openstack/watcher-tempest-plugin
Code Issues Proposed changes

Merge "Bug: 2107531. Adding unique uuid decorator to all watcher tests"

Browse Source
This commit is contained in:
Zuul 2025-05-07 16:26:52 +00:00 committed by Gerrit Code Review
commit f14441847c
27 changed files with 128 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
watcher_tempest_plugin/tests/api/admin/test_action.py
View File

@ -43,6 +43,7 @@ class TestShowListAction(base.BaseInfraOptimTest):
cls.action_plan = action_plans['action_plans'][0]
@decorators.attr(type='smoke')
@decorators.idempotent_id('0390c465-df10-460f-9924-ff3d14779395')
def test_show_one_action(self):
_, body = self.client.list_actions(
action_plan_uuid=self.action_plan["uuid"])
@ -54,6 +55,7 @@ class TestShowListAction(base.BaseInfraOptimTest):
self.assertEqual("PENDING", action['state'])
@decorators.attr(type='smoke')
@decorators.idempotent_id('a5dd767a-6d4f-4d72-bd58-9ce69a6c327d')
def test_show_action_with_links(self):
_, body = self.client.list_actions(
action_plan_uuid=self.action_plan["uuid"])
@ -66,6 +68,7 @@ class TestShowListAction(base.BaseInfraOptimTest):
self.assertIn(action['uuid'], action['links'][0]['href'])
@decorators.attr(type="smoke")
@decorators.idempotent_id('530a308a-f590-4af7-832d-1714ee3e4d59')
def test_list_actions(self):
_, body = self.client.list_actions()
@ -75,6 +78,7 @@ class TestShowListAction(base.BaseInfraOptimTest):
action['links'][0]['href'])
@decorators.attr(type="smoke")
@decorators.idempotent_id('570ef821-af69-473d-989d-bbe86b585a78')
def test_list_actions_by_action_plan(self):
_, body = self.client.list_actions(
action_plan_uuid=self.action_plan["uuid"])
@ -92,6 +96,7 @@ class TestShowListAction(base.BaseInfraOptimTest):
self.assertEqual(1, action_counter.get("sleep"))
@decorators.attr(type="smoke")
@decorators.idempotent_id('5aa8ff0c-aa8c-4488-a246-4e0c98180a69')
def test_list_actions_by_audit(self):
_, body = self.client.list_actions(audit_uuid=self.audit["uuid"])

8
watcher_tempest_plugin/tests/api/admin/test_action_plan.py
View File

@ -27,6 +27,7 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
"""Tests for action plans"""
@decorators.attr(type='smoke')
@decorators.idempotent_id('3ac90a92-1022-4868-b93d-ede7ef7b5041')
def test_create_action_plan(self):
_, goal = self.client.show_goal("dummy")
_, audit_template = self.create_audit_template(goal['uuid'])
@ -47,6 +48,7 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
self.assertEqual('RECOMMENDED', action_plan['state'])
@decorators.attr(type='smoke')
@decorators.idempotent_id('621878a9-0a0b-4cf7-952f-6fd5a0cd613e')
def test_execute_action_plan(self):
_, goal = self.client.show_goal("dummy")
_, audit_template = self.create_audit_template(goal['uuid'])
@ -70,6 +72,7 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
self.assertEqual('SUCCEEDED', action_plan['state'])
@decorators.attr(type='smoke')
@decorators.idempotent_id('67dbb485-5bcb-41d6-b19b-adc8e581eec8')
def test_delete_action_plan(self):
_, goal = self.client.show_goal("dummy")
_, audit_template = self.create_audit_template(goal['uuid'])
@ -113,6 +116,7 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
cls.action_plan = action_plans['action_plans'][0]
@decorators.attr(type='smoke')
@decorators.idempotent_id('33465228-aac1-4688-9db3-6b1532c84323')
def test_show_action_plan(self):
_, action_plan = self.client.show_action_plan(
self.action_plan['uuid'])
@ -120,6 +124,7 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
self.assert_expected(self.action_plan, action_plan)
@decorators.attr(type='smoke')
@decorators.idempotent_id('fec6938c-215e-41a1-a63b-65000051acdd')
def test_show_action_plan_detail(self):
_, action_plans = self.client.list_action_plans_detail(
audit_uuid=self.audit['uuid'])
@ -129,6 +134,7 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
self.assert_expected(self.action_plan, action_plan)
@decorators.attr(type='smoke')
@decorators.idempotent_id('edf017b4-5685-466d-825d-751ba624e36e')
def test_show_action_plan_with_links(self):
_, action_plan = self.client.show_action_plan(
self.action_plan['uuid'])
@ -138,6 +144,7 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
action_plan['links'][0]['href'])
@decorators.attr(type="smoke")
@decorators.idempotent_id('1978e51a-9af2-4d80-a2ba-46caf7fa6f04')
def test_list_action_plans(self):
_, body = self.client.list_action_plans()
self.assertIn(self.action_plan['uuid'],
@ -148,6 +155,7 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
action_plan['links'][0]['href'])
@decorators.attr(type='smoke')
@decorators.idempotent_id('50e227a7-b173-40fb-8957-82989dba8bca')
def test_list_with_limit(self):
# We create 3 extra audits to exceed the limit we fix
for _ in range(3):

3
watcher_tempest_plugin/tests/api/admin/test_api_discovery.py
View File

@ -23,6 +23,7 @@ class TestApiDiscovery(base.BaseInfraOptimTest):
"""Tests for API discovery features."""
@decorators.attr(type='smoke')
@decorators.idempotent_id('e5c9cfc5-1890-4e8e-949e-ab2dca4d5595')
def test_api_versions(self):
_, descr = self.client.get_api_description()
expected_versions = ('v1',)
@ -32,12 +33,14 @@ class TestApiDiscovery(base.BaseInfraOptimTest):
self.assertIn(v, versions)
@decorators.attr(type='smoke')
@decorators.idempotent_id('60602d80-fac7-44cc-a207-275dfcb62112')
def test_default_version(self):
_, descr = self.client.get_api_description()
default_version = descr['default_version']
self.assertEqual('v1', default_version['id'])
@decorators.attr(type='smoke')
@decorators.idempotent_id('79e4bfd1-a349-4dd3-bb32-e24586649255')
def test_version_1_resources(self):
_, descr = self.client.get_version_description(version='v1')
expected_resources = ('audit_templates', 'audits', 'action_plans',

13
watcher_tempest_plugin/tests/api/admin/test_audit.py
View File

@ -36,6 +36,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
expected, actual, keys)
@decorators.attr(type='smoke')
@decorators.idempotent_id('7e759ad3-17e8-4a8e-95cf-6532faf67667')
def test_create_audit_oneshot(self):
_, goal = self.client.show_goal("dummy")
_, audit_template = self.create_audit_template(goal['uuid'])
@ -56,6 +57,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
self.assert_expected(audit, body)
@decorators.attr(type='smoke')
@decorators.idempotent_id('3c9bf382-e43b-43d6-a310-f7387cfc2f58')
def test_create_audit_continuous(self):
_, goal = self.client.show_goal("dummy")
_, audit_template = self.create_audit_template(goal['uuid'])
@ -92,6 +94,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
self.assertEqual(audit['state'], 'CANCELLED')
@decorators.attr(type='smoke')
@decorators.idempotent_id('f26573d6-4020-4971-8868-495bffde982e')
def test_create_audit_event(self):
_, descr = self.client.get_api_description()
if descr['versions']:
@ -134,6 +137,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
self.assertEqual(audit['state'], 'CANCELLED')
@decorators.attr(type='smoke')
@decorators.idempotent_id('3e845716-8288-42b3-b95c-395ba7afbaf5')
def test_create_audit_with_wrong_audit_template(self):
audit_params = dict(
audit_template_uuid='INVALID',
@ -144,6 +148,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
exceptions.BadRequest, self.create_audit, **audit_params)
@decorators.attr(type='smoke')
@decorators.idempotent_id('1afb3b41-40a7-4000-9dc0-53b5e8eaa009')
def test_create_audit_with_invalid_state(self):
_, goal = self.client.show_goal("dummy")
_, audit_template = self.create_audit_template(goal['uuid'])
@ -157,6 +162,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
exceptions.BadRequest, self.create_audit, **audit_params)
@decorators.attr(type='smoke')
@decorators.idempotent_id('d6b6a3a0-0eed-474f-b3dc-14ed0d97c655')
def test_create_audit_with_no_state(self):
_, goal = self.client.show_goal("dummy")
_, audit_template = self.create_audit_template(goal['uuid'])
@ -179,6 +185,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
self.assert_expected(audit, body)
@decorators.attr(type='smoke')
@decorators.idempotent_id('d1520631-2dbb-4240-ba0a-14aa7f347003')
def test_update_audit(self):
_, goal = self.client.show_goal("dummy")
_, audit_template = self.create_audit_template(goal['uuid'])
@ -210,6 +217,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
)
@decorators.attr(type='smoke')
@decorators.idempotent_id('e06add3b-1a48-41c2-871e-5d0803a81a37')
def test_delete_audit(self):
_, goal = self.client.show_goal("dummy")
_, audit_template = self.create_audit_template(goal['uuid'])
@ -260,6 +268,7 @@ class TestShowListAudit(base.BaseInfraOptimTest):
expected, actual, keys)
@decorators.attr(type='smoke')
@decorators.idempotent_id('f1b31895-db1c-4a07-979c-dceb811bad98')
def test_show_audit(self):
_, audit = self.client.show_audit(
self.audit['uuid'])
@ -276,6 +285,7 @@ class TestShowListAudit(base.BaseInfraOptimTest):
self.assert_expected(initial_audit, actual_audit)
@decorators.attr(type='smoke')
@decorators.idempotent_id('4f5ced80-3082-43f5-8394-1cba1160d893')
def test_show_audit_with_links(self):
_, audit = self.client.show_audit(
self.audit['uuid'])
@ -285,6 +295,7 @@ class TestShowListAudit(base.BaseInfraOptimTest):
audit['links'][0]['href'])
@decorators.attr(type="smoke")
@decorators.idempotent_id('14e720d7-ffb3-4c5f-8a5b-2510b31198e8')
def test_list_audits(self):
_, body = self.client.list_audits()
self.assertIn(self.audit['uuid'],
@ -295,6 +306,7 @@ class TestShowListAudit(base.BaseInfraOptimTest):
audit['links'][0]['href'])
@decorators.attr(type='smoke')
@decorators.idempotent_id('5175607c-f2df-4df6-9168-45c789b4a6ea')
def test_list_with_limit(self):
# We create 3 extra audits to exceed the limit we fix
for _ in range(3):
@ -307,6 +319,7 @@ class TestShowListAudit(base.BaseInfraOptimTest):
self.assertIn(next_marker, body['next'])
@decorators.attr(type='smoke')
@decorators.idempotent_id('beb25611-24a8-44e2-a381-923053fb282f')
def test_list_audits_related_to_given_audit_template(self):
_, body = self.client.list_audits(
goal=self.goal['uuid'])

12
watcher_tempest_plugin/tests/api/admin/test_audit_template.py
View File

@ -26,6 +26,7 @@ class TestCreateDeleteAuditTemplate(base.BaseInfraOptimTest):
"""Tests on audit templates"""
@decorators.attr(type='smoke')
@decorators.idempotent_id('51e48dd3-a32f-4a82-b8e9-ca9e897f88ed')
def test_create_audit_template(self):
goal_name = "dummy"
_, goal = self.client.show_goal(goal_name)
@ -49,6 +50,7 @@ class TestCreateDeleteAuditTemplate(base.BaseInfraOptimTest):
self.assert_expected(audit_template, body)
@decorators.attr(type='smoke')
@decorators.idempotent_id('9f1ccd3e-fbe0-4c59-8e0d-b720593e1519')
def test_create_audit_template_unicode_description(self):
goal_name = "dummy"
_, goal = self.client.show_goal(goal_name)
@ -73,6 +75,7 @@ class TestCreateDeleteAuditTemplate(base.BaseInfraOptimTest):
self.assert_expected(audit_template, body)
@decorators.attr(type='smoke')
@decorators.idempotent_id('7dcaf918-9744-4b1c-aa05-1ccb4b077a57')
def test_delete_audit_template(self):
_, goal = self.client.show_goal("dummy")
_, body = self.create_audit_template(goal=goal['uuid'])
@ -96,6 +99,7 @@ class TestAuditTemplate(base.BaseInfraOptimTest):
goal=cls.goal['uuid'], strategy=cls.strategy['uuid'])
@decorators.attr(type='smoke')
@decorators.idempotent_id('93f98a9c-b892-48c5-a60a-a56d78bb8c3b')
def test_show_audit_template(self):
_, audit_template = self.client.show_audit_template(
self.audit_template['uuid'])
@ -103,6 +107,7 @@ class TestAuditTemplate(base.BaseInfraOptimTest):
self.assert_expected(self.audit_template, audit_template)
@decorators.attr(type='smoke')
@decorators.idempotent_id('a071dd02-8fa7-4c71-bbb9-1293589a1a1a')
def test_filter_audit_template_by_goal_uuid(self):
_, audit_templates = self.client.list_audit_templates(
goal=self.audit_template['goal_uuid'])
@ -112,6 +117,7 @@ class TestAuditTemplate(base.BaseInfraOptimTest):
self.assertIn(self.audit_template['uuid'], audit_template_uuids)
@decorators.attr(type='smoke')
@decorators.idempotent_id('0a037446-1a04-415f-810d-5953edfa12a9')
def test_filter_audit_template_by_strategy_uuid(self):
_, audit_templates = self.client.list_audit_templates(
strategy=self.audit_template['strategy_uuid'])
@ -121,6 +127,7 @@ class TestAuditTemplate(base.BaseInfraOptimTest):
self.assertIn(self.audit_template['uuid'], audit_template_uuids)
@decorators.attr(type='smoke')
@decorators.idempotent_id('17c06b01-88a7-41e8-9b1f-2650b4854832')
def test_show_audit_template_with_links(self):
_, audit_template = self.client.show_audit_template(
self.audit_template['uuid'])
@ -130,6 +137,7 @@ class TestAuditTemplate(base.BaseInfraOptimTest):
audit_template['links'][0]['href'])
@decorators.attr(type="smoke")
@decorators.idempotent_id('70ff0bb3-c3be-432c-ab51-5dd094ee9160')
def test_list_audit_templates(self):
_, body = self.client.list_audit_templates()
self.assertIn(self.audit_template['uuid'],
@ -140,6 +148,7 @@ class TestAuditTemplate(base.BaseInfraOptimTest):
audit_template['links'][0]['href'])
@decorators.attr(type='smoke')
@decorators.idempotent_id('47f135ef-056a-48ec-9df7-dc64b9092cbd')
def test_list_with_limit(self):
# We create 3 extra audit templates to exceed the limit we fix
for _ in range(3):
@ -152,6 +161,7 @@ class TestAuditTemplate(base.BaseInfraOptimTest):
self.assertIn(next_marker, body['next'])
@decorators.attr(type='smoke')
@decorators.idempotent_id('41f02098-e043-4b66-96f1-c1461994a95a')
def test_update_audit_template_replace(self):
_, new_goal = self.client.show_goal("server_consolidation")
_, new_strategy = self.client.show_strategy("basic")
@ -187,6 +197,7 @@ class TestAuditTemplate(base.BaseInfraOptimTest):
self.assertEqual(new_strategy['uuid'], body['strategy_uuid'])
@decorators.attr(type='smoke')
@decorators.idempotent_id('c2afac59-f8ea-41b1-bdd4-cc2c25170cf5')
def test_update_audit_template_remove(self):
description = 'my at description'
name = 'my at name %s' % uuidutils.generate_uuid()
@ -210,6 +221,7 @@ class TestAuditTemplate(base.BaseInfraOptimTest):
self.assertEqual(self.goal['uuid'], body['goal_uuid'])
@decorators.attr(type='smoke')
@decorators.idempotent_id('b2555a7f-1f8b-48d1-8ab2-9b957ba06a5b')
def test_update_audit_template_add(self):
params = {'name': 'my at name %s' % uuidutils.generate_uuid(),
'goal': self.goal['uuid']}

3
watcher_tempest_plugin/tests/api/admin/test_goal.py
View File

@ -34,6 +34,7 @@ class TestShowListGoal(base.BaseInfraOptimTest):
expected, actual, keys)
@decorators.attr(type='smoke')
@decorators.idempotent_id('1962c7cf-eb84-468a-8386-53166f4b2c9f')
def test_show_goal(self):
_, goal = self.client.show_goal(self.DUMMY_GOAL)
@ -45,6 +46,7 @@ class TestShowListGoal(base.BaseInfraOptimTest):
self.assertEqual(expected_fields, set(goal.keys()))
@decorators.attr(type='smoke')
@decorators.idempotent_id('a2a9b467-0ba3-4902-9f93-c4d6a43bea94')
def test_show_goal_with_links(self):
_, goal = self.client.show_goal(self.DUMMY_GOAL)
self.assertIn('links', goal.keys())
@ -53,6 +55,7 @@ class TestShowListGoal(base.BaseInfraOptimTest):
goal['links'][0]['href'])
@decorators.attr(type="smoke")
@decorators.idempotent_id('99dca2f7-091b-4de5-b455-0b15786fabca')
def test_list_goals(self):
_, body = self.client.list_goals()
self.assertIn(self.DUMMY_GOAL,

3
watcher_tempest_plugin/tests/api/admin/test_scoring_engine.py
View File

@ -33,6 +33,7 @@ class TestShowListScoringEngine(base.BaseInfraOptimTest):
expected, actual, keys)
@decorators.attr(type='smoke')
@decorators.idempotent_id('5b408f9f-c50f-4084-9f8e-132c29e82b4d')
def test_show_scoring_engine(self):
_, scoring_engine = self.client.show_scoring_engine(
self.DUMMY_SCORING_ENGINE)
@ -43,6 +44,7 @@ class TestShowListScoringEngine(base.BaseInfraOptimTest):
self.assertEqual(expected_fields, set(scoring_engine.keys()))
@decorators.attr(type='smoke')
@decorators.idempotent_id('62b3c437-84f6-48d2-8888-82fe5d352242')
def test_show_scoring_engine_with_links(self):
_, scoring_engine = self.client.show_scoring_engine(
self.DUMMY_SCORING_ENGINE)
@ -52,6 +54,7 @@ class TestShowListScoringEngine(base.BaseInfraOptimTest):
scoring_engine['links'][0]['href'])
@decorators.attr(type="smoke")
@decorators.idempotent_id('c9abdd42-82f6-455d-8f15-2a5da11b8067')
def test_list_scoring_engines(self):
_, body = self.client.list_scoring_engines()
self.assertIn(self.DUMMY_SCORING_ENGINE,

3
watcher_tempest_plugin/tests/api/admin/test_service.py
View File

@ -35,6 +35,7 @@ class TestShowListService(base.BaseInfraOptimTest):
expected, actual, keys)
@decorators.attr(type='smoke')
@decorators.idempotent_id('ca1b9164-a5e1-475e-a869-006428a21ade')
def test_show_service(self):
_, body = self.client.list_services()
self.assertIn('services', body)
@ -53,6 +54,7 @@ class TestShowListService(base.BaseInfraOptimTest):
self.assertIn("status", service.keys())
@decorators.attr(type='smoke')
@decorators.idempotent_id('ebaa53f4-c988-4ac7-9271-1f46ea72d1c9')
def test_show_service_with_links(self):
_, body = self.client.list_services()
self.assertIn('services', body)
@ -71,6 +73,7 @@ class TestShowListService(base.BaseInfraOptimTest):
service['links'][0]['href'])
@decorators.attr(type="smoke")
@decorators.idempotent_id('86062518-4a20-4df3-82bb-b06bfe61917a')
def test_list_services(self):
_, body = self.client.list_services()
self.assertIn('services', body)

3
watcher_tempest_plugin/tests/api/admin/test_strategy.py
View File

@ -34,6 +34,7 @@ class TestShowListStrategy(base.BaseInfraOptimTest):
expected, actual, keys)
@decorators.attr(type='smoke')
@decorators.idempotent_id('569b6bc9-4dd9-43ae-be8a-fa9fff5b3e8f')
def test_show_strategy(self):
_, strategy = self.client.show_strategy(self.DUMMY_STRATEGY)
@ -41,6 +42,7 @@ class TestShowListStrategy(base.BaseInfraOptimTest):
self.assertIn("display_name", strategy.keys())
@decorators.attr(type='smoke')
@decorators.idempotent_id('401fe965-c35f-4d0d-8aa2-b7af815fe31a')
def test_show_strategy_with_links(self):
_, strategy = self.client.show_strategy(self.DUMMY_STRATEGY)
self.assertIn('links', strategy.keys())
@ -49,6 +51,7 @@ class TestShowListStrategy(base.BaseInfraOptimTest):
strategy['links'][0]['href'])
@decorators.attr(type="smoke")
@decorators.idempotent_id('cf308bd5-af8d-4112-9962-1d01851c30fd')
def test_list_strategies(self):
_, body = self.client.list_strategies()
self.assertIn('strategies', body)

4
watcher_tempest_plugin/tests/client_functional/v1/test_action.py
View File

@ -18,6 +18,7 @@ from oslo_utils import uuidutils
import functools
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
from watcher_tempest_plugin.tests.client_functional.v1 import base
@ -63,14 +64,17 @@ class ActionTests(base.TestCase):
'audittemplate delete %s' % cls.audit_template_name)
cls.assertOutput('', raw_output)
@decorators.idempotent_id('8f0fde28-eb6f-4beb-b7ad-896d76d09a15')
def test_action_list(self):
raw_output = self.watcher('action list')
self.assert_table_structure([raw_output], self.list_fields)
@decorators.idempotent_id('dbcc709f-b3b4-4803-9a19-73d77058a6d0')
def test_action_detailed_list(self):
raw_output = self.watcher('action list --detail')
self.assert_table_structure([raw_output], self.detailed_list_fields)
@decorators.idempotent_id('03c83cdb-41fd-4893-a056-fd94403827b2')
def test_action_show(self):
action_list = self.parse_show(self.watcher('action list --audit %s'
% self.audit_uuid))

5
watcher_tempest_plugin/tests/client_functional/v1/test_action_plan.py
View File

@ -18,6 +18,7 @@ from oslo_utils import uuidutils
import functools
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
from watcher_tempest_plugin.tests.client_functional.v1 import base
@ -65,14 +66,17 @@ class ActionPlanTests(base.TestCase):
'audittemplate delete %s' % cls.audit_template_name)
cls.assertOutput('', raw_output)
@decorators.idempotent_id('81b64469-dfe1-499e-8d49-614970aea01e')
def test_action_plan_list(self):
raw_output = self.watcher('actionplan list')
self.assert_table_structure([raw_output], self.list_fields)
@decorators.idempotent_id('af257105-17f4-4330-9904-80272b81de41')
def test_action_plan_detailed_list(self):
raw_output = self.watcher('actionplan list --detail')
self.assert_table_structure([raw_output], self.detailed_list_fields)
@decorators.idempotent_id('f487078d-d001-4419-85e3-d68859c9a238')
def test_action_plan_show(self):
action_plan_list = self.parse_show(self.watcher('actionplan list'))
action_plan_uuid = list(action_plan_list[0])[0]
@ -81,6 +85,7 @@ class ActionPlanTests(base.TestCase):
self.assert_table_structure([actionplan],
self.detailed_list_fields)
@decorators.idempotent_id('629767a4-78fe-4abc-9321-6164e6c5e18d')
def test_action_plan_start(self):
output = self.parse_show(self.watcher('actionplan list --audit %s'
% self.audit_uuid))

11
watcher_tempest_plugin/tests/client_functional/v1/test_audit.py
View File

@ -19,6 +19,7 @@ import functools
from oslo_utils import uuidutils
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
from watcher_tempest_plugin.tests.client_functional.v1 import base
@ -60,19 +61,23 @@ class AuditTests(base.TestCase):
cls.watcher('audit delete %s' % cls.audit_uuid)
cls.watcher('audittemplate delete %s' % cls.audit_template_name)
@decorators.idempotent_id('0b3a021c-93f2-4c6f-b758-959602006f8c')
def test_audit_list(self):
raw_output = self.watcher('audit list')
self.assert_table_structure([raw_output], self.list_fields)
@decorators.idempotent_id('0a3af540-2214-44c9-921e-696fcab81b65')
def test_audit_detailed_list(self):
raw_output = self.watcher('audit list --detail')
self.assert_table_structure([raw_output], self.detailed_list_fields)
@decorators.idempotent_id('78d41161-2fa9-4620-857e-9a325ad785fc')
def test_audit_show(self):
audit = self.watcher('audit show ' + self.audit_uuid)
self.assertIn(self.audit_uuid, audit)
self.assert_table_structure([audit], self.detailed_list_fields)
@decorators.idempotent_id('e3a1b6b8-f13f-4a81-9824-377279ebf488')
def test_audit_update(self):
audit_raw_output = self.watcher('audit update %s add interval=2'
% self.audit_uuid)
@ -89,15 +94,18 @@ class AuditTestsV11(AuditTests):
'Created At', 'Updated At', 'Deleted At', 'Parameters', 'Interval',
'Audit Scope', 'Next Run Time', 'Hostname', 'Start Time', 'End Time']
@decorators.idempotent_id('8ff17811-b066-4ed6-ada2-105c9c3d2691')
def test_audit_detailed_list(self):
raw_output = self.watcher('audit list --detail')
self.assert_table_structure([raw_output], self.detailed_list_fields)
@decorators.idempotent_id('6937dc37-3931-4c20-a081-1cbfc45df623')
def test_audit_show(self):
audit = self.watcher('audit show ' + self.audit_uuid)
self.assertIn(self.audit_uuid, audit)
self.assert_table_structure([audit], self.detailed_list_fields)
@decorators.idempotent_id('b811da86-95ce-4654-afef-82aaeb72b6d4')
def test_audit_update(self):
local_time = datetime.now(tz.tzlocal())
local_time_str = local_time.strftime("%Y-%m-%dT%H:%M:%S")
@ -167,12 +175,14 @@ class AuditActiveTests(base.TestCase):
self.watcher('actionplan delete %s' % action_plan_uuid)
self.watcher('audit delete %s' % audit_uuid)
@decorators.idempotent_id('3fabb0e4-dd89-4fa0-9085-36e95074c4f1')
def test_create_oneshot_audit(self):
audit = self.watcher('audit create -a %s' % self.audit_template_name)
audit_uuid = self.parse_show_as_object(audit)['UUID']
self.assert_table_structure([audit], self.detailed_list_fields)
self._delete_audit(audit_uuid)
@decorators.idempotent_id('981a7682-221f-4b8c-b5c6-33d50a6170f2')
def test_delete_oneshot_audit(self):
audit_uuid = self._create_audit()
self.assertTrue(test_utils.call_until_true(
@ -188,6 +198,7 @@ class AuditActiveTests(base.TestCase):
action_plan_uuid = list(output[0])[0]
self.watcher('actionplan delete %s' % action_plan_uuid)
@decorators.idempotent_id('4ad07aab-60c7-47cf-9e28-98a27ab3bca7')
def test_continuous_audit(self):
audit = self.watcher('audit create -a %s -t CONTINUOUS -i 600'
% self.audit_template_name)

7
watcher_tempest_plugin/tests/client_functional/v1/test_audit_template.py
View File

@ -14,6 +14,7 @@
# limitations under the License.
from oslo_utils import uuidutils
from tempest.lib import decorators
from watcher_tempest_plugin.tests.client_functional.v1 import base
@ -37,14 +38,17 @@ class AuditTemplateTests(base.TestCase):
def tearDownClass(cls):
cls.watcher('audittemplate delete %s' % cls.audit_template_name)
@decorators.idempotent_id('b5065a27-9757-4d65-8e9c-9c6f3677eb10')
def test_audit_template_list(self):
raw_output = self.watcher('audittemplate list')
self.assert_table_structure([raw_output], self.list_fields)
@decorators.idempotent_id('a26146b4-86fd-42ff-8af5-23567a8570e5')
def test_audit_template_detailed_list(self):
raw_output = self.watcher('audittemplate list --detail')
self.assert_table_structure([raw_output], self.detailed_list_fields)
@decorators.idempotent_id('fa8a1e4b-e5b5-4643-b298-99f80e909dc3')
def test_audit_template_show(self):
audit_template = self.watcher(
'audittemplate show %s' % self.audit_template_name)
@ -52,6 +56,7 @@ class AuditTemplateTests(base.TestCase):
self.assert_table_structure([audit_template],
self.detailed_list_fields)
@decorators.idempotent_id('b632e1f5-4ab6-4338-91b3-abf4d257fa28')
def test_audit_template_update(self):
raw_output = self.watcher('audittemplate update %s replace '
'description="Updated Desc"'
@ -75,6 +80,7 @@ class AuditTemplateActiveTests(base.TestCase):
def _delete_audit_template(self):
self.watcher('audittemplate delete %s' % self.audit_template_name)
@decorators.idempotent_id('8c88f312-0e27-44c5-bd9b-c171086bfc55')
def test_create_audit_template(self):
raw_output = self.watcher('audittemplate create %s dummy '
'-s dummy -d "Test Audit Template"'
@ -82,6 +88,7 @@ class AuditTemplateActiveTests(base.TestCase):
self.assert_table_structure([raw_output], self.detailed_list_fields)
self._delete_audit_template()
@decorators.idempotent_id('c1980ccc-8194-4b18-bcdc-964395de3cf9')
def test_delete_audit_template(self):
self._create_audit_template()
raw_output = self.watcher('audittemplate delete %s'

5
watcher_tempest_plugin/tests/client_functional/v1/test_goal.py
View File

@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from tempest.lib import decorators
from watcher_tempest_plugin.tests.client_functional.v1 import base
@ -22,17 +24,20 @@ class GoalTests(base.TestCase):
dummy_name = 'dummy'
list_fields = ['UUID', 'Name', 'Display name']
@decorators.idempotent_id('53046516-5ddb-41b7-ab43-0dac13f964b1')
def test_goal_list(self):
raw_output = self.watcher('goal list')
self.assertIn(self.dummy_name, raw_output)
self.assert_table_structure([raw_output], self.list_fields)
@decorators.idempotent_id('cb88a7fd-c19f-47fd-96e0-51cff152f77f')
def test_goal_detailed_list(self):
raw_output = self.watcher('goal list --detail')
self.assertIn(self.dummy_name, raw_output)
self.assert_table_structure(
[raw_output], self.list_fields + ['Efficacy specification'])
@decorators.idempotent_id('98645ffb-2450-43ce-ad8c-c616720f0471')
def test_goal_show(self):
raw_output = self.watcher('goal show %s' % self.dummy_name)
self.assertIn(self.dummy_name, raw_output)

5
watcher_tempest_plugin/tests/client_functional/v1/test_scoring_engine.py
View File

@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from tempest.lib import decorators
from watcher_tempest_plugin.tests.client_functional.v1 import base
@ -23,16 +25,19 @@ class ScoringEngineTests(base.TestCase):
list_fields = ['UUID', 'Name', 'Description']
detailed_list_fields = list_fields + ['Metainfo']
@decorators.idempotent_id('87b34f07-df9a-49c9-a229-4aba831368b1')
def test_scoringengine_list(self):
raw_output = self.watcher('scoringengine list')
self.assertIn(self.dummy_name, raw_output)
self.assert_table_structure([raw_output], self.list_fields)
@decorators.idempotent_id('ab987528-f56e-49ef-8463-0f4c023aaf48')
def test_scoringengine_detailed_list(self):
raw_output = self.watcher('scoringengine list --detail')
self.assertIn(self.dummy_name, raw_output)
self.assert_table_structure([raw_output], self.detailed_list_fields)
@decorators.idempotent_id('f12b0cb7-808b-4ced-bb69-f18d6ab6ef0f')
def test_scoringengine_show(self):
raw_output = self.watcher('scoringengine show %s' % self.dummy_name)
self.assertIn(self.dummy_name, raw_output)

5
watcher_tempest_plugin/tests/client_functional/v1/test_service.py
View File

@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from tempest.lib import decorators
from watcher_tempest_plugin.tests.client_functional.v1 import base
@ -23,12 +25,14 @@ class ServiceTests(base.TestCase):
applier_name = 'watcher-applier'
list_fields = ['ID', 'Name', 'Host', 'Status']
@decorators.idempotent_id('901af2d0-2a18-45b5-bd07-31d221f19259')
def test_service_list(self):
raw_output = self.watcher('service list')
self.assertIn(self.decision_engine_name, raw_output)
self.assertIn(self.applier_name, raw_output)
self.assert_table_structure([raw_output], self.list_fields)
@decorators.idempotent_id('86b6826b-58ee-4338-a294-e0e24e060ef1')
def test_service_detailed_list(self):
raw_output = self.watcher('service list --detail')
self.assertIn(self.decision_engine_name, raw_output)
@ -36,6 +40,7 @@ class ServiceTests(base.TestCase):
self.assert_table_structure([raw_output],
self.list_fields + ['Last seen up'])
@decorators.idempotent_id('d3b0dc69-290b-4b2d-aaf6-c2768420e125')
def test_service_show(self):
# TODO(alexchadin): this method should be refactored since Watcher will
# get HA support soon.

6
watcher_tempest_plugin/tests/client_functional/v1/test_strategy.py
View File

@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from tempest.lib import decorators
from watcher_tempest_plugin.tests.client_functional.v1 import base
@ -24,17 +26,20 @@ class StrategyTests(base.TestCase):
list_fields = ['UUID', 'Name', 'Display name', 'Goal']
state_fields = ['Datasource', 'Metrics', 'CDM', 'Name']
@decorators.idempotent_id('3ed8bc49-2bd5-4a2b-a407-7b0742ccb935')
def test_strategy_list(self):
raw_output = self.watcher('strategy list')
self.assertIn(self.dummy_name, raw_output)
self.assert_table_structure([raw_output], self.list_fields)
@decorators.idempotent_id('88f9ee68-6cef-4536-b075-259ee28218e0')
def test_strategy_detailed_list(self):
raw_output = self.watcher('strategy list --detail')
self.assertIn(self.dummy_name, raw_output)
self.assert_table_structure([raw_output],
self.list_fields + ['Parameters spec'])
@decorators.idempotent_id('374092aa-3222-4416-9811-7e78529bb1fe')
def test_strategy_show(self):
raw_output = self.watcher('strategy show %s' % self.dummy_name)
self.assertIn(self.dummy_name, raw_output)
@ -42,6 +47,7 @@ class StrategyTests(base.TestCase):
self.list_fields + ['Parameters spec'])
self.assertNotIn('basic', raw_output)
@decorators.idempotent_id('0553c5c1-8776-4a11-b1a2-262b08a1f8ee')
def test_strategy_state(self):
raw_output = self.watcher('strategy state %s' % self.basic_strategy)
self.assertIn(self.basic_strategy, raw_output)

2
watcher_tempest_plugin/tests/scenario/test_execute_actuator.py
View File

@ -20,6 +20,7 @@ import functools
from tempest import config
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
from watcher_tempest_plugin.tests.scenario import base
@ -200,6 +201,7 @@ class TestExecuteActionsViaActuator(base.BaseInfraOptimScenarioTest):
self.assertEqual(expected_action_counter, action_counter)
@decorators.idempotent_id('0af1a181-38c8-4416-8e85-8ebca8ac1cf8')
def test_execute_scenarios(self):
self.addCleanup(self.rollback_compute_nodes_status)

2
watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py
View File

@ -19,6 +19,7 @@ import functools
from tempest import config
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
from watcher_tempest_plugin.tests.scenario import base
@ -54,6 +55,7 @@ class TestExecuteBasicStrategy(base.BaseInfraOptimScenarioTest):
"Less than 2 compute nodes are enabled, "
"skipping multinode tests.")
@decorators.idempotent_id('e6fd7f87-abef-4ef3-8b52-134e22aac2ee')
def test_execute_basic_action_plan(self):
"""Execute an action plan based on the BASIC strategy

2
watcher_tempest_plugin/tests/scenario/test_execute_dummy_optim.py
View File

@ -19,6 +19,7 @@ import collections
import functools
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
from watcher_tempest_plugin.tests.scenario import base
@ -26,6 +27,7 @@ from watcher_tempest_plugin.tests.scenario import base
class TestExecuteDummyStrategy(base.BaseInfraOptimScenarioTest):
"""Tests for action plans"""
@decorators.idempotent_id('77884962-8739-422f-8471-6c9227e8481f')
def test_execute_dummy_action_plan(self):
"""Execute an action plan based on the 'dummy' strategy

2
watcher_tempest_plugin/tests/scenario/test_execute_host_maintenance.py
View File

@ -19,6 +19,7 @@ import functools
from oslo_log import log
from tempest import config
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
from watcher_tempest_plugin.tests.scenario import base
@ -55,6 +56,7 @@ class TestExecuteHostMaintenanceStrategy(base.BaseInfraOptimScenarioTest):
"Less than 2 compute nodes are enabled, "
"skipping multinode tests.")
@decorators.idempotent_id('a9b4abb1-c8fc-410c-86b5-96a7c4150104')
def test_execute_host_maintenance(self):
"""Execute an action plan using the host_maintenance strategy"""
# This test does not require metrics injection

2
watcher_tempest_plugin/tests/scenario/test_execute_storage_balance.py
View File

@ -19,6 +19,7 @@ import functools
from oslo_log import log
from tempest import config
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
from watcher_tempest_plugin.tests.scenario import base
@ -46,6 +47,7 @@ class TestExecuteStorageCapacityBalanceStrategy(
raise cls.skipException("Requires at least two different "
"backend names")
@decorators.idempotent_id('08d96b1f-6186-4e45-8d3d-61e20b700150')
def test_execute_storage_capacity_balance(self):
"""Execute the storage capacity balance strategy"""
self.create_volume(imageRef=CONF.compute.image_ref, size=3)

10
watcher_tempest_plugin/tests/scenario/test_execute_strategies.py
View File

@ -16,6 +16,7 @@
# limitations under the License.
from tempest import config
from tempest.lib import decorators
from watcher_tempest_plugin.tests.scenario import base
@ -47,6 +48,7 @@ class TestExecuteStrategies(base.BaseInfraOptimScenarioTest):
"Less than 2 compute nodes are enabled, "
"skipping multinode tests.")
@decorators.idempotent_id('62766a61-dfc4-478c-b80b-86d871227e67')
def test_execute_basic_strategy(self):
# This test does not require metrics injection
INJECT_METRICS = False
@ -72,6 +74,7 @@ class TestExecuteStrategies(base.BaseInfraOptimScenarioTest):
self.execute_strategy(goal_name, strategy_name, **audit_kwargs)
@decorators.idempotent_id('a660e484-da76-478c-b18c-2eff243dde48')
def test_execute_dummy_strategy(self):
goal_name = "dummy"
strategy_name = "dummy"
@ -81,6 +84,7 @@ class TestExecuteStrategies(base.BaseInfraOptimScenarioTest):
expected_actions=['sleep', 'nop'],
**audit_kwargs)
@decorators.idempotent_id('17afd352-1929-46dd-a10a-63c90bb9255d')
def test_execute_host_maintenance_strategy(self):
# This test does not require metrics injection
INJECT_METRICS = False
@ -103,6 +107,7 @@ class TestExecuteStrategies(base.BaseInfraOptimScenarioTest):
self.execute_strategy(goal_name, strategy_name, **audit_kwargs)
@decorators.idempotent_id('7e3a9195-acc5-40cf-96da-a0a2883294d3')
def test_execute_storage_capacity_balance_strategy(self):
self.addCleanup(self.rollback_compute_nodes_status)
self.create_volume(imageRef=CONF.compute.image_ref, size=3)
@ -117,6 +122,7 @@ class TestExecuteStrategies(base.BaseInfraOptimScenarioTest):
self.execute_strategy(goal_name, strategy_name, **audit_kwargs)
@decorators.idempotent_id('9f3ee978-e033-4c1e-bbf2-9e5a5cb8a365')
def test_execute_vm_workload_consolidation_strategy(self):
# This test requires metrics injection
INJECT_METRICS = True
@ -145,6 +151,7 @@ class TestExecuteStrategies(base.BaseInfraOptimScenarioTest):
self.execute_strategy(goal_name, strategy_name, **audit_kwargs)
@decorators.idempotent_id('14360d59-4923-49f7-bfe5-31d6a819b6f7')
def test_execute_workload_stabilization_strategy(self):
# This test requires metrics injection
INJECT_METRICS = True
@ -175,6 +182,7 @@ class TestExecuteStrategies(base.BaseInfraOptimScenarioTest):
self.execute_strategy(goal_name, strategy_name,
expected_actions=['migrate'], **audit_kwargs)
@decorators.idempotent_id('2119b69f-1cbd-4874-a82e-fceec093ebbb')
def test_execute_zone_migration_live_migration_strategy(self):
# This test requires metrics injection
INJECT_METRICS = True
@ -202,6 +210,7 @@ class TestExecuteStrategies(base.BaseInfraOptimScenarioTest):
self.execute_strategy(goal_name, strategy_name, **audit_kwargs)
@decorators.idempotent_id('c0c061e9-4713-4a23-a6e1-5db794add685')
def test_execute_node_resource_consolidation_strategy_with_auto(self):
# This test does not require metrics injection
INJECT_METRICS = False
@ -223,6 +232,7 @@ class TestExecuteStrategies(base.BaseInfraOptimScenarioTest):
self.execute_strategy(goal_name, strategy_name, **audit_kwargs)
@decorators.idempotent_id('12312f2b-ff7a-4722-9aa3-0262608e1ef0')
def test_execute_node_resource_consolidation_strategy_with_specify(self):
# This test does not require metrics injection
INJECT_METRICS = False

1
watcher_tempest_plugin/tests/scenario/test_execute_strategies_real.py
View File

@ -56,6 +56,7 @@ class TestRealExecuteStrategies(base.BaseInfraOptimScenarioTest):
"skipping multinode tests.")
@decorators.attr(type=['slow', 'real_load'])
@decorators.idempotent_id('95c7f20b-cd6e-4763-b1be-9a6ac7b5331c')
def test_workload_stabilization_strategy(self):
# This test does not require metrics injection
INJECT_METRICS = False

2
watcher_tempest_plugin/tests/scenario/test_execute_vm_workload_consolidation.py
View File

@ -19,6 +19,7 @@ import functools
from tempest import config
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
from watcher_tempest_plugin.tests.scenario import base
@ -54,6 +55,7 @@ class TestExecuteVmWorkloadBalanceStrategy(base.BaseInfraOptimScenarioTest):
"Less than 2 compute nodes are enabled, "
"skipping multinode tests.")
@decorators.idempotent_id('4b1830f6-846a-497f-b44c-636c2cac0df8')
def test_execute_vm_workload_consolidation_action_plan(self):
"""Execute an action plan of vm_workload_consolidation strategy

2
watcher_tempest_plugin/tests/scenario/test_execute_workload_balancing.py
View File

@ -20,6 +20,7 @@ import functools
from oslo_log import log
from tempest import config
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
from watcher_tempest_plugin.tests.scenario import base
@ -56,6 +57,7 @@ class TestExecuteWorkloadBalancingStrategy(base.BaseInfraOptimScenarioTest):
"Less than 2 compute nodes are enabled, "
"skipping multinode tests.")
@decorators.idempotent_id('3bb80932-9caa-4c30-8dfd-7d6f429d8784')
def test_execute_workload_stabilization(self):
# This test requires metrics injection

2
watcher_tempest_plugin/tests/scenario/test_execute_zone_migration.py
View File

@ -16,6 +16,7 @@ import functools
from oslo_log import log
from tempest import config
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
from watcher_tempest_plugin.tests.scenario import base
@ -54,6 +55,7 @@ class TestExecuteZoneMigrationStrategy(base.BaseInfraOptimScenarioTest):
"Less than 2 compute nodes are enabled, "
"skipping multinode tests.")
@decorators.idempotent_id('ebc05585-0b7c-4cb4-b9ee-43758780e70e')
def test_execute_zone_migration_live_migration(self):
"""Execute an action plan using the zone migration strategy"""
self.addCleanup(self.rollback_compute_nodes_status)