You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2012/11/30 15:55:12 UTC
[3/3] git commit: CIMI: Added more XML samples to support/cimi
CIMI: Added more XML samples to support/cimi
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/792957f8
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/792957f8
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/792957f8
Branch: refs/heads/master
Commit: 792957f831a4c7f0a75ac6679802014279cd8689
Parents: 4764efc
Author: Michal Fojtik <mf...@redhat.com>
Authored: Fri Nov 30 10:48:55 2012 +0100
Committer: Michal fojtik <mf...@redhat.com>
Committed: Fri Nov 30 15:54:49 2012 +0100
----------------------------------------------------------------------
server/support/cimi/machine.json | 4 ++--
server/support/cimi/machine.xml | 9 +++++++++
server/support/cimi/machine_from_temp.xml | 6 ++++++
server/support/cimi/machine_template.json | 4 ++--
server/support/cimi/machine_template.xml | 7 +++++++
5 files changed, 26 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/792957f8/server/support/cimi/machine.json
----------------------------------------------------------------------
diff --git a/server/support/cimi/machine.json b/server/support/cimi/machine.json
index e2564d9..edc4cdb 100644
--- a/server/support/cimi/machine.json
+++ b/server/support/cimi/machine.json
@@ -7,7 +7,7 @@
"life": "is life"
},
"machineTemplate": {
- "machineConfig": { "href": " http://localhost:3001/cimi/machine_configurations/m1-small" },
- "machineImage": { "href": " http://localhost:3001/cimi/machine_images/img1" }
+ "machineConfig": { "href": "http://localhost:3001/cimi/machine_configurations/m1-small" },
+ "machineImage": { "href": "http://localhost:3001/cimi/machine_images/img1" }
}
}
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/792957f8/server/support/cimi/machine.xml
----------------------------------------------------------------------
diff --git a/server/support/cimi/machine.xml b/server/support/cimi/machine.xml
new file mode 100644
index 0000000..6242e08
--- /dev/null
+++ b/server/support/cimi/machine.xml
@@ -0,0 +1,9 @@
+<MachineCreate>
+ <name>myMachineXML123</name>
+ <description>Description of my new Machine</description>
+ <machineTemplate>
+ <machineConfig href="http://localhost:3001/cimi/machine_configurations/m1-small"/>
+ <machineImage href="http://localhost:3001/cimi/machine_images/img1"/>
+ </machineTemplate>
+ <property name="test">value</property>
+</MachineCreate>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/792957f8/server/support/cimi/machine_from_temp.xml
----------------------------------------------------------------------
diff --git a/server/support/cimi/machine_from_temp.xml b/server/support/cimi/machine_from_temp.xml
new file mode 100644
index 0000000..a5a8dfc
--- /dev/null
+++ b/server/support/cimi/machine_from_temp.xml
@@ -0,0 +1,6 @@
+<MachineCreate>
+ <name>myMachineXML123</name>
+ <description>Description of my new Machine</description>
+ <machineTemplate href="http://localhost:3001/cimi/machine_templates/1"/>
+ <property name="test">value</property>
+</MachineCreate>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/792957f8/server/support/cimi/machine_template.json
----------------------------------------------------------------------
diff --git a/server/support/cimi/machine_template.json b/server/support/cimi/machine_template.json
index a8e27ae..3f219dc 100644
--- a/server/support/cimi/machine_template.json
+++ b/server/support/cimi/machine_template.json
@@ -2,8 +2,8 @@
"resourceURI": "http://schemas.dmtf.org/cimi/1/MachineTemplateCreate",
"name": "myMachineDemoTemplate",
"description": "My very loved machine template",
- "machineConfig": { "href": " http://localhost:3001/cimi/machine_configurations/m1-xlarge" },
- "machineImage": { "href": " http://localhost:3001/cimi/machine_images/img3" },
+ "machineConfig": { "href": "http://localhost:3001/cimi/machine_configurations/m1-xlarge" },
+ "machineImage": { "href": "http://localhost:3001/cimi/machine_images/img3" },
"properties": {
"foo": "bar",
"life": "is life"
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/792957f8/server/support/cimi/machine_template.xml
----------------------------------------------------------------------
diff --git a/server/support/cimi/machine_template.xml b/server/support/cimi/machine_template.xml
new file mode 100644
index 0000000..85bc3b0
--- /dev/null
+++ b/server/support/cimi/machine_template.xml
@@ -0,0 +1,7 @@
+<MachineTemplateCreate>
+ <name>myXmlTestMachineTemplate1</name>
+ <description>Description of my MachineTemplate</description>
+ <property name="test">value</property>
+ <machineConfig href="http://localhost:3001/cimi/machine_configurations/m1-xlarge"/>
+ <machineImage href="http://localhost:3001/cimi/machine_images/img3"/>
+</MachineTemplateCreate>