pre-commit reformat

Author: katzy687

tests/constants.py

@@ -1,7 +1,12 @@
-DEFAULT_EMPTY_BLUEPRINT = "CloudShell Sandbox Template"
-BLUEPRINT_SETUP_COMMAND = "Setup"
+# create these two blueprints and make them 'public' so they can be reserved
+DEFAULT_EMPTY_BLUEPRINT = "Empty Blueprint"
+
+# this blueprint has a Putshell Resource in it
+# https://community.quali.com/repos/3318/put-shell-mock
+DUT_BLUEPRINT = "DUT Blueprint Test"
 
 # DUT blueprint constants
 DUT_MODEL = "Putshell"
 DUT_COMMAND = "health_check"
-DUT_BLUEPRINT = "DUT Blueprint Test"
+
+BLUEPRINT_SETUP_COMMAND = "Setup"

tests/test_api_dut_sandbox.py

@@ -5,16 +5,16 @@
 - DUT model / command can be referenced in constants.py (Putshell / health_check)
 - Assumed that only one DUT is in blueprint
 """
+import common
+import constants
 import pytest
-from common import *
-from constants import *
 
 from cloudshell.sandbox_rest.sandbox_api import SandboxRestApiSession
 
 
 @pytest.fixture(scope="module")
 def blueprint_id(admin_session: SandboxRestApiSession, dut_blueprint):
-    res_id = get_blueprint_id_from_name(admin_session, dut_blueprint)
+    res_id = common.get_blueprint_id_from_name(admin_session, dut_blueprint)
     assert isinstance(res_id, str)
     return res_id
 
@@ -25,7 +25,7 @@ def sandbox_id(admin_session: SandboxRestApiSession, blueprint_id):
     start_res = admin_session.start_sandbox(blueprint_id=blueprint_id, sandbox_name="Pytest DUT blueprint test")
     sandbox_id = start_res["id"]
     print(f"Sandbox started: {sandbox_id}")
-    fixed_sleep()
+    common.fixed_sleep()
     yield sandbox_id
     admin_session.stop_sandbox(sandbox_id)
     print(f"\nSandbox ended: {sandbox_id}")
@@ -34,40 +34,42 @@ def sandbox_id(admin_session: SandboxRestApiSession, blueprint_id):
 @pytest.fixture(scope="module")
 def component_id(admin_session: SandboxRestApiSession, sandbox_id: str):
     components = admin_session.get_sandbox_components(sandbox_id)
-    fixed_sleep()
-    component_filter = [x for x in components if x["component_type"] == DUT_MODEL]
+    common.fixed_sleep()
+    component_filter = [x for x in components if x["component_type"] == constants.DUT_MODEL]
     assert component_filter
     return component_filter[0]["id"]
 
 
 @pytest.fixture(scope="module")
 def execution_id(admin_session: SandboxRestApiSession, sandbox_id: str, component_id: str):
     print("Starting DUT Command...")
-    res = admin_session.run_component_command(sandbox_id=sandbox_id, component_id=component_id, command_name=DUT_COMMAND)
-    fixed_sleep()
+    res = admin_session.run_component_command(
+        sandbox_id=sandbox_id, component_id=component_id, command_name=constants.DUT_COMMAND
+    )
+    common.fixed_sleep()
     assert isinstance(res, dict)
     print("Started execution response")
-    pretty_print_response(res)
+    common.pretty_print_response(res)
     execution_id = res["executionId"]
     return execution_id
 
 
 @pytest.fixture(scope="module")
 def test_get_execution_details(admin_session, execution_id):
     res = admin_session.get_execution_details(execution_id)
-    fixed_sleep()
+    common.fixed_sleep()
     assert isinstance(res, dict)
     return res
 
 
 def test_delete_execution(admin_session, execution_id, test_get_execution_details):
     print("Execution Details")
-    pretty_print_response(test_get_execution_details)
+    common.pretty_print_response(test_get_execution_details)
     is_supports_cancellation = test_get_execution_details["supports_cancellation"]
     if not is_supports_cancellation:
         print("Can't cancel this command. Returning")
         return
     print("Stopping execution...")
     admin_session.delete_execution(execution_id)
-    fixed_sleep()
+    common.fixed_sleep()
     print("Execution deleted")

tests/test_api_empty_sandbox.py

@@ -2,15 +2,15 @@
 Test the api methods that require an empty, PUBLIC blueprint
 """
 
+import common
 import pytest
-from common import *
 
 from cloudshell.sandbox_rest.sandbox_api import SandboxRestApiSession
 
 
 @pytest.fixture(scope="module")
 def blueprint_id(admin_session: SandboxRestApiSession, empty_blueprint):
-    res_id = get_blueprint_id_from_name(admin_session, empty_blueprint)
+    res_id = common.get_blueprint_id_from_name(admin_session, empty_blueprint)
     assert isinstance(res_id, str)
     return res_id
 
@@ -32,23 +32,23 @@ def test_start_stop(sandbox_id):
 
 
 def test_get_sandbox_details(admin_session, sandbox_id):
-    random_sleep()
+    common.random_sleep()
     details_res = admin_session.get_sandbox_details(sandbox_id)
     assert isinstance(details_res, dict)
     sb_name = details_res["name"]
     print(f"Pulled details for sandbox '{sb_name}'")
 
 
 def test_get_components(admin_session, sandbox_id):
-    random_sleep()
+    common.random_sleep()
     components_res = admin_session.get_sandbox_components(sandbox_id)
     assert isinstance(components_res, list)
     component_count = len(components_res)
     print(f"component count found: {component_count}")
 
 
 def test_get_sandbox_commands(admin_session, sandbox_id):
-    random_sleep()
+    common.random_sleep()
     commands_res = admin_session.get_sandbox_commands(sandbox_id)
     assert isinstance(commands_res, list)
     print(f"Sandbox commands: {[x['name'] for x in commands_res]}")
@@ -57,30 +57,30 @@ def test_get_sandbox_commands(admin_session, sandbox_id):
 
 
 def test_get_sandbox_events(admin_session, sandbox_id):
-    random_sleep()
+    common.random_sleep()
     activity_res = admin_session.get_sandbox_activity(sandbox_id)
     assert isinstance(activity_res, dict) and "events" in activity_res
     events = activity_res["events"]
     print(f"activity events count: {len(events)}")
 
 
 def test_get_console_output(admin_session, sandbox_id):
-    random_sleep()
+    common.random_sleep()
     output_res = admin_session.get_sandbox_output(sandbox_id)
     assert isinstance(output_res, dict) and "entries" in output_res
     entries = output_res["entries"]
     print(f"Sandbox output entries count: {len(entries)}")
 
 
 def test_get_instructions(admin_session, sandbox_id):
-    random_sleep()
+    common.random_sleep()
     instructions_res = admin_session.get_sandbox_instructions(sandbox_id)
     assert isinstance(instructions_res, str)
     print(f"Pulled sandbox instructions: '{instructions_res}'")
 
 
 def test_extend_sandbox(admin_session, sandbox_id):
-    random_sleep()
+    common.random_sleep()
     extend_response = admin_session.extend_sandbox(sandbox_id, "PT0H10M")
     assert isinstance(extend_response, dict) and "remaining_time" in extend_response
     print(f"extended sandbox. Remaining time: {extend_response['remaining_time']}")

tests/test_api_no_sandbox.py

@@ -2,8 +2,8 @@
 Test the api methods that do NOT require a blueprint
 Live Cloudshell server is still a dependency
 """
+import common
 import pytest
-from common import *
 from constants import DEFAULT_EMPTY_BLUEPRINT
 
 from cloudshell.sandbox_rest.sandbox_api import SandboxRestApiSession
@@ -23,21 +23,21 @@ def test_delete_token(admin_session: SandboxRestApiSession, api_token: str):
 
 def test_get_sandboxes(admin_session: SandboxRestApiSession):
     res = admin_session.get_sandboxes()
-    random_sleep()
+    common.random_sleep()
     assert isinstance(res, list)
     print(f"Sandbox count found in system: {len(res)}")
 
 
 def test_get_blueprints(admin_session: SandboxRestApiSession):
     bp_res = admin_session.get_blueprints()
-    random_sleep()
+    common.random_sleep()
     assert isinstance(bp_res, list)
     print(f"Blueprint count found in system: '{len(bp_res)}'")
 
 
 def test_get_default_blueprint(admin_session: SandboxRestApiSession):
     bp_res = admin_session.get_blueprint_details(DEFAULT_EMPTY_BLUEPRINT)
-    random_sleep()
+    common.random_sleep()
     assert isinstance(bp_res, dict)
     bp_name = bp_res["name"]
     print(f"Pulled details for '{bp_name}'")