openstack/vitrage-tempest-plugin
Code Issues Proposed changes

some cleaning

Browse Source 
* remove unused methods
* use testools assert exceptions
* use tearDown where possible
* redundant str()

Change-Id: I18af00599461ead7bf9084168aeed7321adfd4c0
This commit is contained in:
Eyal 2019-02-26 10:09:19 +02:00
parent 8f4de82480
commit 83efcb9e52
26 changed files with 331 additions and 590 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
vitrage_tempest_plugin/tests/api/alarms/__init__.py
View File

28
vitrage_tempest_plugin/tests/api/alarms/base.py
View File

@ -1,28 +0,0 @@
# Copyright 2016 Nokia
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from vitrage_tempest_plugin.tests.base import BaseVitrageTempest
from vitrage_tempest_plugin.tests.common.constants import AodhProperties
from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients
class BaseAlarmsTest(BaseVitrageTempest):
"""Topology test class for Vitrage API tests."""
def _check_num_alarms(self, num_alarms=0, state=''):
if len(TempestClients.aodh().alarm.list()) != num_alarms:
return False
return all(alarm[AodhProperties.STATE].upper() == state.upper()
for alarm in TempestClients.aodh().alarm.list())

66
vitrage_tempest_plugin/tests/api/alarms/test_alarms.py
View File

@ -1,66 +0,0 @@
# Copyright 2016 Nokia
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import json
from oslo_log import log as logging
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 general_utils as g_utils
from vitrage_tempest_plugin.tests.common import vitrage_utils as v_utils
LOG = logging.getLogger(__name__)
class TestAlarms(BaseAlarmsTest):
"""Alarms test class for Vitrage API tests."""
@classmethod
def setUpClass(cls):
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'])
def _compare_alarms_lists(self, api_alarms, cli_alarms,
resource_type, resource_id):
"""Validate alarm existence """
self.assertThat(api_alarms, IsNotEmpty(),
'The alarms list taken from api is empty')
self.assertThat(cli_alarms, IsNotEmpty(),
'The alarms list taken from cli is empty')
LOG.info("The alarms list taken from cli is : " +
str(cli_alarms))
LOG.info("The alarms list taken by api is : " +
str(json.dumps(api_alarms)))
cli_items = cli_alarms.splitlines()
api_by_type = g_utils.all_matches(
api_alarms, vitrage_type=resource_type)
cli_by_type = cli_alarms.count(' ' + resource_type + ' ')
api_by_id = g_utils.all_matches(api_alarms, resource_id=resource_id)
cli_by_id = cli_alarms.count(resource_id)
self.assertEqual(len(cli_items), len(api_alarms) + 4)
self.assertThat(api_by_type, matchers.HasLength(cli_by_type))
self.assertThat(api_by_id, matchers.HasLength(cli_by_id))

49
vitrage_tempest_plugin/tests/api/rca/base.py
View File

@ -17,12 +17,10 @@ import json
from oslo_log import log as logging
from testtools import matchers
from vitrage_tempest_plugin.tests.api.alarms.base import BaseAlarmsTest
from vitrage_tempest_plugin.tests.base import BaseVitrageTempest
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.constants import EdgeLabel
from vitrage_tempest_plugin.tests.common.constants import EdgeProperties
from vitrage_tempest_plugin.tests.common.constants import NOVA_HOST_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import \
NOVA_INSTANCE_DATASOURCE
@ -42,7 +40,7 @@ RCA_ALARM_NAME = 'rca_test_host_alarm'
VITRAGE_ALARM_NAME = 'instance_deduce'
class BaseRcaTest(BaseAlarmsTest):
class BaseRcaTest(BaseVitrageTempest):
@staticmethod
def _clean_all():
@ -132,24 +130,6 @@ class BaseRcaTest(BaseAlarmsTest):
self.assertThat(deduce_alarms_2, matchers.HasLength(1),
"Deduced alarm not found")
def _validate_relationship(self, links, alarms):
self.assertThat(links, IsNotEmpty(), 'The links list is empty')
self.assertThat(alarms, IsNotEmpty(), 'The alarms list is empty')
flag = True
for item in links:
source_alarm_name = alarms[item['source']].get(VProps.NAME)
target_alarm_name = alarms[item['target']].get(VProps.NAME)
relationship_type = item.get(EdgeProperties.RELATIONSHIP_TYPE)
if (item.get('key') != EdgeLabel.CAUSES or
relationship_type != EdgeLabel.CAUSES or
source_alarm_name != RCA_ALARM_NAME or
target_alarm_name != VITRAGE_ALARM_NAME):
flag = False
self.assertThat(alarms, matchers.HasLength(3))
self.assertTrue(flag)
def _validate_set_state(self, topology, instances):
self.assertThat(topology, IsNotEmpty(), 'The topology graph is empty')
host = g_utils.all_matches(
@ -177,29 +157,8 @@ class BaseRcaTest(BaseAlarmsTest):
self.assertThat(vm1, matchers.HasLength(1))
self.assertThat(vm2, matchers.HasLength(1))
def _validate_notifier(self, alarms, vitrage_alarms):
self.assertThat(alarms, IsNotEmpty(), 'The aodh alarms list is empty')
self.assertThat(vitrage_alarms, IsNotEmpty(),
'The vitrage alarms list is empty')
validation = 0
for itemC in alarms:
vitrage_id = filter(
lambda item: item['field'] == VProps.VITRAGE_ID,
itemC.event_rule['query'])
for itemV in vitrage_alarms:
if not vitrage_id:
if itemC.name == itemV[VProps.NAME]:
validation += 1
break
elif vitrage_id[0]['value'] == itemV[VProps.VITRAGE_ID]:
validation += 1
break
self.assertThat(vitrage_alarms, matchers.HasLength(validation))
self.assertThat(alarms, matchers.HasLength(3))
def _get_hostname(self):
@staticmethod
def _get_hostname():
host = vitrage_utils.get_first_host()
return host.get(VProps.ID)

13
vitrage_tempest_plugin/tests/api/rca/test_rca.py
View File

@ -26,6 +26,10 @@ LOG = logging.getLogger(__name__)
class TestRca(BaseRcaTest):
"""RCA test class for Vitrage API tests."""
def tearDown(self):
super(TestRca, self).tearDown()
self._clean_all()
@classmethod
def setUpClass(cls):
super(TestRca, cls).setUpClass()
@ -45,7 +49,6 @@ class TestRca(BaseRcaTest):
(created by special template file), and equals there
resource_id with created instances id
"""
try:
instances = nova_utils.create_instances(num_instances=2,
set_public_network=True)
self._create_alarm(
@ -56,8 +59,6 @@ class TestRca(BaseRcaTest):
self._validate_deduce_alarms(alarms=api_alarms,
instances=instances)
finally:
self._clean_all()
@utils.tempest_logger
def test_validate_set_state(self):
@ -68,7 +69,6 @@ class TestRca(BaseRcaTest):
source state - ERROR
target state - SUBOPTIMAL (caused 2 created instance)
"""
try:
instances = nova_utils.create_instances(num_instances=2,
set_public_network=True)
self._create_alarm(
@ -78,8 +78,3 @@ class TestRca(BaseRcaTest):
self._validate_set_state(topology=topology['nodes'],
instances=instances)
except Exception as e:
self._handle_exception(e)
raise
finally:
self._clean_all()

11
vitrage_tempest_plugin/tests/api/resources/test_resources.py
View File

@ -200,14 +200,3 @@ class TestResource(BaseVitrageTempest):
self.assertEqual(
cli_resource.get("State").lower(),
api_resource.get(VProps.VITRAGE_OPERATIONAL_STATE).lower())
def _compare_resource_show(self, api_resource_show,
cli_resource_show):
self.assertIsNotNone(api_resource_show,
'The resource show taken from rest api is empty')
self.assertIsNotNone(cli_resource_show,
'The resource show taken from terminal is empty')
for item in self.properties:
self.assertEqual(api_resource_show.get(item),
cli_resource_show.get(item))

55
vitrage_tempest_plugin/tests/api/templates/base.py
View File

@ -39,6 +39,15 @@ class BaseTemplateTest(BaseVitrageTempest):
VALIDATION_OK = 'validation OK'
OK_MSG = 'Template validation is OK'
def tearDown(self):
super(BaseTemplateTest, self).tearDown()
self._delete_templates()
def _delete_templates(self):
templates = self.vitrage_client.template.list()
template_ids = [template['uuid'] for template in templates]
self.vitrage_client.template.delete(template_ids)
def _compare_template_lists(self, api_templates, cli_templates):
self.assertThat(api_templates, IsNotEmpty(),
'The template list taken from api is empty')
@ -54,22 +63,6 @@ class BaseTemplateTest(BaseVitrageTempest):
self._validate_passed_templates_length(api_templates, cli_templates)
self._compare_each_template_in_list(api_templates, cli_templates)
def _compare_template_validations(self, api_templates, cli_templates):
self.assertThat(api_templates, IsNotEmpty(),
'The template validations taken from api is empty')
self.assertIsNotNone(
cli_templates, 'The template validations taken from cli is empty')
LOG.info("The template validations taken from cli is : " +
str(cli_templates))
LOG.info("The template validations taken by api is : " +
str(json.dumps(api_templates)))
parsed_topology = json.loads(cli_templates)
sorted_cli_templates = sorted(parsed_topology.items())
sorted_api_templates = sorted(api_templates.items())
self.assert_list_equal(sorted_api_templates, sorted_cli_templates)
def _validate_templates_list_length(self, api_templates, cli_templates):
self.assertEqual(len(cli_templates.splitlines()),
len(api_templates) + 4)
@ -93,16 +86,6 @@ class BaseTemplateTest(BaseVitrageTempest):
break
self.assertThat(api_templates, matchers.HasLength(counter))
def _run_default_template_validation(
self, template, validation, path):
self.assertThat(validation, IsNotEmpty(),
'The template validation is empty')
self.assertEqual(path, validation['file path'])
self.assertEqual(0, validation['status code'])
self.assertEqual(self.VALIDATION_OK, validation['status'])
self.assertEqual(self.OK_MSG, validation['message'])
self.assertEqual(validation['message'], template['status details'])
def _assert_validate_result(self, validation, path, negative=False,
status_code=0):
self.assertThat(validation['results'], matchers.HasLength(1))
@ -110,14 +93,14 @@ class BaseTemplateTest(BaseVitrageTempest):
self.assertIn(path, result['file path'])
if negative:
self.assertEqual(status_code, result['status code'])
self.assertEqual(self.VALIDATION_FAILED, result['status'])
self.assertNotEqual(result['message'], self.OK_MSG)
self.assertEqual(status_code, result['status code'])
return
self.assertEqual(0, result['status code'])
self.assertEqual(self.VALIDATION_OK, result['status'])
self.assertEqual(self.OK_MSG, result['message'])
self.assertEqual(0, result['status code'])
def _assert_add_result(self, result, status, message):
self.assertThat(result, matchers.HasLength(1))
@ -125,22 +108,6 @@ class BaseTemplateTest(BaseVitrageTempest):
self.assertThat(result[0]['status details'],
matchers.StartsWith(message))
def _compare_template_show(self, api_templates, cli_templates):
self.assertThat(api_templates, IsNotEmpty(),
'The template validations taken from api is empty')
self.assertIsNotNone(
cli_templates, 'The template validations taken from cli is empty')
LOG.info("The template validations taken from cli is : " +
str(cli_templates))
LOG.info("The template validations taken by api is : " +
str(json.dumps(api_templates)))
parsed_topology = json.loads(cli_templates)
sorted_cli_templates = sorted(parsed_topology.items())
sorted_api_templates = sorted(api_templates.items())
self.assert_list_equal(sorted_api_templates, sorted_cli_templates)
@staticmethod
def _rollback_to_default(templates):
for t in templates:

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

@ -69,13 +69,10 @@ class TestValidate(BaseTemplateTest):
There negative test - validate error message
in case of non-exist template file
"""
try:
path = self.TEST_PATH + self.NON_EXIST_FILE
validation = self.vitrage_client.template.validate(path=path)
self.assertIsNone(validation)
except Exception as up:
self.assertEqual('No such file or directory', up.strerror)
self.assertEqual(2, up.errno)
self.assertRaises(IOError,
self.vitrage_client.template.validate,
path=path)
def test_templates_validate_corrupted_templates(self):
"""templates_validate test
@ -83,27 +80,21 @@ class TestValidate(BaseTemplateTest):
There negative test - validate correctness of error
message in case of corrupted template file
"""
try:
path = self.TEST_PATH + self.ERROR_FILE
validation = self.vitrage_client.template.validate(path=path)
self.assertThat(validation['results'], matchers.HasLength(1))
self._assert_validate_result(
validation, path, negative=True, status_code=3)
except Exception:
LOG.error('Failed to get validation of corrupted template file')
self._assert_validate_result(validation, path,
negative=True, status_code=3)
def test_templates_validate_correct_template(self):
"""templates_validate test
There test validate correctness of template file
"""
try:
path = self.TEST_PATH + self.OK_FILE
validation = self.vitrage_client.template.validate(path=path)
self.assertThat(validation['results'], matchers.HasLength(1))
self._assert_validate_result(validation, path)
except Exception:
LOG.error('Failed to get validation of template file')
class TemplatesDBTest(BaseTemplateTest):
@ -114,11 +105,9 @@ class TemplatesDBTest(BaseTemplateTest):
test standard , definition and equivalence templates
"""
templates_names = list()
try:
# TODO(ikinory): add folder of templates
# Add standard ,equivalence and definition templates
templates_names = self._add_templates()
self._add_templates()
# assert standard template
db_row = v_utils.get_first_template(
name='host_high_memory_usage_scenarios', type=TTypes.STANDARD)
@ -153,9 +142,6 @@ class TemplatesDBTest(BaseTemplateTest):
db_row,
'corrupted template template presented in list')
finally:
self._rollback_to_default(templates_names)
def test_template_delete(self):
# add standard template
@ -181,10 +167,8 @@ class TemplatesDBTest(BaseTemplateTest):
to cli template list
compares each template in list
"""
templates_names = list()
try:
# Add standard ,equivalence and definition templates
templates_names = self._add_templates()
self._add_templates()
cli_templates_list = utils.run_vitrage_command(
"vitrage template list")
api_templates_list = self.vitrage_client.template.list()
@ -199,8 +183,6 @@ class TemplatesDBTest(BaseTemplateTest):
cli_templates_list)
self._compare_each_template_in_list(api_templates_list,
cli_templates_list)
finally:
self._rollback_to_default(templates_names)
def test_template_show(self):
"""Compare template content from file to DB"""
@ -221,7 +203,8 @@ class TemplatesDBTest(BaseTemplateTest):
"Template content doesn't match")
v_utils.delete_template(db_row['uuid'])
def _add_templates(self):
@staticmethod
def _add_templates():
v_utils.add_template(STANDARD_TEMPLATE,
template_type=TTypes.STANDARD)
v_utils.add_template(EQUIVALENCE_TEMPLATE,

15
vitrage_tempest_plugin/tests/api/templates/test_template_v2.py
View File

@ -32,15 +32,11 @@ TEMPLATE_VALIDATION_OK = 'Template validation is OK'
class TestTemplatesApis(BaseTemplateTest):
def tearDown(self):
super(TestTemplatesApis, self).tearDown()
self._delete_templates()
def _validate_no_type_templates(self, template_name):
path = self.TEST_PATH + template_name
validation = self.vitrage_client.template.validate(path=path)
self._assert_validate_result(
validation, path, negative=True, status_code='')
validation, path, negative=True, status_code=66)
def _validate_standard_template(self, template_name):
path = self.TEST_PATH + template_name
@ -98,18 +94,9 @@ class TestTemplatesApis(BaseTemplateTest):
result = self.vitrage_client.template.add(path=path, params=params)
self._assert_add_result(result, LOADING_STATUS, TEMPLATE_VALIDATION_OK)
def _delete_templates(self):
templates = self.vitrage_client.template.list()
template_ids = [template['uuid'] for template in templates]
self.vitrage_client.template.delete(template_ids)
class TestTemplatesV2(TestTemplatesApis):
def tearDown(self):
super(TestTemplatesV2, self).tearDown()
self._delete_templates()
def test_templates_validate_no_type_templates(self):
self._validate_no_type_templates(NO_TYPE_TEMPLATE)

23
vitrage_tempest_plugin/tests/api/topology/test_topology.py
View File

@ -13,13 +13,10 @@
# under the License.
from oslo_log import log as logging
from testtools import ExpectedException
from vitrage_tempest_plugin.tests.api.topology.base import BaseTopologyTest
from vitrage_tempest_plugin.tests.base import IsEmpty
from vitrage_tempest_plugin.tests.common.constants import OPENSTACK_CLUSTER
from vitrage_tempest_plugin.tests.common.constants import VertexProperties as \
VProps
import vitrage_tempest_plugin.tests.utils as utils
from vitrageclient.exceptions import ClientException
@ -39,10 +36,9 @@ class TestTopology(BaseTopologyTest):
NUM_INSTANCE = 3
NUM_VOLUME = 1
def _get_root_vertex_id(self):
items = self.vitrage_client.resource.list(
resource_type=OPENSTACK_CLUSTER, all_tenants=True)
return items[0][VProps.VITRAGE_ID]
def tearDown(self):
super(TestTopology, self).tearDown()
self._rollback_to_default()
@utils.tempest_logger
def test_compare_api_and_cli(self):
@ -277,21 +273,18 @@ class TestTopology(BaseTopologyTest):
This test validate correctness of topology
graph with depth and without root
"""
try:
# Action
self._create_entities(num_instances=self.NUM_INSTANCE,
num_volumes=self.NUM_VOLUME)
# Calculate expected results
with ExpectedException(ClientException,
"Graph-type 'graph' "
"requires a 'root' with 'depth'"):
self.vitrage_client.topology.get(
limit=2,
root=None,
all_tenants=True)
except ClientException as e:
self.assertEqual(403, e.code)
self.assertEqual(
"Graph-type 'graph' requires a 'root' with 'depth'",
str(e.message))
@utils.tempest_logger
def test_graph_with_no_match_query(self):

2
vitrage_tempest_plugin/tests/api/webhook/test_webhook.py
View File

@ -93,7 +93,7 @@ class TestWebhook(BaseVitrageTempest):
def test_delete_non_existing_webhook(self):
self.assertRaises(ClientException,
self.vitrage_client.webhook.delete,
('non existant'))
'non existent')
def test_list_webhook(self):

6
vitrage_tempest_plugin/tests/base.py
View File

@ -334,11 +334,7 @@ class BaseVitrageTempest(test.BaseTestCase):
(timestamp_name, vertex, utils.TIMESTAMP_FORMAT))
@staticmethod
def _get_value(item, key):
return utils.uni2str(item[key])
@classmethod
def _calc_num_admin_tenant_networks(cls):
def _calc_num_admin_tenant_networks():
neutron_client = TempestClients.neutron()
admin_creds = common_creds.get_configured_admin_credentials()
tenant_networks = neutron_client.list_networks(

2
vitrage_tempest_plugin/tests/common/nova_utils.py
View File

@ -41,7 +41,7 @@ def create_instances(num_instances=1, set_public_network=False, name='vm'):
return resources
if not success:
LOG.warning("create instance failed, delete and retry %s",
str(resources))
resources)
delete_created_instances(resources)
time.sleep(10)
raise AssertionError("Unable to create vms, retries failed")

30
vitrage_tempest_plugin/tests/datasources/test_aodh.py
View File

@ -15,7 +15,7 @@
from oslo_log import log as logging
from vitrage_tempest_plugin.tests import utils
from vitrage_tempest_plugin.tests.api.alarms.base import BaseAlarmsTest
from vitrage_tempest_plugin.tests.base import BaseVitrageTempest
from vitrage_tempest_plugin.tests.common import aodh_utils
from vitrage_tempest_plugin.tests.common import nova_utils
from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients
@ -23,13 +23,18 @@ from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients
LOG = logging.getLogger(__name__)
class TestAodhAlarm(BaseAlarmsTest):
class TestAodhAlarm(BaseVitrageTempest):
NUM_INSTANCE = 1
NUM_ALARM = 1
def tearDown(self):
super(TestAodhAlarm, self).tearDown()
aodh_utils.delete_all_aodh_alarms()
aodh_utils.delete_all_gnocchi_metrics()
nova_utils.delete_all_instances()
@utils.tempest_logger
def test_alarm_with_resource_id(self):
try:
# Action
nova_utils.create_instances(num_instances=self.NUM_INSTANCE)
aodh_utils.create_aodh_alarm(self._find_instance_resource_id())
@ -54,13 +59,9 @@ class TestAodhAlarm(BaseAlarmsTest):
num_entities,
num_edges,
entities)
finally:
aodh_utils.delete_all_aodh_alarms()
nova_utils.delete_all_instances()
@utils.tempest_logger
def test_gnocchi_aggregation_by_metrics_threshold_alarm(self):
try:
# Action
nova_utils.create_instances(num_instances=self.NUM_INSTANCE)
aodh_utils.create_aodh_metrics_threshold_alarm()
@ -84,14 +85,9 @@ class TestAodhAlarm(BaseAlarmsTest):
num_entities,
num_edges,
entities)
finally:
aodh_utils.delete_all_aodh_alarms()
aodh_utils.delete_all_gnocchi_metrics()
nova_utils.delete_all_instances()
@utils.tempest_logger
def test_gnocchi_aggregation_by_resources_threshold(self):
try:
# Action
nova_utils.create_instances(num_instances=self.NUM_INSTANCE)
aodh_utils.create_aodh_resources_threshold_alarm(
@ -116,14 +112,9 @@ class TestAodhAlarm(BaseAlarmsTest):
num_entities,
num_edges,
entities)
finally:
aodh_utils.delete_all_aodh_alarms()
aodh_utils.delete_all_gnocchi_metrics()
nova_utils.delete_all_instances()
@utils.tempest_logger
def test_alarm_without_resource_id(self):
try:
# Action
aodh_utils.create_aodh_alarm()
@ -144,9 +135,8 @@ class TestAodhAlarm(BaseAlarmsTest):
num_entities,
num_edges,
entities)
finally:
aodh_utils.delete_all_aodh_alarms()
def _find_instance_resource_id(self):
@staticmethod
def _find_instance_resource_id():
servers = TempestClients.nova().servers.list()
return servers[0].id

4
vitrage_tempest_plugin/tests/datasources/test_cinder_volume.py
View File

@ -23,6 +23,10 @@ class TestCinderVolume(BaseTopologyTest):
NUM_INSTANCE = 3
NUM_VOLUME = 1
def tearDown(self):
super(TestCinderVolume, self).tearDown()
self._rollback_to_default()
@utils.tempest_logger
def test_volume(self):
# Action

7
vitrage_tempest_plugin/tests/datasources/test_heat_stack.py
View File

@ -28,6 +28,10 @@ LOG = logging.getLogger(__name__)
class TestHeatStack(BaseTopologyTest):
NUM_STACKS = 1
def tearDown(self):
super(TestHeatStack, self).tearDown()
heat_utils.delete_all_stacks()
@utils.tempest_logger
def test_nested_heat_stack(self):
self._test_heat_stack(nested=True,
@ -44,7 +48,6 @@ class TestHeatStack(BaseTopologyTest):
"""
template_file = tempest_resources_dir() + '/heat/' + tmpl_file
image = glance_utils.get_first_image()
try:
# Action
heat_utils.create_stacks(self.NUM_STACKS, nested, template_file,
image['name'])
@ -73,5 +76,3 @@ class TestHeatStack(BaseTopologyTest):
num_entities,
num_edges,
entities)
finally:
heat_utils.delete_all_stacks()

42
vitrage_tempest_plugin/tests/datasources/test_neutron.py
View File

@ -15,9 +15,6 @@
from oslo_log import log as logging
from vitrage_tempest_plugin.tests.api.topology.base import BaseTopologyTest
from vitrage_tempest_plugin.tests.common.constants import VertexProperties as \
VProps
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 import utils
@ -27,6 +24,10 @@ LOG = logging.getLogger(__name__)
class TestNeutron(BaseTopologyTest):
NUM_INSTANCE = 3
def tearDown(self):
super(TestNeutron, self).tearDown()
nova_utils.delete_all_instances()
@utils.tempest_logger
def test_neutron(self):
"""neutron test
@ -34,7 +35,6 @@ class TestNeutron(BaseTopologyTest):
This test validate correctness topology graph with neutron module
"""
try:
# Action
nova_utils.create_instances(num_instances=self.NUM_INSTANCE,
set_public_network=True)
@ -62,37 +62,3 @@ class TestNeutron(BaseTopologyTest):
num_entities,
num_edges,
entities)
finally:
nova_utils.delete_all_instances()
@staticmethod
def _get_network_name(instance, networks):
for network in networks:
try:
if len(instance.networks[network[VProps.NAME]]) > 0:
return network[VProps.NAME]
except Exception:
pass
return None
@staticmethod
def _port_to_inst_edges(instances, network_name, ports):
counter = 0
for vm in instances:
for port in ports:
ips_number = 0
for vm_ip in vm.addresses[network_name]:
for port_ip in port['fixed_ips']:
if vm_ip['addr'] == port_ip['ip_address']:
ips_number += 1
break
if ips_number == len(vm.addresses[network_name]):
counter += 1
break
return counter
def _port_to_network_edges(self, networks, ports):
counter = 0
for net in networks:
counter += len(g_utils.all_matches(ports, network_id=net['id']))
return counter

4
vitrage_tempest_plugin/tests/datasources/test_nova.py
View File

@ -22,6 +22,10 @@ LOG = logging.getLogger(__name__)
class TestNova(BaseTopologyTest):
NUM_INSTANCE = 3
def tearDown(self):
super(TestNova, self).tearDown()
self._rollback_to_default()
@utils.tempest_logger
def test_nova_entities(self):
# Action

7
vitrage_tempest_plugin/tests/datasources/test_prometheus.py
View File

@ -44,7 +44,6 @@ class TestPrometheus(BaseTestEvents):
FIRING))
def _test_send_prometheus_alert(self, details):
try:
# post an event to the message bus
event_time = datetime.now()
event_type = 'prometheus.alarm'
@ -64,13 +63,9 @@ class TestPrometheus(BaseTestEvents):
self._post_event(event_time, event_type, details)
api_alarms = wait_for_answer(2, 0.5, self._check_alarms)
self.assertIsNotNone(api_alarms,)
self.assertIsNotNone(api_alarms)
self.assertThat(api_alarms, IsEmpty(), 'Expected no alarms')
except Exception as e:
LOG.exception(e)
raise
def _check_alarm(self, alarm, details):
self.assertEqual(EntityCategory.ALARM, alarm[VProps.VITRAGE_CATEGORY])
self.assertEqual(details['status'], alarm['status'])

14
vitrage_tempest_plugin/tests/datasources/test_static.py
View File

@ -29,12 +29,16 @@ class TestStatic(BaseVitrageTempest):
NUM_SWITCH = 1
NUM_NIC = 1
@utils.tempest_logger
def test_switches(self):
try:
# Action
def setUp(self):
super(TestStatic, self).setUp()
self._create_switches()
def tearDown(self):
super(TestStatic, self).tearDown()
self._delete_switches()
@utils.tempest_logger
def test_switches(self):
# Calculate expected results
api_graph = self.vitrage_client.topology.get(all_tenants=True)
graph = self._create_graph_from_graph_dictionary(api_graph)
@ -56,8 +60,6 @@ class TestStatic(BaseVitrageTempest):
num_entities,
num_edges,
entities)
finally:
self._delete_switches()
@staticmethod
def _create_switches():

8
vitrage_tempest_plugin/tests/e2e/test_actions_base.py
View File

@ -33,7 +33,7 @@ class TestActionsBase(BaseVitrageTempest):
if not host:
raise Exception("No host found")
if not host.get(VProps.VITRAGE_AGGREGATED_STATE) == 'AVAILABLE':
raise Exception("Host is not running %s", str(host))
raise Exception("Host is not running %s" % host)
cls.orig_host = host
def _trigger_do_action(self, trigger_name):
@ -58,7 +58,7 @@ class TestActionsBase(BaseVitrageTempest):
deduces = g_utils.all_matches(alarms, **deduced_props)
self.assertThat(deduces, matchers.HasLength(deduced_count),
'Expected %s deduces\n - \n%s\n - \n%s' %
(str(deduced_count), str(alarms), str(deduces)))
(deduced_count, alarms, deduces))
def _check_rca(self, rca, expected_alarms, inspected):
rca_nodes = [n for n in rca['nodes'] if not n.get('end_timestamp')]
@ -66,8 +66,8 @@ class TestActionsBase(BaseVitrageTempest):
for expected_alarm in expected_alarms:
self.assertIsNotNone(
g_utils.first_match(rca_nodes, **expected_alarm),
'expected_alarm is not in the rca %s' % str(expected_alarm))
'expected_alarm is not in the rca %s' % expected_alarm)
rca_inspected = rca['nodes'][rca['inspected_index']]
self.assertTrue(g_utils.is_subset(inspected, rca_inspected),
'Invalid inspected item \n%s\n%s' %
(str(rca_inspected), str(inspected)))
(rca_inspected, inspected))

2
vitrage_tempest_plugin/tests/e2e/test_basic_actions.py
View File

@ -256,7 +256,7 @@ class TestBasicActions(TestActionsBase):
alarms = self.vitrage_client.alarm.list(
vitrage_id=self.orig_host.get(VProps.VITRAGE_ID),
all_tenants=True)
self.assertTrue(len(alarms) >= 2, 'alarms %s' % str(alarms))
self.assertTrue(len(alarms) >= 2, 'alarms %s' % alarms)
deduced = g_utils.first_match(alarms, **deduced_props)
trigger = g_utils.first_match(alarms, **trigger_alarm_props)

2
vitrage_tempest_plugin/tests/e2e/test_e2e_webhook.py
View File

@ -329,7 +329,7 @@ class MockHTTPServer(BaseHTTPServer.HTTPServer):
def process_request(self, request, client_address):
self.requests.append(request)
LOG.info('received request: %s', str(request))
LOG.info('received request: %s', request)
BaseHTTPServer.HTTPServer.process_request(
self, client_address=client_address, request=request)

4
vitrage_tempest_plugin/tests/e2e/test_overlapping_actions.py
View File

@ -132,11 +132,11 @@ class TestOverlappingActions(TestActionsBase):
self._trigger_undo_action(TRIGGER_ALARM_4)
nova_service = TempestClients.nova().services.list(
host=host_name, binary='nova-compute')[0]
self.assertEqual("up", str(nova_service.state))
self.assertEqual("up", nova_service.state)
finally:
self._trigger_undo_action(TRIGGER_ALARM_3)
self._trigger_undo_action(TRIGGER_ALARM_4)
# nova.host datasource may take up to snapshot_intreval to update
# nova.host datasource may take up to snapshot_interval to update
time.sleep(130)
@utils.tempest_logger

2
vitrage_tempest_plugin/tests/resources/templates/api/corrupted_template.yaml
View File

@ -1,5 +1,7 @@
metadata:
name: corrupted_template
type: standard
version: 2
definitions:
entities:
- entity:

2
vitrage_tempest_plugin/tests/resources/templates/api/nagios_alarm_for_alarms.yaml
View File

@ -1,5 +1,7 @@
metadata:
name: first_deduced_alarm_ever_nagios
type: standard
version: 2
definitions:
entities:
- entity: