From 332741760ed53cc405377c50f457ff074a4bb94f Mon Sep 17 00:00:00 2001 From: Chris Yeoh Date: Tue, 22 Oct 2013 23:59:46 +1030 Subject: [PATCH] Add flavor-access to core for V3 API Adds the flavor-access plugin to the core list for the V3 API. This is part of the process of adding all of the flavor related extensions to core, with the exception of rxtx, as per the discussion here: https://etherpad.openstack.org/p/NovaV3APICore Note that since the alias changes from os-flavor-access to flavor-access the api samples move directory and quite a few of other api samples as well as flavor access is included by default. Partially implements blueprint nova-v3-api DocImpact Change-Id: I9abc7df8f4620d462b0d381a2c0ed180c48f220e --- .../flavor-access-add-tenant-req.json | 0 .../flavor-access-add-tenant-req.xml | 0 .../flavor-access-add-tenant-resp.json | 4 ++-- .../flavor-access-add-tenant-resp.xml | 2 +- .../flavor-access-create-req.json | 2 +- .../flavor-access-create-req.xml | 4 ++-- .../flavor-access-create-resp.json | 2 +- .../flavor-access/flavor-access-create-resp.xml | 5 +++++ .../flavor-access-detail-resp.json | 10 +++++----- .../flavor-access-detail-resp.xml | 12 ++++++------ .../flavor-access-list-resp.json | 4 ++-- .../flavor-access-list-resp.xml | 2 +- .../flavor-access-remove-tenant-req.json | 0 .../flavor-access-remove-tenant-req.xml | 0 .../flavor-access-remove-tenant-resp.json | 8 ++++++++ .../flavor-access-remove-tenant-resp.xml | 4 ++++ .../flavor-access-show-resp.json | 2 +- .../flavor-access/flavor-access-show-resp.xml | 5 +++++ .../flavor-manage/flavor-create-post-resp.json | 1 + .../flavor-manage/flavor-create-post-resp.xml | 2 +- doc/v3/api_samples/flavors/flavor-get-resp.json | 1 + doc/v3/api_samples/flavors/flavor-get-resp.xml | 2 +- .../api_samples/flavors/flavors-detail-resp.json | 5 +++++ .../api_samples/flavors/flavors-detail-resp.xml | 12 ++++++------ .../flavor-access-create-resp.xml | 5 ----- .../flavor-access-remove-tenant-resp.json | 6 ------ .../flavor-access-remove-tenant-resp.xml | 4 ---- .../os-flavor-access/flavor-access-show-resp.xml | 5 ----- .../os-flavor-rxtx/flavor-rxtx-get-resp.json | 1 + .../os-flavor-rxtx/flavor-rxtx-get-resp.xml | 2 +- .../os-flavor-rxtx/flavor-rxtx-list-resp.json | 5 +++++ .../os-flavor-rxtx/flavor-rxtx-list-resp.xml | 12 ++++++------ .../os-flavor-rxtx/flavor-rxtx-post-resp.json | 1 + .../os-flavor-rxtx/flavor-rxtx-post-resp.xml | 2 +- etc/nova/policy.json | 8 ++++---- nova/api/openstack/__init__.py | 2 +- .../compute/plugins/v3/flavor_access.py | 4 ++-- .../compute/plugins/v3/flavor_manage.py | 2 +- .../compute/plugins/v3/test_flavor_access.py | 16 ++++++++-------- .../compute/plugins/v3/test_flavor_manage.py | 10 +++++----- nova/tests/fake_policy.py | 6 +++--- .../flavor-access-add-tenant-req.json.tpl | 0 .../flavor-access-add-tenant-req.xml.tpl | 0 .../flavor-access-add-tenant-resp.json.tpl | 0 .../flavor-access-add-tenant-resp.xml.tpl | 0 .../flavor-access-create-req.json.tpl | 2 +- .../flavor-access-create-req.xml.tpl | 4 ++-- .../flavor-access-create-resp.json.tpl | 2 +- .../flavor-access-create-resp.xml.tpl | 5 +++++ .../flavor-access-detail-resp.json.tpl | 10 +++++----- .../flavor-access-detail-resp.xml.tpl | 12 ++++++------ .../flavor-access-list-resp.json.tpl | 0 .../flavor-access-list-resp.xml.tpl | 0 .../flavor-access-remove-tenant-req.json.tpl | 0 .../flavor-access-remove-tenant-req.xml.tpl | 0 .../flavor-access-remove-tenant-resp.json.tpl | 0 .../flavor-access-remove-tenant-resp.xml.tpl | 0 .../flavor-access-show-resp.json.tpl | 2 +- .../flavor-access-show-resp.xml.tpl | 5 +++++ .../flavor-create-post-resp.json.tpl | 1 + .../flavor-create-post-resp.xml.tpl | 2 +- .../api_samples/flavors/flavor-get-resp.json.tpl | 1 + .../api_samples/flavors/flavor-get-resp.xml.tpl | 2 +- .../flavors/flavors-detail-resp.json.tpl | 5 +++++ .../flavors/flavors-detail-resp.xml.tpl | 14 +++++++------- .../flavor-access-create-resp.xml.tpl | 5 ----- .../flavor-access-show-resp.xml.tpl | 5 ----- .../os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl | 1 + .../os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl | 2 +- .../flavor-rxtx-list-resp.json.tpl | 5 +++++ .../os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl | 14 +++++++------- .../flavor-rxtx-post-resp.json.tpl | 1 + .../os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl | 2 +- nova/tests/integrated/v3/test_flavor_access.py | 4 ++-- 74 files changed, 158 insertions(+), 128 deletions(-) rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-add-tenant-req.json (100%) rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-add-tenant-req.xml (100%) rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-add-tenant-resp.json (99%) rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-add-tenant-resp.xml (90%) rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-create-req.json (75%) rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-create-req.xml (56%) rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-create-resp.json (91%) create mode 100644 doc/v3/api_samples/flavor-access/flavor-access-create-resp.xml rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-detail-resp.json (92%) rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-detail-resp.xml (68%) rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-list-resp.json (99%) rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-list-resp.xml (90%) rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-remove-tenant-req.json (100%) rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-remove-tenant-req.xml (100%) create mode 100644 doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json create mode 100644 doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.xml rename doc/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-show-resp.json (91%) create mode 100644 doc/v3/api_samples/flavor-access/flavor-access-show-resp.xml delete mode 100644 doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml delete mode 100644 doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json delete mode 100644 doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml delete mode 100644 doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-add-tenant-req.json.tpl (100%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-add-tenant-req.xml.tpl (100%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-add-tenant-resp.json.tpl (100%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-add-tenant-resp.xml.tpl (100%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-create-req.json.tpl (77%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-create-req.xml.tpl (59%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-create-resp.json.tpl (91%) create mode 100644 nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-resp.xml.tpl rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-detail-resp.json.tpl (91%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-detail-resp.xml.tpl (65%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-list-resp.json.tpl (100%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-list-resp.xml.tpl (100%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-remove-tenant-req.json.tpl (100%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-remove-tenant-req.xml.tpl (100%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-remove-tenant-resp.json.tpl (100%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-remove-tenant-resp.xml.tpl (100%) rename nova/tests/integrated/v3/api_samples/{os-flavor-access => flavor-access}/flavor-access-show-resp.json.tpl (91%) create mode 100644 nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-show-resp.xml.tpl delete mode 100644 nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl delete mode 100644 nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-req.json b/doc/v3/api_samples/flavor-access/flavor-access-add-tenant-req.json similarity index 100% rename from doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-req.json rename to doc/v3/api_samples/flavor-access/flavor-access-add-tenant-req.json diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml b/doc/v3/api_samples/flavor-access/flavor-access-add-tenant-req.xml similarity index 100% rename from doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml rename to doc/v3/api_samples/flavor-access/flavor-access-add-tenant-req.xml diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json b/doc/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.json similarity index 99% rename from doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json rename to doc/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.json index e637ad85ae35..8789e666cf47 100644 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json +++ b/doc/v3/api_samples/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" } ] } \ No newline at end of file diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml b/doc/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.xml similarity index 90% rename from doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml rename to doc/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.xml index cc102aeed1e2..061225df0725 100644 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml +++ b/doc/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-create-req.json b/doc/v3/api_samples/flavor-access/flavor-access-create-req.json similarity index 75% rename from doc/v3/api_samples/os-flavor-access/flavor-access-create-req.json rename to doc/v3/api_samples/flavor-access/flavor-access-create-req.json index 77c51d7e43bc..4f874e8b1d56 100644 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-create-req.json +++ b/doc/v3/api_samples/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 } } \ No newline at end of file diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-create-req.xml b/doc/v3/api_samples/flavor-access/flavor-access-create-req.xml similarity index 56% rename from doc/v3/api_samples/os-flavor-access/flavor-access-create-req.xml rename to doc/v3/api_samples/flavor-access/flavor-access-create-req.xml index e463b902ce7e..41523e525190 100644 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-create-req.xml +++ b/doc/v3/api_samples/flavor-access/flavor-access-create-req.xml @@ -1,10 +1,10 @@ \ No newline at end of file diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.json b/doc/v3/api_samples/flavor-access/flavor-access-create-resp.json similarity index 91% rename from doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.json rename to doc/v3/api_samples/flavor-access/flavor-access-create-resp.json index 2a3f87526e8e..f25c67a68b67 100644 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.json +++ b/doc/v3/api_samples/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 diff --git a/doc/v3/api_samples/flavor-access/flavor-access-create-resp.xml b/doc/v3/api_samples/flavor-access/flavor-access-create-resp.xml new file mode 100644 index 000000000000..843b91022ff6 --- /dev/null +++ b/doc/v3/api_samples/flavor-access/flavor-access-create-resp.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json b/doc/v3/api_samples/flavor-access/flavor-access-detail-resp.json similarity index 92% rename from doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json rename to doc/v3/api_samples/flavor-access/flavor-access-detail-resp.json index 8b1dac90a525..ddce409ba8a1 100644 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json +++ b/doc/v3/api_samples/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 diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml b/doc/v3/api_samples/flavor-access/flavor-access-detail-resp.xml similarity index 68% rename from doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml rename to doc/v3/api_samples/flavor-access/flavor-access-detail-resp.xml index b9682318be92..2fe5856d44ea 100644 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml +++ b/doc/v3/api_samples/flavor-access/flavor-access-detail-resp.xml @@ -1,22 +1,22 @@ - - + + - + - + - + - + diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-list-resp.json b/doc/v3/api_samples/flavor-access/flavor-access-list-resp.json similarity index 99% rename from doc/v3/api_samples/os-flavor-access/flavor-access-list-resp.json rename to doc/v3/api_samples/flavor-access/flavor-access-list-resp.json index e637ad85ae35..8789e666cf47 100644 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-list-resp.json +++ b/doc/v3/api_samples/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" } ] } \ No newline at end of file diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-list-resp.xml b/doc/v3/api_samples/flavor-access/flavor-access-list-resp.xml similarity index 90% rename from doc/v3/api_samples/os-flavor-access/flavor-access-list-resp.xml rename to doc/v3/api_samples/flavor-access/flavor-access-list-resp.xml index cc102aeed1e2..061225df0725 100644 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-list-resp.xml +++ b/doc/v3/api_samples/flavor-access/flavor-access-list-resp.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json b/doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.json similarity index 100% rename from doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json rename to doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.json diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml b/doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.xml similarity index 100% rename from doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml rename to doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.xml diff --git 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 new file mode 100644 index 000000000000..b11ba2a0bd07 --- /dev/null +++ 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" + } + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000000..18a077dea035 --- /dev/null +++ b/doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.json b/doc/v3/api_samples/flavor-access/flavor-access-show-resp.json similarity index 91% rename from doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.json rename to doc/v3/api_samples/flavor-access/flavor-access-show-resp.json index 0bdb4cbb7a78..648043598da7 100644 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.json +++ b/doc/v3/api_samples/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 diff --git a/doc/v3/api_samples/flavor-access/flavor-access-show-resp.xml b/doc/v3/api_samples/flavor-access/flavor-access-show-resp.xml new file mode 100644 index 000000000000..b38ec85f05d6 --- /dev/null +++ b/doc/v3/api_samples/flavor-access/flavor-access-show-resp.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.json b/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.json index 2b90c412aa2c..bb8473a884c5 100644 --- 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": [ { diff --git a/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.xml b/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.xml index c1db11c7c752..d20b091739d0 100644 --- 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 @@ - + \ No newline at end of file diff --git a/doc/v3/api_samples/flavors/flavor-get-resp.json b/doc/v3/api_samples/flavors/flavor-get-resp.json index cd4589bcd66f..648043598da7 100644 --- 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": [ { diff --git a/doc/v3/api_samples/flavors/flavor-get-resp.xml b/doc/v3/api_samples/flavors/flavor-get-resp.xml index 62ce0969e8bb..b38ec85f05d6 100644 --- a/doc/v3/api_samples/flavors/flavor-get-resp.xml +++ b/doc/v3/api_samples/flavors/flavor-get-resp.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/doc/v3/api_samples/flavors/flavors-detail-resp.json b/doc/v3/api_samples/flavors/flavors-detail-resp.json index 5e204f3696c0..ddce409ba8a1 100644 --- 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": [ { diff --git a/doc/v3/api_samples/flavors/flavors-detail-resp.xml b/doc/v3/api_samples/flavors/flavors-detail-resp.xml index 2c74e6da2212..2fe5856d44ea 100644 --- a/doc/v3/api_samples/flavors/flavors-detail-resp.xml +++ b/doc/v3/api_samples/flavors/flavors-detail-resp.xml @@ -1,22 +1,22 @@ - - + + - + - + - + - + diff --git 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 deleted file mode 100644 index 0fe92c17958e..000000000000 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git 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 deleted file mode 100644 index ebe0423e82f7..000000000000 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "flavor_access": [{ - "flavor_id": "10", - "tenant_id": "openstack" - }] -} \ No newline at end of file diff --git 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 deleted file mode 100644 index 3c5ef1c5cc5d..000000000000 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git 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 deleted file mode 100644 index 5fd938f5c0aa..000000000000 --- a/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git 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 index 5cd8f19cf43b..d9279b2b4da7 100644 --- 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": [ { diff --git 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 index 111c8722798f..174bc0b6efd5 100644 --- 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 @@ - + \ No newline at end of file diff --git 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 index 53436703a8e5..7c2f626a86df 100644 --- 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": [ { diff --git 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 index a741e6b2ce6b..531ce0a845a2 100644 --- 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 @@ - - + + - + - + - + - + diff --git 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 index e910ac406fd2..5eb0cdbd560a 100644 --- 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": [ { diff --git 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 index 2e74911618d9..d5cd140d5d01 100644 --- 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 @@ - + \ No newline at end of file diff --git a/etc/nova/policy.json b/etc/nova/policy.json index a4f261906a19..ae575df31dbd 100644 --- a/etc/nova/policy.json +++ b/etc/nova/policy.json @@ -113,10 +113,10 @@ "compute_extension:flavor_access": "", "compute_extension:flavor_access:addTenantAccess": "rule:admin_api", "compute_extension:flavor_access:removeTenantAccess": "rule:admin_api", - "compute_extension:v3:os-flavor-access": "", - "compute_extension:v3:os-flavor-access:discoverable": "", - "compute_extension:v3:os-flavor-access:remove_tenant_access": "rule:admin_api", - "compute_extension:v3:os-flavor-access:add_tenant_access": "rule:admin_api", + "compute_extension:v3:flavor-access": "", + "compute_extension:v3:flavor-access:discoverable": "", + "compute_extension:v3:flavor-access:remove_tenant_access": "rule:admin_api", + "compute_extension:v3:flavor-access:add_tenant_access": "rule:admin_api", "compute_extension:flavor_disabled": "", "compute_extension:v3:os-flavor-disabled": "", "compute_extension:v3:os-flavor-disabled:discoverable": "", diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py index 5837407926e7..fed00f558c79 100644 --- a/nova/api/openstack/__init__.py +++ b/nova/api/openstack/__init__.py @@ -64,7 +64,7 @@ CONF.register_opts(api_opts, api_opts_group) API_V3_CORE_EXTENSIONS = set(['consoles', 'extensions', 'flavors', 'ips', 'limits', 'servers', 'server-metadata', 'keypairs', 'console-output', 'versions', - 'flavor-manage']) + 'flavor-manage', 'flavor-access']) class FaultWrapper(base_wsgi.Middleware): diff --git a/nova/api/openstack/compute/plugins/v3/flavor_access.py b/nova/api/openstack/compute/plugins/v3/flavor_access.py index 50b23e59c471..6b473b76efe3 100644 --- a/nova/api/openstack/compute/plugins/v3/flavor_access.py +++ b/nova/api/openstack/compute/plugins/v3/flavor_access.py @@ -26,7 +26,7 @@ from nova.compute import flavors from nova import exception from nova.openstack.common.gettextutils import _ -ALIAS = 'os-flavor-access' +ALIAS = 'flavor-access' soft_authorize = extensions.soft_extension_authorizer('compute', 'v3:' + ALIAS) authorize = extensions.extension_authorizer('compute', 'v3:%s' % ALIAS) @@ -217,7 +217,7 @@ class FlavorAccess(extensions.V3APIExtensionBase): name = "FlavorAccess" alias = ALIAS - namespace = "http://docs.openstack.org/compute/ext/%s/api/v3" % ALIAS + namespace = "http://docs.openstack.org/compute/core/%s/api/v3" % ALIAS version = 1 def get_resources(self): diff --git a/nova/api/openstack/compute/plugins/v3/flavor_manage.py b/nova/api/openstack/compute/plugins/v3/flavor_manage.py index 5815de9c0f80..0b877d017716 100644 --- a/nova/api/openstack/compute/plugins/v3/flavor_manage.py +++ b/nova/api/openstack/compute/plugins/v3/flavor_manage.py @@ -71,7 +71,7 @@ class FlavorManageController(wsgi.Controller): ephemeral_gb = vals.get('ephemeral', 0) swap = vals.get('swap', 0) rxtx_factor = vals.get('rxtx_factor', 1.0) - is_public = vals.get('os-flavor-access:is_public', True) + is_public = vals.get('flavor-access:is_public', True) try: flavor = flavors.create(name, memory, vcpus, root_gb, diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavor_access.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavor_access.py index 57bb752e1675..bfb52a928615 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_flavor_access.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavor_access.py @@ -139,8 +139,8 @@ class FlavorAccessTest(test.NoDBTestCase): self.assertEqual(d1['id'], d2['id']) def test_list_flavor_access_public(self): - # query os-flavor-access on public flavor should return 404 - req = fakes.HTTPRequestV3.blank('/flavors/fake/os-flavor-access', + # query flavor-access on public flavor should return 404 + req = fakes.HTTPRequestV3.blank('/flavors/fake/flavor-access', use_admin_context=True) self.assertRaises(exc.HTTPNotFound, self.flavor_access_controller.index, @@ -154,7 +154,7 @@ class FlavorAccessTest(test.NoDBTestCase): self.assertEqual(result, expected) def test_list_with_no_context(self): - req = fakes.HTTPRequestV3.blank('/flavors/2/os-flavor-access') + req = fakes.HTTPRequestV3.blank('/flavors/2/flavor-access') def fake_authorize(context, target=None, action=None): raise exception.PolicyNotAuthorized(action='index') @@ -242,23 +242,23 @@ class FlavorAccessTest(test.NoDBTestCase): def test_show(self): resp = FakeResponse() self.flavor_action_controller.show(self.req, resp, '0') - self.assertEqual({'id': '0', 'os-flavor-access:is_public': True}, + self.assertEqual({'id': '0', 'flavor-access:is_public': True}, resp.obj['flavor']) self.flavor_action_controller.show(self.req, resp, '2') - self.assertEqual({'id': '0', 'os-flavor-access:is_public': False}, + self.assertEqual({'id': '0', 'flavor-access:is_public': False}, resp.obj['flavor']) def test_detail(self): resp = FakeResponse() self.flavor_action_controller.detail(self.req, resp) - self.assertEqual([{'id': '0', 'os-flavor-access:is_public': True}, - {'id': '2', 'os-flavor-access:is_public': False}], + self.assertEqual([{'id': '0', 'flavor-access:is_public': True}, + {'id': '2', 'flavor-access:is_public': False}], resp.obj['flavors']) def test_create(self): resp = FakeResponse() self.flavor_action_controller.create(self.req, {}, resp) - self.assertEqual({'id': '0', 'os-flavor-access:is_public': True}, + self.assertEqual({'id': '0', 'flavor-access:is_public': True}, resp.obj['flavor']) def test_add_tenant_access(self): diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavor_manage.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavor_manage.py index 87c661b8ae0d..ea56663e3b35 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_flavor_manage.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavor_manage.py @@ -91,7 +91,7 @@ class FlavorManageTest(test.NoDBTestCase): self.app = fakes.wsgi_app_v3(init_only=('servers', 'flavors', 'flavor-manage', 'os-flavor-rxtx', - 'os-flavor-access')) + 'flavor-access')) self.expected_flavor = { "flavor": { @@ -103,7 +103,7 @@ class FlavorManageTest(test.NoDBTestCase): "id": 1234, "swap": 512, "rxtx_factor": 1, - "os-flavor-access:is_public": True, + "flavor-access:is_public": True, } } @@ -180,7 +180,7 @@ class FlavorManageTest(test.NoDBTestCase): "id": 1235, "swap": 512, "rxtx_factor": 1, - "os-flavor-access:is_public": True, + "flavor-access:is_public": True, } } @@ -240,7 +240,7 @@ class PrivateFlavorManageTest(test.TestCase): "OS-FLV-EXT-DATA:ephemeral": 1, "swap": 512, "rxtx_factor": 1, - "os-flavor-access:is_public": False + "flavor-access:is_public": False } } expected = { @@ -278,7 +278,7 @@ class PrivateFlavorManageTest(test.TestCase): "OS-FLV-EXT-DATA:ephemeral": 1, "swap": 512, "rxtx_factor": 1, - "os-flavor-access:is_public": True + "flavor-access:is_public": True } } expected = { diff --git a/nova/tests/fake_policy.py b/nova/tests/fake_policy.py index 6d57342a66bc..e12919bf1ad2 100644 --- a/nova/tests/fake_policy.py +++ b/nova/tests/fake_policy.py @@ -176,10 +176,10 @@ policy_data = """ "compute_extension:flavor_access": "", "compute_extension:flavor_access:addTenantAccess": "rule:admin_api", "compute_extension:flavor_access:removeTenantAccess": "rule:admin_api", - "compute_extension:v3:os-flavor-access": "", - "compute_extension:v3:os-flavor-access:remove_tenant_access": + "compute_extension:v3:flavor-access": "", + "compute_extension:v3:flavor-access:remove_tenant_access": "rule:admin_api", - "compute_extension:v3:os-flavor-access:add_tenant_access": + "compute_extension:v3:flavor-access:add_tenant_access": "rule:admin_api", "compute_extension:flavor_disabled": "", "compute_extension:v3:os-flavor-disabled": "", diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-add-tenant-req.json.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-add-tenant-req.json.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-req.xml.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-req.xml.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.xml.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-req.json.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-req.json.tpl similarity index 77% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-req.json.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-req.json.tpl index 02ac4e695df7..8764c8056015 100644 --- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-req.json.tpl +++ b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-req.json.tpl @@ -5,6 +5,6 @@ "vcpus": 2, "disk": 10, "id": "%(flavor_id)s", - "os-flavor-access:is_public": false + "flavor-access:is_public": false } } diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-req.xml.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-req.xml.tpl similarity index 59% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-req.xml.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-req.xml.tpl index 25bd8c3eb082..e16420306dda 100644 --- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-req.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-req.xml.tpl @@ -1,10 +1,10 @@ diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.json.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-resp.json.tpl similarity index 91% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.json.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-resp.json.tpl index 1e1f0cd4d0b0..1e5807410701 100644 --- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-resp.json.tpl @@ -13,7 +13,7 @@ } ], "name": "%(flavor_name)s", - "os-flavor-access:is_public": false, + "flavor-access:is_public": false, "ram": 1024, "vcpus": 2, "disabled": false, diff --git a/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-resp.xml.tpl new file mode 100644 index 000000000000..2a26585149b9 --- /dev/null +++ b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-resp.xml.tpl @@ -0,0 +1,5 @@ + + + + + diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-detail-resp.json.tpl similarity index 91% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-detail-resp.json.tpl index c3c0eacea844..a7068bd36d15 100644 --- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-detail-resp.json.tpl @@ -16,7 +16,7 @@ } ], "name": "m1.tiny", - "os-flavor-access:is_public": true, + "flavor-access:is_public": true, "ram": 512, "swap": 0, "vcpus": 1 @@ -37,7 +37,7 @@ } ], "name": "m1.small", - "os-flavor-access:is_public": true, + "flavor-access:is_public": true, "ram": 2048, "swap": 0, "vcpus": 1 @@ -58,7 +58,7 @@ } ], "name": "m1.medium", - "os-flavor-access:is_public": true, + "flavor-access:is_public": true, "ram": 4096, "swap": 0, "vcpus": 2 @@ -79,7 +79,7 @@ } ], "name": "m1.large", - "os-flavor-access:is_public": true, + "flavor-access:is_public": true, "ram": 8192, "swap": 0, "vcpus": 4 @@ -100,7 +100,7 @@ } ], "name": "m1.xlarge", - "os-flavor-access:is_public": true, + "flavor-access:is_public": true, "ram": 16384, "swap": 0, "vcpus": 8 diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-detail-resp.xml.tpl similarity index 65% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-detail-resp.xml.tpl index 7ff85f9da51c..2ca11e3e4946 100644 --- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-detail-resp.xml.tpl @@ -1,22 +1,22 @@ - - + + - + - + - + - + diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-list-resp.json.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-list-resp.json.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-list-resp.xml.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.xml.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.xml.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.xml.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-show-resp.json.tpl similarity index 91% rename from nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl rename to nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-show-resp.json.tpl index 771e9a58fa8c..5ce2273be170 100644 --- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-show-resp.json.tpl @@ -13,7 +13,7 @@ } ], "name": "m1.tiny", - "os-flavor-access:is_public": true, + "flavor-access:is_public": true, "ram": 512, "vcpus": 1, "disabled": false, diff --git a/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-show-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-show-resp.xml.tpl new file mode 100644 index 000000000000..df35b4f8315e --- /dev/null +++ b/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-show-resp.xml.tpl @@ -0,0 +1,5 @@ + + + + + diff --git a/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl index 42825dcc44c3..0ee149c8802f 100644 --- a/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl @@ -13,6 +13,7 @@ } ], "name": "%(flavor_name)s", + "flavor-access:is_public": true, "ram": 1024, "vcpus": 2, "disabled": false, diff --git a/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.xml.tpl index e4910b49718c..95f8830d4514 100644 --- a/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl index e6415aa61902..cbf31504bc49 100644 --- a/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl @@ -13,6 +13,7 @@ } ], "name": "m1.tiny", + "flavor-access:is_public": true, "ram": 512, "vcpus": 1, "disabled": false, diff --git a/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.xml.tpl index 25f79e51da17..d3ec31695ff0 100644 --- a/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl index 34bc739c0353..a7068bd36d15 100644 --- a/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl @@ -16,6 +16,7 @@ } ], "name": "m1.tiny", + "flavor-access:is_public": true, "ram": 512, "swap": 0, "vcpus": 1 @@ -36,6 +37,7 @@ } ], "name": "m1.small", + "flavor-access:is_public": true, "ram": 2048, "swap": 0, "vcpus": 1 @@ -56,6 +58,7 @@ } ], "name": "m1.medium", + "flavor-access:is_public": true, "ram": 4096, "swap": 0, "vcpus": 2 @@ -76,6 +79,7 @@ } ], "name": "m1.large", + "flavor-access:is_public": true, "ram": 8192, "swap": 0, "vcpus": 4 @@ -96,6 +100,7 @@ } ], "name": "m1.xlarge", + "flavor-access:is_public": true, "ram": 16384, "swap": 0, "vcpus": 8 diff --git a/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.xml.tpl index 20508af04971..33fb31b37ff2 100644 --- a/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.xml.tpl @@ -1,22 +1,22 @@ - - - + + + - + - + - + - + diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl deleted file mode 100644 index 4cbf2a96c6c2..000000000000 --- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl deleted file mode 100644 index dc67551ba64c..000000000000 --- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl index b9d1375be1c8..8514eaba74c1 100644 --- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl @@ -15,6 +15,7 @@ } ], "name": "m1.tiny", + "flavor-access:is_public": true, "ram": 512, "rxtx_factor": 1.0, "swap": 0, diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl index ae0324d3e1fb..6ca577d8e0dd 100644 --- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl index d4fe93a815c8..830af849a7c6 100644 --- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl @@ -16,6 +16,7 @@ } ], "name": "m1.tiny", + "flavor-access:is_public": true, "ram": 512, "rxtx_factor": 1.0, "swap": 0, @@ -37,6 +38,7 @@ } ], "name": "m1.small", + "flavor-access:is_public": true, "ram": 2048, "rxtx_factor": 1.0, "swap": 0, @@ -58,6 +60,7 @@ } ], "name": "m1.medium", + "flavor-access:is_public": true, "ram": 4096, "rxtx_factor": 1.0, "swap": 0, @@ -79,6 +82,7 @@ } ], "name": "m1.large", + "flavor-access:is_public": true, "ram": 8192, "rxtx_factor": 1.0, "swap": 0, @@ -100,6 +104,7 @@ } ], "name": "m1.xlarge", + "flavor-access:is_public": true, "ram": 16384, "rxtx_factor": 1.0, "swap": 0, diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl index 475fd4a717b8..531ce0a845a2 100644 --- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl @@ -1,23 +1,23 @@ - - + + - + - + - + - + - + \ No newline at end of file diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl index 69bf80ebf632..6279ce92e07a 100644 --- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl @@ -13,6 +13,7 @@ } ], "name": "%(flavor_name)s", + "flavor-access:is_public": true, "ram": 1024, "rxtx_factor": 2.0, "vcpus": 2, diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl index b0a0e30b614d..6b9c1145c592 100644 --- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl @@ -1,5 +1,5 @@ - + diff --git a/nova/tests/integrated/v3/test_flavor_access.py b/nova/tests/integrated/v3/test_flavor_access.py index ba65c3728cef..a57d6bb31ac7 100644 --- a/nova/tests/integrated/v3/test_flavor_access.py +++ b/nova/tests/integrated/v3/test_flavor_access.py @@ -17,7 +17,7 @@ from nova.tests.integrated.v3 import api_sample_base class FlavorAccessSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): - extension_name = 'os-flavor-access' + extension_name = 'flavor-access' def _add_tenant(self): subs = { @@ -53,7 +53,7 @@ class FlavorAccessSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): self._create_flavor() self._add_tenant() flavor_id = 10 - response = self._do_get('flavors/%s/os-flavor-access' % flavor_id) + response = self._do_get('flavors/%s/flavor-access' % flavor_id) subs = { 'flavor_id': flavor_id, 'tenant_id': 'fake_tenant',