openstack/keystone
Code Issues Proposed changes

Validation content and relavant changes.

Browse Source 
Change-Id: I8ddea418b27f2a2e4b365b79dd5aa628b8ec6a5b
This commit is contained in:
Yogeshwar Srikrishnan
2011-09-06 16:56:24 -05:00
parent ed316ffb4a
commit 58e7cdcb44
18 changed files with 84 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystone/content/admin/identity-admin.wadl
View File

@@ -238,7 +238,7 @@
</param>
</request>
<response status="200 203">
<representation mediaType="application/xml" element="identity:auth"/>
<representation mediaType="application/xml" element="identity:access"/>
<representation mediaType="application/json"/>
</response>
&commonFaults;
@@ -274,7 +274,7 @@
</param>
</request>
<response status="200 203">
<representation mediaType="application/xml" element="identity:auth"/>
<representation mediaType="application/xml" element="identity:access"/>
<representation mediaType="application/json"/>
</response>
&commonFaults;

10
keystone/content/common/samples/auth.json
View File

@@ -4,6 +4,14 @@
"id": "asdasdasd-adsasdads-asdasdasd-adsadsasd",
"expires": "2010-11-01T03:32:15-05:00"
},
"user":{
"id":"testId",
"name":"testName",
"roles":[
{
"id":"compute:admin"
}
]},
"serviceCatalog": [
{
"name": "Cloud Servers",
@@ -64,4 +72,4 @@
}
]
}
}
}

4
keystone/content/common/samples/auth.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<access xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://docs.openstack.org/identity/api/v2.0 ../xsd/token.xsd"
xsi:schemaLocation="http://docs.openstack.org/identity/api/v2.0 ../xsd/api.xsd"
xmlns="http://docs.openstack.org/identity/api/v2.0">
<token expires="2010-11-01T03:32:15-05:00"
id="ab48a9efdfedb23ty3494"/>
<user>
<user id="testId" name="test">
<roles>
<role id="compute:admin"></role>
</roles>

10
keystone/content/common/samples/auth_credentials.xml
View File

@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<auth
xmlns="http://docs.openstack.org/identity/api/v2.0"
tenantId="1234">
<passwordCredentials
username="testuser"
password="P@ssword1"/>
<auth xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://docs.openstack.org/identity/api/v2.0"
tenantId="1234">
<passwordCredentials username="test_user" password="test"/>
</auth>

2
keystone/content/common/samples/endpointTemplate.json
View File

@@ -1,5 +1,5 @@
{
"endpointTemplate": {
"OS-KSCATALOG:endpointTemplate": {
"id": 1,
"region": "North",
"global": true,

3
keystone/content/common/samples/endpointTemplate.xml
View File

@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpointTemplate
xmlns="http://docs.openstack.org/identity/api/v2.0"
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0"
id="1"
region="North"
global="true"
type="compute"
name="Compute"
publicURL="https://service-public.com/v1"
internalURL="https://service-internal.com/v1"
enabled="true">

10
keystone/content/common/samples/endpointTemplates.json
View File

@@ -1,5 +1,5 @@
{
"endpointsTemplates": [
"OS-KSCATALOG:endpointsTemplates": [
{
"id": 1,
"region": "North",
@@ -14,7 +14,7 @@
}, {
"id": 2,
"region": "South",
"serviceName": "compute",
"type": "compute",
"publicURL": "https://compute.south.public.com/v1",
"internalURL": "https://compute.south.internal.com/v1",
"versionId": "1",
@@ -25,7 +25,7 @@
"id": 3,
"region": "North",
"global": true,
"serviceName": "object-store",
"type": "object-store",
"publicURL": "https://object-store.north.public.com/v1.0",
"versionId": "1.0",
"versionInfo": "https://object-store.north.public.com/v1.0/",
@@ -34,7 +34,7 @@
}, {
"id": 4,
"region": "South",
"serviceName": "object-store",
"type": "object-store",
"publicURL": "https://object-store.south.public.com/v2",
"versionId": "2",
"versionInfo": "https://object-store.south.public.com/v2/",
@@ -43,7 +43,7 @@
}, {
"id": 5,
"global": true,
"serviceName": "OS-DNS:DNS",
"type": "OS-DNS:DNS",
"publicURL": "https://dns.public.com/v3.2",
"versionId": "1.0",
"versionInfo": "https://dns.public.com/v1.0/",

17
keystone/content/common/samples/endpointTemplates.xml
View File

@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpointTemplates xmlns="http://docs.openstack.org/identity/api/v2.0">
<endpointTemplates xmlns="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0">
<endpointTemplate
id="1"
region="North"
global="true"
serviceType="compute"
type="compute"
name="Compute"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
enabled="true">
@@ -17,7 +18,8 @@
<endpointTemplate
id="2"
region="south"
serviceType="service2"
type="service"
name="Compute"
publicURL="https://service2.public.com/v1"
internalURL="https://service2.internal.public.com/v1"
enabled="false">
@@ -30,7 +32,8 @@
id="3"
region="DFW"
global="true"
serviceType="service1"
type="service1"
name="Compute"
publicURL="https://service1.public.com/v1"
enabled="true">
<version
@@ -41,7 +44,8 @@
<endpointTemplate
id="4"
region="ORD"
serviceType="service2"
type="service3"
name="Compute"
publicURL="https://service2.public.com/v1"
enabled="true">
<version
@@ -52,7 +56,8 @@
<endpointTemplate
id="5"
global="true"
serviceType="service3"
type="service4"
name="Compute"
publicURL="https://service3.public.com/v1">
<version
ID="1"

2
keystone/content/common/samples/service.json
View File

@@ -1,5 +1,5 @@
{
"service": {
"OS-KSADM:service": {
"id": "nova",
"type": "compute",
"description": "A description ..."

2
keystone/content/common/samples/service.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<service xmlns="http://docs.openstack.org/identity/api/v2.0" id="nova"
<service xmlns="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0" id="nova"
type="compute" description="OpenStack Compute Service" />

2
keystone/content/common/samples/services.json
View File

@@ -1,5 +1,5 @@
{
"services": [
"OS-KSADM:services": [
{
"id": "nova",
"type": "compute",

2
keystone/content/common/samples/services.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<services xmlns="http://docs.openstack.org/identity/api/v2.0">
<services xmlns="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0">
<service id="Nova" type="compute" description="Openstack Service" />
<service id="Glance" type="image-service" description="Openstack Service" />
</services>

3
keystone/content/common/samples/user.xml
View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<user xmlns="http://docs.openstack.org/identity/api/v2.0"
enabled="true" email="john.smith@example.org"
username="jqsmith" id="u1000">
</user>
username="jqsmith" id="u1000"/>

2
keystone/content/common/samples/validatetoken.json
View File

@@ -1,5 +1,5 @@
{
"auth": {
"access": {
"token": {
"expires": "2010-11-01T03:32:15-05:00",
"id": "ab48a9efdfedb23ty3494"

6
keystone/content/common/samples/validatetoken.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<auth xmlns="http://docs.openstack.org/identity/api/v2.0">
<access xmlns="http://docs.openstack.org/identity/api/v2.0">
<token expires="2010-11-01T03:32:15-05:00"
id="ab48a9efdfedb23ty3494"/>
<user username="jqsmith">
<user id ="test" name="jqsmith">
<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
<role xmlns="http://docs.openstack.org/identity/api/v2.0"
id="Admin" tenantId="one"/>
@@ -10,4 +10,4 @@
id="compute:cloud_admin"/>
</roles>
</user>
</auth>
</access>

40
keystone/content/common/xsd/OS-KSCATALOG.xsd
View File

@@ -15,12 +15,13 @@
xmlns:atom="http://www.w3.org/2005/Atom"
targetNamespace="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0"
>
<!-- Import ATOM specific schema definitions -->
<import vc:minVersion="1.1" namespace="http://www.w3.org/2005/Atom"
schemaLocation="atom/atom.xsd" />
<import namespace="http://docs.openstack.org/identity/api/v2.0"
schemaLocation="api.xsd" />
<element name="endpointTemplates" type="OS-KSCATALOG:EndpointTemplateList">
<annotation>
<xsd:documentation
@@ -47,6 +48,21 @@
<!-- Complex Types -->
<complexType name="EndpointTemplate">
<sequence>
<element name="version" type="identity:VersionForService" maxOccurs="1" minOccurs="0">
<annotation>
<xsd:documentation
xml:lang="EN"
xmlns="http://www.w3.org/1999/xhtml">
<p>
Version details.
</p>
</xsd:documentation>
</annotation>
</element>
<element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<attribute name="id" type="xsd:int" use="required">
<annotation>
<xsd:documentation
@@ -58,13 +74,24 @@
</xsd:documentation>
</annotation>
</attribute>
<attribute name="serviceName" type="xsd:string" use="required">
<attribute name="type" type="identity:ExtensibleServiceType" use="required">
<annotation>
<xsd:documentation
xml:lang="EN"
xmlns="http://www.w3.org/1999/xhtml">
xml:lang="EN"
xmlns="http://www.w3.org/1999/xhtml">
<p>
The service name of Endpoint Template.
The OpenStack-registered type (e.g. 'compute', 'object-store', etc).
</p>
</xsd:documentation>
</annotation>
</attribute>
<attribute name="name" type="xsd:string" use="optional">
<annotation>
<xsd:documentation
xml:lang="EN"
xmlns="http://www.w3.org/1999/xhtml">
<p>
The commercial service name (e.g. 'My Nova Cloud Servers').
</p>
</xsd:documentation>
</annotation>
@@ -147,5 +174,4 @@
</sequence>
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
</schema>

4
keystone/content/common/xsd/credentials.xsd
View File

@@ -44,7 +44,7 @@
<complexType name="AuthenticationRequest">
<sequence>
<element ref="identity:credentials" minOccurs="1"/>
<element ref="identity:credential" minOccurs="1"/>
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
<attribute name="tenantId" type="xsd:string" use="optional"/>
@@ -81,8 +81,6 @@
<complexType name="CredentialListType">
<sequence>
<element ref="identity:credential" minOccurs="1" maxOccurs="unbounded"/>
<element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>

9
keystone/content/common/xsd/token.xsd
View File

@@ -77,7 +77,7 @@
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<attribute name="id" type="xsd:string"/>
<attribute name="username" type="xsd:string"/>
<attribute name="name" type="xsd:string"/>
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
@@ -171,7 +171,7 @@
<!--EndpointForService-->
<complexType name="EndpointForService">
<sequence>
<element name="version" type="identity:VersionForEndpointForService" maxOccurs="1" minOccurs="0">
<element name="version" type="identity:VersionForService" maxOccurs="1" minOccurs="0">
<annotation>
<xsd:documentation
xml:lang="EN"
@@ -250,8 +250,8 @@
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
<!-- VersionForEndpointForService -->
<complexType name="VersionForEndpointForService">
<!-- VersionForService -->
<complexType name="VersionForService">
<attribute name="id" type="xsd:string" use="required">
<annotation>
<xsd:documentation
@@ -285,6 +285,7 @@
</xsd:documentation>
</annotation>
</attribute>
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
</schema>