deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject [2/6] git commit: CIMI: Map Machine name to Instace name properly
Date Mon, 12 Nov 2012 19:44:02 GMT
CIMI: Map Machine name to Instace name properly


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

Branch: refs/heads/master
Commit: 992f8510da23ee238027c97d48631d6bbc72d56d
Parents: f046e4c
Author: Michal Fojtik <mfojtik@redhat.com>
Authored: Mon Nov 12 12:31:18 2012 +0100
Committer: Michal fojtik <mfojtik@redhat.com>
Committed: Mon Nov 12 20:22:10 2012 +0100

----------------------------------------------------------------------
 server/lib/cimi/models/machine.rb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/992f8510/server/lib/cimi/models/machine.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/models/machine.rb b/server/lib/cimi/models/machine.rb
index e2594d1..648c395 100644
--- a/server/lib/cimi/models/machine.rb
+++ b/server/lib/cimi/models/machine.rb
@@ -123,8 +123,8 @@ class CIMI::Model::Machine < CIMI::Model::Base
     cpu =  memory = (instance.instance_profile.id == "opaque")? "n/a" : nil
     machine_conf = CIMI::Model::MachineConfiguration.find(instance.instance_profile.name,
context)
     machine_spec = {
-      :name => instance.id,
-      :description => instance.name,
+      :name => instance.name,
+      :description => "Instance #{instance.name}",
       :created => instance.launch_time.nil? ? Time.now.xmlschema : Time.parse(instance.launch_time).xmlschema,
       :id => context.machine_url(instance.id),
       :state => convert_instance_state(instance.state),


Mime
View raw message