openstack
/
tempest
Code Issues Proposed changes

Add NetworkSubnetPools to tempest cleanup 

The review adds support for NetworkSubnetPools service,
so if there are leftover subnet pools, tempest cleanup
is able to detect them and remove eventually.

Change-Id: Ieecde490d5eb20e1a894a7bdf3bcf0e7a54c08e2
Related-Bug: #1812660
This commit is contained in:
Martin Kopec 2019-02-18 12:34:52 +00:00
parent 470aca738c
commit e681998023
2 changed files with 108 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tempest/cmd/cleanup_service.py
View File

@ -362,6 +362,7 @@ class BaseNetworkService(BaseService):
self.metering_label_rules_client = manager.metering_label_rules_client
self.security_groups_client = manager.security_groups_client
self.routers_client = manager.routers_client
self.subnetpools_client = manager.subnetpools_client
def _filter_by_conf_networks(self, item_list):
if not item_list or not all(('network_id' in i for i in item_list)):
@ -673,6 +674,41 @@ class NetworkSubnetService(BaseNetworkService):
self.data['subnets'][subnet['id']] = subnet['name']
class NetworkSubnetPoolsService(BaseNetworkService):
def list(self):
client = self.subnetpools_client
pools = client.list_subnetpools(**self.tenant_filter)['subnetpools']
if not self.is_save_state:
# recreate list removing saved subnet pools
pools = [pool for pool in pools if pool['id']
not in self.saved_state_json['subnetpools'].keys()]
if self.is_preserve:
pools = [pool for pool in pools if pool['project_id']
not in CONF_PROJECTS]
LOG.debug("List count, %s Subnet Pools", len(pools))
return pools
def delete(self):
client = self.subnetpools_client
pools = self.list()
for pool in pools:
try:
client.delete_subnetpool(pool['id'])
except Exception:
LOG.exception("Delete Subnet Pool exception.")
def dry_run(self):
pools = self.list()
self.data['subnetpools'] = pools
def save_state(self):
pools = self.list()
self.data['subnetpools'] = {}
for pool in pools:
self.data['subnetpools'][pool['id']] = pool['name']
# begin global services
class FlavorService(BaseService):
def __init__(self, manager, **kwargs):
@ -931,6 +967,7 @@ def get_project_cleanup_services():
project_services.append(NetworkSubnetService)
project_services.append(NetworkService)
project_services.append(NetworkSecGroupService)
project_services.append(NetworkSubnetPoolsService)
if IS_CINDER:
project_services.append(SnapshotService)
project_services.append(VolumeService)

72
tempest/tests/cmd/test_cleanup_services.py
View File

@ -104,6 +104,7 @@ class BaseCmdServiceTests(MockFunctionsBase):
cleanup_service.CONF_PROJECTS[0],
"ports": cleanup_service.CONF_PUB_NETWORK,
"routers": cleanup_service.CONF_PUB_ROUTER,
"subnetpools": cleanup_service.CONF_PROJECTS[0],
}
saved_state = {
@ -139,7 +140,8 @@ class BaseCmdServiceTests(MockFunctionsBase):
"metering_labels": {u'723b346ce866-4c7q': u'saved-label'},
"ports": {u'aa74aa4v-741a': u'saved-port'},
"security_groups": {u'7q844add-3697': u'saved-sec-group'},
"subnets": {u'55ttda4a-2584': u'saved-subnet'}
"subnets": {u'55ttda4a-2584': u'saved-subnet'},
"subnetpools": {u'8acf64c1-43fc': u'saved-subnet-pool'}
}
# Mocked methods
get_method = 'tempest.lib.common.rest_client.RestClient.get'
@ -1097,6 +1099,74 @@ class TestNetworkSubnetService(BaseCmdServiceTests):
self._test_is_preserve_true([(self.get_method, self.response, 200)])
class TestNetworkSubnetPoolsService(BaseCmdServiceTests):
service_class = 'NetworkSubnetPoolsService'
service_name = 'subnetpools'
response = {
"subnetpools": [
{
"min_prefixlen": "64",
"default_prefixlen": "64",
"id": "03f761e6-eee0-43fc-a921-8acf64c14988",
"max_prefixlen": "64",
"name": "my-subnet-pool-ipv6",
"is_default": False,
"project_id": "9fadcee8aa7c40cdb2114fff7d569c08",
"tenant_id": "9fadcee8aa7c40cdb2114fff7d569c08",
"prefixes": [
"2001:db8:0:2::/64",
"2001:db8::/63"
],
"ip_version": 6,
"shared": False,
"description": "",
"created_at": "2016-03-08T20:19:41",
"updated_at": "2016-03-08T20:19:41",
"revision_number": 2,
"tags": ["tag1,tag2"]
},
{
"id": "8acf64c1-43fc",
"name": "saved-subnet-pool"
}
]
}
def test_delete_fail(self):
delete_mock = [(self.get_method, self.response, 200),
(self.delete_method, 'error', None),
(self.log_method, 'exception', None)]
self._test_delete(delete_mock, fail=True)
def test_delete_pass(self):
delete_mock = [(self.get_method, self.response, 200),
(self.delete_method, None, 204),
(self.log_method, 'exception', None)]
self._test_delete(delete_mock)
def test_dry_run(self):
dry_mock = [(self.get_method, self.response, 200),
(self.delete_method, "delete", None)]
self._test_dry_run_true(dry_mock)
def test_save_state(self):
self._test_saved_state_true([(self.get_method, self.response, 200)])
def test_preserve_list(self):
self.response['subnetpools'].append(
{
"min_prefixlen": "64",
"default_prefixlen": "64",
"id": "9acf64c1-43fc",
"name": "preserve-pool",
"project_id": cleanup_service.CONF_PROJECTS[0],
"created_at": "2016-03-08T20:19:41",
"updated_at": "2016-03-08T20:19:41"
})
self._test_is_preserve_true([(self.get_method, self.response, 200)])
# begin global services
class TestDomainService(BaseCmdServiceTests):