diff --git a/include/RequestManagerAllocate.h b/include/RequestManagerAllocate.h index e2561eb4d9..c9921b39d0 100644 --- a/include/RequestManagerAllocate.h +++ b/include/RequestManagerAllocate.h @@ -210,7 +210,7 @@ public: HostAllocate(): RequestManagerAllocate("HostAllocate", "Allocates a new host", - "A:sssss", + "A:ssssss", false) { Nebula& nd = Nebula::instance(); diff --git a/install.sh b/install.sh index 2db3e5ff92..d623fa7a57 100755 --- a/install.sh +++ b/install.sh @@ -967,6 +967,7 @@ OCCI_ETC_TEMPLATE_FILES="src/cloud/occi/etc/templates/common.erb \ src/cloud/occi/etc/templates/custom.erb \ src/cloud/occi/etc/templates/small.erb \ src/cloud/occi/etc/templates/medium.erb \ + src/cloud/occi/etc/templates/network.erb \ src/cloud/occi/etc/templates/large.erb" #----------------------------------------------------------------------------- diff --git a/share/doc/xsd/README.txt b/share/doc/xsd/README.txt new file mode 100644 index 0000000000..00d6a90185 --- /dev/null +++ b/share/doc/xsd/README.txt @@ -0,0 +1,9 @@ +These XML Schemas define the XMLs returned by OpenNebula's XML-RPC API. + +The included XML samples are not actual responses from OpenNebula, as it does +not include the headers (namespace, schema location). + + +To learn more, please read the API reference documentation at +http://opennebula.org/documentation:documentation:api + diff --git a/share/doc/xsd/group.xsd b/share/doc/xsd/group.xsd new file mode 100644 index 0000000000..eb36432fff --- /dev/null +++ b/share/doc/xsd/group.xsd @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + diff --git a/share/doc/xsd/group_pool.xsd b/share/doc/xsd/group_pool.xsd new file mode 100644 index 0000000000..c8dc69c06b --- /dev/null +++ b/share/doc/xsd/group_pool.xsd @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/share/doc/xsd/host.xsd b/share/doc/xsd/host.xsd new file mode 100644 index 0000000000..58fa4d8bbe --- /dev/null +++ b/share/doc/xsd/host.xsd @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/doc/xsd/host_pool.xsd b/share/doc/xsd/host_pool.xsd new file mode 100644 index 0000000000..5d797d3cbb --- /dev/null +++ b/share/doc/xsd/host_pool.xsd @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/share/doc/xsd/image.xsd b/share/doc/xsd/image.xsd new file mode 100644 index 0000000000..207cee1bd0 --- /dev/null +++ b/share/doc/xsd/image.xsd @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/doc/xsd/image_pool.xsd b/share/doc/xsd/image_pool.xsd new file mode 100644 index 0000000000..6e39f45267 --- /dev/null +++ b/share/doc/xsd/image_pool.xsd @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/share/doc/xsd/samples/group/1.xml b/share/doc/xsd/samples/group/1.xml new file mode 100644 index 0000000000..35813b2430 --- /dev/null +++ b/share/doc/xsd/samples/group/1.xml @@ -0,0 +1,12 @@ + + 1 + users + + 2 + 3 + 4 + 5 + + \ No newline at end of file diff --git a/share/doc/xsd/samples/group/2.xml b/share/doc/xsd/samples/group/2.xml new file mode 100644 index 0000000000..83ec0ed02b --- /dev/null +++ b/share/doc/xsd/samples/group/2.xml @@ -0,0 +1,7 @@ + + 100 + new + + \ No newline at end of file diff --git a/share/doc/xsd/samples/group_pool/1.xml b/share/doc/xsd/samples/group_pool/1.xml new file mode 100644 index 0000000000..4c99b3289c --- /dev/null +++ b/share/doc/xsd/samples/group_pool/1.xml @@ -0,0 +1,37 @@ + + + 0 + oneadmin + + 0 + 1 + + + + 1 + users + + 2 + 3 + 4 + 5 + + + + 100 + new + + + + 101 + test + + + + 102 + abc + + + \ No newline at end of file diff --git a/share/doc/xsd/samples/host/1.xml b/share/doc/xsd/samples/host/1.xml new file mode 100644 index 0000000000..400cdf25f7 --- /dev/null +++ b/share/doc/xsd/samples/host/1.xml @@ -0,0 +1,27 @@ + + 0 + localhost + 3 + im_dummy + vmm_dummy + fw + tm_shared + 0 + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + +