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 2013/01/24 17:53:30 UTC
git commit: CIMI - test plan - Resource Metadata,
fixing spacing on Sample code.
Updated Branches:
refs/heads/master 5a492088f -> 1bf34b8d4
CIMI - test plan - Resource Metadata, fixing spacing on Sample code.
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/1bf34b8d
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/1bf34b8d
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/1bf34b8d
Branch: refs/heads/master
Commit: 1bf34b8d42e753b512ecde079bd5274f1909cea6
Parents: 5a49208
Author: Ronelle Landy <rl...@redhat.com>
Authored: Wed Jan 23 14:08:26 2013 -0500
Committer: marios <ma...@redhat.com>
Committed: Thu Jan 24 18:53:11 2013 +0200
----------------------------------------------------------------------
tests/cimi/plan/scRMD.xml | 47 +++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/1bf34b8d/tests/cimi/plan/scRMD.xml
----------------------------------------------------------------------
diff --git a/tests/cimi/plan/scRMD.xml b/tests/cimi/plan/scRMD.xml
index fa56969..30a9ceb 100644
--- a/tests/cimi/plan/scRMD.xml
+++ b/tests/cimi/plan/scRMD.xml
@@ -122,9 +122,6 @@ Content-Type: application/json
<p/>
<popup title="Sample">
- <xml>GET /CEP HTTP/1.1
-Accept: application/json</xml>
- <p/>
<xml>HTTP/1.1 200 OK
Content-Type: application/json
@@ -132,8 +129,12 @@ Content-Type: application/json
"resourceURI": "http://schemas.dmtf.org/cimi/1/ResourceMetadataCollection",
"resourceMetadata":
[{"capabilities":
- [{"uri":"http://schemas.dmtf.org/cimi/1/capability/Collection/Capability1", "description":"Description of Capability 1", "name":"Capability1", "value":"valueOfCapability1"},
- {"uri":"http://schemas.dmtf.org/cimi/1/capability/Collection/Capability2", "description":"Description of Capability 2", "name":"Capability2", "value":"valueOfCapability2A, valueOfCapability2B"}],
+ [{"uri":"http://schemas.dmtf.org/cimi/1/capability/Collection/Capability1",
+ "description":"Description of Capability 1", "name":"Capability1",
+ "value":"valueOfCapability1"},
+ {"uri":"http://schemas.dmtf.org/cimi/1/capability/Collection/Capability2",
+ "description":"Description of Capability 2", "name":"Capability2",
+ "value":"valueOfCapability2A, valueOfCapability2B"}],
"typeUri": "http://schemas.dmtf.org/cimi/1/Collection",
"name": "Collection",
"id": "http://example.com/cimi/resource_metadata/collection"}],
@@ -183,8 +184,12 @@ Content-Type: application/json
"resourceURI": "http://schemas.dmtf.org/cimi/1/ResourceMetadataCollection",
"resourceMetadata":
[{"capabilities":
- [{"uri":"http://schemas.dmtf.org/cimi/1/capability/Machine/Capability1", "description":"Decsription of Capability 1", "name":"Capability1", "value":"valueOfCapability1"},
- {"uri":"http://schemas.dmtf.org/cimi/1/capability/Machine/capability2", "description":"Description of Capability 2", "name":"Capability2", "value":"valueOfCapability2A, valueOfCapability2B"}],
+ [{"uri":"http://schemas.dmtf.org/cimi/1/capability/Machine/Capability1",
+ "description":"Decsription of Capability 1", "name":"Capability1",
+ "value":"valueOfCapability1"},
+ {"uri":"http://schemas.dmtf.org/cimi/1/capability/Machine/capability2",
+ "description":"Description of Capability 2", "name":"Capability2",
+ "value":"valueOfCapability2A, valueOfCapability2B"}],
"typeUri":"http://schemas.dmtf.org/cimi/1/Machine",
"name":"Machine",
"id":"http://example.com/cimi/resource_metadata/machine"}],
@@ -261,11 +266,15 @@ Content-Type: application/json
<xml>HTTP/1.1 200 OK
Content-Type: application/xml
-<ResourceMetadata xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/ResourceMetadata">
+<ResourceMetadata xmlns="http://schemas.dmtf.org/cimi/1"
+ resourceURI="http://schemas.dmtf.org/cimi/1/ResourceMetadata">
<id>http://example.com/cimi/resource_metadata/machine</id>
<name>Machine</name>
<typeUri>http://schemas.dmtf.org/cimi/1/Machine</typeUri>
-<capability name="DefaultInitialState" uri="http://schemas.dmtf.org/cimi/1/capability/Machine/DefaultInitialState" description="Indicates what the default initial state of a new Machine">STARTED</capability>
+<capability name="DefaultInitialState"
+uri="http://schemas.dmtf.org/cimi/1/capability/Machine/DefaultInitialState"
+description="Indicates what the default initial state of a new Machine">
+STARTED</capability>
</ResourceMetadata>
</xml>
</popup>
@@ -384,8 +393,10 @@ Content-Type: application/json
"volumes": { "href": "http://example.com/machines/machineId12345/volumes" },
"networkInterfaces": { "href": "http://example.com/machines/machineId12345/NIs",
"operations": [
- { "rel": "http://schemas.dmtf.org/cimi/1/action/capture", "href": "http://example.com/cimi/machine_images" },
- { "rel": "http://schemas.dmtf.org/cimi/1/action/stop", "href": "http://example.com/machines/machineId12345/stop" }
+ { "rel": "http://schemas.dmtf.org/cimi/1/action/capture",
+ "href": "http://example.com/cimi/machine_images" },
+ { "rel": "http://schemas.dmtf.org/cimi/1/action/stop",
+ "href": "http://example.com/machines/machineId12345/stop" }
]
}
</xml>
@@ -474,11 +485,15 @@ Content-Type: application/json
<xml>HTTP/1.1 200 OK
Content-Type: application/xml
-<ResourceMetadata xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/ResourceMetadata">
+<ResourceMetadata xmlns="http://schemas.dmtf.org/cimi/1"
+resourceURI="http://schemas.dmtf.org/cimi/1/ResourceMetadata">
<id>http://example.com/cimi/resource_metadata/machine</id>
<name>Machine</name>
<typeUri>http://schemas.dmtf.org/cimi/1/Machine</typeUri>
-<capability name="InitialStates" uri="http://schemas.dmtf.org/cimi/1/capability/Machine/InitialStates" description="Indicates the list of allowable initial states">STARTED,STOPPED</capability>
+<capability name="InitialStates"
+uri="http://schemas.dmtf.org/cimi/1/capability/Machine/InitialStates"
+description="Indicates the list of allowable initial states">
+STARTED,STOPPED</capability>
</ResourceMetadata>
</xml>
</popup>
@@ -570,8 +585,10 @@ Content-Type: application/json
"volumes": { "href": "http://example.com/machines/machineId123456/volumes" },
"networkInterfaces": { "href": "http://example.com/machines/machineId123456/NIs",
"operations": [
- { "rel": "http://schemas.dmtf.org/cimi/1/action/capture", "href": "http://example.com/cimi/machine_images" },
- { "rel": "http://schemas.dmtf.org/cimi/1/action/start", "href": "http://example.com/machines/machineId123456/start" }
+ { "rel": "http://schemas.dmtf.org/cimi/1/action/capture",
+ "href": "http://example.com/cimi/machine_images" },
+ { "rel": "http://schemas.dmtf.org/cimi/1/action/start",
+ "href": "http://example.com/machines/machineId123456/start" }
]
}
</xml>