From 6f49c24c14fa50979ae3f1fc9fa162f03885c03e Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Fri, 3 Jan 2014 13:55:27 +0100
Subject: [PATCH] Fix invalid XML

* authwithgroups.xml: Ending tag should be same as opening one
* endpoints.xml: Remove duplicate tenantID="1" attribute
* admin-actions-reset-state.*: Deleted, it's not used anywhere and
  looking at the names, the file admin-actions-reset-server-state
  handles this already
* ports-get-resp.xml: Fix XML code

Change-Id: Ia6b71c736ba92e170167db6ef7bf7f0158483e6a
---
 .../admin-actions-reset-state.json            |  0
 .../admin-actions-reset-state.xml             |  0
 .../src/v2.0/samples/authwithgroups.xml       | 76 +++++++++----------
 .../src/v2.0/samples/endpoints.xml            |  1 -
 .../src/api_samples/ports-get-resp.xml        |  2 +-
 5 files changed, 39 insertions(+), 40 deletions(-)
 delete mode 100644 api-ref/src/wadls/compute-api/src/api_samples/os-admin-actions/admin-actions-reset-state.json
 delete mode 100644 api-ref/src/wadls/compute-api/src/api_samples/os-admin-actions/admin-actions-reset-state.xml

diff --git a/api-ref/src/wadls/compute-api/src/api_samples/os-admin-actions/admin-actions-reset-state.json b/api-ref/src/wadls/compute-api/src/api_samples/os-admin-actions/admin-actions-reset-state.json
deleted file mode 100644
index e69de29bb..000000000
diff --git a/api-ref/src/wadls/compute-api/src/api_samples/os-admin-actions/admin-actions-reset-state.xml b/api-ref/src/wadls/compute-api/src/api_samples/os-admin-actions/admin-actions-reset-state.xml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/authwithgroups.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/authwithgroups.xml
index b41cc6f60..7d89d9537 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/authwithgroups.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/authwithgroups.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <access xmlns="http://docs.openstack.org/identity/api/v2.0">
-	<token expires="2010-11-01T03:32:15-05:00"
+        <token expires="2010-11-01T03:32:15-05:00"
            id="ab48a9efdfedb23ty3494"/>
     <serviceCatalog>
         <service type="compute" name="Computers in the Cloud">
-			<endpoint region="North" tenantId="1"
-				publicURL="https://north.compute.public.com/v2.0/1234"
-				internalURL="https://north.compute.internal.com/v2.0/1234">
-				<version id="2.0"
-					info="https://north.compute.public.com/v2.0/"
-					list="https://north.compute.public.com/"/>
-			</endpoint>
+                        <endpoint region="North" tenantId="1"
+                                publicURL="https://north.compute.public.com/v2.0/1234"
+                                internalURL="https://north.compute.internal.com/v2.0/1234">
+                                <version id="2.0"
+                                        info="https://north.compute.public.com/v2.0/"
+                                        list="https://north.compute.public.com/"/>
+                        </endpoint>
             <endpoint
                     region="South"
                     tenantId="3456"
                     publicURL="https://south.compute.public.com/v2.0/3456"
                     internalURL="https://south.compute.internal.com/v2.0/3456">
-										<version
-											id="2.0"
-											info="https://south.compute.public.com/v2.0/"
-											list="https://south.compute.public.com/" />
-						</endpoint>
+              <version
+                  id="2.0"
+                  info="https://south.compute.public.com/v2.0/"
+                  list="https://south.compute.public.com/" />
+            </endpoint>
         </service>
         <service type="object-store" name="HTTP Object Store">
             <endpoint
@@ -28,43 +28,43 @@
                     tenantId="1234"
                     publicURL="https://north.object-store.public.com/v1/1234"
                     internalURL="https://north.object-store.internal.com/v1/1234">
-							<version
-											id="1"
-											info="https://north.object-store.public.com/v1/"
-											list="https://north.object-store.public.com/" />
-						</endpoint>
+              <version
+                  id="1"
+                  info="https://north.object-store.public.com/v1/"
+                  list="https://north.object-store.public.com/" />
+            </endpoint>
             <endpoint
                     region="South"
                     tenantId="3456"
                     publicURL="https://south.object-store.public.com/v2.0/3456"
                     internalURL="https://south.object-store.internal.com/v2.0/3456">
-										<version
-											id="2.0"
-											info="https://south.object-store.public.com/v1/"
-											list="https://south.object-store.public.com/" />
-						</endpoint>
+              <version
+                  id="2.0"
+                  info="https://south.object-store.public.com/v1/"
+                  list="https://south.object-store.public.com/" />
+            </endpoint>
         </service>
         <service type="dns" name="DNS-as-a-Service">
             <endpoint
                     publicURL="https://dns.public.com/v2.0/blah-blah">
-								<version
-											id="2.0"
-											info="https://dns.public.com/v2.0/"
-											list="https://dns.public.com/" />
-						</endpoint>
+              <version
+                  id="2.0"
+                  info="https://dns.public.com/v2.0/"
+                  list="https://dns.public.com/" />
+            </endpoint>
         </service>
     </serviceCatalog>
     <user xmlns="http://docs.openstack.org/identity/api/v2.0"
       id="123" username="jqsmith">
-	<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
-	  <role id="123" name="Admin" tenantId="1234" description="All Access" />
-	  <role id="234" name="object-store:admin" tenantId="1"/>
+        <roles xmlns="http://docs.openstack.org/identity/api/v2.0">
+          <role id="123" name="Admin" tenantId="1234" description="All Access" />
+          <role id="234" name="object-store:admin" tenantId="1"/>
 
-	</roles>
-	<groups xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0">
-	    <group id="test_global_group_add">
-			<description>A Description of the group</description>
-	    </group>
-	</groups>
+        </roles>
+        <groups xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0">
+            <group id="test_global_group_add">
+                        <description>A Description of the group</description>
+            </group>
+        </groups>
     </user>
-</auth>
+</access>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.xml
index 4cf91e098..5307ff1ff 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.xml
@@ -41,7 +41,6 @@
       publicURL="https://compute.north.public.com/v1"
       internalURL="https://compute.north.internal.com/v1"
       adminURL="https://compute.north.internal.com/v1"
-      tenantId="1"
   />
   <endpoint
       id="4"
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/ports-get-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/ports-get-resp.xml
index 37759d676..faa9cbf92 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/ports-get-resp.xml
+++ b/api-ref/src/wadls/netconn-api/src/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>