deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject svn commit: r1203324 - in /incubator/deltacloud/trunk/server/lib/cimi/model: machine_configuration.rb machine_image.rb
Date Thu, 17 Nov 2011 18:50:31 GMT
Author: mfojtik
Date: Thu Nov 17 18:50:31 2011
New Revision: 1203324

URL: http://svn.apache.org/viewvc?rev=1203324&view=rev
Log:
CIMI: Fixed wrong properties types in MachineImage and MachineConfiguration models

Modified:
    incubator/deltacloud/trunk/server/lib/cimi/model/machine_configuration.rb
    incubator/deltacloud/trunk/server/lib/cimi/model/machine_image.rb

Modified: incubator/deltacloud/trunk/server/lib/cimi/model/machine_configuration.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/cimi/model/machine_configuration.rb?rev=1203324&r1=1203323&r2=1203324&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/cimi/model/machine_configuration.rb (original)
+++ incubator/deltacloud/trunk/server/lib/cimi/model/machine_configuration.rb Thu Nov 17 18:50:31
2011
@@ -15,11 +15,20 @@
 
 class CIMI::Model::MachineConfiguration < CIMI::Model::Base
 
-  scalar :memory
+  struct :memory do
+    scalar :quantity
+    scalar :units
+  end
+
   text :cpu
 
-  array :disk do
-    scalar :capacity
+  array :disks do
+    struct :capacity do
+      scalar :format
+      scalar :quantity
+      scalar :attachment_point
+      scalar :units
+    end
   end
 
   array :operations do

Modified: incubator/deltacloud/trunk/server/lib/cimi/model/machine_image.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/cimi/model/machine_image.rb?rev=1203324&r1=1203323&r2=1203324&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/cimi/model/machine_image.rb (original)
+++ incubator/deltacloud/trunk/server/lib/cimi/model/machine_image.rb Thu Nov 17 18:50:31
2011
@@ -15,7 +15,7 @@
 
 class CIMI::Model::MachineImage < CIMI::Model::Base
 
-  scalar :image_location
+  href :image_location
   text :image_data
 
   array :operations do



Mime
View raw message