diff --git a/doc/api_samples/all_extensions/flavor-get-resp.json b/doc/api_samples/all_extensions/flavor-get-resp.json deleted file mode 100644 index ab15917337..0000000000 --- a/doc/api_samples/all_extensions/flavor-get-resp.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "flavor": { - "OS-FLV-DISABLED:disabled": false, - "OS-FLV-EXT-DATA:ephemeral": 0, - "disk": 1, - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ], - "name": "m1.tiny", - "os-flavor-access:is_public": true, - "ram": 512, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 1 - } -} diff --git a/doc/api_samples/all_extensions/flavors-detail-resp.json b/doc/api_samples/all_extensions/flavors-detail-resp.json deleted file mode 100644 index 9e8a4822a6..0000000000 --- a/doc/api_samples/all_extensions/flavors-detail-resp.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "flavors": [ - { - "OS-FLV-DISABLED:disabled": false, - "disk": 1, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ], - "name": "m1.tiny", - "ram": 512, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 1 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 20, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "2", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/2", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/2", - "rel": "bookmark" - } - ], - "name": "m1.small", - "ram": 2048, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 1 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 40, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "3", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/3", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/3", - "rel": "bookmark" - } - ], - "name": "m1.medium", - "ram": 4096, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 2 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 80, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "4", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/4", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/4", - "rel": "bookmark" - } - ], - "name": "m1.large", - "ram": 8192, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 4 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 160, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "5", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/5", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/5", - "rel": "bookmark" - } - ], - "name": "m1.xlarge", - "ram": 16384, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 8 - } - ] -} diff --git a/doc/api_samples/all_extensions/flavors-list-resp.json b/doc/api_samples/all_extensions/flavors-list-resp.json deleted file mode 100644 index c585f2bb52..0000000000 --- a/doc/api_samples/all_extensions/flavors-list-resp.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "flavors": [ - { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ], - "name": "m1.tiny" - }, - { - "id": "2", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/2", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/2", - "rel": "bookmark" - } - ], - "name": "m1.small" - }, - { - "id": "3", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/3", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/3", - "rel": "bookmark" - } - ], - "name": "m1.medium" - }, - { - "id": "4", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/4", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/4", - "rel": "bookmark" - } - ], - "name": "m1.large" - }, - { - "id": "5", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/5", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/5", - "rel": "bookmark" - } - ], - "name": "m1.xlarge" - } - ] -} \ No newline at end of file diff --git a/doc/api_samples/flavor-access/flavor-access-create-resp.json b/doc/api_samples/flavor-access/flavor-access-create-resp.json deleted file mode 100644 index 60f49f1ca6..0000000000 --- a/doc/api_samples/flavor-access/flavor-access-create-resp.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": { - "OS-FLV-DISABLED:disabled": false, - "disk": 10, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": false, - "id": "10", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/10", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/10", - "rel": "bookmark" - } - ], - "name": "test_flavor", - "ram": 1024, - "swap": "", - "vcpus": 2 - } -} diff --git a/doc/api_samples/flavor-access/flavor-access-detail-resp.json b/doc/api_samples/flavor-access/flavor-access-detail-resp.json deleted file mode 100644 index 28a88d55cf..0000000000 --- a/doc/api_samples/flavor-access/flavor-access-detail-resp.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "flavors": [ - { - "OS-FLV-DISABLED:disabled": false, - "disk": 1, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ], - "name": "m1.tiny", - "ram": 512, - "swap": "", - "vcpus": 1 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 20, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "2", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/2", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/2", - "rel": "bookmark" - } - ], - "name": "m1.small", - "ram": 2048, - "swap": "", - "vcpus": 1 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 40, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "3", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/3", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/3", - "rel": "bookmark" - } - ], - "name": "m1.medium", - "ram": 4096, - "swap": "", - "vcpus": 2 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 80, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "4", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/4", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/4", - "rel": "bookmark" - } - ], - "name": "m1.large", - "ram": 8192, - "swap": "", - "vcpus": 4 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 160, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "5", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/5", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/5", - "rel": "bookmark" - } - ], - "name": "m1.xlarge", - "ram": 16384, - "swap": "", - "vcpus": 8 - } - ] -} diff --git a/doc/api_samples/flavor-access/flavor-access-show-resp.json b/doc/api_samples/flavor-access/flavor-access-show-resp.json deleted file mode 100644 index e48669eeef..0000000000 --- a/doc/api_samples/flavor-access/flavor-access-show-resp.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": { - "OS-FLV-DISABLED:disabled": false, - "disk": 1, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ], - "name": "m1.tiny", - "ram": 512, - "swap": "", - "vcpus": 1 - } -} diff --git a/doc/api_samples/flavor-access/flavor-access-create-req.json b/doc/api_samples/flavor-access/flavor-create-req.json similarity index 100% rename from doc/api_samples/flavor-access/flavor-access-create-req.json rename to doc/api_samples/flavor-access/flavor-create-req.json diff --git a/doc/api_samples/flavor-access/v2.7/flavor-access-create-req.json b/doc/api_samples/flavor-access/v2.7/flavor-create-req.json similarity index 100% rename from doc/api_samples/flavor-access/v2.7/flavor-access-create-req.json rename to doc/api_samples/flavor-access/v2.7/flavor-create-req.json diff --git a/doc/api_samples/flavor-manage/flavor-create-post-req.json b/doc/api_samples/flavor-manage/flavor-create-post-req.json index 0c5914a010..bbd7124813 100644 --- a/doc/api_samples/flavor-manage/flavor-create-post-req.json +++ b/doc/api_samples/flavor-manage/flavor-create-post-req.json @@ -4,6 +4,7 @@ "ram": 1024, "vcpus": 2, "disk": 10, - "id": "10" + "id": "10", + "rxtx_factor": 2.0 } } diff --git a/doc/api_samples/flavor-manage/flavor-create-post-resp.json b/doc/api_samples/flavor-manage/flavor-create-post-resp.json index f275ac411a..cade7bba36 100644 --- a/doc/api_samples/flavor-manage/flavor-create-post-resp.json +++ b/doc/api_samples/flavor-manage/flavor-create-post-resp.json @@ -18,6 +18,7 @@ "name": "test_flavor", "ram": 1024, "swap": "", + "rxtx_factor": 2.0, "vcpus": 2 } } diff --git a/doc/api_samples/flavors/flavor-get-resp.json b/doc/api_samples/flavors/flavor-get-resp.json index e48669eeef..c80372cbfd 100644 --- a/doc/api_samples/flavors/flavor-get-resp.json +++ b/doc/api_samples/flavors/flavor-get-resp.json @@ -18,6 +18,7 @@ "name": "m1.tiny", "ram": 512, "swap": "", - "vcpus": 1 + "vcpus": 1, + "rxtx_factor": 1.0 } } diff --git a/doc/api_samples/flavors/flavors-detail-resp.json b/doc/api_samples/flavors/flavors-detail-resp.json index 28a88d55cf..b83549f188 100644 --- a/doc/api_samples/flavors/flavors-detail-resp.json +++ b/doc/api_samples/flavors/flavors-detail-resp.json @@ -19,7 +19,8 @@ "name": "m1.tiny", "ram": 512, "swap": "", - "vcpus": 1 + "vcpus": 1, + "rxtx_factor": 1.0 }, { "OS-FLV-DISABLED:disabled": false, @@ -40,7 +41,8 @@ "name": "m1.small", "ram": 2048, "swap": "", - "vcpus": 1 + "vcpus": 1, + "rxtx_factor": 1.0 }, { "OS-FLV-DISABLED:disabled": false, @@ -61,7 +63,8 @@ "name": "m1.medium", "ram": 4096, "swap": "", - "vcpus": 2 + "vcpus": 2, + "rxtx_factor": 1.0 }, { "OS-FLV-DISABLED:disabled": false, @@ -82,7 +85,8 @@ "name": "m1.large", "ram": 8192, "swap": "", - "vcpus": 4 + "vcpus": 4, + "rxtx_factor": 1.0 }, { "OS-FLV-DISABLED:disabled": false, @@ -103,7 +107,8 @@ "name": "m1.xlarge", "ram": 16384, "swap": "", - "vcpus": 8 + "vcpus": 8, + "rxtx_factor": 1.0 } ] } diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json deleted file mode 100644 index 7dbf111076..0000000000 --- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "flavor": { - "OS-FLV-DISABLED:disabled": false, - "disk": 1, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ], - "name": "m1.tiny", - "ram": 512, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 1 - } -} diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json deleted file mode 100644 index 9e8a4822a6..0000000000 --- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "flavors": [ - { - "OS-FLV-DISABLED:disabled": false, - "disk": 1, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ], - "name": "m1.tiny", - "ram": 512, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 1 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 20, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "2", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/2", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/2", - "rel": "bookmark" - } - ], - "name": "m1.small", - "ram": 2048, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 1 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 40, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "3", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/3", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/3", - "rel": "bookmark" - } - ], - "name": "m1.medium", - "ram": 4096, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 2 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 80, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "4", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/4", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/4", - "rel": "bookmark" - } - ], - "name": "m1.large", - "ram": 8192, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 4 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 160, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "5", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/5", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/5", - "rel": "bookmark" - } - ], - "name": "m1.xlarge", - "ram": 16384, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 8 - } - ] -} diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json deleted file mode 100644 index 937246a8b7..0000000000 --- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flavor": { - "name": "flavortest", - "ram": 1024, - "vcpus": 2, - "disk": 10, - "id": "100", - "rxtx_factor": 2.0 - } -} diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json deleted file mode 100644 index 9a48582fbc..0000000000 --- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "flavor": { - "OS-FLV-DISABLED:disabled": false, - "disk": 10, - "OS-FLV-EXT-DATA:ephemeral": 0, - "os-flavor-access:is_public": true, - "id": "100", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/100", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/100", - "rel": "bookmark" - } - ], - "name": "flavortest", - "ram": 1024, - "rxtx_factor": 2.0, - "swap": "", - "vcpus": 2 - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavor-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavor-get-resp.json.tpl deleted file mode 100644 index afb508556a..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavor-get-resp.json.tpl +++ /dev/null @@ -1,24 +0,0 @@ -{ - "flavor": { - "OS-FLV-DISABLED:disabled": false, - "OS-FLV-EXT-DATA:ephemeral": 0, - "disk": 1, - "id": "1", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/1", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ], - "name": "m1.tiny", - "os-flavor-access:is_public": true, - "ram": 512, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 1 - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-detail-resp.json.tpl deleted file mode 100644 index 5dfd5e1c8c..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-detail-resp.json.tpl +++ /dev/null @@ -1,114 +0,0 @@ -{ - "flavors": [ - { - "OS-FLV-DISABLED:disabled": false, - "disk": 1, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "1", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/1", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ], - "name": "m1.tiny", - "os-flavor-access:is_public": true, - "ram": 512, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 1 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 20, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "2", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/2", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/2", - "rel": "bookmark" - } - ], - "name": "m1.small", - "os-flavor-access:is_public": true, - "ram": 2048, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 1 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 40, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "3", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/3", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/3", - "rel": "bookmark" - } - ], - "name": "m1.medium", - "os-flavor-access:is_public": true, - "ram": 4096, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 2 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 80, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "4", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/4", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/4", - "rel": "bookmark" - } - ], - "name": "m1.large", - "os-flavor-access:is_public": true, - "ram": 8192, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 4 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 160, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "5", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/5", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/5", - "rel": "bookmark" - } - ], - "name": "m1.xlarge", - "os-flavor-access:is_public": true, - "ram": 16384, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 8 - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-list-resp.json.tpl deleted file mode 100644 index 346a89f8be..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-list-resp.json.tpl +++ /dev/null @@ -1,74 +0,0 @@ -{ - "flavors": [ - { - "id": "1", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/1", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ], - "name": "m1.tiny" - }, - { - "id": "2", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/2", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/2", - "rel": "bookmark" - } - ], - "name": "m1.small" - }, - { - "id": "3", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/3", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/3", - "rel": "bookmark" - } - ], - "name": "m1.medium" - }, - { - "id": "4", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/4", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/4", - "rel": "bookmark" - } - ], - "name": "m1.large" - }, - { - "id": "5", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/5", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/5", - "rel": "bookmark" - } - ], - "name": "m1.xlarge" - } - ] -} \ No newline at end of file diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-resp.json.tpl deleted file mode 100644 index 5ca61bbe35..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-resp.json.tpl +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": { - "disk": 10, - "id": "%(flavor_id)s", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/%(flavor_id)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/%(flavor_id)s", - "rel": "bookmark" - } - ], - "name": "%(flavor_name)s", - "os-flavor-access:is_public": false, - "ram": 1024, - "vcpus": 2, - "OS-FLV-DISABLED:disabled": false, - "OS-FLV-EXT-DATA:ephemeral": 0, - "swap": "" - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-detail-resp.json.tpl deleted file mode 100644 index a2d6ce7d2a..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-detail-resp.json.tpl +++ /dev/null @@ -1,109 +0,0 @@ -{ - "flavors": [ - { - "OS-FLV-DISABLED:disabled": false, - "disk": 1, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "1", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/1", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ], - "name": "m1.tiny", - "os-flavor-access:is_public": true, - "ram": 512, - "swap": "", - "vcpus": 1 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 20, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "2", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/2", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/2", - "rel": "bookmark" - } - ], - "name": "m1.small", - "os-flavor-access:is_public": true, - "ram": 2048, - "swap": "", - "vcpus": 1 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 40, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "3", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/3", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/3", - "rel": "bookmark" - } - ], - "name": "m1.medium", - "os-flavor-access:is_public": true, - "ram": 4096, - "swap": "", - "vcpus": 2 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 80, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "4", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/4", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/4", - "rel": "bookmark" - } - ], - "name": "m1.large", - "os-flavor-access:is_public": true, - "ram": 8192, - "swap": "", - "vcpus": 4 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 160, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "5", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/5", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/5", - "rel": "bookmark" - } - ], - "name": "m1.xlarge", - "os-flavor-access:is_public": true, - "ram": 16384, - "swap": "", - "vcpus": 8 - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-show-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-show-resp.json.tpl deleted file mode 100644 index 664db5c1fc..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-show-resp.json.tpl +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": { - "disk": 1, - "id": "%(flavor_id)s", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/%(flavor_id)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/%(flavor_id)s", - "rel": "bookmark" - } - ], - "name": "m1.tiny", - "os-flavor-access:is_public": true, - "ram": 512, - "vcpus": 1, - "OS-FLV-DISABLED:disabled": false, - "OS-FLV-EXT-DATA:ephemeral": 0, - "swap": "" - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-create-req.json.tpl similarity index 100% rename from nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-create-req.json.tpl diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/v2.7/flavor-access-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/v2.7/flavor-create-req.json.tpl similarity index 100% rename from nova/tests/functional/api_sample_tests/api_samples/flavor-access/v2.7/flavor-access-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-access/v2.7/flavor-create-req.json.tpl diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-req.json.tpl index 5383e5d15e..70d0a57de8 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-req.json.tpl @@ -4,6 +4,7 @@ "ram": 1024, "vcpus": 2, "disk": 10, - "id": "%(flavor_id)s" + "id": "%(flavor_id)s", + "rxtx_factor": 2.0 } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-resp.json.tpl index 180b787029..77248fda59 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-resp.json.tpl @@ -18,6 +18,7 @@ "vcpus": 2, "OS-FLV-DISABLED:disabled": false, "OS-FLV-EXT-DATA:ephemeral": 0, - "swap": "" + "swap": "", + "rxtx_factor": 2.0 } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavors/flavor-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavors/flavor-get-resp.json.tpl index f3bd9fbcfc..59106259a8 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/flavors/flavor-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/flavors/flavor-get-resp.json.tpl @@ -18,6 +18,7 @@ "vcpus": 1, "OS-FLV-DISABLED:disabled": false, "OS-FLV-EXT-DATA:ephemeral": 0, - "swap": "" + "swap": "", + "rxtx_factor": 1.0 } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-detail-resp.json.tpl index a2d6ce7d2a..1d812a82e6 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-detail-resp.json.tpl @@ -19,7 +19,8 @@ "os-flavor-access:is_public": true, "ram": 512, "swap": "", - "vcpus": 1 + "vcpus": 1, + "rxtx_factor": 1.0 }, { "OS-FLV-DISABLED:disabled": false, @@ -40,7 +41,8 @@ "os-flavor-access:is_public": true, "ram": 2048, "swap": "", - "vcpus": 1 + "vcpus": 1, + "rxtx_factor": 1.0 }, { "OS-FLV-DISABLED:disabled": false, @@ -61,7 +63,8 @@ "os-flavor-access:is_public": true, "ram": 4096, "swap": "", - "vcpus": 2 + "vcpus": 2, + "rxtx_factor": 1.0 }, { "OS-FLV-DISABLED:disabled": false, @@ -82,7 +85,8 @@ "os-flavor-access:is_public": true, "ram": 8192, "swap": "", - "vcpus": 4 + "vcpus": 4, + "rxtx_factor": 1.0 }, { "OS-FLV-DISABLED:disabled": false, @@ -103,7 +107,8 @@ "os-flavor-access:is_public": true, "ram": 16384, "swap": "", - "vcpus": 8 + "vcpus": 8, + "rxtx_factor": 1.0 } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl deleted file mode 100644 index 6defdca90c..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl +++ /dev/null @@ -1,24 +0,0 @@ -{ - "flavor": { - "OS-FLV-DISABLED:disabled": false, - "disk": 1, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "1", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/1", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ], - "name": "m1.tiny", - "os-flavor-access:is_public": true, - "ram": 512, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 1 - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl deleted file mode 100644 index 5dfd5e1c8c..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl +++ /dev/null @@ -1,114 +0,0 @@ -{ - "flavors": [ - { - "OS-FLV-DISABLED:disabled": false, - "disk": 1, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "1", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/1", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ], - "name": "m1.tiny", - "os-flavor-access:is_public": true, - "ram": 512, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 1 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 20, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "2", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/2", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/2", - "rel": "bookmark" - } - ], - "name": "m1.small", - "os-flavor-access:is_public": true, - "ram": 2048, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 1 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 40, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "3", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/3", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/3", - "rel": "bookmark" - } - ], - "name": "m1.medium", - "os-flavor-access:is_public": true, - "ram": 4096, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 2 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 80, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "4", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/4", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/4", - "rel": "bookmark" - } - ], - "name": "m1.large", - "os-flavor-access:is_public": true, - "ram": 8192, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 4 - }, - { - "OS-FLV-DISABLED:disabled": false, - "disk": 160, - "OS-FLV-EXT-DATA:ephemeral": 0, - "id": "5", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/5", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/5", - "rel": "bookmark" - } - ], - "name": "m1.xlarge", - "os-flavor-access:is_public": true, - "ram": 16384, - "rxtx_factor": 1.0, - "swap": "", - "vcpus": 8 - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl deleted file mode 100644 index 70d0a57de8..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flavor": { - "name": "%(flavor_name)s", - "ram": 1024, - "vcpus": 2, - "disk": 10, - "id": "%(flavor_id)s", - "rxtx_factor": 2.0 - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl deleted file mode 100644 index 705d25b736..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl +++ /dev/null @@ -1,24 +0,0 @@ -{ - "flavor": { - "disk": 10, - "id": "%(flavor_id)s", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/flavors/%(flavor_id)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/flavors/%(flavor_id)s", - "rel": "bookmark" - } - ], - "name": "%(flavor_name)s", - "os-flavor-access:is_public": true, - "ram": 1024, - "rxtx_factor": 2.0, - "vcpus": 2, - "OS-FLV-DISABLED:disabled": false, - "OS-FLV-EXT-DATA:ephemeral": 0, - "swap": "" - } -} diff --git a/nova/tests/functional/api_sample_tests/test_flavor_access.py b/nova/tests/functional/api_sample_tests/test_flavor_access.py index dd7d731ef4..8cc3813725 100644 --- a/nova/tests/functional/api_sample_tests/test_flavor_access.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_access.py @@ -17,7 +17,10 @@ from nova.tests.functional.api_sample_tests import api_sample_base class FlavorAccessTestsBase(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = 'flavor-access' + sample_dir = 'flavor-access' + # TODO(gmann): This will be removed once all API tests runs for + # all extension enable. + all_extensions = True def _add_tenant(self): subs = { @@ -35,18 +38,13 @@ class FlavorAccessTestsBase(api_sample_base.ApiSampleTestBaseV21): 'flavor_id': '10', 'flavor_name': 'test_flavor' } - response = self._do_post("flavors", - "flavor-access-create-req", - subs) - self._verify_response("flavor-access-create-resp", subs, response, 200) + self._do_post("flavors", + "flavor-create-req", + subs) class FlavorAccessSampleJsonTests(FlavorAccessTestsBase): - def test_flavor_access_detail(self): - response = self._do_get('flavors/detail') - self._verify_response('flavor-access-detail-resp', {}, response, 200) - def test_flavor_access_list(self): self._create_flavor() self._add_tenant() @@ -58,14 +56,6 @@ class FlavorAccessSampleJsonTests(FlavorAccessTestsBase): } self._verify_response('flavor-access-list-resp', subs, response, 200) - def test_flavor_access_show(self): - flavor_id = '1' - response = self._do_get('flavors/%s' % flavor_id) - subs = { - 'flavor_id': flavor_id - } - self._verify_response('flavor-access-show-resp', subs, response, 200) - def test_flavor_access_add_tenant(self): self._create_flavor() self._add_tenant() @@ -97,15 +87,7 @@ class FlavorAccessV27SampleJsonTests(FlavorAccessTestsBase): self.api.microversion = self.microversion def test_add_tenant_access_to_public_flavor(self): - subs = { - 'flavor_id': '10', - 'flavor_name': 'test_flavor' - } - # Create public flavor - response = self._do_post("flavors", - "flavor-access-create-req", - subs) - self.assertEqual(200, response.status_code) + self._create_flavor() subs = { 'flavor_id': '10', diff --git a/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py b/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py index b4896fc4ca..d2bd20744c 100644 --- a/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py @@ -18,7 +18,11 @@ from nova.tests.functional.api_sample_tests import api_sample_base class FlavorExtraSpecsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = 'flavor-extra-specs' + sample_dir = 'flavor-extra-specs' + + # TODO(gmann): This will be removed once all API tests runs for + # all extension enable. + all_extensions = True def _flavor_extra_specs_create(self): subs = {'value1': 'value1', diff --git a/nova/tests/functional/api_sample_tests/test_flavor_manage.py b/nova/tests/functional/api_sample_tests/test_flavor_manage.py index a4aa406308..a3ee93655e 100644 --- a/nova/tests/functional/api_sample_tests/test_flavor_manage.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_manage.py @@ -18,7 +18,11 @@ from nova.tests.functional.api_sample_tests import api_sample_base class FlavorManageSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = 'flavor-manage' + sample_dir = 'flavor-manage' + + # TODO(gmann): This will be removed once all API tests runs for + # all extension enable. + all_extensions = True def _create_flavor(self): """Create a flavor.""" @@ -31,13 +35,8 @@ class FlavorManageSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): subs) self._verify_response("flavor-create-post-resp", subs, response, 200) - # TODO(sdague): remove duplication - def test_create_flavor(self): - # Get api sample to create a flavor. - self._create_flavor() - - def test_delete_flavor(self): - # Get api sample to delete a flavor. + def test_create_delete_flavor(self): + # Get api sample to create and delete a flavor. self._create_flavor() response = self._do_delete("flavors/10") self.assertEqual(202, response.status_code) diff --git a/nova/tests/functional/api_sample_tests/test_flavor_rxtx.py b/nova/tests/functional/api_sample_tests/test_flavor_rxtx.py deleted file mode 100644 index 499945ada7..0000000000 --- a/nova/tests/functional/api_sample_tests/test_flavor_rxtx.py +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2012 Nebula, Inc. -# Copyright 2013 IBM Corp. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from nova.tests.functional.api_sample_tests import api_sample_base - - -class FlavorRxtxJsonTest(api_sample_base.ApiSampleTestBaseV21): - ADMIN_API = True - extension_name = 'os-flavor-rxtx' - - def test_flavor_rxtx_get(self): - flavor_id = '1' - response = self._do_get('flavors/%s' % flavor_id) - subs = { - 'flavor_id': flavor_id, - 'flavor_name': 'm1.tiny' - } - self._verify_response('flavor-rxtx-get-resp', subs, response, 200) - - def test_flavors_rxtx_detail(self): - response = self._do_get('flavors/detail') - self._verify_response('flavor-rxtx-list-resp', {}, response, 200) - - def test_flavors_rxtx_create(self): - subs = { - 'flavor_id': '100', - 'flavor_name': 'flavortest' - } - response = self._do_post('flavors', - 'flavor-rxtx-post-req', - subs) - self._verify_response('flavor-rxtx-post-resp', subs, response, 200) diff --git a/nova/tests/functional/api_sample_tests/test_flavors.py b/nova/tests/functional/api_sample_tests/test_flavors.py index 6f73d1aa5c..c9e89f9ede 100644 --- a/nova/tests/functional/api_sample_tests/test_flavors.py +++ b/nova/tests/functional/api_sample_tests/test_flavors.py @@ -19,6 +19,10 @@ from nova.tests.functional.api_sample_tests import api_sample_base class FlavorsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): sample_dir = 'flavors' + # TODO(gmann): This will be removed once all API tests runs for + # all extension enable. + all_extensions = True + def test_flavors_get(self): response = self._do_get('flavors/1') self._verify_response('flavor-get-resp', {}, response, 200) @@ -30,8 +34,3 @@ class FlavorsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): def test_flavors_detail(self): response = self._do_get('flavors/detail') self._verify_response('flavors-detail-resp', {}, response, 200) - - -class FlavorsSampleAllExtensionJsonTest(FlavorsSampleJsonTest): - all_extensions = True - sample_dir = None