Merge "Add missing "networks" element to the POST /servers call"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
06ece37ed4
@ -1,16 +1,14 @@
|
||||
{
|
||||
"server": {
|
||||
"flavorRef": "http://openstack.example.com/openstack/flavors/1",
|
||||
"imageRef": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
|
||||
"metadata": {
|
||||
"My Server Name": "Apache1"
|
||||
},
|
||||
"name": "new-server-test",
|
||||
"personality": [
|
||||
{
|
||||
"contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==",
|
||||
"path": "/etc/banner.txt"
|
||||
}
|
||||
]
|
||||
}
|
||||
"server":{
|
||||
"name":"server-test-1",
|
||||
"imageRef":"b5660a6e-4b46-4be3-9707-6b47221b454f",
|
||||
"flavorRef":"2",
|
||||
"max_count":1,
|
||||
"min_count":1,
|
||||
"networks":[
|
||||
{
|
||||
"uuid":"d32019d3-bc6e-4319-9c1d-6722fc136a22"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -1,19 +1,23 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
|
||||
<server xmlns="http://docs.openstack.org/compute/api/v1.1"
|
||||
imageRef="b5660a6e-4b46-4be3-9707-6b47221b454f" flavorRef="2"
|
||||
name="server-test-2">
|
||||
<metadata>
|
||||
<meta key="My Server Name">Apache1</meta>
|
||||
<meta key="My Server Name">API Test Server XML</meta>
|
||||
</metadata>
|
||||
<personality>
|
||||
<file path="/etc/banner.txt">
|
||||
ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
|
||||
dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
|
||||
IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
|
||||
c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
|
||||
QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
|
||||
ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
|
||||
dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
|
||||
c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
|
||||
b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
|
||||
</file>
|
||||
ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
|
||||
dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
|
||||
IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
|
||||
c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
|
||||
QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
|
||||
ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
|
||||
dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
|
||||
c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
|
||||
b25zLiINCg0KLVJpY2hhcmQgQmFjaA==</file>
|
||||
</personality>
|
||||
<networks>
|
||||
<network uuid="0ef47ac7-6797-4e01-8a47-ed26ec3aaa56"/>
|
||||
</networks>
|
||||
</server>
|
||||
|
||||
@ -1,16 +1,22 @@
|
||||
{
|
||||
"server": {
|
||||
"adminPass": "MVk5HPrazHcG",
|
||||
"id": "5bbcc3c4-1da2-4437-a48a-66f15b1b13f9",
|
||||
"links": [
|
||||
{
|
||||
"href": "http://openstack.example.com/v2/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9",
|
||||
"rel": "self"
|
||||
},
|
||||
{
|
||||
"href": "http://openstack.example.com/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9",
|
||||
"rel": "bookmark"
|
||||
}
|
||||
]
|
||||
}
|
||||
"server":{
|
||||
"security_groups":[
|
||||
{
|
||||
"name":"default"
|
||||
}
|
||||
],
|
||||
"OS-DCF:diskConfig":"MANUAL",
|
||||
"id":"c6d04159-9bfc-4ab8-823d-0d5ca2abe152",
|
||||
"links":[
|
||||
{
|
||||
"href":"http://166.78.46.130:8774/v2/4fd44f30292945e481c7b8a0c8908869/servers/c6d04159-9bfc-4ab8-823d-0d5ca2abe152",
|
||||
"rel":"self"
|
||||
},
|
||||
{
|
||||
"href":"http://166.78.46.130:8774/4fd44f30292945e481c7b8a0c8908869/servers/c6d04159-9bfc-4ab8-823d-0d5ca2abe152",
|
||||
"rel":"bookmark"
|
||||
}
|
||||
],
|
||||
"adminPass":"aabbccddeeff"
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,18 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="ea8417a1-7957-4ed5-8b3c-0befc1724308" adminPass="FoFw84XtQj3c">
|
||||
<server
|
||||
xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1"
|
||||
xmlns:atom="http://www.w3.org/2005/Atom"
|
||||
xmlns="http://docs.openstack.org/compute/api/v1.1"
|
||||
id="9720d338-07fb-4317-9eda-a0a833226afa" adminPass="aabbccddeeff"
|
||||
OS-DCF:diskConfig="MANUAL">
|
||||
<metadata/>
|
||||
<atom:link href="http://openstack.example.com/v2/openstack/servers/ea8417a1-7957-4ed5-8b3c-0befc1724308" rel="self"/>
|
||||
<atom:link href="http://openstack.example.com/openstack/servers/ea8417a1-7957-4ed5-8b3c-0befc1724308" rel="bookmark"/>
|
||||
</server>
|
||||
<atom:link
|
||||
href="http://166.78.46.130:8774/v2/4fd44f30292945e481c7b8a0c8908869/servers/9720d338-07fb-4317-9eda-a0a833226afa"
|
||||
rel="self"/>
|
||||
<atom:link
|
||||
href="http://166.78.46.130:8774/4fd44f30292945e481c7b8a0c8908869/servers/9720d338-07fb-4317-9eda-a0a833226afa"
|
||||
rel="bookmark"/>
|
||||
<security_groups>
|
||||
<security_group name="default"/>
|
||||
</security_groups>
|
||||
</server>
|
||||
|
||||
@ -134,103 +134,144 @@
|
||||
'>
|
||||
<!-- Server Create Parameters -->
|
||||
|
||||
<!ENTITY serverCreateParameters
|
||||
'
|
||||
|
||||
<param xmlns="http://wadl.dev.java.net/2009/02"
|
||||
name="security_group" style="query" required="true"
|
||||
type="xsd:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN"><para>The name
|
||||
of the security group. If blank, the server is
|
||||
created in the "default" security
|
||||
group.</para></wadl:doc>
|
||||
</param>
|
||||
<param xmlns="http://wadl.dev.java.net/2009/02"
|
||||
name="user_data" style="query" required="false"
|
||||
type="xsd:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN"><para>Configuration information or scripts to use
|
||||
upon launch. Must be Base64 encoded.</para></wadl:doc>
|
||||
</param>
|
||||
<param xmlns="http://wadl.dev.java.net/2009/02"
|
||||
name="availability_zone" style="query"
|
||||
required="false" type="xsd:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN"><para>The
|
||||
availability zone in which to launch the
|
||||
server.</para></wadl:doc>
|
||||
</param>
|
||||
<param xmlns="http://wadl.dev.java.net/2009/02"
|
||||
name="server" style="plain" required="true"
|
||||
type="csapi:ServerForCreate" path="/csapi:server">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN" title="server">
|
||||
<para>server.</para>
|
||||
</wadl:doc>
|
||||
</param>
|
||||
<param name="imageRef" style="plain" required="true"
|
||||
xmlns:csapi="http://docs.openstack.org/compute/api/v2"
|
||||
xmlns="http://wadl.dev.java.net/2009/02"
|
||||
type="csapi:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN" title="imageRef">
|
||||
<para>The image reference for the desired image
|
||||
for your server instance.</para>
|
||||
<para>Specify as an ID or full
|
||||
URL.</para></wadl:doc>
|
||||
</param>
|
||||
<param name="flavorRef" style="plain" required="true"
|
||||
xmlns:csapi="http://docs.openstack.org/compute/api/v2"
|
||||
xmlns="http://wadl.dev.java.net/2009/02"
|
||||
type="csapi:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN" title="flavorRef">
|
||||
<para>The flavor reference for the desired flavor
|
||||
for your server instance.</para>
|
||||
<para>Specify as an ID or full
|
||||
URL.</para></wadl:doc>
|
||||
</param>
|
||||
<param name="name" style="plain" required="true"
|
||||
xmlns:csapi="http://docs.openstack.org/compute/api/v2"
|
||||
xmlns="http://wadl.dev.java.net/2009/02"
|
||||
type="csapi:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN" title="name">
|
||||
<para>The name for your created
|
||||
server.</para></wadl:doc>
|
||||
</param>
|
||||
<param name="metadata" style="plain" required="false"
|
||||
xmlns:csapi="http://docs.openstack.org/compute/api/v2"
|
||||
xmlns="http://wadl.dev.java.net/2009/02"
|
||||
type="csapi:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN" title="metadata">
|
||||
<para>Metadata key and value pairs. The maximum
|
||||
size of the metadata key and value is 255
|
||||
bytes each.</para></wadl:doc>
|
||||
</param>
|
||||
<param name="personality" style="plain" required="false"
|
||||
xmlns="http://wadl.dev.java.net/2009/02"
|
||||
type="csapi:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN" title="personality">
|
||||
<para>File path and contents (text only) to inject
|
||||
into the server at launch. The maximum size of
|
||||
the file path data is 255 bytes. The maximum
|
||||
limit refers to the number of bytes in the
|
||||
decoded data and not the number of characters
|
||||
in the encoded data.</para></wadl:doc>
|
||||
</param>
|
||||
<!ENTITY serverCreateParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
|
||||
name="security_group" style="query" required="true"
|
||||
type="xsd:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN"><para>The name
|
||||
of the security group. If blank, the server is
|
||||
created in the "default" security
|
||||
group.</para></wadl:doc>
|
||||
</param>
|
||||
<param xmlns="http://wadl.dev.java.net/2009/02"
|
||||
name="user_data" style="query" required="false"
|
||||
type="xsd:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN"><para>Configuration information or scripts to use
|
||||
upon launch. Must be Base64 encoded.</para></wadl:doc>
|
||||
</param>
|
||||
<param xmlns="http://wadl.dev.java.net/2009/02"
|
||||
name="availability_zone" style="query"
|
||||
required="false" type="xsd:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN"><para>The
|
||||
availability zone in which to launch the
|
||||
server.</para></wadl:doc>
|
||||
</param>
|
||||
<param xmlns="http://wadl.dev.java.net/2009/02"
|
||||
name="server" style="plain" required="true"
|
||||
type="csapi:ServerForCreate" path="/csapi:server">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN" title="server">
|
||||
<para>server.</para>
|
||||
</wadl:doc>
|
||||
</param>
|
||||
<param name="imageRef" style="plain" required="true"
|
||||
xmlns:csapi="http://docs.openstack.org/compute/api/v2"
|
||||
xmlns="http://wadl.dev.java.net/2009/02"
|
||||
type="csapi:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN" title="imageRef">
|
||||
<para>The image reference for the desired image
|
||||
for your server instance.</para>
|
||||
<para>Specify as an ID or full
|
||||
URL.</para></wadl:doc>
|
||||
</param>
|
||||
<param name="flavorRef" style="plain" required="true"
|
||||
xmlns:csapi="http://docs.openstack.org/compute/api/v2"
|
||||
xmlns="http://wadl.dev.java.net/2009/02"
|
||||
type="csapi:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN" title="flavorRef">
|
||||
<para>The flavor reference for the desired flavor
|
||||
for your server instance.</para>
|
||||
<para>Specify as an ID or full
|
||||
URL.</para></wadl:doc>
|
||||
</param>
|
||||
<param name="networks" style="plain" type="xsd:string"
|
||||
required="false">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook">
|
||||
<para>A <code>networks</code> object. By default, the server
|
||||
instance is provisioned with all isolated networks for the
|
||||
tenant.</para>
|
||||
<para>Optionally, you can create one or more NICs on the
|
||||
server.</para>
|
||||
<para>To provision the server instance with a NIC for a
|
||||
<code>nova-network</code> network, specify the UUID in
|
||||
the <code>uuid</code> attribute in a <code>networks</code>
|
||||
object.</para>
|
||||
<para>To provision the server instance with a NIC for a
|
||||
<code>neutron</code> network, specify the UUID in the
|
||||
<code>port</code> attribute in a <code>networks</code>
|
||||
object.</para>
|
||||
<para>You can specify multiple NICs on the server.</para>
|
||||
</wadl:doc>
|
||||
</param>
|
||||
<param name="uuid" style="plain" type="xsd:string" required="false">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook">
|
||||
<para>To provision the server instance with a NIC for a
|
||||
<code>nova-network</code> network, specify the UUID in
|
||||
the <code>uuid</code> attribute in a <code>networks</code>
|
||||
object. Required if you omit the <code>port</code>
|
||||
attribute.</para>
|
||||
</wadl:doc>
|
||||
</param>
|
||||
<param name="port" style="plain" type="xsd:string" required="false">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook">
|
||||
<para>To provision the server instance with a NIC for a
|
||||
<code>neutron</code> network, specify the UUID in the
|
||||
<code>port</code> attribute in a <code>networks</code>
|
||||
object. Required if you omit the <code>uuid</code>
|
||||
attribute.</para>
|
||||
</wadl:doc>
|
||||
</param>
|
||||
<param name="fixed_ip" style="plain" type="xsd:string"
|
||||
required="false">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook">
|
||||
<para>A fixed IPv4 address for the NIC. Valid with a
|
||||
<code>neutron</code> or <code>nova-networks</code>
|
||||
network.</para>
|
||||
</wadl:doc>
|
||||
</param>
|
||||
<param name="name" style="plain" required="true"
|
||||
xmlns:csapi="http://docs.openstack.org/compute/api/v2"
|
||||
xmlns="http://wadl.dev.java.net/2009/02"
|
||||
type="csapi:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN" title="name">
|
||||
<para>The server name.</para></wadl:doc>
|
||||
</param>
|
||||
<param name="metadata" style="plain" required="false"
|
||||
xmlns:csapi="http://docs.openstack.org/compute/api/v2"
|
||||
xmlns="http://wadl.dev.java.net/2009/02"
|
||||
type="csapi:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN" title="metadata">
|
||||
<para>Metadata key and value pairs. The maximum
|
||||
size of the metadata key and value is 255
|
||||
bytes each.</para></wadl:doc>
|
||||
</param>
|
||||
<param name="personality" style="plain" required="false"
|
||||
xmlns="http://wadl.dev.java.net/2009/02"
|
||||
type="csapi:string">
|
||||
<wadl:doc xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:wadl="http://wadl.dev.java.net/2009/02"
|
||||
xml:lang="EN" title="personality">
|
||||
<para>File path and contents (text only) to inject
|
||||
into the server at launch. The maximum size of
|
||||
the file path data is 255 bytes. The maximum
|
||||
limit refers to the number of bytes in the
|
||||
decoded data and not the number of characters
|
||||
in the encoded data.</para></wadl:doc>
|
||||
</param>
|
||||
'>
|
||||
|
||||
<!-- Server List Parameters -->
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user