openstack/vitrage-tempest-plugin
Code Issues Proposed changes

Merge "Test for (not) showing a DELETED template"

Browse Source
This commit is contained in:
Zuul 2019-04-08 11:00:22 +00:00 committed by Gerrit Code Review
commit 75f252f0d2
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
vitrage_tempest_plugin/tests/api/templates/test_template.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging from oslo_log import log as logging
from testtools import matchers from testtools import matchers
import yaml import yaml
@ -26,6 +25,7 @@ from vitrage_tempest_plugin.tests.common import general_utils as g_utils
from vitrage_tempest_plugin.tests.common import vitrage_utils as v_utils from vitrage_tempest_plugin.tests.common import vitrage_utils as v_utils
import vitrage_tempest_plugin.tests.utils as utils import vitrage_tempest_plugin.tests.utils as utils
from vitrageclient.exceptions import ClientException
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -144,23 +144,14 @@ class TemplatesDBTest(BaseTemplateTest):
'corrupted template template presented in list') 'corrupted template template presented in list')
def test_template_delete(self): def test_template_delete(self):
self._add_delete_template()
# add standard template def test_template_dont_show_deleted_template(self):
v_utils.add_template(STANDARD_TEMPLATE,
template_type=TTypes.STANDARD)
db_row = v_utils.get_first_template(
name='host_high_memory_usage_scenarios',
type=TTypes.STANDARD,
status=TemplateStatus.ACTIVE)
self.assertIsNotNone(db_row,
'Template should appear in templates list')
# delete template uuid = self._add_delete_template()
uuid = db_row['uuid'] self.assertRaises(ClientException,
v_utils.delete_template(uuid) self.vitrage_client.template.show,
db_row = v_utils.get_first_template( uuid)
name='host_high_memory_usage_scenarios', type=TTypes.STANDARD)
self.assertIsNone(db_row, 'Template should not appear in list')
def test_compare_cli_to_api(self): def test_compare_cli_to_api(self):
"""Compare between api template list """Compare between api template list
@ -219,3 +210,29 @@ class TemplatesDBTest(BaseTemplateTest):
'entity equivalence example', 'entity equivalence example',
'basic_def_template', 'basic_def_template',
'corrupted_template'] 'corrupted_template']
def _add_delete_template(self):
"""A helper function:
Adds and deletes a template.
Returns its uuid.
"""
# add a template
v_utils.add_template(STANDARD_TEMPLATE, template_type=TTypes.STANDARD)
db_row = v_utils.get_first_template(
name='host_high_memory_usage_scenarios',
type=TTypes.STANDARD,
status=TemplateStatus.ACTIVE)
self.assertIsNotNone(db_row,
'Template should appear in templates list')
# delete it
uuid = db_row['uuid']
v_utils.delete_template(uuid)
db_row = v_utils.get_first_template(
name='host_high_memory_usage_scenarios',
type=TTypes.STANDARD)
self.assertIsNone(db_row, 'Template should not appear in list')
return uuid