You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by ma...@apache.org on 2012/11/28 17:53:18 UTC
git commit: CIMI - tests updated fixtures to fix broken build after
Updated Branches:
refs/heads/master c1029cd0c -> 752967294
CIMI - tests updated fixtures to fix broken build after
c3dd66187a2093ef8e9716f686b1b51b9ee12707
(MachineImage model nits)
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/75296729
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/75296729
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/75296729
Branch: refs/heads/master
Commit: 752967294802c1c47122d082ce0d85afc7925054
Parents: c1029cd
Author: marios <ma...@redhat.com>
Authored: Wed Nov 28 18:44:29 2012 +0200
Committer: marios <ma...@redhat.com>
Committed: Wed Nov 28 18:44:29 2012 +0200
----------------------------------------------------------------------
server/tests/cimi/data/machine_image.json | 5 +++--
server/tests/cimi/data/machine_image.xml | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/75296729/server/tests/cimi/data/machine_image.json
----------------------------------------------------------------------
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" },
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/75296729/server/tests/cimi/data/machine_image.xml
----------------------------------------------------------------------
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>