[PATCH aggregator] BZ #644011 - consistent aritechture types

[Jan Provazník]

From: Jan Provaznik

https://bugzilla.redhat.com/show_bug.cgi?id=644011

Template's architecture is now 'x86_64' (or i386) instead of 64-bit or 32-bit
---
 src/app/controllers/instances_controller.rb        |    8 +-------
 .../image_descriptor_platform_repositories.yml     |    2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/app/controllers/instances_controller.rb b/src/app/controllers/instances_controller.rb
index 3ffb287..5e68b8e 100644
--- a/src/app/controllers/instances_controller.rb
+++ b/src/app/controllers/instances_controller.rb
@@ -82,15 +82,9 @@ class InstancesController < ApplicationController
   def configure
     @instance = Instance.new(params[:instance])
     require_privilege(Privilege::INSTANCE_MODIFY, @instance.pool)
-    # FIXME: change template.architecture to match expected HWP arch strings
-    if (@instance.template.architecture == "64-bit")
-      arch_value = "x86_64"
-    else
-      arch_value = "i386"
-    end
     @hardware_profiles = HardwareProfile.find(:all, :include => :architecture,
                                    :conditions => {:provider_id => nil,
-                                   "hardware_profile_properties.value" => arch_value})
+                                   'hardware_profile_properties.value' => @instance.template.architecture})
   end

def create
diff --git a/src/config/image_descriptor_platform_repositories.yml b/src/config/image_descriptor_platform_repositories.yml
index c29a244..d16d0c0 100644
--- a/src/config/image_descriptor_platform_repositories.yml
+++ b/src/config/image_descriptor_platform_repositories.yml
@@ -1,4 +1,4 @@
 fedora:
   name: Fedora
   version: 13
-  architecture: 64-bit
+  architecture: x86_64

[Martyn Taylor]

Ack
----- Original Message -----
From: [e-mail]
To: [e-mail]
Sent: Friday, November 26, 2010 1:26:55 PM GMT +00:00 GMT Britain, Ireland, Portugal
Subject: [deltacloud-devel] [PATCH aggregator] BZ #644011 - consistent aritechture types

From: Jan Provaznik

https://bugzilla.redhat.com/show_bug.cgi?id=644011

Template's architecture is now 'x86_64' (or i386) instead of 64-bit or 32-bit
---
 src/app/controllers/instances_controller.rb        |    8 +-------
 .../image_descriptor_platform_repositories.yml     |    2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/app/controllers/instances_controller.rb b/src/app/controllers/instances_controller.rb
index 3ffb287..5e68b8e 100644
--- a/src/app/controllers/instances_controller.rb
+++ b/src/app/controllers/instances_controller.rb
@@ -82,15 +82,9 @@ class InstancesController < ApplicationController
   def configure
     @instance = Instance.new(params[:instance])
     require_privilege(Privilege::INSTANCE_MODIFY, @instance.pool)
-    # FIXME: change template.architecture to match expected HWP arch strings
-    if (@instance.template.architecture == "64-bit")
-      arch_value = "x86_64"
-    else
-      arch_value = "i386"
-    end
     @hardware_profiles = HardwareProfile.find(:all, :include => :architecture,
                                    :conditions => {:provider_id => nil,
-                                   "hardware_profile_properties.value" => arch_value})
+                                   'hardware_profile_properties.value' => @instance.template.architecture})
   end

def create
diff --git a/src/config/image_descriptor_platform_repositories.yml b/src/config/image_descriptor_platform_repositories.yml
index c29a244..d16d0c0 100644
--- a/src/config/image_descriptor_platform_repositories.yml
+++ b/src/config/image_descriptor_platform_repositories.yml
@@ -1,4 +1,4 @@
 fedora:
   name: Fedora
   version: 13
-  architecture: 64-bit
+  architecture: x86_64