You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@deltacloud.apache.org by mf...@apache.org on 2011/11/16 13:49:52 UTC

svn commit: r1202676 - in /incubator/deltacloud/trunk/server: lib/cimi/model.rb spec/cimi/data/machine_image.json

Author: mfojtik
Date: Wed Nov 16 12:49:52 2011
New Revision: 1202676

URL: http://svn.apache.org/viewvc?rev=1202676&view=rev
Log:
CIMI: Registred new model in model.rb. Small bugfix in machine_image JSON

Modified:
    incubator/deltacloud/trunk/server/lib/cimi/model.rb
    incubator/deltacloud/trunk/server/spec/cimi/data/machine_image.json

Modified: incubator/deltacloud/trunk/server/lib/cimi/model.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/cimi/model.rb?rev=1202676&r1=1202675&r2=1202676&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/cimi/model.rb (original)
+++ incubator/deltacloud/trunk/server/lib/cimi/model.rb Wed Nov 16 12:49:52 2011
@@ -23,3 +23,5 @@ end
 require 'cimi/model/schema'
 require 'cimi/model/base'
 require 'cimi/model/machine_template'
+require 'cimi/model/machine_image'
+require 'cimi/model/machine_configuration'

Modified: incubator/deltacloud/trunk/server/spec/cimi/data/machine_image.json
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/spec/cimi/data/machine_image.json?rev=1202676&r1=1202675&r2=1202676&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/spec/cimi/data/machine_image.json (original)
+++ incubator/deltacloud/trunk/server/spec/cimi/data/machine_image.json Wed Nov 16 12:49:52 2011
@@ -3,11 +3,12 @@
   "name": "My First image",
   "description": "A image for testing",
   "created": "2011-11-14",
-  "imageLocation": { "href": "nfs://cimi.example.com/images/1.img"}
-  "properties": [ {"name": "status", "value": "build"}, { "name": "locked", "value": "true" } ]
+  "imageLocation": { "href": "nfs://cimi.example.com/images/1.img" },
+  "properties": [ { "name": "status", "value": "build"}, { "name": "locked", "value": "true" } ],
   "operations": [
-    { "rel": "edit",
-      "href": "http://cimi.example.org/machine_images/1/edit" },
-    { "rel": "delete",
-      "href": "http://cimi.example.org/machine_images/1/delete" }]
+  { "rel": "edit",
+    "href": "http://cimi.example.org/machine_images/1/edit" },
+  { "rel": "delete",
+    "href": "http://cimi.example.org/machine_images/1/delete" }
+  ]
 }