Merge "Changes to return groups as a part of RAXKSGRP extension.Also fixed incorrect schema version references in wadls and examples."

16 files changed, 121 insertions, 13 deletions

diff --git a/keystone/content/admin/OS-KSADM-admin.wadl b/keystone/content/admin/OS-KSADM-admin.wadl
index 846bf7d9..a85b63f2 100644
--- a/keystone/content/admin/OS-KSADM-admin.wadl
+++ b/keystone/content/admin/OS-KSADM-admin.wadl
@@ -15,7 +15,7 @@
 <application xmlns="http://wadl.dev.java.net/2009/02"
 	xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
 	xmlns:OS-KSADM="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"	
-	xmlns:capi="http://docs.openstack.org/common/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"
 	xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0" 
diff --git a/keystone/content/admin/OS-KSCATALOG-admin.wadl b/keystone/content/admin/OS-KSCATALOG-admin.wadl
index 35d7731c..32ac63ee 100644
--- a/keystone/content/admin/OS-KSCATALOG-admin.wadl
+++ b/keystone/content/admin/OS-KSCATALOG-admin.wadl
@@ -15,7 +15,7 @@
 <application xmlns="http://wadl.dev.java.net/2009/02"
 	xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
 	xmlns:OS-KSCATALOG="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0"
-	xmlns:capi="http://docs.openstack.org/common/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"
 	xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
diff --git a/keystone/content/admin/OS-KSEC2-admin.wadl b/keystone/content/admin/OS-KSEC2-admin.wadl
index dd555fa9..53ed9c71 100644
--- a/keystone/content/admin/OS-KSEC2-admin.wadl
+++ b/keystone/content/admin/OS-KSEC2-admin.wadl
@@ -15,7 +15,7 @@
 <application xmlns="http://wadl.dev.java.net/2009/02"
 	xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
 	xmlns:OS-KSEC2="http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0"	
-	xmlns:capi="http://docs.openstack.org/common/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"
 	xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
diff --git a/keystone/content/admin/RAX-KSGRP-admin.wadl b/keystone/content/admin/RAX-KSGRP-admin.wadl
new file mode 100644
index 00000000..80ec61ef
--- /dev/null
+++ b/keystone/content/admin/RAX-KSGRP-admin.wadl
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!--*******************************************************-->
+<!--         Import Common XML Entities                    -->
+<!--                                                       -->
+<!--     You can resolve the entites with xmllint          -->
+<!--                                                       -->
+<!--        xmllint -noent RAX-KSGRP-admin.wadl            -->
+<!--*******************************************************-->
+<!DOCTYPE application [
+<!ENTITY % common  SYSTEM "../common/common.ent">
+%common;
+]>
+<application xmlns="http://wadl.dev.java.net/2009/02"
+    xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
+    xmlns:RAX-KSGRP="http://docs.openstack.org/identity/api/ext/RAX-KSGRP/v1.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"
+    xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0" 
+    xsi:schemaLocation="http://docs.openstack.org/identity/api/v2.0 ../common/xsd/api.xsd
+    http://docs.openstack.org/common/api/v1.0 ../common/xsd/api-common.xsd
+    http://wadl.dev.java.net/2009/02 http://www.w3.org/Submission/wadl/wadl.xsd
+    http://docs.openstack.org/identity/api/ext/RAX-KSGRP/v1.0 ../common/xsd/RAX-KSGRP-groups.xsd
+    ">
+    
+    <grammars>
+        <include href="../common/xsd/api.xsd"/>
+        <include href="../common/xsd/api-common.xsd"/>
+        <include href="../common/xsd/RAX-KSGRP-groups.xsd"/>
+    </grammars>
+    <!--*******************************************************-->
+    <!--             All Resoruces                             -->
+    <!--*******************************************************-->
+    
+    <!-- We should use SSL in production -->
+    <resources base="http://localhost:5001">
+        <resource id="version" path="v2.0">
+            <param name="X-Auth-Token" style="header" type="xsd:string" required="true">
+                <doc>You need a valid admin token for access.</doc>
+            </param>            
+            <resource id="users" path="users">
+                <resource id="userById" path="{userId}">
+                    <param name="userId" style="template" type="xsd:string"/>
+                    <resource id="user-groups-RAX-KSGRP" path="RAX-KSGRP">
+                        <method href="#listUserGroups"/>
+                    </resource>
+                </resource>
+            </resource>
+        </resource>
+    </resources>
+    
+    <method name="GET" id="listUserGroups">
+        <doc xml:lang="EN" title="List Groups for a User">
+            <p xmlns="http://www.w3.org/1999/xhtml">List all the groups for a user.</p>
+            
+        </doc>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="RAX-KSGRP:groups">
+                <doc xml:lang="EN">
+                    <xsdxt:code href="../common/samples/RAX-KSGRP-groups.xml"/>
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc xml:lang="EN">
+                    <xsdxt:code href="../common/samples/RAX-KSGRP-groups.json"/>
+                </doc>
+            </representation>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+   </application> 
+   
\ No newline at end of file
diff --git a/keystone/content/admin/RAX-KSKEY-admin.wadl b/keystone/content/admin/RAX-KSKEY-admin.wadl
index 7c4a04c2..25409db4 100644
--- a/keystone/content/admin/RAX-KSKEY-admin.wadl
+++ b/keystone/content/admin/RAX-KSKEY-admin.wadl
@@ -15,7 +15,7 @@
 <application xmlns="http://wadl.dev.java.net/2009/02"
 	xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
 	xmlns:RAX-KSKEY="http://docs.openstack.org/identity/api/ext/RAX-KSKEY/v1.0"	
-	xmlns:capi="http://docs.openstack.org/common/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"
 	xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
diff --git a/keystone/content/admin/extensions.xml b/keystone/content/admin/extensions.xml
index d63c1b96..ed5ee9c6 100644
--- a/keystone/content/admin/extensions.xml
+++ b/keystone/content/admin/extensions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<extensions xmlns="http://docs.openstack.org/common/api/v2.0"
+<extensions xmlns="http://docs.openstack.org/common/api/v1.0"
             xmlns:atom="http://www.w3.org/2005/Atom">
 </extensions>
diff --git a/keystone/content/admin/identity-admin.wadl b/keystone/content/admin/identity-admin.wadl
index 9f70b9ba..6d4c9871 100644
--- a/keystone/content/admin/identity-admin.wadl
+++ b/keystone/content/admin/identity-admin.wadl
@@ -13,7 +13,7 @@
 
 <application 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/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"
 	xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0" 
diff --git a/keystone/content/common/xsd/extensions.xsd b/keystone/content/common/xsd/extensions.xsd
index f81a04be..26694c07 100644
--- a/keystone/content/common/xsd/extensions.xsd
+++ b/keystone/content/common/xsd/extensions.xsd
@@ -57,4 +57,4 @@
         </xsd:restriction>
     </xsd:simpleType>
 
-</xsd:schema>
+</xsd:schema>
\ No newline at end of file
diff --git a/keystone/contrib/extensions/admin/osksadm/extension.xml b/keystone/contrib/extensions/admin/osksadm/extension.xml
index fdd074af..b3c0a7a6 100644
--- a/keystone/contrib/extensions/admin/osksadm/extension.xml
+++ b/keystone/contrib/extensions/admin/osksadm/extension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<extension  xmlns="http://docs.openstack.org/common/api/v2.0"
+<extension  xmlns="http://docs.openstack.org/common/api/v1.0"
             xmlns:atom="http://www.w3.org/2005/Atom"
             name="Openstack Keystone Admin" namespace="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
             alias="OS-KSADM"
diff --git a/keystone/contrib/extensions/admin/oskscatalog/extension.xml b/keystone/contrib/extensions/admin/oskscatalog/extension.xml
index 8b6fcf15..8664c77f 100644
--- a/keystone/contrib/extensions/admin/oskscatalog/extension.xml
+++ b/keystone/contrib/extensions/admin/oskscatalog/extension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<extension  xmlns="http://docs.openstack.org/common/api/v2.0"
+<extension  xmlns="http://docs.openstack.org/common/api/v1.0"
             xmlns:atom="http://www.w3.org/2005/Atom"
             name="Openstack Keystone Catalog" namespace="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0"
             alias="OS-KSCATALOG"
diff --git a/keystone/contrib/extensions/admin/raxgrp/extension.json b/keystone/contrib/extensions/admin/raxgrp/extension.json
new file mode 100644
index 00000000..6af6d049
--- /dev/null
+++ b/keystone/contrib/extensions/admin/raxgrp/extension.json
@@ -0,0 +1,19 @@
+{
+  "extension":{
+    "name": "Rackspace Keystone Group Extensions",
+    "namespace": "http://docs.rackspace.com/identity/api/ext/RAX-KSGROUP/v1.0",
+    "alias": "RAX-KSGRP",
+    "updated": "2011-08-14T13:25:27-06:00",
+    "description": "Rackspace extensions to Keystone v2.0 API enabling groups.",
+    "links": [{
+        "rel": "describedby",
+        "type": "application/pdf",
+        "href": "https://github.com/openstack/keystone/raw/master/keystone/content/admin/RAX-KSGRP-admin-devguide.pdf"
+    },
+    {
+        "rel": "describedby",
+        "type": "application/vnd.sun.wadl+xml",
+        "href": "https://github.com/openstack/keystone/raw/master/keystone/content/admin/RAX-KSGRP-admin.wadl"
+    }]
+ }
+}
\ No newline at end of file
diff --git a/keystone/contrib/extensions/admin/raxgrp/extension.xml b/keystone/contrib/extensions/admin/raxgrp/extension.xml
new file mode 100644
index 00000000..22f77faa
--- /dev/null
+++ b/keystone/contrib/extensions/admin/raxgrp/extension.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension  xmlns="http://docs.openstack.org/common/api/v1.0"
+            xmlns:atom="http://www.w3.org/2005/Atom"
+            name="Rackspace Keystone Group Extensions" namespace="http://docs.rackspace.com/identity/api/ext/RAX-KSGROUP/v1.0"
+            alias="RAX-KSGRP"
+            updated="2011-08-14T13:25:27-06:00">
+            <description>
+                        Rackspace extensions to Keystone v2.0 API
+                        enabling groups.
+            </description>
+            <atom:link rel="describedby" type="application/pdf"
+                        href="https://github.com/openstack/keystone/raw/master/keystone/content/admin/RAX-KSGRP-admin-devguide.pdf"/>
+            <atom:link rel="describedby" type="application/vnd.sun.wadl+xml"
+                        href="https://github.com/openstack/keystone/raw/master/keystone/content/admin/RAX-KSGRP-admin.wadl"/>
+</extension>
diff --git a/keystone/contrib/extensions/admin/raxkey/extension.xml b/keystone/contrib/extensions/admin/raxkey/extension.xml
index ae83c0e9..175d7302 100644
--- a/keystone/contrib/extensions/admin/raxkey/extension.xml
+++ b/keystone/contrib/extensions/admin/raxkey/extension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<extension  xmlns="http://docs.openstack.org/common/api/v2.0"
+<extension  xmlns="http://docs.openstack.org/common/api/v1.0"
             xmlns:atom="http://www.w3.org/2005/Atom"
             name="Rackspace API Key authentication" namespace="http://docs.rackspace.com/identity/api/ext/RAX-KSKEY/v1.0"
             alias="RAX-KSKEY-admin"
diff --git a/keystone/contrib/extensions/service/raxgrp/extension.xml b/keystone/contrib/extensions/service/raxgrp/extension.xml
index 67c72255..f05855ac 100644
--- a/keystone/contrib/extensions/service/raxgrp/extension.xml
+++ b/keystone/contrib/extensions/service/raxgrp/extension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<extension  xmlns="http://docs.openstack.org/common/api/v2.0"
+<extension  xmlns="http://docs.openstack.org/common/api/v1.0"
             xmlns:atom="http://www.w3.org/2005/Atom"
             name="Rackspace Keystone Group Extensions" namespace="http://docs.rackspace.com/identity/api/ext/RAX-KSGROUP/v1.0"
             alias="RAX-KSGRP"
diff --git a/keystone/contrib/extensions/service/raxkey/extension.xml b/keystone/contrib/extensions/service/raxkey/extension.xml
index b997bcac..981cb2bc 100644
--- a/keystone/contrib/extensions/service/raxkey/extension.xml
+++ b/keystone/contrib/extensions/service/raxkey/extension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<extension  xmlns="http://docs.openstack.org/common/api/v2.0"
+<extension  xmlns="http://docs.openstack.org/common/api/v1.0"
             xmlns:atom="http://www.w3.org/2005/Atom"
             name="Rackspace API Key authentication" namespace="http://docs.rackspace.com/identity/api/ext/RAX-KSKEY/v1.0"
             alias="RAX-KSKEY"
diff --git a/keystone/test/functional/test_ext_raxkskey.py b/keystone/test/functional/test_ext_raxkskey.py
index 86945420..81b3b341 100644
--- a/keystone/test/functional/test_ext_raxkskey.py
+++ b/keystone/test/functional/test_ext_raxkskey.py
@@ -22,7 +22,7 @@ class TestExtensions(common.ApiTestCase):
         self.assertTrue('xml' in r.getheader('Content-Type'))
         content = r.xml
         extension = content.find(
-            "{http://docs.openstack.org/common/api/v2.0}extension")
+            "{http://docs.openstack.org/common/api/v1.0}extension")
         self.assertEqual(extension.get("alias"), "RAX-KSKEY")