openstack/placement
Code Issues Proposed changes

Merge V2 and V2.1 aggregate functional tests

Browse Source 
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.

We can have one set of tests which can run for both v2 and v2.1.

This commit merges aggregate functional tests.

Change-Id: I6d6ffd797d6015cebac3b21fc073b2297e5f67f2
This commit is contained in:
ghanshyam
2015-03-24 15:20:15 +09:00
parent 15cbeaf427
commit 9f79cf1afb
25 changed files with 17 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/api_samples/os-aggregates/aggregate-add-host-post-req.json
View File

@@ -1,6 +0,0 @@
{
"add_host":
{
"host": "581d29b9e3504d8a895caddb13839b15"
}
}

9
doc/api_samples/os-aggregates/aggregate-metadata-post-req.json
View File

@@ -1,9 +0,0 @@
{
"set_metadata":
{
"metadata":
{
"key": "value"
}
}
}

7
doc/api_samples/os-aggregates/aggregate-post-req.json
View File

@@ -1,7 +0,0 @@
{
"aggregate":
{
"name": "name",
"availability_zone": "nova"
}
}

11
doc/api_samples/os-aggregates/aggregate-post-resp.json
View File

@@ -1,11 +0,0 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "2012-10-01T18:50:27.781065",
"deleted": false,
"deleted_at": null,
"id": 1,
"name": "name",
"updated_at": null
}
}

6
doc/api_samples/os-aggregates/aggregate-remove-host-post-req.json
View File

@@ -1,6 +0,0 @@
{
"remove_host":
{
"host": "581d29b9e3504d8a895caddb13839b15"
}
}

7
doc/api_samples/os-aggregates/aggregate-update-post-req.json
View File

@@ -1,7 +0,0 @@
{
"aggregate":
{
"name": "newname",
"availability_zone": "nova2"
}
}

15
doc/api_samples/os-aggregates/aggregate-update-post-resp.json
View File

@@ -1,15 +0,0 @@
{
"aggregate": {
"availability_zone": "nova2",
"created_at": "2012-12-04T12:04:27.075065",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {
"availability_zone": "nova2"
},
"name": "newname",
"updated_at": "2012-12-04T12:04:27.242597"
}
}

17
doc/api_samples/os-aggregates/aggregates-add-host-post-resp.json
View File

@@ -1,17 +0,0 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "2012-12-04T12:04:24.399784",
"deleted": false,
"deleted_at": null,
"hosts": [
"0438c6a4e8d841ad823b801d681f4680"
],
"id": 1,
"metadata": {
"availability_zone": "nova"
},
"name": "name",
"updated_at": null
}
}

15
doc/api_samples/os-aggregates/aggregates-get-resp.json
View File

@@ -1,15 +0,0 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "2012-11-16T06:22:23.032493",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {
"availability_zone": "nova"
},
"name": "name",
"updated_at": null
}
}

17
doc/api_samples/os-aggregates/aggregates-list-get-resp.json
View File

@@ -1,17 +0,0 @@
{
"aggregates": [
{
"availability_zone": "nova",
"created_at": "2012-11-16T06:22:23.361359",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {
"availability_zone": "nova"
},
"name": "name",
"updated_at": null
}
]
}

16
doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json
View File

@@ -1,16 +0,0 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "2012-11-16T06:22:22.342791",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {
"availability_zone": "nova",
"key": "value"
},
"name": "name",
"updated_at": null
}
}

15
doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.json
View File

@@ -1,15 +0,0 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "2012-12-04T12:04:26.557909",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {
"availability_zone": "nova"
},
"name": "name",
"updated_at": null
}
}

6
nova/tests/functional/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl
View File

@@ -1,6 +0,0 @@
{
"add_host":
{
"host": "%(host_name)s"
}
}

9
nova/tests/functional/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl
View File

@@ -1,9 +0,0 @@
{
"set_metadata":
{
"metadata":
{
"key": "value"
}
}
}

7
nova/tests/functional/api_samples/os-aggregates/aggregate-post-req.json.tpl
View File

@@ -1,7 +0,0 @@
{
"aggregate":
{
"name": "name",
"availability_zone": "nova"
}
}

11
nova/tests/functional/api_samples/os-aggregates/aggregate-post-resp.json.tpl
View File

@@ -1,11 +0,0 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "%(strtime)s",
"deleted": false,
"deleted_at": null,
"id": %(aggregate_id)s,
"name": "name",
"updated_at": null
}
}

6
nova/tests/functional/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl
View File

@@ -1,6 +0,0 @@
{
"remove_host":
{
"host": "%(host_name)s"
}
}

7
nova/tests/functional/api_samples/os-aggregates/aggregate-update-post-req.json.tpl
View File

@@ -1,7 +0,0 @@
{
"aggregate":
{
"name": "newname",
"availability_zone": "nova2"
}
}

15
nova/tests/functional/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl
View File

@@ -1,15 +0,0 @@
{
"aggregate": {
"availability_zone": "nova2",
"created_at": "%(strtime)s",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {
"availability_zone": "nova2"
},
"name": "newname",
"updated_at": "%(strtime)s"
}
}

17
nova/tests/functional/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl
View File

@@ -1,17 +0,0 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "%(strtime)s",
"deleted": false,
"deleted_at": null,
"hosts": [
"%(compute_host)s"
],
"id": 1,
"metadata": {
"availability_zone": "nova"
},
"name": "name",
"updated_at": null
}
}

15
nova/tests/functional/api_samples/os-aggregates/aggregates-get-resp.json.tpl
View File

@@ -1,15 +0,0 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "%(strtime)s",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {
"availability_zone": "nova"
},
"name": "name",
"updated_at": null
}
}

17
nova/tests/functional/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl
View File

@@ -1,17 +0,0 @@
{
"aggregates": [
{
"availability_zone": "nova",
"created_at": "%(strtime)s",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {
"availability_zone": "nova"
},
"name": "name",
"updated_at": null
}
]
}

16
nova/tests/functional/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl
View File

@@ -1,16 +0,0 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "%(strtime)s",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {
"availability_zone": "nova",
"key": "value"
},
"name": "name",
"updated_at": null
}
}

15
nova/tests/functional/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl
View File

@@ -1,15 +0,0 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "%(strtime)s",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {
"availability_zone": "nova"
},
"name": "name",
"updated_at": null
}
}

17
nova/tests/functional/v3/test_aggregates.py
View File

@@ -13,12 +13,29 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_config import cfg
from nova.tests.functional.v3 import api_sample_base
CONF = cfg.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.extensions')
class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV3):
ADMIN_API = True
extension_name = "os-aggregates"
# TODO(gmann): Overriding '_api_version' till all functional tests
# are merged between v2 and v2.1. After that base class variable
# itself can be changed to 'v2'
_api_version = 'v2'
def _get_flags(self):
f = super(AggregatesSampleJsonTest, self)._get_flags()
f['osapi_compute_extension'] = CONF.osapi_compute_extension[:]
f['osapi_compute_extension'].append(
'nova.api.openstack.compute.contrib.aggregates.Aggregates')
return f
def test_aggregate_create(self):
subs = {