openstack/vitrage-tempest-plugin
Code Issues Proposed changes

Replacing hardcoded values with constants

Browse Source 
Change-Id: If1eb029bc1958642b50934a8cceef545c8189503
This commit is contained in:
Alexey Weyl 2017-06-12 11:57:10 +00:00
parent 12d9e56bcb
commit 6fef0a7212
4 changed files with 17 additions and 8 deletions
vitrage_tempest_tests/tests
api
base.py
rca
base.py
resources
test_resources.py
base_mock.py

3
vitrage_tempest_tests/tests/api/base.py

@ -17,6 +17,7 @@ import time
from oslo_log import log as logging
from oslotest import base
from vitrage.common.constants import EdgeProperties
from vitrage.common.constants import EntityCategory
from vitrage.common.constants import VertexProperties as VProps
from vitrage.datasources.aodh import AODH_DATASOURCE
@ -206,7 +207,7 @@ class BaseApiTest(base.BaseTestCase):
for i in range(len(edges)):
graph.add_edge(Edge(str(edges[i]['source']),
str(edges[i]['target']),
edges[i]['relationship_type']))
edges[i][EdgeProperties.RELATIONSHIP_TYPE]))
return graph

6
vitrage_tempest_tests/tests/api/rca/base.py

@ -16,6 +16,8 @@ import json
from oslo_log import log as logging
from vitrage.common.constants import EdgeLabel
from vitrage.common.constants import EdgeProperties
from vitrage.common.constants import VertexProperties as VProps
from vitrage.datasources.aodh import AODH_DATASOURCE
from vitrage.datasources import NOVA_HOST_DATASOURCE
@ -118,8 +120,8 @@ class BaseRcaTest(BaseAlarmsTest):
alarms[item['source']], VProps.NAME)
target_alarm_name = self._get_value(
alarms[item['target']], VProps.NAME)
if self._get_value(item, 'key') != 'causes' \
or self._get_value(item, 'relationship_type') != 'causes' \
if self._get_value(item, 'key') != EdgeLabel.CAUSES \
or self._get_value(item, EdgeProperties.RELATIONSHIP_TYPE) != EdgeLabel.CAUSES \
or source_alarm_name != RCA_ALARM_NAME \
or target_alarm_name != VITRAGE_ALARM_NAME:
flag = False

5
vitrage_tempest_tests/tests/api/resources/test_resources.py

@ -143,9 +143,10 @@ class TestResource(BaseApiTest):
self.assertNotEqual(len(resource_list), 0)
for resource in resource_list:
api_resource_show = \
self.vitrage_client.resource.show(resource['vitrage_id'])
self.vitrage_client.resource.show(resource[VProps.VITRAGE_ID])
cli_resource_show = utils.run_vitrage_command(
'vitrage resource show ' + resource['vitrage_id'], self.conf)
'vitrage resource show ' + resource[VProps.VITRAGE_ID],
self.conf)
self._compare_resource_show(
api_resource_show, cli_resource_show)

11
vitrage_tempest_tests/tests/base_mock.py

@ -17,6 +17,8 @@ import testtools
from oslo_config import cfg
from vitrage.common.constants import DatasourceAction
from vitrage.common.constants import DatasourceProperties
from vitrage.entity_graph.initialization_status import InitializationStatus
from vitrage.entity_graph.processor import processor as proc
from vitrage.tests.mocks import mock_driver as mock_sync
@ -46,11 +48,14 @@ class BaseMock(testtools.TestCase):
def _create_mock_events():
gen_list = mock_sync.simple_zone_generators(
2, 4, snapshot_events=2,
snap_vals={'vitrage_datasource_action': 'init_snapshot'})
snap_vals={DatasourceProperties.DATASOURCE_ACTION:
DatasourceAction.INIT_SNAPSHOT})
gen_list += mock_sync.simple_host_generators(
2, 4, 4,
snap_vals={'vitrage_datasource_action': 'init_snapshot'})
snap_vals={DatasourceProperties.DATASOURCE_ACTION:
DatasourceAction.INIT_SNAPSHOT})
gen_list += mock_sync.simple_instance_generators(
4, 15, 15,
snap_vals={'vitrage_datasource_action': 'init_snapshot'})
snap_vals={DatasourceProperties.DATASOURCE_ACTION:
DatasourceAction.INIT_SNAPSHOT})
return mock_sync.generate_sequential_events_list(gen_list)