x/ranger-tempest-plugin
Code Issues Proposed changes

Merge "Fix flavor tag tests to update and restore tags"

Browse Source
This commit is contained in:
Zuul 2020-06-29 14:25:00 +00:00 committed by Gerrit Code Review
commit 6daea23d65
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ranger_tempest_plugin/tests/api/test_flavors.py
View File

@ -178,14 +178,6 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
region_status)) region_status))
region_index += 1 region_index += 1
def _restore_default_tags(self, flavor_id):
tag_body = {"tags": self.tags}
_, body = self.client.update_tags(flavor_id, tag_body)
self._wait_for_flavor_status_on_dcp(flavor_id, 'Success')
_, tag_body = self.client.get_tags(flavor_id)
self.assertDictEqual(self.tags, body.get("tags"))
def _restore_custom_es(self, flavor_id): def _restore_custom_es(self, flavor_id):
_, body = self.client.update_extra_specs(flavor_id, self.custom_es) _, body = self.client.update_extra_specs(flavor_id, self.custom_es)
self._wait_for_flavor_status_on_dcp(flavor_id, 'Success') self._wait_for_flavor_status_on_dcp(flavor_id, 'Success')
@ -246,7 +238,6 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
""" """
post_body = self._get_flavor_params() post_body = self._get_flavor_params()
flavor = self._data_setup(post_body) flavor = self._data_setup(post_body)
self._restore_default_tags(flavor['id'])
# for use by the 'constains and 'starts_with' filter # for use by the 'constains and 'starts_with' filter
str_index1 = data_utils.rand_int_id(0, len(flavor['name']) - 1) str_index1 = data_utils.rand_int_id(0, len(flavor['name']) - 1)
@ -283,18 +274,25 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
def test_add_flavor_tags(self): def test_add_flavor_tags(self):
# test add_tags command with two sets of key:values # test add_tags command with two sets of key:values
add_tag_body = {"tags": {"aa": "bb", "cc": "dd"}} add_tag_body = {"tags": {"aa": "bb", "cc": "dd"}}
self._exec_tags_function(self.flavor['id'], None, 'delete', None)
_, tag_body = self.client.get_tags(self.flavor['id'])
self.assertDictEqual(tag_body, {"tags": {}})
self._exec_tags_function(self.flavor['id'], add_tag_body, 'add', None) self._exec_tags_function(self.flavor['id'], add_tag_body, 'add', None)
_, tag_body = self.client.get_tags(self.flavor['id']) _, tag_body = self.client.get_tags(self.flavor['id'])
subset = {k: v for k, v in list(tag_body.get("tags").items()) subset = {k: v for k, v in list(tag_body.get("tags").items())
if k in add_tag_body.get("tags")} if k in add_tag_body.get("tags")}
self._restore_default_tags(self.flavor['id'])
self.assertDictEqual(add_tag_body.get("tags"), subset) self.assertDictEqual(add_tag_body.get("tags"), subset)
@SYNC('flavor') @SYNC('flavor')
@decorators.idempotent_id('db8e5c0f-0041-45d4-9939-e079296123d8') @decorators.idempotent_id('db8e5c0f-0041-45d4-9939-e079296123d8')
def test_replace_flavor_tags(self): def test_replace_flavor_tags(self):
_, tag_body = self.client.get_tags(self.flavor['id'])
# test replace_tags command # test replace_tags command
replace_tag_body = {"tags": {"ee": "ff", "gg": "hh"}} replace_tag_body = {"tags": {"ee": "ff", "gg": "hh"}}
self._exec_tags_function(self.flavor['id'], replace_tag_body, self._exec_tags_function(self.flavor['id'], replace_tag_body,
@ -302,20 +300,26 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
_, tag_body = self.client.get_tags(self.flavor['id']) _, tag_body = self.client.get_tags(self.flavor['id'])
self.assertDictEqual(replace_tag_body.get("tags"), self.assertDictEqual(replace_tag_body.get("tags"),
tag_body.get("tags")) tag_body.get("tags"))
self._restore_default_tags(self.flavor['id']) # restore tags
self._exec_tags_function(self.flavor['id'], tag_body, 'update', None)
@SYNC('flavor') @SYNC('flavor')
@decorators.idempotent_id('e0a0eca6-e120-45ab-a1a4-f5b95fdf97f1') @decorators.idempotent_id('e0a0eca6-e120-45ab-a1a4-f5b95fdf97f1')
def test_delete_flavor_tag(self): def test_delete_flavor_tag(self):
# test delete_tag command - delete a tag from tags body # test delete_tag command - delete a tag from tags body
delete_tag_key = "a" delete_tag_key = 'a'
self._exec_tags_function(self.flavor['id'], None, 'delete', self._exec_tags_function(self.flavor['id'], None, 'delete',
delete_tag_key) delete_tag_key)
# do get_tag and tries to retrieve the deleted tag # do get_tag and tries to retrieve the deleted tag
_, tag_body = self.client.get_tags(self.flavor['id']) _, tag_body = self.client.get_tags(self.flavor['id'])
tag_present = tag_body.get("tags").get(delete_tag_key, None) tag_present = tag_body.get("tags").get(delete_tag_key, None)
self.assertIsNone(tag_present) self.assertIsNone(tag_present)
self._restore_default_tags(self.flavor['id'])
# restore tags
self._exec_tags_function(self.flavor['id'],
{'tags': {'aa': 'bb'}},
'add',
None)
@SYNC('flavor') @SYNC('flavor')
@decorators.idempotent_id('9c511020-53ed-4139-8c53-451cb0ea8c75') @decorators.idempotent_id('9c511020-53ed-4139-8c53-451cb0ea8c75')