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:
@@ -1,26 +1,26 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<access xmlns="http://docs.openstack.org/identity/api/v2.0">
|
<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"/>
|
id="ab48a9efdfedb23ty3494"/>
|
||||||
<serviceCatalog>
|
<serviceCatalog>
|
||||||
<service type="compute" name="Computers in the Cloud">
|
<service type="compute" name="Computers in the Cloud">
|
||||||
<endpoint region="North" tenantId="1"
|
<endpoint region="North" tenantId="1"
|
||||||
publicURL="https://north.compute.public.com/v2.0/1234"
|
publicURL="https://north.compute.public.com/v2.0/1234"
|
||||||
internalURL="https://north.compute.internal.com/v2.0/1234">
|
internalURL="https://north.compute.internal.com/v2.0/1234">
|
||||||
<version id="2.0"
|
<version id="2.0"
|
||||||
info="https://north.compute.public.com/v2.0/"
|
info="https://north.compute.public.com/v2.0/"
|
||||||
list="https://north.compute.public.com/"/>
|
list="https://north.compute.public.com/"/>
|
||||||
</endpoint>
|
</endpoint>
|
||||||
<endpoint
|
<endpoint
|
||||||
region="South"
|
region="South"
|
||||||
tenantId="3456"
|
tenantId="3456"
|
||||||
publicURL="https://south.compute.public.com/v2.0/3456"
|
publicURL="https://south.compute.public.com/v2.0/3456"
|
||||||
internalURL="https://south.compute.internal.com/v2.0/3456">
|
internalURL="https://south.compute.internal.com/v2.0/3456">
|
||||||
<version
|
<version
|
||||||
id="2.0"
|
id="2.0"
|
||||||
info="https://south.compute.public.com/v2.0/"
|
info="https://south.compute.public.com/v2.0/"
|
||||||
list="https://south.compute.public.com/" />
|
list="https://south.compute.public.com/" />
|
||||||
</endpoint>
|
</endpoint>
|
||||||
</service>
|
</service>
|
||||||
<service type="object-store" name="HTTP Object Store">
|
<service type="object-store" name="HTTP Object Store">
|
||||||
<endpoint
|
<endpoint
|
||||||
@@ -28,43 +28,43 @@
|
|||||||
tenantId="1234"
|
tenantId="1234"
|
||||||
publicURL="https://north.object-store.public.com/v1/1234"
|
publicURL="https://north.object-store.public.com/v1/1234"
|
||||||
internalURL="https://north.object-store.internal.com/v1/1234">
|
internalURL="https://north.object-store.internal.com/v1/1234">
|
||||||
<version
|
<version
|
||||||
id="1"
|
id="1"
|
||||||
info="https://north.object-store.public.com/v1/"
|
info="https://north.object-store.public.com/v1/"
|
||||||
list="https://north.object-store.public.com/" />
|
list="https://north.object-store.public.com/" />
|
||||||
</endpoint>
|
</endpoint>
|
||||||
<endpoint
|
<endpoint
|
||||||
region="South"
|
region="South"
|
||||||
tenantId="3456"
|
tenantId="3456"
|
||||||
publicURL="https://south.object-store.public.com/v2.0/3456"
|
publicURL="https://south.object-store.public.com/v2.0/3456"
|
||||||
internalURL="https://south.object-store.internal.com/v2.0/3456">
|
internalURL="https://south.object-store.internal.com/v2.0/3456">
|
||||||
<version
|
<version
|
||||||
id="2.0"
|
id="2.0"
|
||||||
info="https://south.object-store.public.com/v1/"
|
info="https://south.object-store.public.com/v1/"
|
||||||
list="https://south.object-store.public.com/" />
|
list="https://south.object-store.public.com/" />
|
||||||
</endpoint>
|
</endpoint>
|
||||||
</service>
|
</service>
|
||||||
<service type="dns" name="DNS-as-a-Service">
|
<service type="dns" name="DNS-as-a-Service">
|
||||||
<endpoint
|
<endpoint
|
||||||
publicURL="https://dns.public.com/v2.0/blah-blah">
|
publicURL="https://dns.public.com/v2.0/blah-blah">
|
||||||
<version
|
<version
|
||||||
id="2.0"
|
id="2.0"
|
||||||
info="https://dns.public.com/v2.0/"
|
info="https://dns.public.com/v2.0/"
|
||||||
list="https://dns.public.com/" />
|
list="https://dns.public.com/" />
|
||||||
</endpoint>
|
</endpoint>
|
||||||
</service>
|
</service>
|
||||||
</serviceCatalog>
|
</serviceCatalog>
|
||||||
<user xmlns="http://docs.openstack.org/identity/api/v2.0"
|
<user xmlns="http://docs.openstack.org/identity/api/v2.0"
|
||||||
id="123" username="jqsmith">
|
id="123" username="jqsmith">
|
||||||
<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
|
<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
|
||||||
<role id="123" name="Admin" tenantId="1234" description="All Access" />
|
<role id="123" name="Admin" tenantId="1234" description="All Access" />
|
||||||
<role id="234" name="object-store:admin" tenantId="1"/>
|
<role id="234" name="object-store:admin" tenantId="1"/>
|
||||||
|
|
||||||
</roles>
|
</roles>
|
||||||
<groups xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0">
|
<groups xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0">
|
||||||
<group id="test_global_group_add">
|
<group id="test_global_group_add">
|
||||||
<description>A Description of the group</description>
|
<description>A Description of the group</description>
|
||||||
</group>
|
</group>
|
||||||
</groups>
|
</groups>
|
||||||
</user>
|
</user>
|
||||||
</auth>
|
</access>
|
||||||
|
|||||||
@@ -41,7 +41,6 @@
|
|||||||
publicURL="https://compute.north.public.com/v1"
|
publicURL="https://compute.north.public.com/v1"
|
||||||
internalURL="https://compute.north.internal.com/v1"
|
internalURL="https://compute.north.internal.com/v1"
|
||||||
adminURL="https://compute.north.internal.com/v1"
|
adminURL="https://compute.north.internal.com/v1"
|
||||||
tenantId="1"
|
|
||||||
/>
|
/>
|
||||||
<endpoint
|
<endpoint
|
||||||
id="4"
|
id="4"
|
||||||
|
|||||||
@@ -54,7 +54,7 @@
|
|||||||
<port_filter quantum:type="bool">False</port_filter>
|
<port_filter quantum:type="bool">False</port_filter>
|
||||||
</binding:capabilities>
|
</binding:capabilities>
|
||||||
<mac_address>fa:16:3e:2d:dc:7e</mac_address>
|
<mac_address>fa:16:3e:2d:dc:7e</mac_address>
|
||||||
<fixed_ip>
|
<fixed_ips>
|
||||||
<fixed_ip>
|
<fixed_ip>
|
||||||
<subnet_id>a318fcb4-9ff0-4485-b78c-9e6738c21b26</subnet_id>
|
<subnet_id>a318fcb4-9ff0-4485-b78c-9e6738c21b26</subnet_id>
|
||||||
<ip_address>10.0.0.1</ip_address>
|
<ip_address>10.0.0.1</ip_address>
|
||||||
|
|||||||
Reference in New Issue
Block a user