You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by mf...@redhat.com on 2011/11/16 21:34:31 UTC

[PATCH core 2/4] CIMI: Fixed typos in sample data

From: Michal Fojtik <mf...@redhat.com>

---
 server/spec/cimi/data/machine_configuration.json |    4 ++--
 server/spec/cimi/data/machine_image.xml          |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/spec/cimi/data/machine_configuration.json b/server/spec/cimi/data/machine_configuration.json
index 4ed3214..1d33c5a 100644
--- a/server/spec/cimi/data/machine_configuration.json
+++ b/server/spec/cimi/data/machine_configuration.json
@@ -11,7 +11,7 @@
   "properties": [ { "architectore": "i386" } ],
   "operations": [
     { "rel": "edit",
-      "href": "http://cimi.example.org/machine_images/1/edit" },
+      "href": "http://cimi.example.org/machine_configurations/1/edit" },
     { "rel": "delete",
-      "href": "http://cimi.example.org/machine_images/1/delete" }]
+      "href": "http://cimi.example.org/machine_configurations/1/delete" }]
 }
diff --git a/server/spec/cimi/data/machine_image.xml b/server/spec/cimi/data/machine_image.xml
index a02bc36..2614dac 100644
--- a/server/spec/cimi/data/machine_image.xml
+++ b/server/spec/cimi/data/machine_image.xml
@@ -1,11 +1,11 @@
 <MachineImage xmlns="http://www.dmtf.org/cimi">
-  <uri>http://cimi.example.org/machine_image/1</uri>
+  <uri>http://cimi.example.org/machine_images/1</uri>
   <name>img1</name>
   <description>Machine Image One</description>
   <created>2011-11-14</created>
   <property name="status">BUILD</property>
   <property name="locked">true</property>
   <imageLocation href="nfs://cimi.example.com/images/1.img"/>
-  <operation rel="edit" href="http://cimi.example.org/machine_image/1/edit"/>
-  <operation rel="delete" href="http://cimi.example.org/machine_image/1/delete"/>
+  <operation rel="edit" href="http://cimi.example.org/machine_images/1/edit"/>
+  <operation rel="delete" href="http://cimi.example.org/machine_images/1/delete"/>
 </MachineImage>
-- 
1.7.7.3


Re: [PATCH core 2/4] CIMI: Fixed typos in sample data

Posted by "marios@redhat.com" <ma...@redhat.com>.
ACK

(I have to change this is MachineAdmin too... thats what you get for
copying ;) )

On 16/11/11 22:34, mfojtik@redhat.com wrote:
> From: Michal Fojtik <mf...@redhat.com>
> 
> ---
>  server/spec/cimi/data/machine_configuration.json |    4 ++--
>  server/spec/cimi/data/machine_image.xml          |    6 +++---
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/server/spec/cimi/data/machine_configuration.json b/server/spec/cimi/data/machine_configuration.json
> index 4ed3214..1d33c5a 100644
> --- a/server/spec/cimi/data/machine_configuration.json
> +++ b/server/spec/cimi/data/machine_configuration.json
> @@ -11,7 +11,7 @@
>    "properties": [ { "architectore": "i386" } ],
>    "operations": [
>      { "rel": "edit",
> -      "href": "http://cimi.example.org/machine_images/1/edit" },
> +      "href": "http://cimi.example.org/machine_configurations/1/edit" },
>      { "rel": "delete",
> -      "href": "http://cimi.example.org/machine_images/1/delete" }]
> +      "href": "http://cimi.example.org/machine_configurations/1/delete" }]
>  }
> diff --git a/server/spec/cimi/data/machine_image.xml b/server/spec/cimi/data/machine_image.xml
> index a02bc36..2614dac 100644
> --- a/server/spec/cimi/data/machine_image.xml
> +++ b/server/spec/cimi/data/machine_image.xml
> @@ -1,11 +1,11 @@
>  <MachineImage xmlns="http://www.dmtf.org/cimi">
> -  <uri>http://cimi.example.org/machine_image/1</uri>
> +  <uri>http://cimi.example.org/machine_images/1</uri>
>    <name>img1</name>
>    <description>Machine Image One</description>
>    <created>2011-11-14</created>
>    <property name="status">BUILD</property>
>    <property name="locked">true</property>
>    <imageLocation href="nfs://cimi.example.com/images/1.img"/>
> -  <operation rel="edit" href="http://cimi.example.org/machine_image/1/edit"/>
> -  <operation rel="delete" href="http://cimi.example.org/machine_image/1/delete"/>
> +  <operation rel="edit" href="http://cimi.example.org/machine_images/1/edit"/>
> +  <operation rel="delete" href="http://cimi.example.org/machine_images/1/delete"/>
>  </MachineImage>