From 0bc2aa3fcf118499ebeee914c8897e0c51b73126 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Fri, 3 Jan 2014 21:53:42 +0100
Subject: [PATCH] Fix invalid XML

These files were not valid XML files, fixed now.

Change-Id: I1332f58d71955efef5ad08ff9c69956e45fd6f14
---
 v1.0/samples/fault.xml                  | 2 +-
 v2.0/api_samples/ports-get-resp.xml     | 2 +-
 v2.0/samples/fault.xml                  | 2 +-
 v2.0/samples/networks-put-req-prov.json | 7 +------
 v2.0/samples/networks-put-req-prov.xml  | 5 -----
 v2.0/samples/ports-get-resp.xml         | 2 +-
 v2.0/samples/ports-put-req-prov.xml     | 6 ------
 v2.0/section_provider_ext_networks.xml  | 8 ++++++++
 8 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/v1.0/samples/fault.xml b/v1.0/samples/fault.xml
index ec9220b..85730ff 100644
--- a/v1.0/samples/fault.xml
+++ b/v1.0/samples/fault.xml
@@ -5,4 +5,4 @@
    <detail>
        Network 8de6af7c-ef95-4ac1-9d37-172f8df33a1f could not be found
    </detail>
-</networkNotFound
\ No newline at end of file
+</networkNotFound>
diff --git a/v2.0/api_samples/ports-get-resp.xml b/v2.0/api_samples/ports-get-resp.xml
index 37759d6..faa9cbf 100644
--- a/v2.0/api_samples/ports-get-resp.xml
+++ b/v2.0/api_samples/ports-get-resp.xml
@@ -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>
diff --git a/v2.0/samples/fault.xml b/v2.0/samples/fault.xml
index ec9220b..85730ff 100644
--- a/v2.0/samples/fault.xml
+++ b/v2.0/samples/fault.xml
@@ -5,4 +5,4 @@
    <detail>
        Network 8de6af7c-ef95-4ac1-9d37-172f8df33a1f could not be found
    </detail>
-</networkNotFound
\ No newline at end of file
+</networkNotFound>
diff --git a/v2.0/samples/networks-put-req-prov.json b/v2.0/samples/networks-put-req-prov.json
index fea2df7..b432aa8 100644
--- a/v2.0/samples/networks-put-req-prov.json
+++ b/v2.0/samples/networks-put-req-prov.json
@@ -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
     }
-}
\ No newline at end of file
+}
diff --git a/v2.0/samples/networks-put-req-prov.xml b/v2.0/samples/networks-put-req-prov.xml
index 39dc770..25f3fd4 100644
--- a/v2.0/samples/networks-put-req-prov.xml
+++ b/v2.0/samples/networks-put-req-prov.xml
@@ -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"
diff --git a/v2.0/samples/ports-get-resp.xml b/v2.0/samples/ports-get-resp.xml
index 37759d6..faa9cbf 100644
--- a/v2.0/samples/ports-get-resp.xml
+++ b/v2.0/samples/ports-get-resp.xml
@@ -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>
diff --git a/v2.0/samples/ports-put-req-prov.xml b/v2.0/samples/ports-put-req-prov.xml
index f6b9bc1..25f3fd4 100644
--- a/v2.0/samples/ports-put-req-prov.xml
+++ b/v2.0/samples/ports-put-req-prov.xml
@@ -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>
-
diff --git a/v2.0/section_provider_ext_networks.xml b/v2.0/section_provider_ext_networks.xml
index c150fd8..e9635b1 100644
--- a/v2.0/section_provider_ext_networks.xml
+++ b/v2.0/section_provider_ext_networks.xml
@@ -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>