Rename core fixtures to match the drivetrain component names
The following changes:
common_services_deployed -> core_deployed
sl_deployed -> stacklight_deployed
Change-Id: I6e505d2ef96053b19b2d43b0214f5a30f71ae8ea
diff --git a/tcp_tests/tests/system/test_install_opencontrail.py b/tcp_tests/tests/system/test_install_opencontrail.py
index 74b5d2b..efc37c8 100644
--- a/tcp_tests/tests/system/test_install_opencontrail.py
+++ b/tcp_tests/tests/system/test_install_opencontrail.py
@@ -27,7 +27,8 @@
@pytest.mark.fail_snapshot
@pytest.mark.with_rally(rally_node="ctl01.")
def test_opencontrail_simple(self, config, underlay, salt_deployed,
- openstack_deployed, sl_deployed, show_step):
+ openstack_deployed, stacklight_deployed,
+ show_step):
"""Runner for Juniper contrail-tests
Scenario:
@@ -50,14 +51,14 @@
# Run SL component tetsts
if settings.RUN_SL_TESTS:
show_step(5)
- sl_deployed.run_sl_functional_tests(
+ stacklight_deployed.run_sl_functional_tests(
'ctl01',
'/root/stacklight-pytest/stacklight_tests/',
'tests/prometheus',
'test_alerts.py')
show_step(8)
# Download report
- sl_deployed.download_sl_test_report(
+ stacklight_deployed.download_sl_test_report(
'ctl01',
'/root/stacklight-pytest/stacklight_tests/report.xml')
LOG.info("*************** DONE **************")
@@ -65,7 +66,8 @@
@pytest.mark.fail_snapshot
@pytest.mark.with_rally(rally_node="ctl01.")
def test_opencontrail3_maas(self, config, underlay, salt_actions,
- openstack_deployed, show_step, sl_deployed):
+ openstack_deployed, show_step,
+ stacklight_deployed):
"""Runner for Juniper contrail-tests
Scenario:
@@ -94,7 +96,7 @@
'monitoring_alertmanager',
'monitoring_remote_collector',
'monitoring_pushgateway']
- mon_nodes = sl_deployed.get_monitoring_nodes()
+ mon_nodes = stacklight_deployed.get_monitoring_nodes()
LOG.debug('Mon nodes list {0}'.format(mon_nodes))
prometheus_relay_enabled = salt_actions.get_pillar(
@@ -104,18 +106,19 @@
# InfluxDB is used if prometheus relay service is not installed
expected_service_list.append('monitoring_remote_storage_adapter')
show_step(6)
- sl_deployed.check_docker_services(mon_nodes, expected_service_list)
+ stacklight_deployed.check_docker_services(mon_nodes,
+ expected_service_list)
# Run SL component tetsts
if settings.RUN_SL_TESTS:
show_step(7)
- sl_deployed.run_sl_functional_tests(
+ stacklight_deployed.run_sl_functional_tests(
'ctl01',
'/root/stacklight-pytest/stacklight_tests/',
'tests/prometheus',
'test_alerts.py')
show_step(8)
# Download report
- sl_deployed.download_sl_test_report(
+ stacklight_deployed.download_sl_test_report(
'ctl01',
'/root/stacklight-pytest/stacklight_tests/report.xml')