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/fixtures/stacklight_fixtures.py b/tcp_tests/fixtures/stacklight_fixtures.py
index c1747b8..2c30530 100644
--- a/tcp_tests/fixtures/stacklight_fixtures.py
+++ b/tcp_tests/fixtures/stacklight_fixtures.py
@@ -35,11 +35,11 @@
return sl_manager.SLManager(config, underlay, salt_deployed)
-@pytest.mark.revert_snapshot(ext.SNAPSHOT.sl_deployed)
+@pytest.mark.revert_snapshot(ext.SNAPSHOT.stacklight_deployed)
@pytest.fixture(scope='function')
-def sl_deployed(revert_snapshot, request, config,
- hardware, underlay, common_services_deployed,
- salt_deployed, sl_actions):
+def stacklight_deployed(revert_snapshot, request, config,
+ hardware, underlay, core_deployed,
+ salt_deployed, sl_actions):
"""Fixture to get or install SL services on environment
:param revert_snapshot: fixture that reverts snapshot that is specified
@@ -56,7 +56,7 @@
steps_path = config.sl_deploy.sl_steps_path
commands = underlay.read_template(steps_path)
sl_actions.install(commands)
- hardware.create_snapshot(ext.SNAPSHOT.sl_deployed)
+ hardware.create_snapshot(ext.SNAPSHOT.stacklight_deployed)
salt_deployed.sync_time()
else:
@@ -70,16 +70,16 @@
return sl_actions
-@pytest.mark.revert_snapshot(ext.SNAPSHOT.sl_deployed)
+@pytest.mark.revert_snapshot(ext.SNAPSHOT.stacklight_deployed)
@pytest.fixture(scope='function')
def sl_os_deployed(revert_snapshot,
openstack_deployed,
- sl_deployed):
+ stacklight_deployed):
"""Fixture to get or install SL and OpenStack services on environment
- Uses fixtures openstack_deployed and sl_deployed, with 'sl_deployed'
- top-level snapshot.
+ Uses fixtures openstack_deployed and stacklight_deployed,
+ with 'stacklight_deployed' top-level snapshot.
Returns SLManager instance object
"""
- return sl_deployed
+ return stacklight_deployed