Merge "Add flavor-access to core for V3 API"

2013-12-03 02:08:29 +00:00
parent 0fc4bb8c9f 332741760e
commit ce51e0d77f
74 changed files with 158 additions and 128 deletions
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-req.json
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-req.json
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json
@@ -2,11 +2,11 @@
    "flavor_access": [
        {
            "flavor_id": "10",
-            "tenant_id": "fake_tenant"
+            "tenant_id": "openstack"
        },
        {
            "flavor_id": "10",
-            "tenant_id": "openstack"
+            "tenant_id": "fake_tenant"
        }
    ]
 }
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavor_access>
-  <access tenant_id="fake_tenant" flavor_id="10"/>
  <access tenant_id="openstack" flavor_id="10"/>
+  <access tenant_id="fake_tenant" flavor_id="10"/>
 </flavor_access>
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-create-req.json
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-create-req.json
@@ -5,6 +5,6 @@
        "vcpus": 2,
        "disk": 10,
        "id": "10",
-        "os-flavor-access:is_public": false
+        "flavor-access:is_public": false
    }
 }
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-create-req.xml
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-create-req.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavor xmlns="http://docs.openstack.org/compute/api/v1.1"
-   xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3"
+   xmlns:flavor-access="http://docs.openstack.org/compute/core/flavor-access/api/v3"
   name="test_flavor"
   ram="1024"
   vcpus="2"
   disk="10"
   id="10"
-   os-flavor-access:is_public="False"
+   flavor-access:is_public="False"
 />
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.json
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.json
@@ -3,6 +3,7 @@
        "disabled": false,
        "disk": 10,
        "ephemeral": 0,
+        "flavor-access:is_public": false,
        "id": "10",
        "links": [
            {
@@ -15,7 +16,6 @@
            }
        ],
        "name": "test_flavor",
-        "os-flavor-access:is_public": false,
        "ram": 1024,
        "swap": 0,
        "vcpus": 2
--- a/doc/v3/api_samples/flavor-access/flavor-access-create-resp.xml
+++ b/doc/v3/api_samples/flavor-access/flavor-access-create-resp.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavor xmlns:flavor-access="http://docs.openstack.org/compute/core/flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="test_flavor" ram="1024" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="10" id="10" flavor-access:is_public="False">
+  <atom:link href="http://openstack.example.com/v3/flavors/10" rel="self"/>
+  <atom:link href="http://openstack.example.com/flavors/10" rel="bookmark"/>
+</flavor>
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json
@@ -4,6 +4,7 @@
            "disabled": false,
            "disk": 1,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "1",
            "links": [
                {
@@ -16,7 +17,6 @@
                }
            ],
            "name": "m1.tiny",
-            "os-flavor-access:is_public": true,
            "ram": 512,
            "swap": 0,
            "vcpus": 1
@@ -25,6 +25,7 @@
            "disabled": false,
            "disk": 20,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "2",
            "links": [
                {
@@ -37,7 +38,6 @@
                }
            ],
            "name": "m1.small",
-            "os-flavor-access:is_public": true,
            "ram": 2048,
            "swap": 0,
            "vcpus": 1
@@ -46,6 +46,7 @@
            "disabled": false,
            "disk": 40,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "3",
            "links": [
                {
@@ -58,7 +59,6 @@
                }
            ],
            "name": "m1.medium",
-            "os-flavor-access:is_public": true,
            "ram": 4096,
            "swap": 0,
            "vcpus": 2
@@ -67,6 +67,7 @@
            "disabled": false,
            "disk": 80,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "4",
            "links": [
                {
@@ -79,7 +80,6 @@
                }
            ],
            "name": "m1.large",
-            "os-flavor-access:is_public": true,
            "ram": 8192,
            "swap": 0,
            "vcpus": 4
@@ -88,6 +88,7 @@
            "disabled": false,
            "disk": 160,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "5",
            "links": [
                {
@@ -100,7 +101,6 @@
                }
            ],
            "name": "m1.xlarge",
-            "os-flavor-access:is_public": true,
            "ram": 16384,
            "swap": 0,
            "vcpus": 8
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" os-flavor-access:is_public="True">
+<flavors xmlns:flavor-access="http://docs.openstack.org/compute/core/flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" flavor-access:is_public="True">
    <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
  </flavor>
-  <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" os-flavor-access:is_public="True">
+  <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" flavor-access:is_public="True">
    <atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/>
  </flavor>
-  <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" os-flavor-access:is_public="True">
+  <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" flavor-access:is_public="True">
    <atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/>
  </flavor>
-  <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" os-flavor-access:is_public="True">
+  <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" flavor-access:is_public="True">
    <atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/>
  </flavor>
-  <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" os-flavor-access:is_public="True">
+  <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" flavor-access:is_public="True">
    <atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/>
  </flavor>
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-list-resp.json
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-list-resp.json
@@ -2,11 +2,11 @@
    "flavor_access": [
        {
            "flavor_id": "10",
-            "tenant_id": "fake_tenant"
+            "tenant_id": "openstack"
        },
        {
            "flavor_id": "10",
-            "tenant_id": "openstack"
+            "tenant_id": "fake_tenant"
        }
    ]
 }
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-list-resp.xml
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-list-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavor_access>
-  <access tenant_id="fake_tenant" flavor_id="10"/>
  <access tenant_id="openstack" flavor_id="10"/>
+  <access tenant_id="fake_tenant" flavor_id="10"/>
 </flavor_access>
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml
--- a/doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json
+++ b/doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json
@@ -0,0 +1,8 @@
+{
+    "flavor_access": [
+        {
+            "flavor_id": "10",
+            "tenant_id": "openstack"
+        }
+    ]
+}
--- a/doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.xml
+++ b/doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavor_access>
+  <access tenant_id="openstack" flavor_id="10"/>
+</flavor_access>
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.json
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.json
@@ -3,6 +3,7 @@
        "disabled": false,
        "disk": 1,
        "ephemeral": 0,
+        "flavor-access:is_public": true,
        "id": "1",
        "links": [
            {
@@ -15,7 +16,6 @@
            }
        ],
        "name": "m1.tiny",
-        "os-flavor-access:is_public": true,
        "ram": 512,
        "swap": 0,
        "vcpus": 1
--- a/doc/v3/api_samples/flavor-access/flavor-access-show-resp.xml
+++ b/doc/v3/api_samples/flavor-access/flavor-access-show-resp.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavor xmlns:flavor-access="http://docs.openstack.org/compute/core/flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" flavor-access:is_public="True">
+  <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
+  <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
+</flavor>
--- a/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.json
+++ b/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.json
@@ -3,6 +3,7 @@
        "disabled": false,
        "disk": 10,
        "ephemeral": 0,
+        "flavor-access:is_public": true,
        "id": "10",
        "links": [
            {
--- a/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.xml
+++ b/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="test_flavor" ram="1024" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="10" id="10">
+<flavor xmlns:flavor-access="http://docs.openstack.org/compute/core/flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="test_flavor" ram="1024" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="10" id="10" flavor-access:is_public="True">
  <atom:link href="http://openstack.example.com/v3/flavors/10" rel="self"/>
  <atom:link href="http://openstack.example.com/flavors/10" rel="bookmark"/>
 </flavor>
--- a/doc/v3/api_samples/flavors/flavor-get-resp.json
+++ b/doc/v3/api_samples/flavors/flavor-get-resp.json
@@ -3,6 +3,7 @@
        "disabled": false,
        "disk": 1,
        "ephemeral": 0,
+        "flavor-access:is_public": true,
        "id": "1",
        "links": [
            {
--- a/doc/v3/api_samples/flavors/flavor-get-resp.xml
+++ b/doc/v3/api_samples/flavors/flavor-get-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1">
+<flavor xmlns:flavor-access="http://docs.openstack.org/compute/core/flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" flavor-access:is_public="True">
  <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
  <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
 </flavor>
--- a/doc/v3/api_samples/flavors/flavors-detail-resp.json
+++ b/doc/v3/api_samples/flavors/flavors-detail-resp.json
@@ -4,6 +4,7 @@
            "disabled": false,
            "disk": 1,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "1",
            "links": [
                {
@@ -24,6 +25,7 @@
            "disabled": false,
            "disk": 20,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "2",
            "links": [
                {
@@ -44,6 +46,7 @@
            "disabled": false,
            "disk": 40,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "3",
            "links": [
                {
@@ -64,6 +67,7 @@
            "disabled": false,
            "disk": 80,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "4",
            "links": [
                {
@@ -84,6 +88,7 @@
            "disabled": false,
            "disk": 160,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "5",
            "links": [
                {
--- a/doc/v3/api_samples/flavors/flavors-detail-resp.xml
+++ b/doc/v3/api_samples/flavors/flavors-detail-resp.xml
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1">
+<flavors xmlns:flavor-access="http://docs.openstack.org/compute/core/flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" flavor-access:is_public="True">
    <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
  </flavor>
-  <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2">
+  <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" flavor-access:is_public="True">
    <atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/>
  </flavor>
-  <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3">
+  <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" flavor-access:is_public="True">
    <atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/>
  </flavor>
-  <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4">
+  <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" flavor-access:is_public="True">
    <atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/>
  </flavor>
-  <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5">
+  <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" flavor-access:is_public="True">
    <atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/>
  </flavor>
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="test_flavor" ram="1024" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="10" id="10" os-flavor-access:is_public="False">
-  <atom:link href="http://openstack.example.com/v3/flavors/10" rel="self"/>
-  <atom:link href="http://openstack.example.com/flavors/10" rel="bookmark"/>
-</flavor>
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json
@@ -1,6 +0,0 @@
-{
-    "flavor_access": [{
-        "flavor_id": "10",
-        "tenant_id": "openstack"
-    }]
-}
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor_access>
-    <access tenant_id="openstack" flavor_id="10"/>
-</flavor_access>
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" os-flavor-access:is_public="True">
-  <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
-  <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
-</flavor>
--- a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json
+++ b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json
@@ -3,6 +3,7 @@
        "disabled": false,
        "disk": 1,
        "ephemeral": 0,
+        "flavor-access:is_public": true,
        "id": "1",
        "links": [
            {
--- a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml
+++ b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" rxtx_factor="1.0">
+<flavor xmlns:flavor-access="http://docs.openstack.org/compute/core/flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" flavor-access:is_public="True" rxtx_factor="1.0">
  <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
  <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
 </flavor>
--- a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json
+++ b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json
@@ -4,6 +4,7 @@
            "disabled": false,
            "disk": 1,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "1",
            "links": [
                {
@@ -25,6 +26,7 @@
            "disabled": false,
            "disk": 20,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "2",
            "links": [
                {
@@ -46,6 +48,7 @@
            "disabled": false,
            "disk": 40,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "3",
            "links": [
                {
@@ -67,6 +70,7 @@
            "disabled": false,
            "disk": 80,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "4",
            "links": [
                {
@@ -88,6 +92,7 @@
            "disabled": false,
            "disk": 160,
            "ephemeral": 0,
+            "flavor-access:is_public": true,
            "id": "5",
            "links": [
                {
--- a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml
+++ b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" rxtx_factor="1.0">
+<flavors xmlns:flavor-access="http://docs.openstack.org/compute/core/flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" flavor-access:is_public="True" rxtx_factor="1.0">
    <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
  </flavor>
-  <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" rxtx_factor="1.0">
+  <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" flavor-access:is_public="True" rxtx_factor="1.0">
    <atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/>
  </flavor>
-  <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" rxtx_factor="1.0">
+  <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" flavor-access:is_public="True" rxtx_factor="1.0">
    <atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/>
  </flavor>
-  <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" rxtx_factor="1.0">
+  <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" flavor-access:is_public="True" rxtx_factor="1.0">
    <atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/>
  </flavor>
-  <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" rxtx_factor="1.0">
+  <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" flavor-access:is_public="True" rxtx_factor="1.0">
    <atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/>
    <atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/>
  </flavor>
--- a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json
+++ b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json
@@ -3,6 +3,7 @@
        "disabled": false,
        "disk": 10,
        "ephemeral": 0,
+        "flavor-access:is_public": true,
        "id": "100",
        "links": [
            {
--- a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml
+++ b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="flavortest" ram="1024" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="10" id="100" rxtx_factor="2.0">
+<flavor xmlns:flavor-access="http://docs.openstack.org/compute/core/flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="flavortest" ram="1024" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="10" id="100" flavor-access:is_public="True" rxtx_factor="2.0">
  <atom:link href="http://openstack.example.com/v3/flavors/100" rel="self"/>
  <atom:link href="http://openstack.example.com/flavors/100" rel="bookmark"/>
 </flavor>