Introducing doc to support OS-KSCATALOG extensions.Adding new calls to OS-KSADM extension document.

Change-Id: Iac701b53f547be254517993388d199ef6980c455

13 files changed, 236 insertions, 73 deletions

diff --git a/keystone/content/admin/OS-KSADM-admin-devguide.pdf b/keystone/content/admin/OS-KSADM-admin-devguide.pdf
new file mode 100644
index 00000000..38c78de9
--- /dev/null
+++ b/keystone/content/admin/OS-KSADM-admin-devguide.pdf
diff --git a/keystone/content/admin/OS-KSADM-admin.wadl b/keystone/content/admin/OS-KSADM-admin.wadl
index 8e484d0b..f7833579 100644
--- a/keystone/content/admin/OS-KSADM-admin.wadl
+++ b/keystone/content/admin/OS-KSADM-admin.wadl
@@ -65,7 +65,7 @@
                             <resource id="userCredentialsByType" path="{credential-type}">
                                 <method href="#listCredentialsByType"/>
                             </resource>
-                            <resource id="userCredentialByTypeAndId" path="{credential-type-and-id}">
+                            <resource id="userCredentialByTypeAndId" path="{credential-type-and-optional-id}">
                                 <param name="credentialTypeAndId" style="template" type="xsd:string"/>
                                 <method href="#updateUserCredential"/>
                                 <method href="#deleteUserCredential"/>
@@ -93,7 +93,7 @@
                             <resource id="userForTenant" path="{userId}">
                                 <param name="userId" style="template" type="xsd:string"/>
                                 <resource id="userRolesForTenant" path="roles">
-                                    <resource id="role" path="{roleId}">
+                                    <resource id="userSpecificRoleForTenant" path="{roleId}">
                                         <method href="#addRolesToUserOnTenant"/>
                                         <method href="#deleteRoleFromUserOnTenant"/>
                                     </resource>
@@ -194,6 +194,9 @@
                 Deletes a tenant.
             </p>
             <p xmlns="http://www.w3.org/1999/xhtml">This call deletes a tenant.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Delete Tenant Request">
+                <example href="../common/samples/norequestbody.txt"/>
+            </examples>
         </doc>
         <response status="204"/>
         &commonFaults;
@@ -266,6 +269,9 @@
     <method name="PUT" id="addRolesToUserOnTenant">
         <doc xml:lang="EN" title="Add roles on a tenant.">
             <p xmlns="http://www.w3.org/1999/xhtml">Adds a specific role to a user for a tenant.</p>
+            <examples xmlns="http://docs.rackspace.com/api">
+                <example href="../common/samples/norequestbody.txt"/>
+            </examples>
         </doc>
         <response status="200"/>
         &commonFaults;
@@ -276,6 +282,9 @@
     <method name="DELETE" id="deleteRoleFromUserOnTenant">
         <doc xml:lang="EN" title="Delete roles on tenant.">
             <p xmlns="http://www.w3.org/1999/xhtml">Deletes a specific role from a user for a tenant.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Delete Role From User For a Tenant Request">
+                <example href="../common/samples/norequestbody.txt"/>
+            </examples>
         </doc>
         <response status="204"/>
         &commonFaults;
@@ -312,6 +321,8 @@
         <doc xml:lang="EN" title="Update user">
             <p xmlns="http://www.w3.org/1999/xhtml">Update a user.</p>
             <examples xmlns="http://docs.rackspace.com/api" title="User Updation Request">
+             </examples>
+            <examples xmlns="http://docs.rackspace.com/api" title="User Updation Request">
                 <example href="../common/samples/user.xml" language="xml"/>
                 <example href="../common/samples/user.json" language="javascript"/>
             </examples>
@@ -336,6 +347,9 @@
     <method name="DELETE" id="deleteUser">
         <doc xml:lang="EN" title="Delete user">
             <p xmlns="http://www.w3.org/1999/xhtml">Delete a user.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Delete User Request">
+                <example href="../common/samples/norequestbody.txt"/>
+            </examples>
         </doc>
         <response status="204"/>
         &commonFaults;
@@ -371,9 +385,9 @@
 
     <!--User Roles-->
     <method name="GET" id="listUserRoles">
-        <doc xml:lang="EN" title="List Roles">
-            <p xmlns="http://www.w3.org/1999/xhtml">List roles for a user.</p>
-            <examples xmlns="http://docs.rackspace.com/api" title="List Roles for User Response">
+        <doc xml:lang="EN" title="List Global Roles for a User">
+            <p xmlns="http://www.w3.org/1999/xhtml">List all the global roles for a user.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="List Global Roles for User Response">
                 <example href="../common/samples/roles.xml" language="xml"/>
                 <example href="../common/samples/roles.json" language="javascript"/>
             </examples>            
@@ -390,8 +404,11 @@
     </method>
     
     <method name="PUT" id="addUserRole">
-        <doc xml:lang="EN" title="Add roles to a user.">
-            <p xmlns="http://www.w3.org/1999/xhtml">Adds a specific role to a user.</p>
+        <doc xml:lang="EN" title="Add Global roles to a user.">
+            <p xmlns="http://www.w3.org/1999/xhtml">Adds a specific global role to a user.</p>
+            <examples xmlns="http://docs.rackspace.com/api">
+                <example href="../common/samples/norequestbody.txt"/>
+            </examples>
         </doc>
         <response status="200"/>
         &commonFaults;
@@ -401,7 +418,7 @@
     
     <method name="GET" id="getUserRole">
         <doc xml:lang="EN" title="Get user Role">
-            <p xmlns="http://www.w3.org/1999/xhtml">Get information about a role that belongs to a user.</p>
+            <p xmlns="http://www.w3.org/1999/xhtml">Get information about a global role that belongs to a user.</p>
             <examples xmlns="http://docs.rackspace.com/api" title="List Roles for User Response">
                 <example href="../common/samples/role.xml" language="xml"/>
                 <example href="../common/samples/role.json" language="javascript"/>
@@ -417,8 +434,11 @@
     </method>
     
     <method name="DELETE" id="deleteUserRole">
-        <doc xml:lang="EN" title="Delete roles on user.">
-            <p xmlns="http://www.w3.org/1999/xhtml">Deletes a specific role from a user.</p>
+        <doc xml:lang="EN" title="Delete Global Roles on User.">
+            <p xmlns="http://www.w3.org/1999/xhtml">Deletes a specific global role from a user.</p>
+            <examples xmlns="http://docs.rackspace.com/api">
+                <example href="../common/samples/norequestbody.txt"/>
+            </examples>
         </doc>
         <response status="204"/>
         &commonFaults;
@@ -430,6 +450,15 @@
     <method name="POST" id="addUserCredential">
         <doc xml:lang="EN" title="Add user Credential.">
             <p xmlns="http://www.w3.org/1999/xhtml">Adds a credential to a user.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Add Credentials Request">
+                <example href="../common/samples/passwordcredentials.xml" language="xml"/>
+                <example href="../common/samples/passwordcredentials.json" language="javascript"/>
+            </examples>            
+            
+            <examples xmlns="http://docs.rackspace.com/api" title="Add Credential Response">
+                <example href="../common/samples/passwordcredentials.xml" language="xml"/>
+                <example href="../common/samples/passwordcredentials.json" language="javascript"/>
+            </examples>            
         </doc>
         <request>
             <representation mediaType="application/xml" element="identity:credentials"/>
@@ -447,9 +476,17 @@
     <method name="GET" id="listCredentials">
         <doc xml:lang="EN" title="List Credentials">
             <p xmlns="http://www.w3.org/1999/xhtml">List credentials.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="List Credentials Response">
+                <example href="../common/samples/credentials.xml" language="xml"/>
+                <example href="../common/samples/credentials.json" language="javascript"/>
+            </examples>            
         </doc>
+        <request>
+            <param name="marker" style="query" required="false" type="xsd:string"/>
+            <param name="limit" style="query" required="false" type="xsd:int"/>
+        </request>
         <response status="200 203">
-            <representation mediaType="application/xml" element="identity:credentials-collection"/>
+            <representation mediaType="application/xml" element="identity:credentials"/>
             <representation mediaType="application/json"/>
         </response>
         &commonFaults;
@@ -459,9 +496,17 @@
     <method name="GET" id="listCredentialsByType">
         <doc xml:lang="EN" title="List Credentials by type">
             <p xmlns="http://www.w3.org/1999/xhtml">List credentials by type.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="List Credentials Response">
+                <example href="../common/samples/credentials.xml" language="xml"/>
+                <example href="../common/samples/credentials.json" language="javascript"/>
+            </examples>            
         </doc>
+        <request>
+            <param name="marker" style="query" required="false" type="xsd:string"/>
+            <param name="limit" style="query" required="false" type="xsd:int"/>
+        </request>
         <response status="200 203">
-            <representation mediaType="application/xml" element="identity:credentials-collection"/>
+            <representation mediaType="application/xml" element="identity:credentials"/>
             <representation mediaType="application/json"/>
         </response>
         &commonFaults;
@@ -471,6 +516,15 @@
     <method name="POST" id="updateUserCredential">
         <doc xml:lang="EN" title="Update user credential">
             <p xmlns="http://www.w3.org/1999/xhtml">Update credentials.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Update Credential Request">
+                <example href="../common/samples/passwordcredentials.xml" language="xml"/>
+                <example href="../common/samples/passwordcredentials.json" language="javascript"/>
+            </examples>            
+            
+            <examples xmlns="http://docs.rackspace.com/api" title="Update Credential Response">
+                <example href="../common/samples/passwordcredentials.xml" language="xml"/>
+                <example href="../common/samples/passwordcredentials.json" language="javascript"/>
+            </examples>            
         </doc>
         <request>
             <representation mediaType="application/xml" element="identity:credentials"/>
@@ -487,12 +541,12 @@
     
     <method name="POST" id="deleteUserCredential">
         <doc xml:lang="EN" title="Update user credential">
-            <p xmlns="http://www.w3.org/1999/xhtml">Delete credentials.</p>
+            <p xmlns="http://www.w3.org/1999/xhtml">Delete User credentials.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Delete User Credentials">
+                <example href="../common/samples/norequestbody.txt"/>
+            </examples>
         </doc>
-        <response status="200">
-            <representation mediaType="application/xml" element="identity:credentials"/>
-            <representation mediaType="application/json"/>
-        </response>
+        <response status="204"/>
         &commonFaults;
         &postPutFaults;
         &getFaults;
@@ -501,6 +555,10 @@
     <method name="GET" id="getUserCredential">
         <doc xml:lang="EN" title="Get user Credentials">
             <p xmlns="http://www.w3.org/1999/xhtml">Get user credentials.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Get User Credential Response">
+                <example href="../common/samples/passwordcredentials.xml" language="xml"/>
+                <example href="../common/samples/passwordcredentials.json" language="javascript"/>
+            </examples>            
         </doc>
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:credentials"/>
@@ -583,6 +641,9 @@
     <method name="DELETE" id="deleteRole">
         <doc xml:lang="EN" title="Delete Role">
             <p xmlns="http://www.w3.org/1999/xhtml">Delete a role.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Delete a Role">
+                <example href="../common/samples/norequestbody.txt"/>
+            </examples>
         </doc>
         <response status="204"/>
         &commonFaults;
@@ -656,8 +717,11 @@
         &getFaults;
     </method>
     <method name="DELETE" id="deleteService">
-        <doc xml:lang="EN" title="Add Service">
+        <doc xml:lang="EN" title="Delete Service">
             <p xmlns="http://www.w3.org/1999/xhtml">Delete a service.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Delete a Service">
+                <example href="../common/samples/norequestbody.txt"/>
+            </examples>
         </doc>    
         <response status="204"/>
         &commonFaults;
diff --git a/keystone/content/admin/OS-KSCATALOG-admin-devguide.pdf b/keystone/content/admin/OS-KSCATALOG-admin-devguide.pdf
new file mode 100644
index 00000000..028ee63d
--- /dev/null
+++ b/keystone/content/admin/OS-KSCATALOG-admin-devguide.pdf
diff --git a/keystone/content/admin/OS-KSCATALOG-admin.wadl b/keystone/content/admin/OS-KSCATALOG-admin.wadl
index 5abf9644..8ec4c136 100644
--- a/keystone/content/admin/OS-KSCATALOG-admin.wadl
+++ b/keystone/content/admin/OS-KSCATALOG-admin.wadl
@@ -43,7 +43,7 @@
                     <param name="tenantId" style="template" type="xsd:string"/>
                     <resource id="endpoints-OS-KSCATALOG" path="OS-KSCATALOG">                    
                         <resource id="endpoints" path="endpoints">
-                            <method href="#getEndpoints"/>
+                            <method href="#listEndpoints"/>
                             <method href="#addEndpoint"/>
                             <resource id="endpoint" path="{endpointId}">
                                 <param name="endpointId" style="template" type="xsd:string"/>
@@ -78,6 +78,13 @@
     <!-- EndPoint Templates -->
     
     <method name="GET" id="listEndpointTemplates">
+        <doc xml:lang="EN" title="List Endpoint Templates">
+            <p xmlns="http://www.w3.org/1999/xhtml">List Endpoint Templates.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="List Endpont Templates Response">
+                <example href="../common/samples/endpointTemplates.xml" language="xml"/>
+                <example href="../common/samples/endpointTemplates.json" language="javascript"/>
+            </examples>
+        </doc>        
         <request>
             <param name="serviceId" style="query" required="false" type="xsd:string"/>
         </request>
@@ -90,6 +97,13 @@
     </method>
     
     <method name="GET" id="getEndpointTemplate">
+        <doc xml:lang="EN" title="Get Endpoint Template">
+            <p xmlns="http://www.w3.org/1999/xhtml">Get Endpoint Template.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Get Endpont Template Response">
+                <example href="../common/samples/endpointTemplate.xml" language="xml"/>
+                <example href="../common/samples/endpointTemplate.json" language="javascript"/>
+            </examples>
+        </doc>
         <response status="200 203">
             <representation mediaType="application/xml" element="OS-KSCATALOG:endpointTemplate"/>
             <representation mediaType="application/json"/>
@@ -99,6 +113,17 @@
     </method>
     
     <method name="POST" id="addEndpointTemplate">
+        <doc xml:lang="EN" title="Add Endpoint Template">
+            <p xmlns="http://www.w3.org/1999/xhtml">Add Endpoint Template.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Add Endpoint Template Request">
+                <example href="../common/samples/endpointTemplate.xml" language="xml"/>
+                <example href="../common/samples/endpointTemplate.json" language="javascript"/>
+            </examples>
+            <examples xmlns="http://docs.rackspace.com/api" title="Add Endpoint Template Response">
+                <example href="../common/samples/endpointTemplate.xml" language="xml"/>
+                <example href="../common/samples/endpointTemplate.json" language="javascript"/>
+            </examples>
+        </doc>
         <request>
             <representation mediaType="application/xml" element="OS-KSCATALOG:endpointTemplate"/>
             <representation mediaType="application/json"/>
@@ -117,12 +142,29 @@
     </method>
     
     <method name="DELETE" id="deleteEndpointTemplate">
+        <doc xml:lang="EN" title="Delete Endpoint Template.">
+            <p xmlns="http://www.w3.org/1999/xhtml">Delete a Endpoint Template.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Delete Endpoint Template Request">
+                <example href="../common/samples/norequestbody.txt"/>
+            </examples>
+        </doc>    
         <response status="204"/>
         &commonFaults;
         &getFaults;
     </method>
     
     <method name="POST" id="addEndpoint">
+        <doc xml:lang="EN" title="Add Endpoint">
+            <p xmlns="http://www.w3.org/1999/xhtml">Add Endpoint to a tenant.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Add Endpoint Request">
+                <example href="../common/samples/endpoint.xml" language="xml"/>
+                <example href="../common/samples/endpoint.json" language="javascript"/>
+            </examples>
+            <examples xmlns="http://docs.rackspace.com/api" title="Add Endpoint Response">
+                <example href="../common/samples/endpoint.xml" language="xml"/>
+                <example href="../common/samples/endpoint.json" language="javascript"/>
+            </examples>
+        </doc>
         <request>
             <representation mediaType="application/xml" element="identity:endpoint"/>
             <representation mediaType="application/json"/>
@@ -140,7 +182,14 @@
         &postPutFaults;
     </method>
     
-    <method name="GET" id="getEndpoints">
+    <method name="GET" id="listEndpoints">
+        <doc xml:lang="EN" title="List Endpoints">
+            <p xmlns="http://www.w3.org/1999/xhtml">List Endpoints of a Tenant.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="List Endponts Response">
+                <example href="../common/samples/endpoints.xml" language="xml"/>
+                <example href="../common/samples/endpoints.json" language="javascript"/>
+            </examples>
+        </doc>        
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:endpoints"/>
             <representation mediaType="application/json"/>
@@ -150,6 +199,13 @@
     </method>
     
     <method name="GET" id="getEndpoint">
+        <doc xml:lang="EN" title="Get Endpoint">
+            <p xmlns="http://www.w3.org/1999/xhtml">Get Endpoint of a Tenant.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Get Endpont Response">
+                <example href="../common/samples/endpoint.xml" language="xml"/>
+                <example href="../common/samples/endpoint.json" language="javascript"/>
+            </examples>
+        </doc>
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:endpoint"/>
             <representation mediaType="application/json"/>
@@ -159,6 +215,12 @@
     </method>
     
     <method name="DELETE" id="deleteEndpoint">
+        <doc xml:lang="EN" title="Delete Endpoint.">
+            <p xmlns="http://www.w3.org/1999/xhtml">Delete a Endpoint from a Tenant.</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Delete Endpoint From a Tenant Request">
+                <example href="../common/samples/norequestbody.txt"/>
+            </examples>
+        </doc>    
         <response status="204"/>
         &commonFaults;
         &getFaults;
diff --git a/keystone/content/admin/identity-OS-KSADM-dev-guide.pdf b/keystone/content/admin/identity-OS-KSADM-dev-guide.pdf
deleted file mode 100644
index e5ec2014..00000000
--- a/keystone/content/admin/identity-OS-KSADM-dev-guide.pdf
+++ /dev/null
diff --git a/keystone/content/admin/identity-admin.wadl b/keystone/content/admin/identity-admin.wadl
index 2af24d56..b4b6767f 100644
--- a/keystone/content/admin/identity-admin.wadl
+++ b/keystone/content/admin/identity-admin.wadl
@@ -230,7 +230,7 @@
     <method name="GET" id="validateToken">
         <doc xml:lang="EN" title="Validate Token">
             <p xmlns="http://www.w3.org/1999/xhtml" class="shortdesc">
-                Check that a token is valid and that it belongs to a particular user
+                Check that a token is valid and that it belongs to a supplied tenant
                 and return the permissions relevant to a particular client.
             </p>
             <p xmlns="http://www.w3.org/1999/xhtml">
@@ -264,7 +264,7 @@
     <method name="HEAD" id="checkToken">
         <doc xml:lang="EN" title="Check Token">
             <p xmlns="http://www.w3.org/1999/xhtml" class="shortdesc">
-                Check that a token is valid and that it belongs to a particular user
+                Check that a token is valid and that it belongs to a particular tenant
                 (For performance).
             </p>
         </doc>
diff --git a/keystone/content/common/samples/credentials.json b/keystone/content/common/samples/credentials.json
new file mode 100644
index 00000000..66f77cfa
--- /dev/null
+++ b/keystone/content/common/samples/credentials.json
@@ -0,0 +1,13 @@
+{
+    "credentials": {
+        "values": [
+            {
+                "passwordCredentials": {
+                    "username": "test_user",
+                    "password": "mypass"
+                }
+            }
+        ],
+        "links": []
+    }
+}
diff --git a/keystone/content/common/samples/credentials.xml b/keystone/content/common/samples/credentials.xml
new file mode 100644
index 00000000..1d6a7cb1
--- /dev/null
+++ b/keystone/content/common/samples/credentials.xml
@@ -0,0 +1,5 @@
+<?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="test"/>
+</credentials>
\ No newline at end of file
diff --git a/keystone/content/common/samples/endpointTemplates.json b/keystone/content/common/samples/endpointTemplates.json
index adf7fa63..f7638570 100644
--- a/keystone/content/common/samples/endpointTemplates.json
+++ b/keystone/content/common/samples/endpointTemplates.json
@@ -1,54 +1,61 @@
 {
-"OS-KSCATALOG:endpointsTemplates": [
-    {
-      "id": 1,
-      "region": "North",
-      "global": true,
-      "type": "compute",
-      "publicURL": "https://compute.north.public.com/v1",
-      "internalURL": "https://compute.north.internal.com/v1",
-      "versionId": "1",
-      "versionInfo": "https://compute.north.public.com/v1/",
-      "versionList": "https://compute.north.public.com/",
-      "enabled": true
-    }, {
-      "id": 2,
-      "region": "South",
-      "type": "compute",
-      "publicURL": "https://compute.south.public.com/v1",
-      "internalURL": "https://compute.south.internal.com/v1",
-      "versionId": "1",
-      "versionInfo": "https://compute.south.public.com/v1/",
-      "versionList": "https://compute.south.public.com/",
-      "enabled": false
-    }, {
-      "id": 3,
-      "region": "North",
-      "global": true,
-      "type": "object-store",
-      "publicURL": "https://object-store.north.public.com/v1.0",
-      "versionId": "1.0",
-      "versionInfo": "https://object-store.north.public.com/v1.0/",
-      "versionList": "https://object-store.north.public.com/",
-      "enabled": true
-    }, {
-      "id": 4,
-      "region": "South",
-      "type": "object-store",
-      "publicURL": "https://object-store.south.public.com/v2",
-      "versionId": "2",
-      "versionInfo": "https://object-store.south.public.com/v2/",
-      "versionList": "https://object-store.south.public.com/",
-      "enabled": true
-    }, {
-      "id": 5,
-      "global": true,
-      "type": "OS-DNS:DNS",
-      "publicURL": "https://dns.public.com/v3.2",
-      "versionId": "1.0",
-      "versionInfo": "https://dns.public.com/v1.0/",
-      "versionList": "https://dns.public.com/",
-      "enabled": true
+    "OS-KSCATALOG:endpointsTemplates": {
+        "values": [
+            {
+                "id": 1,
+                "region": "North",
+                "global": true,
+                "type": "compute",
+                "publicURL": "https://compute.north.public.com/v1",
+                "internalURL": "https://compute.north.internal.com/v1",
+                "versionId": "1",
+                "versionInfo": "https://compute.north.public.com/v1/",
+                "versionList": "https://compute.north.public.com/",
+                "enabled": true
+            },
+            {
+                "id": 2,
+                "region": "South",
+                "type": "compute",
+                "publicURL": "https://compute.south.public.com/v1",
+                "internalURL": "https://compute.south.internal.com/v1",
+                "versionId": "1",
+                "versionInfo": "https://compute.south.public.com/v1/",
+                "versionList": "https://compute.south.public.com/",
+                "enabled": false
+            },
+            {
+                "id": 3,
+                "region": "North",
+                "global": true,
+                "type": "object-store",
+                "publicURL": "https://object-store.north.public.com/v1.0",
+                "versionId": "1.0",
+                "versionInfo": "https://object-store.north.public.com/v1.0/",
+                "versionList": "https://object-store.north.public.com/",
+                "enabled": true
+            },
+            {
+                "id": 4,
+                "region": "South",
+                "type": "object-store",
+                "publicURL": "https://object-store.south.public.com/v2",
+                "versionId": "2",
+                "versionInfo": "https://object-store.south.public.com/v2/",
+                "versionList": "https://object-store.south.public.com/",
+                "enabled": true
+            },
+            {
+                "id": 5,
+                "global": true,
+                "type": "OS-DNS:DNS",
+                "publicURL": "https://dns.public.com/v3.2",
+                "versionId": "1.0",
+                "versionInfo": "https://dns.public.com/v1.0/",
+                "versionList": "https://dns.public.com/",
+                "enabled": true
+            }
+        ],
+        "links": []
     }
-  ]
 }
diff --git a/keystone/content/common/samples/norequestbody.txt b/keystone/content/common/samples/norequestbody.txt
new file mode 100644
index 00000000..c6a777d5
--- /dev/null
+++ b/keystone/content/common/samples/norequestbody.txt
@@ -0,0 +1 @@
+This operation does not require a request body.
diff --git a/keystone/content/common/samples/noresponsebody.txt b/keystone/content/common/samples/noresponsebody.txt
new file mode 100644
index 00000000..96e583f9
--- /dev/null
+++ b/keystone/content/common/samples/noresponsebody.txt
@@ -0,0 +1 @@
+This operation does not return a response body.
diff --git a/keystone/content/common/samples/passwordcredentials.json b/keystone/content/common/samples/passwordcredentials.json
new file mode 100644
index 00000000..f405fa79
--- /dev/null
+++ b/keystone/content/common/samples/passwordcredentials.json
@@ -0,0 +1,6 @@
+{
+    "passwordCredentials": {
+        "username": "test_user",
+        "password": "mypass"
+    }
+}
diff --git a/keystone/content/common/samples/passwordcredentials.xml b/keystone/content/common/samples/passwordcredentials.xml
new file mode 100644
index 00000000..86e4d9fe
--- /dev/null
+++ b/keystone/content/common/samples/passwordcredentials.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <passwordCredentials xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://docs.openstack.org/identity/api/v2.0" username="test_user" password="test"/>
+