update tenant and user documentation bug

bug 905540 Change-Id: I8e463c40c9c754436ae0aa7cd102fa35553c1a90
openstack-attic · Dec 16, 2011 · aa43a81 · aa43a81
1 parent ab78902
commit aa43a81
Show file tree

Hide file tree

Showing 26 changed files with 56 additions and 56 deletions.
diff --git a/openstack-compute-api-1.1/src/os-compute-1.1.wadl b/openstack-compute-api-1.1/src/os-compute-1.1.wadl
@@ -43,8 +43,8 @@
                     <method href="#getExtension" />
                 </resource>
             </resource>
-            <resource id="tenantID" path="{tenantId}">
-                <param name="tenantId" style="template" type="xsd:string"/>
+            <resource id="tenantID" path="{tenant_id}">
+                <param name="tenant_id" style="template" type="xsd:string"/>
                 <resource id="limits" path="limits">
                     <method href="#listLimits"/>
                 </resource>

diff --git a/openstack-compute-api-1.1/src/os-compute-devguide.xml b/openstack-compute-api-1.1/src/os-compute-devguide.xml
@@ -108,7 +108,7 @@
                         </listitem>
                         <listitem>
                             <para>
-                                Added tenant and userId
+                                Added tenant and user_id
                                 attributes to server and
                                 image.
                             </para>

diff --git a/openstack-compute-api-1.1/src/samples/ext-servers.json b/openstack-compute-api-1.1/src/samples/ext-servers.json
@@ -2,8 +2,8 @@
     "servers": [
         {
             "id": "52415800-8b69-11e0-9b19-734f6af67565",
-            "tenantId": "1234",
-            "userId": "5678",
+            "tenant_id": "1234",
+            "user_id": "5678",
             "name": "sample-server",
             "updated": "2010-10-10T12:00:00Z",
             "created": "2010-08-10T12:00:00Z",

diff --git a/openstack-compute-api-1.1/src/samples/ext-servers.xml b/openstack-compute-api-1.1/src/samples/ext-servers.xml
@@ -2,7 +2,7 @@
 <servers xmlns="http://docs.openstack.org/compute/api/v1.1"
          xmlns:atom="http://www.w3.org/2005/Atom">
   <server id="52415800-8b69-11e0-9b19-734f6af67565"
-          tenantId="1234" userId="5678"
+          tenant_id="1234" user_id="5678"
           name="sample-server" status="BUILD" 
           progress="60" hostId="e4d909c290d0fb1ca068ffaddf22cbd0"
           updated="2010-10-10T12:00:00Z"

diff --git a/openstack-compute-api-1.1/src/samples/image.json b/openstack-compute-api-1.1/src/samples/image.json
@@ -4,8 +4,8 @@
         "name" : "My Server Backup",
         "updated" : "2010-10-10T12:00:00Z",
         "created" : "2010-08-10T12:00:00Z",
-        "tenantId" : "12345",
-        "userId" : "joe", 
+        "tenant_id" : "12345",
+        "user_id" : "joe", 
         "status" : "SAVING",
         "progress" : 80,
         "minDisk" : 5,

diff --git a/openstack-compute-api-1.1/src/samples/image.xml b/openstack-compute-api-1.1/src/samples/image.xml
@@ -6,8 +6,8 @@
     name="My Server Backup"
     updated="2010-10-10T12:00:00Z"
     created="2010-08-10T12:00:00Z"
-    tenantId="12345"
-    userId="joe"
+    tenant_id="12345"
+    user_id="joe"
     status="SAVING" progress="80"
     minDisk="5" minRam="256">
     <server id="52415800-8b69-11e0-9b19-734f335aa7b3">

diff --git a/openstack-compute-api-1.1/src/samples/images.json b/openstack-compute-api-1.1/src/samples/images.json
@@ -5,8 +5,8 @@
             "name": "CentOS 5.2",
             "updated": "2010-10-10T12:00:00Z",
             "created": "2010-08-10T12:00:00Z",
-            "tenantId" : "12345",
-            "userId" : "joe", 
+            "tenant_id" : "12345",
+            "user_id" : "joe", 
             "status": "ACTIVE",
             "metadata": {
                 "ImageType": "Gold",
@@ -28,8 +28,8 @@
             "name" : "My Server Backup",
             "updated" : "2010-10-10T12:00:00Z",
             "created" : "2010-08-10T12:00:00Z",
-            "tenantId" : "12345",
-            "userId" : "joe", 
+            "tenant_id" : "12345",
+            "user_id" : "joe", 
             "status" : "SAVING",
             "progress" : 80,
             "minDisk" : 5,

diff --git a/openstack-compute-api-1.1/src/samples/images.xml b/openstack-compute-api-1.1/src/samples/images.xml
@@ -5,8 +5,8 @@
          name="CentOS 5.2"
          updated="2010-10-10T12:00:00Z"
          created="2010-08-10T12:00:00Z"
-         tenantId="12345"
-         userId="joe"
+         tenant_id="12345"
+         user_id="joe"
          status="ACTIVE">
     <metadata>
         <meta key="ImageType">Gold</meta>
@@ -24,8 +24,8 @@
       name="My Server Backup"
       updated="2010-10-10T12:00:00Z"
       created="2010-08-10T12:00:00Z"
-      tenantId="12345"
-      userId="joe"
+      tenant_id="12345"
+      user_id="joe"
       status="SAVING" progress="80"
       minDisk="5" minRam="256">
       <server id="52415800-8b69-11e0-9b19-734f335aa7b3">

diff --git a/openstack-compute-api-1.1/src/samples/rebuild-resp.json b/openstack-compute-api-1.1/src/samples/rebuild-resp.json
@@ -1,8 +1,8 @@
 {
     "server": {
         "id": "52415800-8b69-11e0-9b19-734f565bc83b",
-        "tenantId": "1234",
-        "userId": "5678",
+        "tenant_id": "1234",
+        "user_id": "5678",
         "name": "newName",
         "created": "2010-11-11T12:00:00Z",
         "hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",

diff --git a/openstack-compute-api-1.1/src/samples/rebuild-resp.xml b/openstack-compute-api-1.1/src/samples/rebuild-resp.xml
@@ -2,7 +2,7 @@
 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
         xmlns:atom="http://www.w3.org/2005/Atom"
         id="52415800-8b69-11e0-9b19-734f565bc83b" 
-        tenantId="1234" userId="5678"
+        tenant_id="1234" user_id="5678"
         name="newName"
         hostId="e4d909c290d0fb1ca068ffaddf22cbd0" progress="0"
         status="REBUILD" adminPass="GFf1j9aP"

diff --git a/openstack-compute-api-1.1/src/samples/server-fault.json b/openstack-compute-api-1.1/src/samples/server-fault.json
@@ -1,8 +1,8 @@
 {
     "server": {
         "id": "52415800-8b69-11e0-9b19-734f0000ffff",
-        "tenantId": "1234",
-        "userId": "5678",
+        "tenant_id": "1234",
+        "user_id": "5678",
         "name": "sample-server",
         "created": "2010-08-10T12:00:00Z",
         "hostId": "e4d909c290d0fb1ca068ffafff22cbd0",

diff --git a/openstack-compute-api-1.1/src/samples/server-fault.xml b/openstack-compute-api-1.1/src/samples/server-fault.xml
@@ -2,7 +2,7 @@
 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
         xmlns:atom="http://www.w3.org/2005/Atom"
         id="52415800-8b69-11e0-9b19-734f0000ffff"
-        tenantId="1234" userId="5678"
+        tenant_id="1234" user_id="5678"
         name="sample-server" status="ERROR"
         created="2010-08-10T12:00:00Z"
         progress="66" hostId="e4d909c290d0fb1ca068ffafff22cbd0">

diff --git a/openstack-compute-api-1.1/src/samples/server-post-resp.json b/openstack-compute-api-1.1/src/samples/server-post-resp.json
@@ -1,8 +1,8 @@
 {
     "server": {
         "id": "52415800-8b69-11e0-9b19-734f565bc83b",
-        "tenantId": "1234",
-        "userId": "5678",
+        "tenant_id": "1234",
+        "user_id": "5678",
         "name": "new-server-test",
         "created": "2010-11-11T12:00:00Z",
         "hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",

diff --git a/openstack-compute-api-1.1/src/samples/server-post-resp.xml b/openstack-compute-api-1.1/src/samples/server-post-resp.xml
@@ -2,7 +2,7 @@
 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
         xmlns:atom="http://www.w3.org/2005/Atom"
         id="52415800-8b69-11e0-9b19-734f565bc83b" 
-        tenantId="1234" userId="5678"
+        tenant_id="1234" user_id="5678"
         name="new-server-test"
         hostId="e4d909c290d0fb1ca068ffaddf22cbd0" progress="0"
         status="BUILD" adminPass="GFf1j9aP"

diff --git a/openstack-compute-api-1.1/src/samples/server-put-resp-ad.json b/openstack-compute-api-1.1/src/samples/server-put-resp-ad.json
@@ -1,8 +1,8 @@
 {
     "server": {
         "id": "52415800-8b69-11e0-9b19-734f565bc83b",
-        "tenantId": "1234",
-        "userId": "5678",
+        "tenant_id": "1234",
+        "user_id": "5678",
         "name": "new-server-test",
         "created": "2010-11-11T12:00:00Z",
         "updated": "2010-11-12T12:55:55Z",

diff --git a/openstack-compute-api-1.1/src/samples/server-put-resp-ad.xml b/openstack-compute-api-1.1/src/samples/server-put-resp-ad.xml
@@ -2,7 +2,7 @@
 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
         xmlns:atom="http://www.w3.org/2005/Atom"
         id="52415800-8b69-11e0-9b19-734f565bc83b" 
-        tenantId="1234" userId="5678"
+        tenant_id="1234" user_id="5678"
         name="new-server-test"
         hostId="e4d909c290d0fb1ca068ffaddf22cbd0" progress="0"
         status="ACTIVE"

diff --git a/openstack-compute-api-1.1/src/samples/server-put-resp.json b/openstack-compute-api-1.1/src/samples/server-put-resp.json
@@ -1,8 +1,8 @@
 {
     "server": {
         "id": "52415800-8b69-11e0-9b19-734f565bc83b",
-        "tenantId": "1234",
-        "userId": "5678",
+        "tenant_id": "1234",
+        "user_id": "5678",
         "name": "new-server-test",
         "created": "2010-11-11T12:00:00Z",
         "updated": "2010-11-12T12:44:44Z",

diff --git a/openstack-compute-api-1.1/src/samples/server-put-resp.xml b/openstack-compute-api-1.1/src/samples/server-put-resp.xml
@@ -2,7 +2,7 @@
 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
         xmlns:atom="http://www.w3.org/2005/Atom"
         id="52415800-8b69-11e0-9b19-734f565bc83b" 
-        tenantId="1234" userId="5678"
+        tenant_id="1234" user_id="5678"
         name="new-server-test"
         hostId="e4d909c290d0fb1ca068ffaddf22cbd0" progress="0"
         status="ACTIVE"

diff --git a/openstack-compute-api-1.1/src/samples/server.json b/openstack-compute-api-1.1/src/samples/server.json
@@ -1,8 +1,8 @@
 {
     "server": {
         "id": "52415800-8b69-11e0-9b19-734f000004d2",
-        "tenantId": "1234",
-        "userId": "5678",
+        "tenant_id": "1234",
+        "user_id": "5678",
         "name": "sample-server",
         "updated": "2010-10-10T12:00:00Z",
         "created": "2010-08-10T12:00:00Z",

diff --git a/openstack-compute-api-1.1/src/samples/server.xml b/openstack-compute-api-1.1/src/samples/server.xml
@@ -2,7 +2,7 @@
 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
         xmlns:atom="http://www.w3.org/2005/Atom"
         id="52415800-8b69-11e0-9b19-734f000004d2"
-        tenantId="1234" userId="5678"
+        tenant_id="1234" user_id="5678"
         name="sample-server" status="BUILD"
         updated="2010-10-10T12:00:00Z" created="2010-08-10T12:00:00Z"
         progress="60" hostId="e4d909c290d0fb1ca068ffaddf22cbd0"

diff --git a/openstack-compute-api-1.1/src/samples/servers-page1.json b/openstack-compute-api-1.1/src/samples/servers-page1.json
@@ -2,8 +2,8 @@
     "servers": [
         {
             "id": "52415800-8b69-11e0-9b19-734f6af67565",
-            "tenantId": "1234",
-            "userId": "5678",
+            "tenant_id": "1234",
+            "user_id": "5678",
             "name": "sample-server",
             "updated": "2010-10-10T12:00:00Z",
             "created": "2010-08-10T12:00:00Z",
@@ -87,8 +87,8 @@
         },
         {
             "id": "52415800-8b69-11e0-9b19-734f1f1350e5",
-            "tenantId": "1234",
-            "userId": "5678",
+            "tenant_id": "1234",
+            "user_id": "5678",
             "name": "sample-server2",
             "updated": "2010-10-10T12:00:00Z",
             "created": "2010-08-10T12:00:00Z",

diff --git a/openstack-compute-api-1.1/src/samples/servers-page1.xml b/openstack-compute-api-1.1/src/samples/servers-page1.xml
@@ -2,7 +2,7 @@
 <servers xmlns="http://docs.openstack.org/compute/api/v1.1"
          xmlns:atom="http://www.w3.org/2005/Atom">
   <server id="52415800-8b69-11e0-9b19-734f6af67565"
-          tenantId="1234" userId="5678"
+          tenant_id="1234" user_id="5678"
           name="sample-server" status="BUILD" 
           progress="60" hostId="e4d909c290d0fb1ca068ffaddf22cbd0"
           updated="2010-10-10T12:00:00Z"
@@ -52,7 +52,7 @@
         href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/>
   </server>
   <server id="52415800-8b69-11e0-9b19-734f1f1350e5"
-          tenantId="1234" userId="5678"
+          tenant_id="1234" user_id="5678"
           name="sample-server2"
           status="ACTIVE" hostId="9e107d9d372bb6826bd81d3542a419d6"
           updated="2010-10-10T12:00:00Z"

diff --git a/openstack-compute-api-1.1/src/samples/servers.json b/openstack-compute-api-1.1/src/samples/servers.json
@@ -2,8 +2,8 @@
     "servers": [
         {
             "id": "52415800-8b69-11e0-9b19-734f6af67565",
-            "tenantId": "1234",
-            "userId": "5678",
+            "tenant_id": "1234",
+            "user_id": "5678",
             "name": "sample-server",
             "updated": "2010-10-10T12:00:00Z",
             "created": "2010-08-10T12:00:00Z",
@@ -85,9 +85,9 @@
         },
         {
             "id": "52415800-8b69-11e0-9b19-734f1f1350e5",
-            "userId": "5678",
+            "user_id": "5678",
             "name": "sample-server2",
-            "tenantId": "1234",
+            "tenant_id": "1234",
             "updated": "2010-10-10T12:00:00Z",
             "created": "2010-08-10T12:00:00Z",
             "hostId": "9e107d9d372bb6826bd81d3542a419d6",

diff --git a/openstack-compute-api-1.1/src/samples/servers.xml b/openstack-compute-api-1.1/src/samples/servers.xml
@@ -2,7 +2,7 @@
 <servers xmlns="http://docs.openstack.org/compute/api/v1.1"
          xmlns:atom="http://www.w3.org/2005/Atom">
   <server id="52415800-8b69-11e0-9b19-734f6af67565"
-          tenantId="1234" userId="5678"
+          tenant_id="1234" user_id="5678"
           name="sample-server" status="BUILD" 
           progress="60" hostId="e4d909c290d0fb1ca068ffaddf22cbd0"
           updated="2010-10-10T12:00:00Z"
@@ -50,7 +50,7 @@
         href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/>
   </server>
   <server id="52415800-8b69-11e0-9b19-734f1f1350e5"
-          tenantId="1234" userId="5678"
+          tenant_id="1234" user_id="5678"
           name="sample-server2"
           status="ACTIVE" hostId="9e107d9d372bb6826bd81d3542a419d6"
           updated="2010-10-10T12:00:00Z"

diff --git a/openstack-compute-api-1.1/src/xsd/image.xsd b/openstack-compute-api-1.1/src/xsd/image.xsd
@@ -179,7 +179,7 @@
         </xsd:documentation>
       </annotation>
     </attribute>
-    <attribute type="xsd:string"  name="tenantId" use="optional">
+    <attribute type="xsd:string"  name="tenant_id" use="optional">
       <annotation>
         <xsd:documentation
             xml:lang="EN"
@@ -191,7 +191,7 @@
         </xsd:documentation>
       </annotation>
     </attribute>
-    <attribute type="xsd:string"    name="userId" use="optional">
+    <attribute type="xsd:string"    name="user_id" use="optional">
       <annotation>
         <xsd:documentation
             xml:lang="EN"

diff --git a/openstack-compute-api-1.1/src/xsd/server.xsd b/openstack-compute-api-1.1/src/xsd/server.xsd
@@ -405,7 +405,7 @@
         </xsd:documentation>
       </annotation>
     </attribute>
-    <attribute type="xsd:string"    name="tenantId" use="optional">
+    <attribute type="xsd:string"    name="tenant_id" use="optional">
       <annotation>
         <xsd:documentation
             xml:lang="EN"
@@ -417,7 +417,7 @@
         </xsd:documentation>
       </annotation>
     </attribute>
-    <attribute type="xsd:string"    name="userId" use="optional">
+    <attribute type="xsd:string"    name="user_id" use="optional">
       <annotation>
         <xsd:documentation
             xml:lang="EN"
@@ -514,8 +514,8 @@
               <attribute type="xsd:string" name="accessIPv4" use="prohibited"/>
               <attribute type="xsd:string" name="accessIPv6" use="prohibited" />
               <attribute type="xsd:string" name="adminPass" use="prohibited"/>
-              <attribute type="xsd:string" name="tenantId" use="prohibited"/>
-              <attribute type="xsd:string" name="userId" use="prohibited"/>
+              <attribute type="xsd:string" name="tenant_id" use="prohibited"/>
+              <attribute type="xsd:string" name="user_id" use="prohibited"/>
               <attribute type="xsd:string" name="hostId" use="prohibited"/>
               <attribute type="csapi:Progress" name="progress"  use="prohibited"/>
               <attribute type="csapi:ExtensibleServerStatus" name="status" use="prohibited"/>
@@ -586,8 +586,8 @@
               <attribute type="xsd:string" name="accessIPv6" use="optional" />
               <attribute type="xsd:string" name="adminPass" use="optional"/>
               <attribute type="csapi:UUID" name="id"   use="prohibited"/>
-              <attribute type="xsd:string" name="tenantId" use="prohibited"/>
-              <attribute type="xsd:string" name="userId" use="prohibited"/>
+              <attribute type="xsd:string" name="tenant_id" use="prohibited"/>
+              <attribute type="xsd:string" name="user_id" use="prohibited"/>
               <attribute type="xsd:string" name="hostId" use="prohibited"/>
               <attribute type="csapi:Progress" name="progress"  use="prohibited"/>
               <attribute type="csapi:ExtensibleServerStatus" name="status" use="prohibited"/>