Merge "Updated samples"

8 files changed, 48 insertions, 35 deletions

diff --git a/keystone/content/common/samples/auth.json b/keystone/content/common/samples/auth.json
index 9b6285e0..1b648918 100644
--- a/keystone/content/common/samples/auth.json
+++ b/keystone/content/common/samples/auth.json
@@ -10,16 +10,16 @@
         "type": "compute",
         "endpoints": [
           {
-            "publicURL": "https://compute.north.host/v1/blah-blah",
-            "internalURL": "https://compute.north.host/v1/blah-blah",
+            "publicURL": "https://compute.north.host/v1/1234",
+            "internalURL": "https://compute.north.host/v1/1234",
             "region": "North",
             "tenantId": "1234",
             "versionId": "1.0",
             "versionInfo": "https://compute.north.host/v1.0/",
             "versionList": "https://compute.north.host/"
           }, {
-            "publicURL": "https://compute.north.host/v1.1/blah-blah",
-            "internalURL": "https://compute.north.host/v1.1/blah-blah",
+            "publicURL": "https://compute.north.host/v1.1/3456",
+            "internalURL": "https://compute.north.host/v1.1/3456",
             "region": "North",
             "tenantId": "3456",
             "versionId": "1.1",
@@ -60,7 +60,7 @@
     "serviceCatalog_links": [
       {
         "rel": "next",
-        "href": "uri"
+        "href": "https://identity.host/v2.0/endpoints?session=2834jshfh898yur&marker=2"
       }
     ]
   }
diff --git a/keystone/content/common/samples/auth.xml b/keystone/content/common/samples/auth.xml
index 53a60058..01f3036b 100644
--- a/keystone/content/common/samples/auth.xml
+++ b/keystone/content/common/samples/auth.xml
@@ -7,8 +7,8 @@
             <endpoint
                     region="North"
                     tenantId="1234"
-                    publicURL="https://north.compute.public.com/v2.0/account1"
-                    internalURL="https://north.compute.internal.com/v2.0/account1">
+										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/"
@@ -17,8 +17,8 @@
             <endpoint
                     region="South"
                     tenantId="3456"
-                    publicURL="https://south.compute.public.com/v2.0/account1"
-                    internalURL="https://south.compute.internal.com/v2.0/account1">
+                    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/"
@@ -29,8 +29,8 @@
             <endpoint
                     region="North"
                     tenantId="1234"
-                    publicURL="https://north.object-store.public.com/v1/account1"
-                    internalURL="https://north.object-store.internal.com/v1/account1">
+                    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/"
@@ -39,8 +39,8 @@
             <endpoint
                     region="South"
                     tenantId="3456"
-                    publicURL="https://south.object-store.public.com/v2.0/account1"
-                    internalURL="https://south.object-store.internal.com/v2.0/account1">
+                    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/"
diff --git a/keystone/content/common/samples/auth_credentials-OS-EC2.json b/keystone/content/common/samples/auth_credentials-OS-EC2.json
index 5169c0cc..93461cea 100644
--- a/keystone/content/common/samples/auth_credentials-OS-EC2.json
+++ b/keystone/content/common/samples/auth_credentials-OS-EC2.json
@@ -1,8 +1,10 @@
 {
-  "OS-EC2-ec2Credentials": {
-    "username": "test_user",
-    "secret": "aaaaa",
-    "signature": "bbb",
+  "auth": {
+    "OS-EC2-ec2Credentials": {
+      "username": "test_user",
+      "secret": "aaaaa",
+      "signature": "bbb",
+    },
     "tenantId": "77654"
   }
-}
+}
\ No newline at end of file
diff --git a/keystone/content/common/samples/auth_credentials-OS-EC2.xml b/keystone/content/common/samples/auth_credentials-OS-EC2.xml
index 3ee63392..b3c6abb0 100644
--- a/keystone/content/common/samples/auth_credentials-OS-EC2.xml
+++ b/keystone/content/common/samples/auth_credentials-OS-EC2.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ec2Credentials
+<auth
+  xmlns="http://docs.openstack.org/identity/api/v2.0"
+  tenantId="1234">
+  <ec2Credentials
     xmlns="http://docs.openstack.org/identity/api/ext/OS-EC2/v1.0"
     username="testuser"
     key="aaaaa"
     signature="bbbbb"
     tenantId="77654"/>
+</auth>
\ No newline at end of file
diff --git a/keystone/content/common/samples/auth_credentials-RAX-KEY.json b/keystone/content/common/samples/auth_credentials-RAX-KEY.json
index 95af8d61..adc7507c 100644
--- a/keystone/content/common/samples/auth_credentials-RAX-KEY.json
+++ b/keystone/content/common/samples/auth_credentials-RAX-KEY.json
@@ -1,7 +1,8 @@
 {
-  "RAX-KEY:apikeyCredentials": {
-    "username": "test_user",
-    "apikey": "aaaaa-bbbbb-ccccc-12345678",
-    "tenantId": "77654"
+  "auth": {
+    "RAX-KEY:apikeyCredentials": {
+      "username": "test_user",
+      "apikey": "aaaaa-bbbbb-ccccc-12345678"
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/keystone/content/common/samples/auth_credentials-RAX-KEY.xml b/keystone/content/common/samples/auth_credentials-RAX-KEY.xml
index 133e4340..d8529896 100644
--- a/keystone/content/common/samples/auth_credentials-RAX-KEY.xml
+++ b/keystone/content/common/samples/auth_credentials-RAX-KEY.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<apikeyCredentials
+<auth  xmlns="http://docs.openstack.org/identity/api/v2.0">
+  <apikeyCredentials
     xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KEY/v1.0"
     username="testuser"
-    apikey="aaaaa-bbbbb-ccccc-12345678"
-    tenantId="77654"/>
-
+    apikey="aaaaa-bbbbb-ccccc-12345678"/>
+</auth>
diff --git a/keystone/content/common/samples/auth_credentials.json b/keystone/content/common/samples/auth_credentials.json
index d26a5d4a..282f321d 100644
--- a/keystone/content/common/samples/auth_credentials.json
+++ b/keystone/content/common/samples/auth_credentials.json
@@ -1,6 +1,9 @@
 {
-  "passwordCredentials": {
-    "username": "test_user",
-    "password": "a86850deb2742ec3cb41518e26aa2d89"
+  "auth": {
+    "passwordCredentials": {
+      "username": "test_user",
+      "password": "mypass"
+    },
+    "tenantId": "1234"
   }
-}
+}
\ No newline at end of file
diff --git a/keystone/content/common/samples/auth_credentials.xml b/keystone/content/common/samples/auth_credentials.xml
index 2de074d4..a02c7c8e 100644
--- a/keystone/content/common/samples/auth_credentials.xml
+++ b/keystone/content/common/samples/auth_credentials.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<passwordCredentials
-    xmlns="http://docs.openstack.org/identity/api/v2.0"
+<auth
+  xmlns="http://docs.openstack.org/identity/api/v2.0"
+  tenantId="1234">
+  <passwordCredentials
     username="testuser"
-    password="P@ssword1"/>
\ No newline at end of file
+    password="P@ssword1"/>
+</auth>
\ No newline at end of file