incubator-deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "marios@redhat.com" <mandr...@redhat.com>
Subject Re: [PATCH core 5/5] CIMI: Registred new model in model.rb. Small bugfix in machine_image JSON
Date Wed, 16 Nov 2011 11:21:40 GMT
ACK

On 14/11/11 17:09, mfojtik@redhat.com wrote:
> From: Michal Fojtik <mfojtik@redhat.com>
> 
> 
> Signed-off-by: Michal fojtik <mfojtik@redhat.com>
> ---
>  server/lib/cimi/model.rb                 |    2 ++
>  server/spec/cimi/data/machine_image.json |   13 +++++++------
>  2 files changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/server/lib/cimi/model.rb b/server/lib/cimi/model.rb
> index fcc6e17..1e4a34a 100644
> --- a/server/lib/cimi/model.rb
> +++ b/server/lib/cimi/model.rb
> @@ -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'
> diff --git a/server/spec/cimi/data/machine_image.json b/server/spec/cimi/data/machine_image.json
> index e037144..8b1f476 100644
> --- a/server/spec/cimi/data/machine_image.json
> +++ b/server/spec/cimi/data/machine_image.json
> @@ -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" }
> +  ]
>  }


Mime
View raw message