deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject git commit: CIMI - Fixes nits on MachineImage model - DTACLOUD-378
Date Wed, 28 Nov 2012 13:58:22 GMT
Updated Branches:
  refs/heads/master ea5fda91d -> c3dd66187


CIMI - Fixes nits on MachineImage model - DTACLOUD-378

https://issues.apache.org/jira/browse/DTACLOUD-378


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

Branch: refs/heads/master
Commit: c3dd66187a2093ef8e9716f686b1b51b9ee12707
Parents: ea5fda9
Author: marios <marios@redhat.com>
Authored: Thu Nov 22 10:20:54 2012 +0200
Committer: marios <marios@redhat.com>
Committed: Wed Nov 28 15:57:26 2012 +0200

----------------------------------------------------------------------
 server/lib/cimi/models/machine_image.rb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c3dd6618/server/lib/cimi/models/machine_image.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/models/machine_image.rb b/server/lib/cimi/models/machine_image.rb
index 3e1e604..6034e5b 100644
--- a/server/lib/cimi/models/machine_image.rb
+++ b/server/lib/cimi/models/machine_image.rb
@@ -18,8 +18,9 @@ class CIMI::Model::MachineImage < CIMI::Model::Base
   acts_as_root_entity
 
   text :state
-  href :image_location
-  text :image_data
+  text :type
+  text :image_location
+  href :related_image
 
   array :operations do
     scalar :rel, :href
@@ -41,9 +42,10 @@ class CIMI::Model::MachineImage < CIMI::Model::Base
       :name => image.id,
       :id => context.machine_image_url(image.id),
       :state => image.state || 'UNKNOWN',
+      :type => "IMAGE",
       :description => image.description,
       :created => Time.now.xmlschema,
-      :image_location => { :href => "#{context.driver.name}://#{image.id}" } # FIXME
+      :image_location => "#{context.driver.name}://#{image.id}" # FIXME
     )
   end
 


Mime
View raw message