From c580c0b03bfe620ff5b291dca54ba9eb58f71fab Mon Sep 17 00:00:00 2001
From: Ziad Sawalha <github@highbridgellc.com>
Date: Fri, 20 May 2011 15:35:01 -0500
Subject: More version fixes

---
 README.md                                          |   4 +-
 bin/keystone-auth                                  |   2 +
 docs/guide/src/docbkx/samples/extension.json       |   2 +-
 docs/guide/src/docbkx/samples/extension.xml        |   4 +-
 docs/guide/src/docbkx/samples/extensions.json      |  10 +-
 docs/guide/src/docbkx/samples/extensions.xml       |  10 +-
 docs/guide/src/docbkx/samples/identity_fault.json  |   2 +-
 docs/guide/src/docbkx/samples/identity_fault.xml   |   4 +-
 .../src/docbkx/samples/samplerequestheader.json    |   2 +-
 docs/guide/src/docbkx/samples/version-atom.xml     |   8 +-
 docs/guide/src/docbkx/samples/version.json         |   4 +-
 docs/guide/src/docbkx/samples/version.xml          |   4 +-
 docs/guide/src/docbkx/samples/versions-atom.xml    |   2 +-
 docs/guide/src/docbkx/xsd/api.xsd                  |   2 +-
 docs/guide/src/docbkx/xsd/fault.xsd                |  38 ++--
 docs/guide/src/docbkx/xsd/tenant.xsd               |   8 +-
 docs/guide/src/docbkx/xsd/token.xsd                |  16 +-
 keystone/common/wsgi.py                            |   2 +-
 test/IdentitySOAPUI.xml                            | 218 ++++++++++-----------
 test/unit/test_exthandler.py                       |  12 +-
 test/unit/test_server.py                           |   2 +-
 21 files changed, 179 insertions(+), 177 deletions(-)

diff --git a/README.md b/README.md
index 4d3141ed..6257536f 100644
--- a/README.md
+++ b/README.md
@@ -120,11 +120,11 @@ After starting keystone a keystone.db sqlite database should be created in the k
 
 Add test data to the database:
 
-    $ sqlite3 bin/keystone.sqlite < test/test_setup.sql
+    $ sqlite3 bin/keystone.db < test/test_setup.sql
 
 To clean the test database
 
-    $ sqlite3 bin/keystone.sqlite < test/kill.sql
+    $ sqlite3 bin/keystone.db < test/kill.sql
 
 To run client demo (with all auth middleware running locally on sample service):
 
diff --git a/bin/keystone-auth b/bin/keystone-auth
index eae99ec9..8dc71aaa 100755
--- a/bin/keystone-auth
+++ b/bin/keystone-auth
@@ -60,6 +60,8 @@ if __name__ == '__main__':
         conf, app = config.load_paste_app('server', options, args)
         server = wsgi.Server()
         server.start(app, int(conf['bind_port']), conf['bind_host'])
+        print "Server listening on %s:%s" % (conf['bind_host'],
+                                              conf['bind_port'])
         server.wait()
     except RuntimeError, e:
         sys.exit("ERROR: %s" % e)
diff --git a/docs/guide/src/docbkx/samples/extension.json b/docs/guide/src/docbkx/samples/extension.json
index 68233e90..9efaa422 100644
--- a/docs/guide/src/docbkx/samples/extension.json
+++ b/docs/guide/src/docbkx/samples/extension.json
@@ -9,7 +9,7 @@
           {
               "rel" : "describedby",
               "type" : "application/pdf",
-              "href" : "http://docs.rackspacecloud.com/idm/api/ext/identity-meta-20111201.pdf"
+              "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"
           },
           {
               "rel" : "describedby",
diff --git a/docs/guide/src/docbkx/samples/extension.xml b/docs/guide/src/docbkx/samples/extension.xml
index d0dbffe9..056d7e96 100644
--- a/docs/guide/src/docbkx/samples/extension.xml
+++ b/docs/guide/src/docbkx/samples/extension.xml
@@ -13,10 +13,10 @@
 
     <atom:link rel="describedby"
                type="application/pdf"
-               href="http://docs.rackspacecloud.com/idm/api/ext/idm-meta-20111201.pdf"/>
+               href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"/>
     <atom:link rel="describedby"
                type="application/vnd.sun.wadl+xml"
-               href="http://docs.rackspacecloud.com/idm/api/ext/idm-meta.wadl"/>
+               href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta.wadl"/>
 
 </extension>
     
diff --git a/docs/guide/src/docbkx/samples/extensions.json b/docs/guide/src/docbkx/samples/extensions.json
index 8b594526..553c892e 100644
--- a/docs/guide/src/docbkx/samples/extensions.json
+++ b/docs/guide/src/docbkx/samples/extensions.json
@@ -3,7 +3,7 @@
         "values" : [
             {
                 "name" : "Reset Password Extension",
-                "namespace" : "http://docs.rackspacecloud.com/idm/api/ext/rpe/v1.0",
+                "namespace" : "http://docs.rackspacecloud.com/identity/api/ext/rpe/v1.0",
                 "alias" : "RS-RPE",
                 "updated" : "2011-01-22T13:25:27-06:00",
                 "description" : "Adds the capability to reset a user's password. The user is emailed when the password has been reset.",
@@ -11,12 +11,12 @@
                     {
                         "rel" : "describedby",
                         "type" : "application/pdf",
-                        "href" : "http://docs.rackspacecloud.com/idm/api/ext/idm-rpe-20111111.pdf"
+                        "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-rpe-20111111.pdf"
                     },
                     {
                         "rel" : "describedby",
                         "type" : "application/vnd.sun.wadl+xml",
-                        "href" : "http://docs.rackspacecloud.com/idm/api/ext/idm-rpe.wadl"
+                        "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-rpe.wadl"
                     }
                 ]
             },
@@ -30,12 +30,12 @@
                     {
                         "rel" : "describedby",
                         "type" : "application/pdf",
-                        "href" : "http://docs.rackspacecloud.com/idm/api/ext/idm-meta-20111201.pdf"
+                        "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"
                     },
                     {
                         "rel" : "describedby",
                         "type" : "application/vnd.sun.wadl+xml",
-                        "href" : "http://docs.rackspacecloud.com/idm/api/ext/idm-meta.wadl"
+                        "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-meta.wadl"
                     }
                 ]
             }
diff --git a/docs/guide/src/docbkx/samples/extensions.xml b/docs/guide/src/docbkx/samples/extensions.xml
index f0a9a49d..c11b06d7 100644
--- a/docs/guide/src/docbkx/samples/extensions.xml
+++ b/docs/guide/src/docbkx/samples/extensions.xml
@@ -4,7 +4,7 @@
             xmlns:atom="http://www.w3.org/2005/Atom">
     <extension
         name="Reset Password Extension"
-        namespace="http://docs.rackspacecloud.com/idm/api/ext/rpe/v1.0"
+        namespace="http://docs.rackspacecloud.com/identity/api/ext/rpe/v1.0"
         alias="RS-RPE"
         updated="2011-01-22T13:25:27-06:00">
 
@@ -15,10 +15,10 @@
 
         <atom:link rel="describedby"
                    type="application/pdf"
-                   href="http://docs.rackspacecloud.com/idm/api/ext/idm-rpe-20111111.pdf"/>
+                   href="http://docs.rackspacecloud.com/identity/api/ext/identity-rpe-20111111.pdf"/>
         <atom:link rel="describedby"
                    type="application/vnd.sun.wadl+xml"
-                   href="http://docs.rackspacecloud.com/idm/api/ext/idm-rpe.wadl"/>
+                   href="http://docs.rackspacecloud.com/identity/api/ext/identity-rpe.wadl"/>
     </extension>
     <extension
         name="User Metadata Extension"
@@ -31,9 +31,9 @@
 
         <atom:link rel="describedby"
                    type="application/pdf"
-                   href="http://docs.rackspacecloud.com/idm/api/ext/idm-meta-20111201.pdf"/>
+                   href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"/>
         <atom:link rel="describedby"
                    type="application/vnd.sun.wadl+xml"
-                   href="http://docs.rackspacecloud.com/idm/api/ext/idm-meta.wadl"/>
+                   href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta.wadl"/>
     </extension>
 </extensions>
diff --git a/docs/guide/src/docbkx/samples/identity_fault.json b/docs/guide/src/docbkx/samples/identity_fault.json
index 84e3908e..d61feff4 100644
--- a/docs/guide/src/docbkx/samples/identity_fault.json
+++ b/docs/guide/src/docbkx/samples/identity_fault.json
@@ -1,4 +1,4 @@
-{"idmFault":
+{"identityFault":
     {
       "message": "Fault",
       "details": "Error Details...",
diff --git a/docs/guide/src/docbkx/samples/identity_fault.xml b/docs/guide/src/docbkx/samples/identity_fault.xml
index 0592d948..6787af21 100644
--- a/docs/guide/src/docbkx/samples/identity_fault.xml
+++ b/docs/guide/src/docbkx/samples/identity_fault.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<idmFault xmlns="http://docs.openstack.org/identity/api/v2.0"
+<identityFault xmlns="http://docs.openstack.org/identity/api/v2.0"
           code="500">
 	<message>Fault</message>
 	<details>Error Details...</details>
-</idmFault>
+</identityFault>
diff --git a/docs/guide/src/docbkx/samples/samplerequestheader.json b/docs/guide/src/docbkx/samples/samplerequestheader.json
index 7db2a40f..32a3a798 100644
--- a/docs/guide/src/docbkx/samples/samplerequestheader.json
+++ b/docs/guide/src/docbkx/samples/samplerequestheader.json
@@ -1,4 +1,4 @@
-POST /v1.0/token HTTP/1.1
+POST /v2.0/token HTTP/1.1
 Host: identity.api.rackspace.com
 Content-Type: application/json
 Accept: application/xml
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/version-atom.xml b/docs/guide/src/docbkx/samples/version-atom.xml
index 13ac3b0b..519ab203 100644
--- a/docs/guide/src/docbkx/samples/version-atom.xml
+++ b/docs/guide/src/docbkx/samples/version-atom.xml
@@ -7,13 +7,13 @@
    <link rel="self" href="http://identity.api.openstack.org/v2.0/"/>
    <entry>
       <id>http://identity.api.openstack.org/v2.0/</id>
-      <title type="text">Version v1.0</title>
+      <title type="text">Version v2.0</title>
       <updated>2011-01-21T11:33:21-06:00</updated>
       <link rel="self" href="http://identity.api.openstack.org/v2.0/"/>
       <link rel="describedby" type="application/pdf"
-           href="http://docs.rackspacecloud.com/identity/api/v2.0/idm-devguide-20110125.pdf"/>
+           href="http://docs.openstack.org/identity/api/v2.0/identity-devguide-20110125.pdf"/>
       <link rel="describedby" type="application/vnd.sun.wadl+xml"
-           href="http://docs.rackspacecloud.com/identity/api/v2.0/application.wadl"/>
-      <content type="text">Version v1.0 CURRENT (2011-01-21T11:33:21-06:00)</content>
+           href="http://docs.openstack.org/identity/api/v2.0/application.wadl"/>
+      <content type="text">Version v2.0 CURRENT (2011-01-21T11:33:21-06:00)</content>
    </entry>
 </feed>
diff --git a/docs/guide/src/docbkx/samples/version.json b/docs/guide/src/docbkx/samples/version.json
index 60953de0..fce09386 100644
--- a/docs/guide/src/docbkx/samples/version.json
+++ b/docs/guide/src/docbkx/samples/version.json
@@ -1,6 +1,6 @@
 {
     "version" : {
-        "id" : "v1.0",
+        "id" : "v2.0",
         "status" : "CURRENT",
         "updated" : "2011-01-21T11:33:21-06:00",
         "links": [
@@ -11,7 +11,7 @@
             {
                 "rel" : "describedby",
                 "type" : "application/pdf",
-                "href" : "http://docs.rackspacecloud.com/identity/api/v2.0/idm-devguide-20110125.pdf"
+                "href" : "http://docs.rackspacecloud.com/identity/api/v2.0/identity-devguide-20110125.pdf"
             },
             {
                 "rel" : "describedby",
diff --git a/docs/guide/src/docbkx/samples/version.xml b/docs/guide/src/docbkx/samples/version.xml
index 08eac21e..0e884504 100644
--- a/docs/guide/src/docbkx/samples/version.xml
+++ b/docs/guide/src/docbkx/samples/version.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <version xmlns="http://docs.openstack.org/common/api/v1.0"
          xmlns:atom="http://www.w3.org/2005/Atom"
-         id="v1.0" status="CURRENT" updated="2011-01-21T11:33:21-06:00">
+         id="v2.0" status="CURRENT" updated="2011-01-21T11:33:21-06:00">
 
      <media-types>
          <media-type base="application/xml"
@@ -15,7 +15,7 @@
 
     <atom:link rel="describedby"
                type="application/pdf"
-               href="http://docs.rackspacecloud.com/identity/api/v2.0/idm-devguide-20110125.pdf" />
+               href="http://docs.rackspacecloud.com/identity/api/v2.0/identity-devguide-20110125.pdf" />
 
     <atom:link rel="describedby"
                type="application/vnd.sun.wadl+xml"
diff --git a/docs/guide/src/docbkx/samples/versions-atom.xml b/docs/guide/src/docbkx/samples/versions-atom.xml
index d9fcade7..55c27318 100644
--- a/docs/guide/src/docbkx/samples/versions-atom.xml
+++ b/docs/guide/src/docbkx/samples/versions-atom.xml
@@ -13,7 +13,7 @@
        <content type="text">Version v1.1 CURRENT (2010-12-12T18:30:02.25Z)</content>
     </entry>
     <entry>
-       <id>http://identity.api.openstack.org/v2.0/</id>
+       <id>http://identity.api.openstack.org/v1.0/</id>
        <title type="text">Version v1.0</title>
        <updated>2009-10-09T11:30:00Z</updated>
        <link rel="self" href="http://identity.api.openstack.org/v2.0/"/>
diff --git a/docs/guide/src/docbkx/xsd/api.xsd b/docs/guide/src/docbkx/xsd/api.xsd
index cedb4026..d4603c2e 100644
--- a/docs/guide/src/docbkx/xsd/api.xsd
+++ b/docs/guide/src/docbkx/xsd/api.xsd
@@ -4,7 +4,7 @@
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:idm="http://docs.openstack.org/identity/api/v2.0"
+    xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://docs.openstack.org/identity/api/v2.0"
 >
diff --git a/docs/guide/src/docbkx/xsd/fault.xsd b/docs/guide/src/docbkx/xsd/fault.xsd
index c37c0419..6725e3a4 100644
--- a/docs/guide/src/docbkx/xsd/fault.xsd
+++ b/docs/guide/src/docbkx/xsd/fault.xsd
@@ -4,23 +4,23 @@
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:idm="http://docs.openstack.org/identity/api/v2.0"
+    xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://docs.openstack.org/identity/api/v2.0"
 >
     <!-- Fault Elements -->
-    <element name="idmFault" type="idm:IDMFault"/>
-    <element name="serviceUnavailable" type="idm:ServiceUnavailableFault"/>
-    <element name="badRequest" type="idm:BadRequestFault"/>
-    <element name="unauthorized" type="idm:UnauthorizedFault"/>
-    <element name="overLimit" type="idm:OverLimitFault"/>
-    <element name="userDisabled" type="idm:UserDisabledFault"/>
-    <element name="forbidden" type="idm:ForbiddenFault"/>
-    <element name="itemNotFound" type="idm:ItemNotFoundFault"/>
-    <element name="tenantConflict" type="idm:TenantConflictFault"/>
+    <element name="identityFault" type="identity:IdentityFault"/>
+    <element name="serviceUnavailable" type="identity:ServiceUnavailableFault"/>
+    <element name="badRequest" type="identity:BadRequestFault"/>
+    <element name="unauthorized" type="identity:UnauthorizedFault"/>
+    <element name="overLimit" type="identity:OverLimitFault"/>
+    <element name="userDisabled" type="identity:UserDisabledFault"/>
+    <element name="forbidden" type="identity:ForbiddenFault"/>
+    <element name="itemNotFound" type="identity:ItemNotFoundFault"/>
+    <element name="tenantConflict" type="identity:TenantConflictFault"/>
 
     <!-- Fault Types -->
-    <complexType name="IDMFault">
+    <complexType name="IdentityFault">
         <sequence>
             <element name="message" type="xsd:string">
                 <annotation>
@@ -66,56 +66,56 @@
 
     <complexType name="ServiceUnavailableFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="BadRequestFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="UnauthorizedFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="UserDisabledFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="ForbiddenFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="ItemNotFoundFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="TenantConflictFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="OverLimitFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
                 <attribute name="retryAt" type="xsd:dateTime" use="optional">
                     <annotation>
                         <xsd:documentation
diff --git a/docs/guide/src/docbkx/xsd/tenant.xsd b/docs/guide/src/docbkx/xsd/tenant.xsd
index 400ded28..26ef15fe 100644
--- a/docs/guide/src/docbkx/xsd/tenant.xsd
+++ b/docs/guide/src/docbkx/xsd/tenant.xsd
@@ -4,7 +4,7 @@
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:idm="http://docs.openstack.org/identity/api/v2.0"
+    xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
     xmlns:atom="http://www.w3.org/2005/Atom"
@@ -15,13 +15,13 @@
             schemaLocation="atom/atom.xsd" />
 
     <!-- Elements -->
-    <element name="tenant" type="idm:Tenant"  />
-    <element name="tenants" type="idm:Tenants" />
+    <element name="tenant" type="identity:Tenant"  />
+    <element name="tenants" type="identity:Tenants" />
 
     <!-- Complex Types -->
     <complexType name="Tenants">
         <sequence>
-            <element name="tenant" type="idm:Tenant" maxOccurs="1000"/>
+            <element name="tenant" type="identity:Tenant" maxOccurs="1000"/>
             <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
diff --git a/docs/guide/src/docbkx/xsd/token.xsd b/docs/guide/src/docbkx/xsd/token.xsd
index de95da4c..888bbebf 100644
--- a/docs/guide/src/docbkx/xsd/token.xsd
+++ b/docs/guide/src/docbkx/xsd/token.xsd
@@ -4,19 +4,19 @@
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:idm="http://docs.openstack.org/identity/api/v2.0"
+    xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://docs.openstack.org/identity/api/v2.0"
 >
     <!-- Elements -->
-    <element name="passwordCredentials" type="idm:PasswordCredentials"/>
-    <element name="auth" type="idm:AuthData"/>
+    <element name="passwordCredentials" type="identity:PasswordCredentials"/>
+    <element name="auth" type="identity:AuthData"/>
 
     <!-- Complex Types -->
     <complexType name="Credentials" abstract="true" />
     <complexType name="PasswordCredentials">
         <complexContent>
-            <extension base="idm:Credentials">
+            <extension base="identity:Credentials">
                 <sequence>
                     <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
                 </sequence>
@@ -30,8 +30,8 @@
 
     <complexType name="AuthData">
         <sequence>
-            <element name="token" type="idm:Token"/>
-            <element name="user" type="idm:User"/>
+            <element name="token" type="identity:Token"/>
+            <element name="user" type="identity:User"/>
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>
@@ -48,7 +48,7 @@
 
     <complexType name="User">
         <sequence>
-            <element name="groups" type="idm:Groups" />
+            <element name="groups" type="identity:Groups" />
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <attribute name="tenantId" type="xsd:string"/>
@@ -58,7 +58,7 @@
 
     <complexType name="Groups">
         <sequence>
-            <element name="group" type="idm:Group" maxOccurs="1000"/>
+            <element name="group" type="identity:Group" maxOccurs="1000"/>
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>
diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py
index d9cab6dc..32de27c9 100755
--- a/keystone/common/wsgi.py
+++ b/keystone/common/wsgi.py
@@ -176,7 +176,7 @@ class Router(object):
           # Pointing to an arbitrary WSGI app.  You can specify the
           # {path_info:.*} parameter so the target app can be handed just that
           # section of the URL.
-          mapper.connect(None, "/v1.0/{path_info:.*}", controller=BlogApp())
+          mapper.connect(None, "/v2.0/{path_info:.*}", controller=BlogApp())
         """
         self.map = mapper
         self._router = routes.middleware.RoutesMiddleware(self._dispatch,
diff --git a/test/IdentitySOAPUI.xml b/test/IdentitySOAPUI.xml
index 86795a38..d5832df8 100644
--- a/test/IdentitySOAPUI.xml
+++ b/test/IdentitySOAPUI.xml
@@ -28,7 +28,7 @@
   <con:entry key="Save After" value="false"/>
   <con:entry key="Add Settings" value="false"/>
   <con:entry key="Endpoint" value=""/>
-</xml-fragment>]]></con:setting></con:settings><con:interface xsi:type="con:RestService" wadlVersion="http://wadl.dev.java.net/2009/02" name="Keystone" type="rest" basePath="" definitionUrl="file:/Users/jorgew/projects/keystone/keystone/identity.wadl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="file:/Users/jorgew/projects/keystone/keystone/identity.wadl"><con:part><con:url>file:/Users/jorgew/projects/keystone/keystone/identity.wadl</con:url><con:content><![CDATA[<application xsi:schemaLocation="http://docs.openstack.org/identity/api/v2.0                                  xsd/api.xsd                                  http://docs.openstack.org/common/api/v1.0                                  xsd/api-common.xsd                                  " xmlns="http://wadl.dev.java.net/2009/02" xmlns:idm="http://docs.openstack.org/identity/api/v2.0" xmlns:capi="http://docs.openstack.org/common/api/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+</xml-fragment>]]></con:setting></con:settings><con:interface xsi:type="con:RestService" wadlVersion="http://wadl.dev.java.net/2009/02" name="Keystone" type="rest" basePath="" definitionUrl="file:/Users/jorgew/projects/keystone/keystone/identity.wadl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="file:/Users/jorgew/projects/keystone/keystone/identity.wadl"><con:part><con:url>file:/Users/jorgew/projects/keystone/keystone/identity.wadl</con:url><con:content><![CDATA[<application xsi:schemaLocation="http://docs.openstack.org/identity/api/v2.0                                  xsd/api.xsd                                  http://docs.openstack.org/common/api/v1.0                                  xsd/api-common.xsd                                  " xmlns="http://wadl.dev.java.net/2009/02" xmlns:identity="http://docs.openstack.org/identity/api/v2.0" xmlns:capi="http://docs.openstack.org/common/api/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <grammars>
     <include href="xsd/api.xsd"/>
     <include href="xsd/api-common.xsd"/>
@@ -73,13 +73,13 @@
       <representation mediaType="application/json"/>
     </response>
     <response status="400">
-      <representation mediaType="application/xml" element="idm:badRequest"/>
+      <representation mediaType="application/xml" element="identity:badRequest"/>
     </response>
     <response status="500">
-      <representation mediaType="application/xml" element="idm:idmFault"/>
+      <representation mediaType="application/xml" element="identity:identityFault"/>
     </response>
     <response status="503">
-      <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+      <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
     </response>
     <response status="400 500 503">
       <representation mediaType="application/json"/>
@@ -91,16 +91,16 @@
       <representation mediaType="application/json"/>
     </response>
     <response status="400">
-      <representation mediaType="application/xml" element="idm:badRequest"/>
+      <representation mediaType="application/xml" element="identity:badRequest"/>
     </response>
     <response status="404">
-      <representation mediaType="application/xml" element="idm:itemNotFound"/>
+      <representation mediaType="application/xml" element="identity:itemNotFound"/>
     </response>
     <response status="500">
-      <representation mediaType="application/xml" element="idm:idmFault"/>
+      <representation mediaType="application/xml" element="identity:identityFault"/>
     </response>
     <response status="503">
-      <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+      <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
     </response>
     <response status="400 404 500 503">
       <representation mediaType="application/json"/>
@@ -113,13 +113,13 @@
       <representation mediaType="application/json"/>
     </response>
     <response status="400">
-      <representation mediaType="application/xml" element="idm:badRequest"/>
+      <representation mediaType="application/xml" element="identity:badRequest"/>
     </response>
     <response status="500">
-      <representation mediaType="application/xml" element="idm:idmFault"/>
+      <representation mediaType="application/xml" element="identity:identityFault"/>
     </response>
     <response status="503">
-      <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+      <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
     </response>
     <response status="400 500 503">
       <representation mediaType="application/json"/>
@@ -128,27 +128,27 @@
   <!--Token Operations-->
   <method name="POST" id="authenticate">
     <request>
-      <representation mediaType="application/xml" element="idm:passwordCredentials"/>
+      <representation mediaType="application/xml" element="identity:passwordCredentials"/>
       <representation mediaType="application/json"/>
     </request>
     <response status="200 203">
-      <representation mediaType="application/xml" element="idm:auth"/>
+      <representation mediaType="application/xml" element="identity:auth"/>
       <representation mediaType="application/json"/>
     </response>
     <response status="401">
-      <representation mediaType="application/xml" element="idm:unauthorized"/>
+      <representation mediaType="application/xml" element="identity:unauthorized"/>
     </response>
     <response status="403">
-      <representation mediaType="application/xml" element="idm:userDisabled"/>
+      <representation mediaType="application/xml" element="identity:userDisabled"/>
     </response>
     <response status="400">
-      <representation mediaType="application/xml" element="idm:badRequest"/>
+      <representation mediaType="application/xml" element="identity:badRequest"/>
     </response>
     <response status="500">
-      <representation mediaType="application/xml" element="idm:idmFault"/>
+      <representation mediaType="application/xml" element="identity:identityFault"/>
     </response>
     <response status="503">
-      <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+      <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
     </response>
     <response status="401 403 400 500 503">
       <representation mediaType="application/json"/>
@@ -159,27 +159,27 @@
       <param name="belongsTo" style="query" required="false" type="xsd:string"/>
     </request>
     <response status="200 203">
-      <representation mediaType="application/xml" element="idm:auth"/>
+      <representation mediaType="application/xml" element="identity:auth"/>
       <representation mediaType="application/json"/>
     </response>
     <response status="401">
-      <representation mediaType="application/xml" element="idm:unauthorized"/>
+      <representation mediaType="application/xml" element="identity:unauthorized"/>
     </response>
     <response status="403">
-      <representation mediaType="application/xml" element="idm:forbidden"/>
-      <representation mediaType="application/xml" element="idm:userDisabled"/>
+      <representation mediaType="application/xml" element="identity:forbidden"/>
+      <representation mediaType="application/xml" element="identity:userDisabled"/>
     </response>
     <response status="400">
-      <representation mediaType="application/xml" element="idm:badRequest"/>
+      <representation mediaType="application/xml" element="identity:badRequest"/>
     </response>
     <response status="404">
-      <representation mediaType="application/xml" element="idm:itemNotFound"/>
+      <representation mediaType="application/xml" element="identity:itemNotFound"/>
     </response>
     <response status="500">
-      <representation mediaType="application/xml" element="idm:idmFault"/>
+      <representation mediaType="application/xml" element="identity:identityFault"/>
     </response>
     <response status="503">
-      <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+      <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
     </response>
     <response status="400 401 403 404 500 503">
       <representation mediaType="application/json"/>
@@ -188,22 +188,22 @@
   <method name="DELETE" id="revokeToken">
     <response status="204"/>
     <response status="401">
-      <representation mediaType="application/xml" element="idm:unauthorized"/>
+      <representation mediaType="application/xml" element="identity:unauthorized"/>
     </response>
     <response status="403">
-      <representation mediaType="application/xml" element="idm:forbidden"/>
+      <representation mediaType="application/xml" element="identity:forbidden"/>
     </response>
     <response status="400">
-      <representation mediaType="application/xml" element="idm:badRequest"/>
+      <representation mediaType="application/xml" element="identity:badRequest"/>
     </response>
     <response status="404">
-      <representation mediaType="application/xml" element="idm:itemNotFound"/>
+      <representation mediaType="application/xml" element="identity:itemNotFound"/>
     </response>
     <response status="500">
-      <representation mediaType="application/xml" element="idm:idmFault"/>
+      <representation mediaType="application/xml" element="identity:identityFault"/>
     </response>
     <response status="503">
-      <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+      <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
     </response>
     <response status="400 401 403 404 500 503">
       <representation mediaType="application/json"/>
@@ -216,26 +216,26 @@
       <param name="limit" style="query" required="false" type="xsd:int"/>
     </request>
     <response status="200 203">
-      <representation mediaType="application/xml" element="idm:tenants"/>
+      <representation mediaType="application/xml" element="identity:tenants"/>
       <representation mediaType="application/json"/>
     </response>
     <response status="401">
-      <representation mediaType="application/xml" element="idm:unauthorized"/>
+      <representation mediaType="application/xml" element="identity:unauthorized"/>
     </response>
     <response status="403">
-      <representation mediaType="application/xml" element="idm:forbidden"/>
+      <representation mediaType="application/xml" element="identity:forbidden"/>
     </response>
     <response status="400">
-      <representation mediaType="application/xml" element="idm:badRequest"/>
+      <representation mediaType="application/xml" element="identity:badRequest"/>
     </response>
     <response status="404">
-      <representation mediaType="application/xml" element="idm:itemNotFound"/>
+      <representation mediaType="application/xml" element="identity:itemNotFound"/>
     </response>
     <response status="500">
-      <representation mediaType="application/xml" element="idm:idmFault"/>
+      <representation mediaType="application/xml" element="identity:identityFault"/>
     </response>
     <response status="503">
-      <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+      <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
     </response>
     <response status="400 401 403 404 500 503">
       <representation mediaType="application/json"/>
@@ -243,30 +243,30 @@
   </method>
   <method name="POST" id="createTenant">
     <request>
-      <representation mediaType="application/xml" element="idm:tenant"/>
+      <representation mediaType="application/xml" element="identity:tenant"/>
       <representation mediaType="application/json"/>
     </request>
     <response status="201">
-      <representation mediaType="application/xml" element="idm:tenant"/>
+      <representation mediaType="application/xml" element="identity:tenant"/>
       <representation mediaType="application/json"/>
     </response>
     <response status="401">
-      <representation mediaType="application/xml" element="idm:unauthorized"/>
+      <representation mediaType="application/xml" element="identity:unauthorized"/>
     </response>
     <response status="403">
-      <representation mediaType="application/xml" element="idm:forbidden"/>
+      <representation mediaType="application/xml" element="identity:forbidden"/>
     </response>
     <response status="409">
-       <representation mediaType="application/xml" element="idm:tenantConflict"/>
+       <representation mediaType="application/xml" element="identity:tenantConflict"/>
     </response>
     <response status="400">
-      <representation mediaType="application/xml" element="idm:badRequest"/>
+      <representation mediaType="application/xml" element="identity:badRequest"/>
     </response>
     <response status="500">
-      <representation mediaType="application/xml" element="idm:idmFault"/>
+      <representation mediaType="application/xml" element="identity:identityFault"/>
     </response>
     <response status="503">
-      <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+      <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
     </response>
     <response status="401 403 400 409 500 503">
       <representation mediaType="application/json"/>
@@ -274,26 +274,26 @@
   </method>
   <method name="GET" id="getTenant">
     <response status="200 203">
-      <representation mediaType="application/xml" element="idm:tenant"/>
+      <representation mediaType="application/xml" element="identity:tenant"/>
       <representation mediaType="application/json"/>
     </response>
     <response status="401">
-      <representation mediaType="application/xml" element="idm:unauthorized"/>
+      <representation mediaType="application/xml" element="identity:unauthorized"/>
     </response>
     <response status="403">
-      <representation mediaType="application/xml" element="idm:forbidden"/>
+      <representation mediaType="application/xml" element="identity:forbidden"/>
     </response>
     <response status="400">
-      <representation mediaType="application/xml" element="idm:badRequest"/>
+      <representation mediaType="application/xml" element="identity:badRequest"/>
     </response>
     <response status="404">
-      <representation mediaType="application/xml" element="idm:itemNotFound"/>
+      <representation mediaType="application/xml" element="identity:itemNotFound"/>
     </response>
     <response status="500">
-      <representation mediaType="application/xml" element="idm:idmFault"/>
+      <representation mediaType="application/xml" element="identity:identityFault"/>
     </response>
     <response status="503">
-      <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+      <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
     </response>
     <response status="400 401 403 404 500 503">
       <representation mediaType="application/json"/>
@@ -301,30 +301,30 @@
   </method>
   <method name="PUT" id="updateTenant">
     <request>
-      <representation mediaType="application/xml" element="idm:tenant"/>
+      <representation mediaType="application/xml" element="identity:tenant"/>
       <representation mediaType="application/json"/>
     </request>
     <response status="200">
-      <representation mediaType="application/xml" element="idm:tenant"/>
+      <representation mediaType="application/xml" element="identity:tenant"/>
       <representation mediaType="application/json"/>
     </response>
     <response status="401">
-      <representation mediaType="application/xml" element="idm:unauthorized"/>
+      <representation mediaType="application/xml" element="identity:unauthorized"/>
     </response>
     <response status="403">
-      <representation mediaType="application/xml" element="idm:forbidden"/>
+      <representation mediaType="application/xml" element="identity:forbidden"/>
     </response>
     <response status="404">
-      <representation mediaType="application/xml" element="idm:itemNotFound"/>
+      <representation mediaType="application/xml" element="identity:itemNotFound"/>
     </response>
     <response status="400">
-      <representation mediaType="application/xml" element="idm:badRequest"/>
+      <representation mediaType="application/xml" element="identity:badRequest"/>
     </response>
     <response status="500">
-      <representation mediaType="application/xml" element="idm:idmFault"/>
+      <representation mediaType="application/xml" element="identity:identityFault"/>
     </response>
     <response status="503">
-      <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+      <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
     </response>
     <response status="401 403 404 400 500 503">
       <representation mediaType="application/json"/>
@@ -333,40 +333,40 @@
   <method name="DELETE" id="deleteTenant">
     <response status="204"/>
     <response status="401">
-      <representation mediaType="application/xml" element="idm:unauthorized"/>
+      <representation mediaType="application/xml" element="identity:unauthorized"/>
     </response>
     <response status="403">
-      <representation mediaType="application/xml" element="idm:forbidden"/>
+      <representation mediaType="application/xml" element="identity:forbidden"/>
     </response>
     <response status="400">
-      <representation mediaType="application/xml" element="idm:badRequest"/>
+      <representation mediaType="application/xml" element="identity:badRequest"/>
     </response>
     <response status="404">
-      <representation mediaType="application/xml" element="idm:itemNotFound"/>
+      <representation mediaType="application/xml" element="identity:itemNotFound"/>
     </response>
     <response status="500">
-      <representation mediaType="application/xml" element="idm:idmFault"/>
+      <representation mediaType="application/xml" element="identity:identityFault"/>
     </response>
     <response status="503">
-      <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+      <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
     </response>
     <response status="400 401 403 404 500 503">
       <representation mediaType="application/json"/>
     </response>
   </method>
-</application>]]></con:content><con:type>http://wadl.dev.java.net/2009/02</con:type></con:part><con:part><con:url>file:/Users/jorgew/projects/keystone/keystone/xsd/api.xsd</con:url><con:content>&lt;schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.openstack.org/identity/api/v2.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:idm="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+</application>]]></con:content><con:type>http://wadl.dev.java.net/2009/02</con:type></con:part><con:part><con:url>file:/Users/jorgew/projects/keystone/keystone/xsd/api.xsd</con:url><con:content>&lt;schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.openstack.org/identity/api/v2.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:identity="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   &lt;include schemaLocation="token.xsd"/>
   &lt;include schemaLocation="tenant.xsd"/>
   &lt;include schemaLocation="fault.xsd"/>
-&lt;/schema></con:content><con:type>http://www.w3.org/2001/XMLSchema</con:type></con:part><con:part><con:url>file:/Users/jorgew/projects/keystone/keystone/xsd/token.xsd</con:url><con:content><![CDATA[<schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.openstack.org/identity/api/v2.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:idm="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+&lt;/schema></con:content><con:type>http://www.w3.org/2001/XMLSchema</con:type></con:part><con:part><con:url>file:/Users/jorgew/projects/keystone/keystone/xsd/token.xsd</con:url><con:content><![CDATA[<schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.openstack.org/identity/api/v2.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:identity="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <!--Elements-->
-  <element name="passwordCredentials" type="idm:PasswordCredentials"/>
-  <element name="auth" type="idm:AuthData"/>
+  <element name="passwordCredentials" type="identity:PasswordCredentials"/>
+  <element name="auth" type="identity:AuthData"/>
   <!--Complex Types-->
   <complexType name="Credentials" abstract="true"/>
   <complexType name="PasswordCredentials">
     <complexContent>
-      <extension base="idm:Credentials">
+      <extension base="identity:Credentials">
         <sequence>
           <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
         </sequence>
@@ -379,8 +379,8 @@
   </complexType>
   <complexType name="AuthData">
     <sequence>
-      <element name="token" type="idm:Token"/>
-      <element name="user" type="idm:User"/>
+      <element name="token" type="identity:Token"/>
+      <element name="user" type="identity:User"/>
       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
     </sequence>
     <anyAttribute namespace="##other" processContents="lax"/>
@@ -395,7 +395,7 @@
   </complexType>
   <complexType name="User">
     <sequence>
-      <element name="groups" type="idm:Groups"/>
+      <element name="groups" type="identity:Groups"/>
       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
     </sequence>
     <attribute name="tenantId" type="xsd:string"/>
@@ -404,7 +404,7 @@
   </complexType>
   <complexType name="Groups">
     <sequence>
-      <element name="group" type="idm:Group" maxOccurs="1000"/>
+      <element name="group" type="identity:Group" maxOccurs="1000"/>
       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
     </sequence>
     <anyAttribute namespace="##other" processContents="lax"/>
@@ -414,16 +414,16 @@
     <attribute name="tenantId" type="xsd:string" use="optional"/>
     <anyAttribute namespace="##other" processContents="lax"/>
   </complexType>
-</schema>]]></con:content><con:type>http://www.w3.org/2001/XMLSchema</con:type></con:part><con:part><con:url>file:/Users/jorgew/projects/keystone/keystone/xsd/tenant.xsd</con:url><con:content><![CDATA[<schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.openstack.org/identity/api/v2.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:idm="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" xmlns:atom="http://www.w3.org/2005/Atom">
+</schema>]]></con:content><con:type>http://www.w3.org/2001/XMLSchema</con:type></con:part><con:part><con:url>file:/Users/jorgew/projects/keystone/keystone/xsd/tenant.xsd</con:url><con:content><![CDATA[<schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.openstack.org/identity/api/v2.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:identity="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" xmlns:atom="http://www.w3.org/2005/Atom">
   <!--Import ATOM specific schema definitions-->
   <import vc:minVersion="1.1" namespace="http://www.w3.org/2005/Atom" schemaLocation="./atom/atom.xsd"/>
   <!--Elements-->
-  <element name="tenant" type="idm:Tenant"/>
-  <element name="tenants" type="idm:Tenants"/>
+  <element name="tenant" type="identity:Tenant"/>
+  <element name="tenants" type="identity:Tenants"/>
   <!--Complex Types-->
   <complexType name="Tenants">
     <sequence>
-      <element name="tenant" type="idm:Tenant" maxOccurs="1000"/>
+      <element name="tenant" type="identity:Tenant" maxOccurs="1000"/>
       <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded"/>
       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
     </sequence>
@@ -780,19 +780,19 @@
       </div>
     </xs:documentation>
   </xs:annotation>
-</xs:schema>]]></con:content><con:type>http://www.w3.org/2001/XMLSchema</con:type></con:part><con:part><con:url>file:/Users/jorgew/projects/keystone/keystone/xsd/fault.xsd</con:url><con:content><![CDATA[<schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.openstack.org/identity/api/v2.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:idm="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+</xs:schema>]]></con:content><con:type>http://www.w3.org/2001/XMLSchema</con:type></con:part><con:part><con:url>file:/Users/jorgew/projects/keystone/keystone/xsd/fault.xsd</con:url><con:content><![CDATA[<schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.openstack.org/identity/api/v2.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:identity="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <!--Fault Elements-->
-  <element name="idmFault" type="idm:IDMFault"/>
-  <element name="serviceUnavailable" type="idm:ServiceUnavailableFault"/>
-  <element name="badRequest" type="idm:BadRequestFault"/>
-  <element name="unauthorized" type="idm:UnauthorizedFault"/>
-  <element name="overLimit" type="idm:OverLimitFault"/>
-  <element name="userDisabled" type="idm:UserDisabledFault"/>
-  <element name="forbidden" type="idm:ForbiddenFault"/>
-  <element name="itemNotFound" type="idm:ItemNotFoundFault"/>
-  <element name="tenantConflict" type="idm:TenantConflictFault"/>
+  <element name="identityFault" type="identity:IdentityFault"/>
+  <element name="serviceUnavailable" type="identity:ServiceUnavailableFault"/>
+  <element name="badRequest" type="identity:BadRequestFault"/>
+  <element name="unauthorized" type="identity:UnauthorizedFault"/>
+  <element name="overLimit" type="identity:OverLimitFault"/>
+  <element name="userDisabled" type="identity:UserDisabledFault"/>
+  <element name="forbidden" type="identity:ForbiddenFault"/>
+  <element name="itemNotFound" type="identity:ItemNotFoundFault"/>
+  <element name="tenantConflict" type="identity:TenantConflictFault"/>
   <!--Fault Types-->
-  <complexType name="IDMFault">
+  <complexType name="IdentityFault">
     <sequence>
       <element name="message" type="xsd:string">
         <annotation>
@@ -825,42 +825,42 @@
   </complexType>
   <complexType name="ServiceUnavailableFault">
     <complexContent>
-      <extension base="idm:IDMFault"></extension>
+      <extension base="identity:IdentityFault"></extension>
     </complexContent>
   </complexType>
   <complexType name="BadRequestFault">
     <complexContent>
-      <extension base="idm:IDMFault"></extension>
+      <extension base="identity:IdentityFault"></extension>
     </complexContent>
   </complexType>
   <complexType name="UnauthorizedFault">
     <complexContent>
-      <extension base="idm:IDMFault"></extension>
+      <extension base="identity:IdentityFault"></extension>
     </complexContent>
   </complexType>
   <complexType name="UserDisabledFault">
     <complexContent>
-      <extension base="idm:IDMFault"></extension>
+      <extension base="identity:IdentityFault"></extension>
     </complexContent>
   </complexType>
   <complexType name="ForbiddenFault">
     <complexContent>
-      <extension base="idm:IDMFault"></extension>
+      <extension base="identity:IdentityFault"></extension>
     </complexContent>
   </complexType>
   <complexType name="ItemNotFoundFault">
     <complexContent>
-      <extension base="idm:IDMFault"></extension>
+      <extension base="identity:IdentityFault"></extension>
     </complexContent>
   </complexType>
   <complexType name="TenantConflictFault">
     <complexContent>
-      <extension base="idm:IDMFault"></extension>
+      <extension base="identity:IdentityFault"></extension>
     </complexContent>
   </complexType>
   <complexType name="OverLimitFault">
     <complexContent>
-      <extension base="idm:IDMFault">
+      <extension base="identity:IdentityFault">
         <attribute name="retryAt" type="xsd:dateTime" use="optional">
           <annotation>
             <xsd:documentation xml:lang="EN" xmlns="http://www.w3.org/1999/xhtml" xmlns:xs="http://www.w3.org/2001/XMLSchema">
@@ -1094,47 +1094,47 @@
     </xs:attribute>
     <xs:anyAttribute namespace="##other" processContents="lax"/>
   </xs:complexType>
-</xs:schema>]]></con:content><con:type>http://www.w3.org/2001/XMLSchema</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="v1.0" path="v1.0"><con:settings/><con:parameters/><con:resource name="extensions" path="extensions"><con:settings/><con:parameters/><con:resource name="{alias}" path="{alias}"><con:settings/><con:parameters><con:parameter><con:name>alias</con:name><con:value xsi:nil="true"/><con:style>TEMPLATE</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:string</con:type><con:default xsi:nil="true"/></con:parameter></con:parameters><con:method name="GET - getExtension" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE" id=""><con:mediaType>application/xml</con:mediaType><con:status>200 203</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/common/api/v1.0">v1:extension</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/json</con:mediaType><con:status>200 203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:idmFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400 404 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml" accept="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="alias" value="RAX-TEST" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:request></con:method></con:resource><con:method name="GET - getExtensions" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE" id=""><con:mediaType>application/xml</con:mediaType><con:status>200 203</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/common/api/v1.0">v1:extensions</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/json</con:mediaType><con:status>200 203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:idmFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml" accept="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="token" path="token"><con:settings/><con:parameters/><con:resource name="{tokenId}" path="{tokenId}"><con:settings/><con:parameters><con:parameter required="true"><con:name>X-Auth-Token</con:name><con:value xsi:nil="true"/><con:style>HEADER</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:string</con:type><con:default xsi:nil="true"/></con:parameter><con:parameter><con:name>tokenId</con:name><con:value xsi:nil="true"/><con:style>TEMPLATE</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:string</con:type><con:default xsi:nil="true"/></con:parameter></con:parameters><con:method name="GET - validateToken" method="GET"><con:settings/><con:parameters><con:parameter><con:name>belongsTo</con:name><con:value xsi:nil="true"/><con:style>QUERY</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:string</con:type><con:default xsi:nil="true"/></con:parameter></con:parameters><con:representation type="RESPONSE" id=""><con:mediaType>application/xml</con:mediaType><con:status>200 203</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:auth</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/json</con:mediaType><con:status>200 203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:forbidden</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:userDisabled</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:idmFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400 401 403 404 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml" accept="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
+</xs:schema>]]></con:content><con:type>http://www.w3.org/2001/XMLSchema</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="v1.0" path="v1.0"><con:settings/><con:parameters/><con:resource name="extensions" path="extensions"><con:settings/><con:parameters/><con:resource name="{alias}" path="{alias}"><con:settings/><con:parameters><con:parameter><con:name>alias</con:name><con:value xsi:nil="true"/><con:style>TEMPLATE</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:string</con:type><con:default xsi:nil="true"/></con:parameter></con:parameters><con:method name="GET - getExtension" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE" id=""><con:mediaType>application/xml</con:mediaType><con:status>200 203</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/common/api/v1.0">v1:extension</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/json</con:mediaType><con:status>200 203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:identityFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400 404 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml" accept="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="alias" value="RAX-TEST" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:request></con:method></con:resource><con:method name="GET - getExtensions" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE" id=""><con:mediaType>application/xml</con:mediaType><con:status>200 203</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/common/api/v1.0">v1:extensions</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/json</con:mediaType><con:status>200 203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:identityFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml" accept="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="token" path="token"><con:settings/><con:parameters/><con:resource name="{tokenId}" path="{tokenId}"><con:settings/><con:parameters><con:parameter required="true"><con:name>X-Auth-Token</con:name><con:value xsi:nil="true"/><con:style>HEADER</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:string</con:type><con:default xsi:nil="true"/></con:parameter><con:parameter><con:name>tokenId</con:name><con:value xsi:nil="true"/><con:style>TEMPLATE</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:string</con:type><con:default xsi:nil="true"/></con:parameter></con:parameters><con:method name="GET - validateToken" method="GET"><con:settings/><con:parameters><con:parameter><con:name>belongsTo</con:name><con:value xsi:nil="true"/><con:style>QUERY</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:string</con:type><con:default xsi:nil="true"/></con:parameter></con:parameters><con:representation type="RESPONSE" id=""><con:mediaType>application/xml</con:mediaType><con:status>200 203</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:auth</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/json</con:mediaType><con:status>200 203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:forbidden</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:userDisabled</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:identityFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400 401 403 404 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml" accept="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
   <con:entry key="tokenId" value="887665443383838"/>
   <con:entry key="X-Auth-Token" value="999888777666"/>
   <con:entry key="belongsTo" value="1234"/>
-</con:parameters></con:request></con:method><con:method name="DELETE - revokeToken" method="DELETE"><con:settings/><con:parameters/><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:forbidden</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:idmFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400 401 403 404 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
+</con:parameters></con:request></con:method><con:method name="DELETE - revokeToken" method="DELETE"><con:settings/><con:parameters/><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:forbidden</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:identityFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400 401 403 404 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
   <con:entry key="tokenId" value="3u37737"/>
   <con:entry key="X-Auth-Token" value="3838737726"/>
 </con:parameters></con:request></con:method></con:resource><con:method name="POST - authenticate" method="POST"><con:settings/><con:parameters/><con:representation type="REQUEST" id=""><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:passwordCredentials</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="REQUEST" id=""><con:mediaType>application/json</con:mediaType><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/xml</con:mediaType><con:status>200
 203</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:auth</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/json</con:mediaType><con:status>200
-203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:userDisabled</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:idmFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>401
+203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:userDisabled</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:identityFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>401
 403 400 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml" postQueryString="false" accept="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request>&lt;passwordCredentials
 password="secrete" username="joeuser"
 xmlns="http://docs.openstack.org/identity/api/v2.0"/></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="tenants" path="tenants"><con:settings/><con:parameters><con:parameter required="true"><con:name>X-Auth-Token</con:name><con:value xsi:nil="true"/><con:style>HEADER</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:string</con:type><con:default xsi:nil="true"/></con:parameter></con:parameters><con:resource name="{tenantId}" path="{tenantId}"><con:settings/><con:parameters><con:parameter><con:name>tenantId</con:name><con:value xsi:nil="true"/><con:style>TEMPLATE</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:string</con:type><con:default xsi:nil="true"/></con:parameter></con:parameters><con:method name="GET - getTenant" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE" id=""><con:mediaType>application/xml</con:mediaType><con:status>200
 203</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:tenant</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/json</con:mediaType><con:status>200
-203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:forbidden</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:idmFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400
+203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:forbidden</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:identityFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400
 401 403 404 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml" accept="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
   <con:entry key="tenantId" value="1234"/>
   <con:entry key="X-Auth-Token" value="999888777666"/>
-</con:parameters></con:request></con:method><con:method name="PUT - updateTenant" method="PUT"><con:settings/><con:parameters/><con:representation type="REQUEST" id=""><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:tenant</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="REQUEST" id=""><con:mediaType>application/json</con:mediaType><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/xml</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:tenant</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/json</con:mediaType><con:status>200</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:forbidden</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:idmFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>401
+</con:parameters></con:request></con:method><con:method name="PUT - updateTenant" method="PUT"><con:settings/><con:parameters/><con:representation type="REQUEST" id=""><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:tenant</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="REQUEST" id=""><con:mediaType>application/json</con:mediaType><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/xml</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:tenant</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/json</con:mediaType><con:status>200</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:forbidden</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:identityFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>401
 403 404 400 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request>&lt;v1:tenant enabled="true" xmlns:v1="http://docs.openstack.org/identity/api/v2.0">
    &lt;v1:description>New Description&lt;/v1:description>
 &lt;/v1:tenant></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
   <con:entry key="tenantId" value="1234"/>
   <con:entry key="X-Auth-Token" value="999888777666"/>
-</con:parameters></con:request></con:method><con:method name="DELETE - deleteTenant" method="DELETE"><con:settings/><con:parameters/><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:forbidden</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:idmFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400
+</con:parameters></con:request></con:method><con:method name="DELETE - deleteTenant" method="DELETE"><con:settings/><con:parameters/><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:forbidden</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:identityFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400
 401 403 404 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;entry key="Accept" value="application/xml" xmlns="http://eviware.com/soapui/config"/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
   <con:entry key="tenantId" value="0000"/>
   <con:entry key="X-Auth-Token" value="999888777666"/>
 </con:parameters></con:request></con:method></con:resource><con:method name="GET - getTenants" method="GET"><con:settings/><con:parameters><con:parameter><con:name>marker</con:name><con:value xsi:nil="true"/><con:style>QUERY</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:string</con:type><con:default xsi:nil="true"/></con:parameter><con:parameter><con:name>limit</con:name><con:value xsi:nil="true"/><con:style>QUERY</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:int</con:type><con:default xsi:nil="true"/></con:parameter></con:parameters><con:representation type="RESPONSE" id=""><con:mediaType>application/xml</con:mediaType><con:status>200
 203</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:tenants</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/json</con:mediaType><con:status>200
-203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:forbidden</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:idmFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400
+203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:forbidden</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>404</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:itemNotFound</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:identityFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400
 401 403 404 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="X-Auth-Token" value="999888777666" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:request></con:method><con:method name="POST - createTenant" method="POST"><con:settings/><con:parameters/><con:representation type="REQUEST" id=""><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:tenant</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="REQUEST" id=""><con:mediaType>application/json</con:mediaType><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/xml</con:mediaType><con:status>201</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:tenant</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/json</con:mediaType><con:status>201</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>401</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:unauthorized</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>403</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:forbidden</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType>
 <con:status>409</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:tenantConflict</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType>
-<con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:idmFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>401
+<con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:identityFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>401
 403 400 409 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml" postQueryString="false" accept="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request>&lt;v1:tenant
 enabled="true" id="my_new_tenant"
 xmlns:v1="http://docs.openstack.org/identity/api/v2.0">&lt;v1:description>This
 is a description of my tenant. Thank you very
 much.&lt;/v1:description>&lt;/v1:tenant></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="X-Auth-Token" value="999888777666" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:request></con:method></con:resource><con:method name="GET - getVersionInfo" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE" id=""><con:mediaType>application/xml</con:mediaType><con:status>200
 203</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/common/api/v1.0">v1:version</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="RESPONSE" id=""><con:mediaType>application/json</con:mediaType><con:status>200
-203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:idmFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400
+203</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>400</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:badRequest</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:identityFault</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/xml</con:mediaType><con:status>503</con:status><con:params/><con:element xmlns:v1="http://docs.openstack.org/identity/api/v2.0">v1:serviceUnavailable</con:element><con:description xsi:nil="true"/></con:representation><con:representation type="FAULT" id=""><con:mediaType>application/json</con:mediaType><con:status>400
 500 503</con:status><con:params/><con:element xsi:nil="true"/><con:description xsi:nil="true"/></con:representation><con:request name="Request 1" mediaType="application/xml" accept="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource></con:interface><con:testSuite name="Keystone Tests"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="Admin Credential Check" searchProperties="true" id="29b2fa4b-e1c3-49c4-a7e6-334724e74bb9"><con:settings/><con:testStep type="restrequest" name="GET - validateToken - Valid Token"><con:settings/><con:config service="Keystone" resourcePath="/v1.0/token/{tokenId}" methodName="GET - validateToken" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GET - validateToken - Valid Token" mediaType="application/xml" accept="application/xml"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:assertion type="Simple Contains"><con:configuration><token>auth</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains"><con:configuration><token>token</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains"><con:configuration><token>user</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Schema Compliance"><con:configuration><definition/></con:configuration></con:assertion><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
   <con:entry key="tokenId" value="887665443383838"/>
   <con:entry key="X-Auth-Token" value="999888777666"/>
diff --git a/test/unit/test_exthandler.py b/test/unit/test_exthandler.py
index 4d09c148..5d41aeac 100644
--- a/test/unit/test_exthandler.py
+++ b/test/unit/test_exthandler.py
@@ -26,22 +26,22 @@ class UrlExtensionFilterTest(unittest.TestCase):
         self.filter = UrlExtensionFilter(MockWsgiApp(), {})
 
     def test_xml_extension(self):
-        env = {'PATH_INFO': '/v1.0/someresource.xml'}
+        env = {'PATH_INFO': '/v2.0/someresource.xml'}
         self.filter(env, _start_response)
-        self.assertEqual('/v1.0/someresource', env['PATH_INFO'])
+        self.assertEqual('/v2.0/someresource', env['PATH_INFO'])
         self.assertEqual('application/xml', env['HTTP_ACCEPT'])
 
     def test_json_extension(self):
-        env = {'PATH_INFO': '/v1.0/someresource.json'}
+        env = {'PATH_INFO': '/v2.0/someresource.json'}
         self.filter(env, _start_response)
-        self.assertEqual('/v1.0/someresource', env['PATH_INFO'])
+        self.assertEqual('/v2.0/someresource', env['PATH_INFO'])
         self.assertEqual('application/json', env['HTTP_ACCEPT'])
 
     def test_extension_overrides_header(self):
-        env = {'PATH_INFO': '/v1.0/someresource.json',
+        env = {'PATH_INFO': '/v2.0/someresource.json',
                 'HTTP_ACCEPT': 'application/xml'}
         self.filter(env, _start_response)
-        self.assertEqual('/v1.0/someresource', env['PATH_INFO'])
+        self.assertEqual('/v2.0/someresource', env['PATH_INFO'])
         self.assertEqual('application/json', env['HTTP_ACCEPT'])
 
 
diff --git a/test/unit/test_server.py b/test/unit/test_server.py
index a6b98892..294b1e54 100644
--- a/test/unit/test_server.py
+++ b/test/unit/test_server.py
@@ -65,7 +65,7 @@ class TestServer(unittest.TestCase):
         self.assertTrue(server.get_auth_token(self.request),"Test Token")
     
     def test_get_normalized_request_content_exception(self):
-        self.assertRaises(fault.IDMFault,server.get_normalized_request_content,None,self.request)
+        self.assertRaises(fault.IdentityFault,server.get_normalized_request_content,None,self.request)
     
     def test_get_normalized_request_content_xml(self):
         self.request.environ["CONTENT_TYPE"]="application/xml"
-- 
cgit