Merge "Remove XML samples for Identity v2.0 extensions"

This commit is contained in:
Jenkins 2015-05-10 12:03:18 +00:00 committed by Gerrit Code Review
commit 50c8089feb
30 changed files with 36 additions and 894 deletions

View File

@ -12,80 +12,15 @@
version="5.0-extension RackBook-2.0" xml:id="identity-v2-ext"
role="api-reference">
<title>Identity API v2.0 extensions (SUPPORTED)</title>
<para>Queries the Identity API to list available extensions with a
&GET; request to <code>v2.0/extensions</code>.</para>
<section xml:id="os-ksadm-admin-ext">
<para>
To list available Identity API v2.0 extensions, issue a &GET; request
to <code>v2.0/extensions</code>.
</para>
<section xml:id="os-ksadm-admin-ext">
<title>OS-KSADM admin extension</title>
<wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#users-v2.0">
<wadl:method href="#listUsers"/>
<wadl:method href="#addUser"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#userById-v2.0">
<wadl:method href="#updateUser"/>
<wadl:method href="#deleteUser"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#userRoles-v2.0">
<wadl:method href="#listUserRoles"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#userRoleById-v2.0">
<wadl:method href="#addUserRole"/>
<wadl:method href="#deleteUserRole"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#tenants-v2.0">
<wadl:method href="#addTenant"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#tenantById-v2.0">
<wadl:method href="#updateTenant"/>
<wadl:method href="#deleteTenant"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#usersForTenant-v2.0">
<wadl:method href="#listUsersForTenant"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#userSpecificRoleForTenant-v2.0">
<wadl:method href="#addRolesToUserOnTenant"/>
<wadl:method href="#deleteRoleFromUserOnTenant"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#roles-v2.0">
<wadl:method href="#getRoleByName"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#roles_list-v2.0">
<wadl:method href="#listRoles"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#roles-v2.0">
<wadl:method href="#addRole"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#roleId-v2.0">
<wadl:method href="#getRole"/>
<wadl:method href="#deleteRole"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#services-v2.0">
<wadl:method href="#listServices"/>
<wadl:method href="#addService"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#serviceName-v2.0">
<wadl:method href="#getServiceByName"/>
</wadl:resource>
<wadl:resource
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#serviceId-v2.0">
<wadl:method href="#getService"/>
<wadl:method href="#deleteService"/>
</wadl:resource>
</wadl:resources>
<wadl:resources
xmlns:wadl="http://wadl.dev.java.net/2009/02"
href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl"/>
</section>
<section xml:id="os-kscatalog-ext">
<title>OS-KSCATALOG admin extension</title>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<credentials xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://docs.openstack.org/identity/api/v2.0">
<passwordCredentials username="test_user" password="secretsecret"/>
</credentials>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<role xmlns="http://docs.openstack.org/identity/api/v2.0"
id="123" name="Admin" description="All Access" />

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
<role id="123" name="Admin" description="All Access" />
<role id="234" name="Guest" description="Guest Access" />
</roles>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<service
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
id="123" name="nova" type="compute"
description="OpenStack Compute Service"/>

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<services
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0">
<service id="123" name="nova" type="compute"
description="OpenStack Compute Service"/>
<service id="234" name="glance" type="image"
description="OpenStack Image Service"/>
</services>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<tenant xmlns="http://docs.openstack.org/identity/api/v2.0"
enabled="true" id="1234" name="ACME Corp">
<description>A description...</description>
</tenant>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<tenant xmlns="http://docs.openstack.org/identity/api/v2.0"
enabled="true" name="ACME Corp">
<description>A description...</description>
</tenant>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
<role id="8341d3603a1d4d5985bff09f10704d4d" name="service"/>
<role id="2e66d57df76946fdbe034bc4da6fdec0" name="admin"/>
</roles>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<user xmlns="http://docs.openstack.org/identity/api/v2.0"
enabled="true" email="john.smith@example.org"
name="jqsmith" id="u1000"/>

View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<users xmlns="http://docs.openstack.org/identity/api/v2.0">
<user xmlns="http://docs.openstack.org/identity/api/v2.0"
enabled="true" email="john.smith@example.org"
name="jqsmith" id="u1000"/>
<user xmlns="http://docs.openstack.org/identity/api/v2.0"
enabled="true" email="john.smith@example.org"
name="jqsmith" id="u1001"/>
</users>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<user xmlns="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:type="UserWithOnlyEnabled"
enabled="true"/>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<user xmlns="http://docs.openstack.org/identity/api/v2.0"
xmlns:OS-KSADM="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
enabled="true" email="john.smith@example.org"
name="jqsmith"
OS-KSADM:password="secretsecret"/>

View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpoint
id="1"
tenantId="1"
type="compute"
name="Compute"
region="North"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1"
xmlns="http://docs.openstack.org/identity/api/v2.0">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>

View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpointTemplate
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0"
id="1"
region="North"
global="true"
type="compute"
name="Compute"
publicURL="https://service-public.com/v1"
internalURL="https://service-internal.com/v1"
enabled="true">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpointTemplate>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpointTemplate
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:type="EndpointTemplateWithOnlyId"
id="1"/>

View File

@ -1,67 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpointTemplates xmlns="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0">
<endpointTemplate
id="1"
region="North"
global="true"
type="compute"
name="Compute"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
enabled="true">
<version
id="1"
list="https://compute.north.public.com/"
info="https://compute.north.public.com/v1"/>
</endpointTemplate>
<endpointTemplate
id="2"
region="south"
type="compute"
name="Compute"
publicURL="https://service2.public.com/v1"
internalURL="https://service2.internal.public.com/v1"
enabled="false">
<version
id="1"
list="https://service1.public.com/"
info="https://service1.public.com/v1"/>
</endpointTemplate>
<endpointTemplate
id="3"
region="DFW"
global="true"
type="ext1:service1"
name="Compute"
publicURL="https://service1.public.com/v1"
enabled="true">
<version
id="1"
list="https://service1.public.com/"
info="https://service1.public.com/v1"/>
</endpointTemplate>
<endpointTemplate
id="4"
region="ORD"
type="compute"
name="Compute"
publicURL="https://service2.public.com/v1"
enabled="true">
<version
id="1"
list="https://service1.public.com/"
info="https://service1.public.com/v1"/>
</endpointTemplate>
<endpointTemplate
id="5"
global="true"
type="compute"
name="Compute"
publicURL="https://service3.public.com/v1">
<version
id="1"
list="https://service1.public.com/"
info="https://service1.public.com/v1"/>
</endpointTemplate>
</endpointTemplates>

View File

@ -1,75 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpoints
xmlns="http://docs.openstack.org/identity/api/v2.0">
<endpoint
id="1"
tenantId="1"
type="compute"
name="Compute"
region="North"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
<endpoint
id="2"
tenantId="2"
type="compute"
name="Compute"
region="South"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
<endpoint
id="3"
tenantId="1"
type="compute"
name="Compute"
region="East"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1"
/>
<endpoint
id="4"
tenantId="1"
type="compute"
name="Compute"
region="West"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
<endpoint
id="5"
tenantId="1"
type="compute"
name="Compute"
region="Global"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
</endpoints>

View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<auth
xmlns="http://docs.openstack.org/identity/api/v2.0"
tenantId="1234">
<ec2Credentials
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0"
username="testuser"
key="aaaaa"
signature="bbbbb"/>
</auth>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<credentials xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://docs.openstack.org/identity/api/v2.0">
<passwordCredentials username="test_user" password="secretsecret"/>
<ec2Credentials xmlns="http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0"
username="testuser" key="aaaaa" signature="bbbbb"/>
</credentials>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ec2Credentials
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0"
username="testuser"
key="aaaaa"
signature="bbbbb"/>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<credentials xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://docs.openstack.org/identity/api/v2.0">
<passwordCredentials username="test_user" password="secretsecret"/>
<s3Credentials xmlns="http://docs.openstack.org/identity/api/ext/OS-KSS3/v1.0"
username="testuser" key="aaaaa" signature="bbbbb"/>
</credentials>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<s3Credentials
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSS3/v1.0"
username="testuser"
key="aaaaa"
signature="bbbbb"/>

View File

@ -1,75 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpoints
xmlns="http://docs.openstack.org/identity/api/v2.0">
<endpoint
id="1"
tenantId="1"
type="compute"
name="Compute"
region="North"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
<endpoint
id="2"
tenantId="2"
type="compute"
name="Compute"
region="South"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
<endpoint
id="3"
tenantId="1"
type="compute"
name="Compute"
region="East"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1"
/>
<endpoint
id="4"
tenantId="1"
type="compute"
name="Compute"
region="West"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
<endpoint
id="5"
tenantId="1"
type="compute"
name="Compute"
region="Global"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
</endpoints>

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<access xmlns="http://docs.openstack.org/identity/api/v2.0">
<token id="ab48a9efdfedb23ty3494" expires="2010-11-01T03:32:15-05:00">
<tenant id="456" name="My Project" />
</token>
<user id="123" name="jqsmith">
<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
<role id="123" name="Admin" tenantId="one"/>
<role id="234" name="object-store:admin" tenantId="1"/>
</roles>
</user>
</access>

View File

@ -203,15 +203,6 @@
<para role="shortdesc">Creates a tenant.</para>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="identity:tenant">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSADM/samples/tenantwithoutid.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -222,14 +213,6 @@
</representation>
</request>
<response status="201">
<representation mediaType="application/xml"
element="identity:tenant">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/tenant.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -244,14 +227,6 @@
<para role="shortdesc"> Updates a tenant.</para>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="identity:tenant">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/tenant.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -261,14 +236,6 @@
</representation>
</request>
<response status="200">
<representation mediaType="application/xml"
element="identity:tenant">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/tenant.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -293,13 +260,6 @@
&limitMarkerReqParameter;
</request>
<response status="200 203">
<representation mediaType="application/xml"
element="identity:users">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/users.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -333,13 +293,6 @@
&limitMarkerReqParameter;
</request>
<response status="200 203">
<representation mediaType="application/xml"
element="identity:userss">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/users.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -354,19 +307,6 @@
<para role="shortdesc">Adds a user.</para>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="identity:user">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSADM/samples/userwithoutid.xml"/>
</wadl:doc>
<param name="name" style="plain" path="/identity:user"
type="String">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">The user name.</wadl:doc>
</param>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -377,13 +317,6 @@
</representation>
</request>
<response status="201">
<representation mediaType="application/xml"
element="identity:user">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/user.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -397,13 +330,6 @@
<para role="shortdesc">Updates a user.</para>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="identity:user">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/user.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -412,13 +338,6 @@
</representation>
</request>
<response status="200">
<representation mediaType="application/xml"
element="identity:user">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/user.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -453,20 +372,6 @@
</tbody></table>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="identity:user">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSADM/samples/userwithenabledonly.xml"
/>
</wadl:doc>
<param name="user" style="plain" path="/identity:user"
type="UserWithOnlyEnabled">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">The user name.</wadl:doc>
</param>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -477,13 +382,6 @@
</representation>
</request>
<response status="200">
<representation mediaType="application/xml"
element="identity:user">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/user.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -510,15 +408,6 @@
/>
</wadl:doc>
</representation>
<representation mediaType="application/xml"
element="identity:roles">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSADM/samples/user-role-list-resp.xml"
/>
</wadl:doc>
</representation>
</response> &commonFaults; &getFaults; </method>
<method name="PUT" id="addUserRole">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
@ -546,13 +435,6 @@
&limitMarkerReqParameter;
</request>
<response status="200 203">
<representation mediaType="application/xml"
element="identity:roles">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/roles.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -579,13 +461,6 @@
<para role="shortdesc">Adds a role.</para>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="identity:role">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/role.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -595,13 +470,6 @@
</request>
<response status="201">
<representation mediaType="application/xml"
element="identity:role">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/role.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -620,13 +488,6 @@
<para role="shortdesc">Gets a role by name.</para>
</wadl:doc>
<response status="200 203">
<representation mediaType="application/xml"
element="identity:role">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/role.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -646,13 +507,6 @@
role.</para>
</wadl:doc>
<response status="200 203">
<representation mediaType="application/xml"
element="identity:role">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/role.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -682,14 +536,6 @@
&limitMarkerReqParameter;
</request>
<response status="200 203">
<representation mediaType="application/xml"
element="services">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSADM/samples/services.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -705,14 +551,6 @@
</wadl:doc>
<response status="200 203">
<representation mediaType="application/xml"
element="service">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/service.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -727,14 +565,6 @@
<para role="shortdesc">Gets a service.</para>
</wadl:doc>
<response status="200 203">
<representation mediaType="application/xml"
element="service">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/service.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -749,14 +579,6 @@
<para role="shortdesc">Adds a service.</para>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="service">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/service.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -766,14 +588,6 @@
</representation>
</request>
<response status="201">
<representation mediaType="application/xml"
element="service">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code href="../OS-KSADM/samples/service.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">

View File

@ -127,16 +127,7 @@
&limitMarkerReqParameter;
</request>
<response status="200 203">
<representation mediaType="application/xml"
element="endpointTemplates">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
href="../OS-KSCATALOG/samples/endpointTemplates.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="endpointTemplates">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
@ -152,16 +143,7 @@
<para role="shortdesc">Gets endpoint templates.</para>
</wadl:doc>
<response status="200 203">
<representation mediaType="application/xml"
element="endpointTemplate">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
href="../OS-KSCATALOG/samples/endpointTemplate.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="endpointTemplate">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
@ -177,16 +159,7 @@
<para role="shortdesc">Adds endpoint template.</para>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="endpointTemplate">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
href="../OS-KSCATALOG/samples/endpointTemplate.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="endpointTemplate">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
@ -196,18 +169,7 @@
</representation>
</request>
<response status="201">
<representation mediaType="application/xml"
element="endpointTemplate">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
href="../OS-KSCATALOG/samples/endpointTemplate.xml"
/>
</wadl:doc>
<param name="Location" type="xsd:anyURI"
style="header"/>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="endpointTemplate">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
@ -225,16 +187,7 @@
<para role="shortdesc">Updates endpoint template.</para>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="endpointTemplate">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
href="../OS-KSCATALOG/samples/endpointTemplate.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="endpointTemplate">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
@ -244,16 +197,7 @@
</representation>
</request>
<response status="200">
<representation mediaType="application/xml"
element="endpointTemplate">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
href="../OS-KSCATALOG/samples/endpointTemplate.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="endpointTemplate">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
@ -277,18 +221,7 @@
<para role="shortdesc">Adds endpoint to a tenant.</para>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="endpointTemplate">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
href="../OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml"
/>
</wadl:doc>
<param name="endpoint" style="plain" path="/"
type="EndpointTemplateWithOnlyId"/>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="endpointTemplate">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
@ -298,17 +231,7 @@
</representation>
</request>
<response status="201">
<representation mediaType="application/xml"
element="identity:endpoint">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
href="../OS-KSCATALOG/samples/endpoint.xml"/>
</wadl:doc>
<param name="Location" type="xsd:anyURI"
style="header"/>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="identity:endpoint">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
@ -329,15 +252,7 @@
&limitMarkerReqParameter;
</request>
<response status="200 203">
<representation mediaType="application/xml"
element="identity:endpoints">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
href="../OS-KSCATALOG/samples/endpoints.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="identity:endpoints">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
@ -353,15 +268,7 @@
<para role="shortdesc">Gets endpoint for a tenant.</para>
</wadl:doc>
<response status="200 203">
<representation mediaType="application/xml"
element="identity:endpoint">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
href="../OS-KSCATALOG/samples/endpoint.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="identity:endpoint">
<wadl:doc xml:lang="EN"
xmlns="http://docbook.org/ns/docbook">
<xsdxt:code

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (C) 2011-2014 OpenStack Foundation, All Rights Reserved -->
<!-- (C) 2011-2015 OpenStack Foundation, All Rights Reserved -->
<!--*******************************************************-->
<!-- Import Common XML Entities -->
<!-- -->
@ -91,16 +91,7 @@
<para role="shortdesc">Adds a credential to a user.</para>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="ec2Credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSEC2/samples/ec2Credentials.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="ec2Credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
@ -110,16 +101,7 @@
</representation>
</request>
<response status="201">
<representation mediaType="application/xml"
element="ec2Credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSEC2/samples/ec2Credentials.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="ec2Credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
@ -128,7 +110,6 @@
</wadl:doc>
</representation>
</response> &commonFaults; &postPutFaults; &getFaults; </method>
<method name="GET" id="listCredentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
title="List credentials">
@ -138,16 +119,7 @@
&limitMarkerReqParameter;
</request>
<response status="200 203">
<representation mediaType="application/xml"
element="identity:credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSEC2/samples/credentialswithec2.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="identity:credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
@ -156,7 +128,6 @@
</wadl:doc>
</representation>
</response> &commonFaults; &getFaults; </method>
<method name="GET" id="listCredentialsByType">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
title="List credentials by type">
@ -166,19 +137,11 @@
&limitMarkerReqParameter;
</request>
<response status="200 203">
<representation mediaType="application/xml"
element="identity:credentials">
<representation mediaType="application/json" element="identity:credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSADM/samples/credentials.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSADM/samples/credentials.xml"/>
href="../OS-KSADM/samples/credentials.json"/>
</wadl:doc>
</representation>
</response> &commonFaults; &getFaults; </method>
@ -190,16 +153,7 @@
user.</para>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="ec2Credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSEC2/samples/ec2Credentials.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="ec2Credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
@ -209,16 +163,7 @@
</representation>
</request>
<response status="200">
<representation mediaType="application/xml"
element="ec2Credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSEC2/samples/ec2Credentials.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="ec2Credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
@ -242,16 +187,7 @@
<para role="shortdesc">Gets user credentials.</para>
</wadl:doc>
<response status="200 203">
<representation mediaType="application/xml"
element="ec2Credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSEC2/samples/ec2Credentials.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="ec2Credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code

View File

@ -90,15 +90,7 @@
<para role="shortdesc">Adds a credential to a user.</para>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="s3credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSS3/samples/s3Credentials.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="s3credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
@ -107,15 +99,7 @@
</representation>
</request>
<response status="201">
<representation mediaType="application/xml"
element="s3credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSS3/samples/s3Credentials.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="s3credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
@ -133,16 +117,7 @@
&limitMarkerReqParameter;
</request>
<response status="200 203">
<representation mediaType="application/xml"
element="identity:credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSS3/samples/credentialswiths3.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="identity:credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
@ -162,16 +137,7 @@
&limitMarkerReqParameter;
</request>
<response status="200 203">
<representation mediaType="application/xml"
element="identity:credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSS3/samples/credentialswiths3.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="identity:credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
@ -188,15 +154,7 @@
credentials.</para>
</wadl:doc>
<request>
<representation mediaType="application/xml"
element="s3credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSS3/samples/s3Credentials.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="s3credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
@ -205,15 +163,7 @@
</representation>
</request>
<response status="200">
<representation mediaType="application/xml"
element="s3credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSS3/samples/s3Credentials.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="s3credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
@ -238,15 +188,7 @@
credentials.</para>
</wadl:doc>
<response status="200 203">
<representation mediaType="application/xml"
element="s3credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSS3/samples/s3Credentials.xml"/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="s3credentials">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code

View File

@ -135,16 +135,7 @@
extensions such as HP-IDM.</para>
</wadl:doc>
<response status="200 203">
<representation mediaType="application/xml"
element="identity:access">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSVALIDATE/samples/validatetoken.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="identity:access">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
@ -182,16 +173,7 @@
&limitMarkerReqParameter;
</request>
<response status="200 203">
<representation mediaType="application/xml"
element="identity:endpoints">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../OS-KSVALIDATE/samples/endpoints.xml"
/>
</wadl:doc>
</representation>
<representation mediaType="application/json">
<representation mediaType="application/json" element="identity:endpoints">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code