Added: "UserWithPassword"

Added: "UserWithOnlyEnabled" Removed: "UserWithOnlyPassword" Included samples. UPDATED: JSON sample whitespaces. Change-Id: I4c15a7ab34843918ed2e32281b740204c951dc9f
openstack · Jan 24, 2012 · e2f8607 · e2f8607
1 parent 27d1411
commit e2f8607
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/keystone/content/common/samples/RAX-KSADM-userWithPassword.json b/keystone/content/common/samples/RAX-KSADM-userWithPassword.json
@@ -0,0 +1,8 @@
+{
+  "user": {
+    "username": "jqsmith",
+    "password": "Secret0",
+    "email": "john.smith@example.org",
+    "enabled": true
+    }
+}
diff --git a/keystone/content/common/samples/RAX-KSADM-userWithPassword.xml b/keystone/content/common/samples/RAX-KSADM-userWithPassword.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<user xmlns="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:type="UserWithPassword"
+ enabled="true" email="john.smith@example.org"
+ username="jqsmith" password="Secret0" />
diff --git a/keystone/content/common/xsd/RAX-KSADM-users.xsd b/keystone/content/common/xsd/RAX-KSADM-users.xsd
@@ -18,14 +18,36 @@
         schemaLocation="user.xsd"/>
 
     <!-- Elements -->
-    <complexType name="UserWithOnlyPassword">
+    <complexType name="UserWithOnlyEnabled">
         <complexContent>
             <restriction base="identity:User">
                 <attribute name="id" type="xsd:string" use="prohibited"/>
+                <attribute name="username" type="xsd:string" use="prohibited"/>
                 <attribute name="email" type="xsd:string" use="prohibited"/>
-                <attribute name="enabled" type="xsd:boolean" use="prohibited"/>
+                <attribute name="enabled" type="xsd:boolean" use="required"/>
             </restriction>
         </complexContent>
     </complexType>
-</schema>
 
+    <complexType name="UserWithPassword">
+         <complexContent>
+              <annotation>
+                   <xsd:appinfo>
+                        <xsdxt:samples>
+                             <xsdxt:sample>
+                                  <xsdxt:code type="application/xml" href="../samples/RAX-KSADM-userWithPassword.xml" />
+                             </xsdxt:sample>
+                             <xsdxt:sample>
+                                  <xsdxt:code type="application/json" href="../samples/RAX-KSADM-userWithPassword.json" />
+                             </xsdxt:sample>
+                        </xsdxt:samples>
+                   </xsd:appinfo>
+              </annotation>
+              <extension base="identity:User">
+                   <attribute name="password" type="xsd:string" use="optional"/>
+                   <anyAttribute namespace="##other" processContents="lax" />
+              </extension>
+         </complexContent>
+    </complexType>
+
+</schema>