openstack/nova
Code Issues Proposed changes

Share V2 and V2.1 tenant-networks 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 tenant-networks functional tests.

Change-Id: I470ce6d26cd0865d2645ef269aa419b2b200ac37
This commit is contained in:
ghanshyam 2015-03-27 17:05:19 +09:00 committed by Ghanshyam Mann
parent e69a74f365
commit dd09e57a1c
8 changed files with 13 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/api_samples/os-tenant-networks/networks-list-res.json
View File

@ -1,14 +0,0 @@
{
"networks": [
{
"cidr": "10.0.0.0/29",
"id": "616fb98f-46ca-475e-917e-2563e5a8cd19",
"label": "test_0"
},
{
"cidr": "10.0.0.8/29",
"id": "616fb98f-46ca-475e-917e-2563e5a8cd20",
"label": "test_1"
}
]
}

9
doc/api_samples/os-tenant-networks/networks-post-req.json
View File

@ -1,9 +0,0 @@
{
"network": {
"label": "public",
"cidr": "172.0.0.0/24",
"vlan_start": 1,
"num_networks": 1,
"network_size": 255
}
}

7
doc/api_samples/os-tenant-networks/networks-post-res.json
View File

@ -1,7 +0,0 @@
{
"network": {
"cidr": "172.0.0.0/24",
"id": "5bbcc3c4-1da2-4437-a48a-66f15b1b13f9",
"label": "public"
}
}

14
nova/tests/functional/api_samples/os-tenant-networks/networks-list-res.json.tpl
View File

@ -1,14 +0,0 @@
{
"networks": [
{
"cidr": "10.0.0.0/29",
"id": "%(id)s",
"label": "test_0"
},
{
"cidr": "10.0.0.8/29",
"id": "%(id)s",
"label": "test_1"
}
]
}

9
nova/tests/functional/api_samples/os-tenant-networks/networks-post-req.json.tpl
View File

@ -1,9 +0,0 @@
{
"network": {
"label": "public",
"cidr": "172.0.0.0/24",
"vlan_start": 1,
"num_networks": 1,
"network_size": 255
}
}

7
nova/tests/functional/api_samples/os-tenant-networks/networks-post-res.json.tpl
View File

@ -1,7 +0,0 @@
{
"network": {
"cidr": "172.0.0.0/24",
"id": "%(id)s",
"label": "public"
}
}

39
nova/tests/functional/test_api_samples.py
View File

@ -49,7 +49,6 @@ from nova import exception
from nova.network import api as network_api
from nova.network.neutronv2 import api as neutron_api # noqa - only for cfg
from nova import objects
import nova.quota
from nova.servicegroup import api as service_group_api
from nova import test
from nova.tests.functional import api_samples_test_base
@ -2067,44 +2066,6 @@ class DiskConfigJsonTest(ServersSampleBase):
self._verify_response('image-list-resp', subs, response, 200)
class OsNetworksJsonTests(ApiSampleTestBaseV2):
ADMIN_API = True
extension_name = ("nova.api.openstack.compute.contrib.os_tenant_networks"
".Os_tenant_networks")
def setUp(self):
super(OsNetworksJsonTests, self).setUp()
CONF.set_override("enable_network_quota", True)
def fake(*args, **kwargs):
pass
self.stubs.Set(nova.quota.QUOTAS, "reserve", fake)
self.stubs.Set(nova.quota.QUOTAS, "commit", fake)
self.stubs.Set(nova.quota.QUOTAS, "rollback", fake)
self.stubs.Set(nova.quota.QuotaEngine, "reserve", fake)
self.stubs.Set(nova.quota.QuotaEngine, "commit", fake)
self.stubs.Set(nova.quota.QuotaEngine, "rollback", fake)
def test_list_networks(self):
response = self._do_get('os-tenant-networks')
subs = self._get_regexes()
self._verify_response('networks-list-res', subs, response, 200)
def test_create_network(self):
response = self._do_post('os-tenant-networks', "networks-post-req", {})
subs = self._get_regexes()
self._verify_response('networks-post-res', subs, response, 200)
def test_delete_network(self):
response = self._do_post('os-tenant-networks', "networks-post-req", {})
net = jsonutils.loads(response.content)
response = self._do_delete('os-tenant-networks/%s' %
net["network"]["id"])
self.assertEqual(response.status_code, 202)
self.assertEqual(response.content, "")
class NetworksJsonTests(ApiSampleTestBaseV2):
ADMIN_API = True
extension_name = ("nova.api.openstack.compute.contrib"

13
nova/tests/functional/v3/test_tenant_networks.py
View File

@ -23,11 +23,24 @@ from nova.tests.functional.v3 import api_sample_base
CONF = cfg.CONF
CONF.import_opt('enable_network_quota',
'nova.api.openstack.compute.contrib.os_tenant_networks')
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.extensions')
class TenantNetworksJsonTests(api_sample_base.ApiSampleTestBaseV3):
ADMIN_API = True
extension_name = "os-tenant-networks"
# 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(TenantNetworksJsonTests, self)._get_flags()
f['osapi_compute_extension'] = CONF.osapi_compute_extension[:]
f['osapi_compute_extension'].append('nova.api.openstack.compute.'
'contrib.os_tenant_networks.Os_tenant_networks')
return f
def setUp(self):
super(TenantNetworksJsonTests, self).setUp()