[1/2] git commit: CIMI: fix issue with (mock driver) opaque hardware_profile conversion

[ma...@apache.org]

Updated Branches:
  refs/heads/master f2fe244f9 -> f96f99825


CIMI: fix issue with (mock driver) opaque hardware_profile conversion


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/f96f9982
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/f96f9982
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/f96f9982

Branch: refs/heads/master
Commit: f96f998259df0f435a3e72a3dedbacb7c467910a
Parents: 4a4b179
Author: marios <ma...@redhat.com>
Authored: Wed Mar 7 13:24:57 2012 +0200
Committer: marios <ma...@redhat.com>
Committed: Wed Mar 7 13:24:57 2012 +0200

----------------------------------------------------------------------
 server/lib/cimi/model/machine.rb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/f96f9982/server/lib/cimi/model/machine.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/model/machine.rb b/server/lib/cimi/model/machine.rb
index 88c9f73..2e31065 100644
--- a/server/lib/cimi/model/machine.rb
+++ b/server/lib/cimi/model/machine.rb
@@ -136,15 +136,16 @@ class CIMI::Model::Machine < CIMI::Model::Base
   private
 
   def self.from_instance(instance, context)
+    cpu =  memory = disks = (instance.instance_profile.id == "opaque")? "n/a" : nil
     self.new(
       :name => instance.id,
       :description => instance.name,
       :created => instance.launch_time,
       :uri => context.machine_url(instance.id),
       :state => convert_instance_state(instance.state),
-      :cpu => convert_instance_cpu(instance.instance_profile, context),
-      :memory => convert_instance_memory(instance.instance_profile, context),
-      :disks => convert_instance_storage(instance.instance_profile, context),
+      :cpu => cpu || convert_instance_cpu(instance.instance_profile, context),
+      :memory => memory || convert_instance_memory(instance.instance_profile, context),
+      :disks => disks || convert_instance_storage(instance.instance_profile, context),
       :network_interfaces => convert_instance_addresses(instance),
       :operations => convert_instance_actions(instance, context),
       :volumes=>convert_storage_volumes(instance, context),