openstack/vitrage
Code Issues Proposed changes

Merge "call super for setUpClass"

Browse Source
This commit is contained in:
Zuul 2017-12-18 20:08:27 +00:00 committed by Gerrit Code Review
commit d59307701e
41 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vitrage/tests/functional/evaluator/test_action_executor.py
View File

@ -53,6 +53,7 @@ class TestActionExecutor(TestFunctionalBase):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestActionExecutor, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.PROCESSOR_OPTS, group='entity_graph')
cls.conf.register_opts(cls.DATASOURCES_OPTS, group='datasources')

1
vitrage/tests/functional/evaluator/test_scenario_evaluator.py
View File

@ -76,6 +76,7 @@ class TestScenarioEvaluator(TestFunctionalBase):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestScenarioEvaluator, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.PROCESSOR_OPTS, group='entity_graph')
cls.conf.register_opts(cls.EVALUATOR_OPTS, group='evaluator')

1
vitrage/tests/unit/datasources/aodh/test_aodh_driver.py
View File

@ -35,6 +35,7 @@ class AodhDriverTest(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(AodhDriverTest, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=AODH_DATASOURCE)

3
vitrage/tests/unit/datasources/aodh/test_aodh_transformer.py
View File

@ -39,6 +39,7 @@ class TestAodhAlarmTransformer(AodhTransformerBaseTest):
@classmethod
def setUpClass(cls):
super(TestAodhAlarmTransformer, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=AODH_DATASOURCE)
@ -116,8 +117,10 @@ class TestAodhAlarmPushTransformer(AodhTransformerBaseTest):
default=UpdateMethod.PUSH),
]
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestAodhAlarmPushTransformer, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=AODH_DATASOURCE)

1
vitrage/tests/unit/datasources/ceilometer/test_ceilometer_driver.py
View File

@ -37,6 +37,7 @@ class CeilometerDriverTest(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(CeilometerDriverTest, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=CEILOMETER_DATASOURCE)

4
vitrage/tests/unit/datasources/ceilometer/test_ceilometer_transformer.py
View File

@ -39,8 +39,10 @@ class TestCeilometerAlarmTransformer(CeilometerTransformerBaseTest):
default=UpdateMethod.PULL),
]
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestCeilometerAlarmTransformer, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=CEILOMETER_DATASOURCE)
@ -119,8 +121,10 @@ class TestCeilometerAlarmPushTransformer(CeilometerTransformerBaseTest):
default=UpdateMethod.PUSH),
]
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestCeilometerAlarmPushTransformer, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=CEILOMETER_DATASOURCE)

1
vitrage/tests/unit/datasources/cinder/test_cinder_volume_transformer.py
View File

@ -48,6 +48,7 @@ class TestCinderVolumeTransformer(base.BaseTest):
# noinspection PyAttributeOutsideInit,PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestCinderVolumeTransformer, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=CINDER_VOLUME_DATASOURCE)

1
vitrage/tests/unit/datasources/collectd/test_collectd_driver.py
View File

@ -36,6 +36,7 @@ class TestCollectdDriver(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestCollectdDriver, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=COLLECTD_DATASOURCE)

1
vitrage/tests/unit/datasources/collectd/test_collectd_transformer.py
View File

@ -44,6 +44,7 @@ class TestCollectdTransformer(BaseAlarmTransformerTest):
# noinspection PyAttributeOutsideInit,PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestCollectdTransformer, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=COLLECTD_DATASOURCE)

1
vitrage/tests/unit/datasources/consistency/test_consistency_transformer.py
View File

@ -38,6 +38,7 @@ class TestConsistencyTransformer(base.BaseTest):
# noinspection PyAttributeOutsideInit,PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestConsistencyTransformer, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=CONSISTENCY_DATASOURCE)

1
vitrage/tests/unit/datasources/heat/test_heat_stack_transformer.py
View File

@ -48,6 +48,7 @@ class TestHeatStackTransformer(base.BaseTest):
# noinspection PyAttributeOutsideInit,PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestHeatStackTransformer, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=HEAT_STACK_DATASOURCE)

1
vitrage/tests/unit/datasources/nagios/test_nagios_config.py
View File

@ -81,6 +81,7 @@ class TestNagiosConfig(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestNagiosConfig, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=NAGIOS_DATASOURCE)

1
vitrage/tests/unit/datasources/nagios/test_nagios_driver.py
View File

@ -41,6 +41,7 @@ class NagiosDriverTest(NagiosBaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(NagiosDriverTest, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=NAGIOS_DATASOURCE)

1
vitrage/tests/unit/datasources/nagios/test_nagios_transformer.py
View File

@ -50,6 +50,7 @@ class NagiosTransformerTest(base.BaseTest):
# noinspection PyAttributeOutsideInit,PyPep8Naming
@classmethod
def setUpClass(cls):
super(NagiosTransformerTest, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=NAGIOS_DATASOURCE)

1
vitrage/tests/unit/datasources/nova/test_nova_host_transformer.py
View File

@ -48,6 +48,7 @@ class NovaHostTransformerTest(base.BaseTest):
# noinspection PyAttributeOutsideInit,PyPep8Naming
@classmethod
def setUpClass(cls):
super(NovaHostTransformerTest, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=NOVA_HOST_DATASOURCE)

1
vitrage/tests/unit/datasources/nova/test_nova_instance_transformer.py
View File

@ -48,6 +48,7 @@ class NovaInstanceTransformerTest(base.BaseTest):
# noinspection PyAttributeOutsideInit,PyPep8Naming
@classmethod
def setUpClass(cls):
super(NovaInstanceTransformerTest, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=NOVA_INSTANCE_DATASOURCE)

1
vitrage/tests/unit/datasources/nova/test_nova_zone_transformer.py
View File

@ -47,6 +47,7 @@ class NovaZoneTransformerTest(base.BaseTest):
# noinspection PyAttributeOutsideInit,PyPep8Naming
@classmethod
def setUpClass(cls):
super(NovaZoneTransformerTest, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=NOVA_ZONE_DATASOURCE)

1
vitrage/tests/unit/datasources/static/test_static_driver.py
View File

@ -62,6 +62,7 @@ class TestStaticDriver(base.BaseTest):
# noinspection PyAttributeOutsideInit,PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestStaticDriver, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=STATIC_DATASOURCE)
cls.static_driver = driver.StaticDriver(cls.conf)

1
vitrage/tests/unit/datasources/static/test_static_transformer.py
View File

@ -41,6 +41,7 @@ class TestStaticTransformer(base.BaseTest):
# noinspection PyAttributeOutsideInit,PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestStaticTransformer, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=STATIC_DATASOURCE)

1
vitrage/tests/unit/datasources/static_physical/test_static_physical_driver.py
View File

@ -69,6 +69,7 @@ class TestStaticPhysicalDriver(base.BaseTest):
# noinspection PyAttributeOutsideInit,PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestStaticPhysicalDriver, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=STATIC_PHYSICAL_DATASOURCE)
cls.static_physical_driver = driver.StaticPhysicalDriver(cls.conf)

1
vitrage/tests/unit/datasources/static_physical/test_static_physical_transformer.py
View File

@ -47,6 +47,7 @@ class TestStaticPhysicalTransformer(base.BaseTest):
# noinspection PyAttributeOutsideInit,PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestStaticPhysicalTransformer, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=STATIC_PHYSICAL_DATASOURCE)

1
vitrage/tests/unit/datasources/test_datasource_update_method.py
View File

@ -147,6 +147,7 @@ class DatasourceUpdateMethod(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(DatasourceUpdateMethod, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.DATASOURCES_OPTS, group='datasources')
cls.conf.register_opts(cls.NOVA_HOST_OPTS, group=NOVA_HOST_DATASOURCE)

1
vitrage/tests/unit/datasources/zabbix/test_zabbix_configuration.py
View File

@ -70,6 +70,7 @@ class TestZabbixConfig(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(TestZabbixConfig, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=ZABBIX_DATASOURCE)

1
vitrage/tests/unit/datasources/zabbix/test_zabbix_driver.py
View File

@ -40,6 +40,7 @@ class ZabbixDriverTest(ZabbixBaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(ZabbixDriverTest, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=ZABBIX_DATASOURCE)

1
vitrage/tests/unit/datasources/zabbix/test_zabbix_transformer.py
View File

@ -52,6 +52,7 @@ class ZabbixTransformerTest(base.BaseTest):
# noinspection PyAttributeOutsideInit,PyPep8Naming
@classmethod
def setUpClass(cls):
super(ZabbixTransformerTest, cls).setUpClass()
cls.transformers = {}
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group=ZABBIX_DATASOURCE)

1
vitrage/tests/unit/entity_graph/test_transformer_manager.py
View File

@ -45,6 +45,7 @@ class TransformerManagerTest(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(TransformerManagerTest, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group='datasources')

2
vitrage/tests/unit/evaluator/recipes/test_add_causal_relationship_recipe.py
View File

@ -30,7 +30,7 @@ class AddCausalRelationshipTest(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(AddCausalRelationshipTest, cls).setUpClass()
cls.target_vertex = Vertex('RESOURCE:nova.host:test_target')
cls.source_vertex = Vertex('RESOURCE:nova.host:test_source')

2
vitrage/tests/unit/evaluator/recipes/test_execute_mistral.py
View File

@ -29,7 +29,7 @@ class RaiseAlarmRecipeTest(BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(RaiseAlarmRecipeTest, cls).setUpClass()
cls.props = {EXECUTION_ENGINE: MISTRAL,
WORKFLOW: 'wf_4',
'host': 'host5',

2
vitrage/tests/unit/evaluator/recipes/test_mark_down.py
View File

@ -27,7 +27,7 @@ class MarkDownRecipeTest(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(MarkDownRecipeTest, cls).setUpClass()
cls.target_vertex = Vertex('RESOURCE:nova.host:test1')
targets = {TFields.TARGET: cls.target_vertex}

2
vitrage/tests/unit/evaluator/recipes/test_raise_alarm.py
View File

@ -30,7 +30,7 @@ class RaiseAlarmRecipeTest(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(RaiseAlarmRecipeTest, cls).setUpClass()
cls.target_props = {VProps.VITRAGE_TYPE: NOVA_HOST_DATASOURCE}
cls.target_vertex = Vertex('RESOURCE:nova.host:test1',
cls.target_props)

1
vitrage/tests/unit/evaluator/recipes/test_set_state_recipe.py
View File

@ -31,6 +31,7 @@ class SetStateRecipeTest(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(SetStateRecipeTest, cls).setUpClass()
cls.target_vertex = Vertex('RESOURCE:nova.host:test1')

1
vitrage/tests/unit/evaluator/template_validation/content/base.py
View File

@ -61,6 +61,7 @@ class ActionValidatorTest(ValidatorTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(ActionValidatorTest, cls).setUpClass()
cls._hide_useless_logging_messages()

1
vitrage/tests/unit/evaluator/template_validation/content/test_template_content_validator.py
View File

@ -33,6 +33,7 @@ class TemplateContentValidatorTest(ValidatorTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(TemplateContentValidatorTest, cls).setUpClass()
template_dir_path = '%s/templates/general' % utils.get_resources_dir()
cls.def_templates_tests_path = '%s/templates/def_template_tests/' % \

1
vitrage/tests/unit/evaluator/template_validation/test_def_template_syntax_validator.py
View File

@ -24,6 +24,7 @@ class DefTemplateSyntaxValidatorTest(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(DefTemplateSyntaxValidatorTest, cls).setUpClass()
cls.def_template_dir_path = utils.get_resources_dir() + \
'/templates/def_template_tests'

1
vitrage/tests/unit/evaluator/template_validation/test_template_syntax_validator.py
View File

@ -32,6 +32,7 @@ class TemplateSyntaxValidatorTest(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(TemplateSyntaxValidatorTest, cls).setUpClass()
cls.def_template_dir_path = utils.get_resources_dir() + \
'/templates/def_template_tests'

6
vitrage/tests/unit/evaluator/test_scenario_repository.py
View File

@ -41,7 +41,7 @@ class ScenarioRepositoryTest(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(ScenarioRepositoryTest, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group='evaluator')
@ -111,7 +111,7 @@ class RegExTemplateTest(base.BaseTest):
@classmethod
def setUpClass(cls):
super(RegExTemplateTest, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group='evaluator')
cls.scenario_repository = ScenarioRepository(cls.conf)
@ -185,7 +185,7 @@ class EquivalentScenarioTest(base.BaseTest):
@classmethod
def setUpClass(cls):
super(EquivalentScenarioTest, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group='evaluator')

1
vitrage/tests/unit/graph/test_graph_algo.py
View File

@ -39,6 +39,7 @@ class GraphAlgorithmTest(GraphTestBase):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(GraphAlgorithmTest, cls).setUpClass()
cls.vm_id = 10000000
cls.vm_alarm_id = 30000000
cls.vms = []

2
vitrage/tests/unit/machine_learning/jaccard_correlation/test_jaccard_correlation.py
View File

@ -158,8 +158,10 @@ class JaccardCorrelationTest(base.BaseTest):
help='medium correlation lower limit'),
]
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(JaccardCorrelationTest, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.OPTS, group='jaccard_correlation')

2
vitrage/tests/unit/notifier/snmp_notifier/test_snmp_notifier.py
View File

@ -24,8 +24,10 @@ from vitrage.tests.unit.notifier.snmp_notifier import common
class SnmpNotifierTest(base.BaseTest):
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(SnmpNotifierTest, cls).setUpClass()
cls.resource_props = {VProps.VITRAGE_IS_DELETED: common.false_,
VProps.VITRAGE_IS_PLACEHOLDER: common.false_}
cls.props = {VProps.VITRAGE_IS_DELETED: common.false_,

2
vitrage/tests/unit/notifier/snmp_notifier/test_snmp_sender_with_severity_map.py
View File

@ -45,8 +45,10 @@ class SnmpNotifierTest(base.BaseTest):
'oid_tree_with_severity_mapping.yaml'),
]
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(SnmpNotifierTest, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.simple_opts, group='snmp')

2
vitrage/tests/unit/notifier/snmp_notifier/test_snmp_sender_without_severity_map.py
View File

@ -44,8 +44,10 @@ class SnmpNotifierTest(base.BaseTest):
'oid_tree_without_severity_mapping.yaml'),
]
# noinspection PyPep8Naming
@classmethod
def setUpClass(cls):
super(SnmpNotifierTest, cls).setUpClass()
cls.conf = cfg.ConfigOpts()
cls.conf.register_opts(cls.simple_opts, group='snmp')