openstack-attic/netconn-api
Code Issues Proposed changes

Merge "Fix invalid XML"

Browse Source
This commit is contained in:
Jenkins 2014-01-08 08:39:41 +00:00 committed by Gerrit Code Review
commit 6bd278b761
8 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v1.0/samples/fault.xml
View File

@ -5,4 +5,4 @@
<detail>
Network 8de6af7c-ef95-4ac1-9d37-172f8df33a1f could not be found
</detail>
</networkNotFound
</networkNotFound>

2
v2.0/api_samples/ports-get-resp.xml
View File

@ -54,7 +54,7 @@
<port_filter quantum:type="bool">False</port_filter>
</binding:capabilities>
<mac_address>fa:16:3e:2d:dc:7e</mac_address>
<fixed_ip>
<fixed_ips>
<fixed_ip>
<subnet_id>a318fcb4-9ff0-4485-b78c-9e6738c21b26</subnet_id>
<ip_address>10.0.0.1</ip_address>

2
v2.0/samples/fault.xml
View File

@ -5,4 +5,4 @@
<detail>
Network 8de6af7c-ef95-4ac1-9d37-172f8df33a1f could not be found
</detail>
</networkNotFound
</networkNotFound>

7
v2.0/samples/networks-put-req-prov.json
View File

@ -1,8 +1,3 @@
PUT /v2.0/networks/3a06dfc7-d239-4aad-9a57-21cd171c72e5.json
Content-Type: application/json
Accept: application/json
{
"network":
{
@ -10,4 +5,4 @@ Accept: application/json
"provider:physical_network": "physnet_1",
"provider:segmentation_id": null
}
}
}

5
v2.0/samples/networks-put-req-prov.xml
View File

@ -1,8 +1,3 @@
PUT /v2.0/networks/3a06dfc7-d239-4aad-9a57-21cd171c72e5.xml
Content-Type: application/xml
Accept: application/xml
<?xml version='1.0' encoding='UTF-8'?>
<network xmlns="http://openstack.org/neutron/api/v2.0"
xmlns:neutron="http://openstack.org/neutron/api/v2.0"

2
v2.0/samples/ports-get-resp.xml
View File

@ -54,7 +54,7 @@
<port_filter quantum:type="bool">False</port_filter>
</binding:capabilities>
<mac_address>fa:16:3e:2d:dc:7e</mac_address>
<fixed_ip>
<fixed_ips>
<fixed_ip>
<subnet_id>a318fcb4-9ff0-4485-b78c-9e6738c21b26</subnet_id>
<ip_address>10.0.0.1</ip_address>

6
v2.0/samples/ports-put-req-prov.xml
View File

@ -1,8 +1,3 @@
PUT /v2.0/networks/3a06dfc7-d239-4aad-9a57-21cd171c72e5.xml
Content-Type: application/xml
Accept: application/xml
<?xml version='1.0' encoding='UTF-8'?>
<network xmlns="http://openstack.org/neutron/api/v2.0"
xmlns:neutron="http://openstack.org/neutron/api/v2.0"
@ -12,4 +7,3 @@ Accept: application/xml
<provider:physical_network>physnet_1</provider:physical_network>
<provider:segmentation_id xsi:nil="true"/>
</network>

8
v2.0/section_provider_ext_networks.xml
View File

@ -277,11 +277,19 @@
<example>
<title>Update Network with provider extended attributes:
JSON Request</title>
<screen><computeroutput>PUT /v2.0/networks/3a06dfc7-d239-4aad-9a57-21cd171c72e5.json
Content-Type: application/json
Accept: application/json</computeroutput></screen>
<programlisting language="json"><xi:include href="samples/networks-put-req-prov.json" parse="text"/></programlisting>
</example>
<example>
<title>Update Network with provider extended attributes:
XML Request</title>
<screen><computeroutput>PUT /v2.0/networks/3a06dfc7-d239-4aad-9a57-21cd171c72e5.xml
Content-Type: application/xml
Accept: application/xml</computeroutput></screen>
<programlisting language="xml"><xi:include href="samples/networks-put-req-prov.xml" parse="text"/></programlisting>
</example>
</section>