On 11/28, [email protected] wrote: ACK.
> From: marios <[email protected]> > > c3dd66187a2093ef8e9716f686b1b51b9ee12707 > > (MachineImage model nits) > > Signed-off-by: marios <[email protected]> > --- > server/tests/cimi/data/machine_image.json | 5 +++-- > server/tests/cimi/data/machine_image.xml | 5 +++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/server/tests/cimi/data/machine_image.json > b/server/tests/cimi/data/machine_image.json > index c79ab9e..db26696 100644 > --- a/server/tests/cimi/data/machine_image.json > +++ b/server/tests/cimi/data/machine_image.json > @@ -2,11 +2,12 @@ > "resourceURI": "http://schemas.dmtf.org/cimi/1/MachineImage";, > "id": "http://cimi.example.org/machine_images/1";, > "name": "img1", > - "state": "AVAILABLE", > "description": "Machine Image One", > "created": "2011-11-14", > - "imageLocation": { "href": "nfs://cimi.example.com/images/1.img" }, > "properties": { "status": "BUILD", "locked": "true" }, > + "state": "AVAILABLE", > + "type": "IMAGE", > + "imageLocation": "nfs://cimi.example.com/images/1.img", > "operations": [ > { "rel": "edit", > "href": "http://cimi.example.org/machine_images/1/edit"; }, > diff --git a/server/tests/cimi/data/machine_image.xml > b/server/tests/cimi/data/machine_image.xml > index 158460f..7f2d69b 100644 > --- a/server/tests/cimi/data/machine_image.xml > +++ b/server/tests/cimi/data/machine_image.xml > @@ -3,10 +3,11 @@ > <name>img1</name> > <description>Machine Image One</description> > <created>2011-11-14</created> > - <state>AVAILABLE</state> > <property key="status">BUILD</property> > <property key="locked">true</property> > - <imageLocation href="nfs://cimi.example.com/images/1.img"/> > + <state>AVAILABLE</state> > + <type>IMAGE</type> > + <imageLocation>nfs://cimi.example.com/images/1.img</imageLocation> > <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.11.7 > -- Michal Fojtik <[email protected]> Deltacloud API, CloudForms
