black reformatted

Author: katzy687

cloudshell/sandbox_rest/sandbox_api.py

@@ -403,8 +403,7 @@ def delete_execution(self, execution_id: str) -> None:
             raise SandboxRestException(f"Failed to delete execution for '{execution_id}'", response)
         response_dict = response.json()
         if not response_dict["result"] == "success":
-            raise SandboxRestException(f"Failed execution deletion of id {execution_id}\n"
-                                       f"Response: {response_dict}")
+            raise SandboxRestException(f"Failed execution deletion of id {execution_id}\n" f"Response: {response_dict}")
 
 
 if __name__ == "__main__":

tests/common.py

@@ -1,4 +1,5 @@
 import json
+
 from cloudshell.sandbox_rest.sandbox_api import SandboxRestApiSession
 
 
@@ -9,4 +10,4 @@ def pretty_print_response(dict_response):
 
 def get_blueprint_id_from_name(api: SandboxRestApiSession, bp_name: str):
     res = api.get_blueprint_details(bp_name)
-    return res["id"]
+    return res["id"]

tests/conftest.py

@@ -1,18 +1,17 @@
 import time
 
 import pytest
-from env_settings import *
 from constants import *
+from env_settings import *
 
 from cloudshell.sandbox_rest.sandbox_api import SandboxRestApiSession
 
 
 @pytest.fixture(scope="session")
 def admin_session() -> SandboxRestApiSession:
-    with SandboxRestApiSession(host=CLOUDSHELL_SERVER,
-                               username=CLOUDSHELL_ADMIN_USER,
-                               password=CLOUDSHELL_ADMIN_PASSWORD,
-                               domain=CLOUDSHELL_DOMAIN) as api:
+    with SandboxRestApiSession(
+        host=CLOUDSHELL_SERVER, username=CLOUDSHELL_ADMIN_USER, password=CLOUDSHELL_ADMIN_PASSWORD, domain=CLOUDSHELL_DOMAIN
+    ) as api:
         yield api
         time.sleep(2)
         print("admin session token revoked")
@@ -26,5 +25,3 @@ def empty_blueprint():
 @pytest.fixture(scope="session")
 def dut_blueprint():
     return DUT_BLUEPRINT
-
-

tests/test_api _no_sandbox.py

@@ -9,25 +9,25 @@
 
 def test_get_sandboxes(admin_session: SandboxRestApiSession):
     res = admin_session.get_sandboxes()
-    assert(type(res) is list)
+    assert type(res) is list
     print(f"Sandbox count found in system: {len(res)}")
 
 
 def test_get_blueprints(admin_session: SandboxRestApiSession):
     bp_res = admin_session.get_blueprints()
-    assert(type(bp_res) is list)
+    assert type(bp_res) is 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)
-    assert(type(bp_res) is dict)
+    assert type(bp_res) is dict
     bp_name = bp_res["name"]
     print(f"Pulled details for '{bp_name}'")
 
 
 def test_get_and_delete_token(admin_session: SandboxRestApiSession):
     """ get token for admin user """
     token_res = admin_session.get_token_for_target_user("admin")
-    assert(type(token_res) is str)
+    assert type(token_res) is str
     print(f"Token response: '{token_res}'")

tests/test_api_empty_sandbox.py

@@ -4,24 +4,23 @@
 import time
 
 import pytest
-from cloudshell.sandbox_rest.sandbox_api import SandboxRestApiSession
-from constants import *
 from common import *
+from constants 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)
-    assert(type(res_id) is str)
+    assert type(res_id) is str
     return res_id
 
 
 @pytest.fixture(scope="module")
 def sandbox_id(admin_session: SandboxRestApiSession, blueprint_id):
     # start sandbox
-    start_res = admin_session.start_sandbox(
-        blueprint_id=blueprint_id, sandbox_name="Pytest empty blueprint test"
-    )
+    start_res = admin_session.start_sandbox(blueprint_id=blueprint_id, sandbox_name="Pytest empty blueprint test")
     sandbox_id = start_res["id"]
     print(f"Sandbox started: {sandbox_id}")
     yield sandbox_id
@@ -43,63 +42,62 @@ def setup_execution_id(admin_session: SandboxRestApiSession, sandbox_id: str):
         counter += 1
 
     print("Rerunning Setup...")
-    res = admin_session.run_sandbox_command(sandbox_id=sandbox_id,
-                                            command_name=BLUEPRINT_SETUP_COMMAND)
-    assert (type(res) is dict)
+    res = admin_session.run_sandbox_command(sandbox_id=sandbox_id, command_name=BLUEPRINT_SETUP_COMMAND)
+    assert type(res) is dict
     print("Setup re-run execution response")
     pretty_print_response(res)
     execution_id = res["executionId"]
     return execution_id
 
 
 def test_start_stop(admin_session, sandbox_id):
-    assert (type(sandbox_id) is str)
+    assert type(sandbox_id) is str
     print(f"Sandbox ID: {sandbox_id}")
 
 
 def test_get_sandbox_details(admin_session, sandbox_id):
     details_res = admin_session.get_sandbox_details(sandbox_id)
-    assert (type(details_res) is dict)
+    assert type(details_res) is dict
     sb_name = details_res["name"]
     print(f"Pulled details for sandbox '{sb_name}'")
 
 
 def test_get_components(admin_session, sandbox_id):
     components_res = admin_session.get_sandbox_components(sandbox_id)
-    assert (type(components_res) is list)
+    assert type(components_res) is list
     component_count = len(components_res)
     print(f"component count found: {component_count}")
 
 
 def test_get_sandbox_commands(admin_session, sandbox_id):
     commands_res = admin_session.get_sandbox_commands(sandbox_id)
-    assert (type(commands_res) is list)
+    assert type(commands_res) is list
     print(f"Sandbox commands: {[x['name'] for x in commands_res]}")
     first_sb_command = admin_session.get_sandbox_command_details(sandbox_id, commands_res[0]["name"])
     print(f"SB command name: {first_sb_command['name']}\n" f"description: {first_sb_command['description']}")
 
 
 def test_get_sandbox_events(admin_session, sandbox_id):
     activity_res = admin_session.get_sandbox_activity(sandbox_id)
-    assert (type(activity_res) is dict and "events" in activity_res)
+    assert type(activity_res) is 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):
     output_res = admin_session.get_sandbox_output(sandbox_id)
-    assert (type(output_res) is dict and "entries" in output_res)
+    assert type(output_res) is 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):
     instructions_res = admin_session.get_sandbox_instructions(sandbox_id)
-    assert (type(instructions_res) is str)
+    assert type(instructions_res) is str
     print(f"Pulled sandbox instructions: '{instructions_res}'")
 
 
 def test_extend_sandbox(admin_session, sandbox_id):
     extend_response = admin_session.extend_sandbox(sandbox_id, "PT0H10M")
-    assert (type(extend_response) is dict and "remaining_time" in extend_response)
+    assert type(extend_response) is dict and "remaining_time" in extend_response
     print(f"extended sandbox. Remaining time: {extend_response['remaining_time']}")

tests/test_api_heath_check_sandbox.py

@@ -7,24 +7,23 @@
 import time
 
 import pytest
-from cloudshell.sandbox_rest.sandbox_api import SandboxRestApiSession
-from constants import *
 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)
-    assert(type(res_id) is str)
+    assert type(res_id) is str
     return res_id
 
 
 @pytest.fixture(scope="module")
 def sandbox_id(admin_session: SandboxRestApiSession, blueprint_id):
     # start sandbox
-    start_res = admin_session.start_sandbox(
-        blueprint_id=blueprint_id, sandbox_name="Pytest DUT blueprint test"
-    )
+    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}")
     yield sandbox_id
@@ -43,10 +42,8 @@ def component_id(admin_session: SandboxRestApiSession, sandbox_id: str, dut_blue
 @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)
-    assert(type(res) is dict)
+    res = admin_session.run_component_command(sandbox_id=sandbox_id, component_id=component_id, command_name=DUT_COMMAND)
+    assert type(res) is dict
     print("Started execution response")
     pretty_print_response(res)
     execution_id = res["executionId"]
@@ -56,7 +53,7 @@ def execution_id(admin_session: SandboxRestApiSession, sandbox_id: str, componen
 @pytest.fixture(scope="module")
 def test_get_execution_details(admin_session, execution_id):
     res = admin_session.get_execution_details(execution_id)
-    assert(type(res) is dict)
+    assert type(res) is dict
     print("Execution Details")
     pretty_print_response(res)
 
@@ -66,5 +63,3 @@ def test_delete_execution(admin_session, execution_id, test_get_execution_detail
     time.sleep(1)
     admin_session.delete_execution(execution_id)
     print("Execution deleted")
-
-

tests/test_rerun_setup.py

@@ -4,17 +4,16 @@
 import time
 
 import pytest
-from cloudshell.sandbox_rest.sandbox_api import SandboxRestApiSession
-from constants import *
 from common import *
+from constants import *
+
+from cloudshell.sandbox_rest.sandbox_api import SandboxRestApiSession
 
 
 @pytest.fixture(scope="module")
 def sandbox_id(admin_session: SandboxRestApiSession, empty_blueprint):
     # start sandbox
-    start_res = admin_session.start_sandbox(
-        blueprint_id=empty_blueprint, sandbox_name="Pytest empty blueprint test"
-    )
+    start_res = admin_session.start_sandbox(blueprint_id=empty_blueprint, sandbox_name="Pytest empty blueprint test")
     sandbox_id = start_res["id"]
     print(f"Sandbox started: {sandbox_id}")
     yield sandbox_id
@@ -36,9 +35,8 @@ def setup_execution_id(admin_session: SandboxRestApiSession, sandbox_id: str):
         counter += 1
 
     print("Rerunning Setup...")
-    res = admin_session.run_sandbox_command(sandbox_id=sandbox_id,
-                                            command_name=BLUEPRINT_SETUP_COMMAND)
-    assert (type(res) is dict)
+    res = admin_session.run_sandbox_command(sandbox_id=sandbox_id, command_name=BLUEPRINT_SETUP_COMMAND)
+    assert type(res) is dict
     print("Setup re-run execution response")
     pretty_print_response(res)
     execution_id = res["executionId"]