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
This commit is contained in:
Andreas Jaeger
2014-01-03 13:55:27 +01:00
parent 0e20750a49
commit 6f49c24c14
5 changed files with 39 additions and 40 deletions

View File

@@ -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>

View File

@@ -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"

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>