diff --git a/vitrage_tempest_plugin/tests/api/alarms/test_alarms.py b/vitrage_tempest_plugin/tests/api/alarms/test_alarms.py index e08e4bb..75758e8 100644 --- a/vitrage_tempest_plugin/tests/api/alarms/test_alarms.py +++ b/vitrage_tempest_plugin/tests/api/alarms/test_alarms.py @@ -19,15 +19,8 @@ from testtools import matchers from vitrage_tempest_plugin.tests.api.alarms.base import BaseAlarmsTest from vitrage_tempest_plugin.tests.base import IsNotEmpty -from vitrage_tempest_plugin.tests.common import aodh_utils -from vitrage_tempest_plugin.tests.common.constants import AODH_DATASOURCE from vitrage_tempest_plugin.tests.common import general_utils as g_utils -from vitrage_tempest_plugin.tests.common import nova_utils -from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients from vitrage_tempest_plugin.tests.common import vitrage_utils as v_utils -from vitrage_tempest_plugin.tests import utils - -import unittest LOG = logging.getLogger(__name__) @@ -40,38 +33,12 @@ class TestAlarms(BaseAlarmsTest): super(TestAlarms, cls).setUpClass() cls._template = v_utils.add_template('nagios_alarm_for_alarms.yaml') + # noinspection PyPep8Naming @classmethod def tearDownClass(cls): if cls._template is not None: v_utils.delete_template(cls._template['uuid']) - @unittest.skip("CLI tests are ineffective and not maintained") - @utils.tempest_logger - def test_compare_cli_vs_api_alarms(self): - """Wrapper that returns a test graph.""" - try: - instances = nova_utils.create_instances(num_instances=1, - set_public_network=True) - self.assertThat(instances, IsNotEmpty(), - 'The instances list is empty') - aodh_utils.create_aodh_alarm( - resource_id=instances[0].id, - name='tempest_aodh_test') - - api_alarms = TempestClients.vitrage().alarm.list(vitrage_id='all', - all_tenants=True) - cli_alarms = utils.run_vitrage_command( - 'vitrage alarm list', self.conf) - self._compare_alarms_lists( - api_alarms, cli_alarms, AODH_DATASOURCE, - instances[0].id) - except Exception as e: - self._handle_exception(e) - raise - finally: - aodh_utils.delete_all_aodh_alarms() - nova_utils.delete_all_instances() - def _compare_alarms_lists(self, api_alarms, cli_alarms, resource_type, resource_id): """Validate alarm existence """ diff --git a/vitrage_tempest_plugin/tests/api/rca/test_rca.py b/vitrage_tempest_plugin/tests/api/rca/test_rca.py index 361c08c..723ddfc 100644 --- a/vitrage_tempest_plugin/tests/api/rca/test_rca.py +++ b/vitrage_tempest_plugin/tests/api/rca/test_rca.py @@ -16,16 +16,10 @@ from oslo_log import log as logging from vitrage_tempest_plugin.tests.api.rca.base import BaseRcaTest from vitrage_tempest_plugin.tests.api.rca.base import RCA_ALARM_NAME -from vitrage_tempest_plugin.tests.base import IsNotEmpty -from vitrage_tempest_plugin.tests.common.constants import VertexProperties \ - as VProps from vitrage_tempest_plugin.tests.common import nova_utils -from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients from vitrage_tempest_plugin.tests.common import vitrage_utils as v_utils from vitrage_tempest_plugin.tests import utils -import unittest - LOG = logging.getLogger(__name__) @@ -37,71 +31,12 @@ class TestRca(BaseRcaTest): super(TestRca, cls).setUpClass() cls._template = v_utils.add_template('host_aodh_alarm_for_rca.yaml') + # noinspection PyPep8Naming @classmethod def tearDownClass(cls): if cls._template is not None: v_utils.delete_template(cls._template['uuid']) - @unittest.skip("CLI tests are ineffective and not maintained") - @utils.tempest_logger - def test_compare_cli_and_api(self): - """compare_cli_and_api test - - There test validate correctness of rca of created - aodh event alarms, and equals them with cli rca - """ - try: - instances = nova_utils.create_instances(num_instances=1, - set_public_network=True) - self.assertThat(instances, IsNotEmpty(), - 'Failed to create instance') - - instance_alarm = self._create_alarm( - resource_id=instances[0].id, - alarm_name='instance_rca_alarm', unic=True) - - vitrage_id = instance_alarm.get(VProps.VITRAGE_ID) - api_rca = self.vitrage_client.rca.get(alarm_id=vitrage_id) - cli_rca = utils.run_vitrage_command( - 'vitrage rca show ' + vitrage_id, self.conf) - - self._compare_rca(api_rca, cli_rca) - except Exception as e: - self._handle_exception(e) - raise - finally: - self._clean_all() - - @unittest.skip("skipping test - test not working") - @utils.tempest_logger - # TODO(nivo): check why creation of alarm doesnt return the alarm - def test_validate_rca(self): - """validate_rca test - - There tests validates correctness of rca of created aodh - event alarm and correctness of relationship between host alarm - to instance alarms (created by special template file), - source alarm - aodh alarm on host - target alarms - 2 instance alarms (caused 2 created instance) - """ - try: - nova_utils.create_instances(num_instances=2, - set_public_network=True) - host_alarm = self._create_alarm( - resource_id=self._get_hostname(), - alarm_name=RCA_ALARM_NAME) - api_rca = self.vitrage_client.rca.get( - alarm_id=host_alarm.get(VProps.VITRAGE_ID), all_tenants=True) - - self._validate_rca(rca=api_rca['nodes']) - self._validate_relationship(links=api_rca['links'], - alarms=api_rca['nodes']) - except Exception as e: - self._handle_exception(e) - raise - finally: - self._clean_all() - @utils.tempest_logger def test_validate_deduce_alarms(self): """validate_deduce_alarms test @@ -151,31 +86,3 @@ class TestRca(BaseRcaTest): raise finally: self._clean_all() - - @unittest.skip("aodh notifier is not supported") - @utils.tempest_logger - def test_validate_notifier(self): - """validate_notifier test - - There tests validates work of aodh alarm notifier - - all created vitrage alarms appears in ceilometer - alarms-list. - IMPORTANT: enable notifiers=aodh in vitrage.conf file - """ - try: - nova_utils.create_instances(num_instances=2, - set_public_network=True) - self._create_alarm( - resource_id=self._get_hostname(), - alarm_name=RCA_ALARM_NAME) - vitrage_alarms = TempestClients.vitrage().alarm.list( - vitrage_id='all', all_tenants=True) - aodh_alarms = TempestClients.aodh().alarm.list() - - self._validate_notifier(alarms=aodh_alarms, - vitrage_alarms=vitrage_alarms) - except Exception as e: - self._handle_exception(e) - raise - finally: - self._clean_all() diff --git a/vitrage_tempest_plugin/tests/api/resources/test_resources.py b/vitrage_tempest_plugin/tests/api/resources/test_resources.py index 5dcd857..04ac55e 100644 --- a/vitrage_tempest_plugin/tests/api/resources/test_resources.py +++ b/vitrage_tempest_plugin/tests/api/resources/test_resources.py @@ -16,7 +16,6 @@ import json from oslo_log import log as logging from testtools import matchers -import unittest from vitrage_tempest_plugin.tests.base import BaseVitrageTempest from vitrage_tempest_plugin.tests.base import IsEmpty @@ -49,6 +48,7 @@ class TestResource(BaseVitrageTempest): cls.instances = nova_utils.create_instances(num_instances=1, set_public_network=True) + # noinspection PyPep8Naming @classmethod def tearDownClass(cls): super(TestResource, cls).tearDownClass() @@ -187,21 +187,6 @@ class TestResource(BaseVitrageTempest): self._handle_exception(e) raise - @unittest.skip("CLI tests are ineffective and not maintained") - def test_compare_resource_show(self): - """resource_show test""" - resource_list = self.vitrage_client.resource.list(all_tenants=False) - self.self.assertThat(resource_list, IsNotEmpty()) - for resource in resource_list: - api_resource_show = \ - self.vitrage_client.resource.get(resource[VProps.VITRAGE_ID]) - cli_resource_show = utils.run_vitrage_command( - 'vitrage resource show ' + resource[VProps.VITRAGE_ID], - self.conf) - - self._compare_resource_show( - api_resource_show, cli_resource_show) - def test_resource_show_with_no_existing_resource(self): """resource_show test no existing resource""" try: diff --git a/vitrage_tempest_plugin/tests/api/topology/test_topology.py b/vitrage_tempest_plugin/tests/api/topology/test_topology.py index bf8978e..972fbde 100644 --- a/vitrage_tempest_plugin/tests/api/topology/test_topology.py +++ b/vitrage_tempest_plugin/tests/api/topology/test_topology.py @@ -23,9 +23,6 @@ from vitrage_tempest_plugin.tests.common.constants import VertexProperties as \ import vitrage_tempest_plugin.tests.utils as utils from vitrageclient.exceptions import ClientException -import unittest - - LOG = logging.getLogger(__name__) NOVA_QUERY = '{"and": [{"==": {"vitrage_category": "RESOURCE"}},' \ '{"==": {"vitrage_is_deleted": false}},' \ @@ -318,75 +315,6 @@ class TestTopology(BaseTopologyTest): finally: self._rollback_to_default() - @unittest.skip("skipping test - not working") - @utils.tempest_logger - def test_graph_with_root_and_depth_exclude_instance(self): - """tree_with_query - - This test validate correctness of topology graph - with root and depth exclude instance - """ - try: - # Action - self._create_entities(num_instances=self.NUM_INSTANCE) - - # Calculate expected results - api_graph = self.vitrage_client.topology.get( - limit=2, - root=self._get_root_vertex_id(), - all_tenants=True) - graph = self._create_graph_from_graph_dictionary(api_graph) - entities = self._entities_validation_data( - host_entities=1, host_edges=1) - - # Test Assertions - self._validate_graph_correctness(graph, - self.num_default_entities, - self.num_default_edges, - entities) - except Exception as e: - self._handle_exception(e) - raise - finally: - self._rollback_to_default() - - @unittest.skip("skipping test - not working") - @utils.tempest_logger - def test_graph_with_root_and_depth_include_instance(self): - """graph_with_root_and_depth_include_instance - - This test validate correctness of topology graph - with root and depth include instance - """ - try: - # Action - self._create_entities(num_instances=self.NUM_INSTANCE) - - # Calculate expected results - api_graph = self.vitrage_client.topology.get( - limit=3, - root=self._get_root_vertex_id(), - all_tenants=True) - graph = self._create_graph_from_graph_dictionary(api_graph) - entities = self._entities_validation_data( - host_entities=1, - host_edges=self.NUM_INSTANCE + 1, - instance_entities=self.NUM_INSTANCE, - instance_edges=self.NUM_INSTANCE) - num_entities = self.num_default_entities + self.NUM_INSTANCE - num_edges = self.num_default_edges + self.NUM_INSTANCE - - # Test Assertions - self._validate_graph_correctness(graph, - num_entities, - num_edges, - entities) - except Exception as e: - self._handle_exception(e) - raise - finally: - self._rollback_to_default() - @utils.tempest_logger def test_graph_with_depth_and_no_root(self): """graph_with_depth_and_no_root