black formatted

Author: katzy687

cloudshell/sandbox_rest/exceptions.py

@@ -2,7 +2,7 @@
 
 
 class SandboxRestException(Exception):
-    """ Base Exception Class inside Rest client class """
+    """Base Exception Class inside Rest client class"""
 
     def __init__(self, msg: str, response: Response = None):
         self.msg = msg
@@ -11,7 +11,9 @@ def __init__(self, msg: str, response: Response = None):
     def __str__(self):
         return self._format_err_msg(self.msg, self.response)
 
-    def _format_err_msg(self, custom_err_msg="Failed Api Call", response: Response = None) -> str:
+    def _format_err_msg(
+        self, custom_err_msg="Failed Api Call", response: Response = None
+    ) -> str:
         err_msg = f"Sandbox API Error: {custom_err_msg}"
 
         if response:
@@ -27,6 +29,6 @@ def _format_response_msg(response: Response):
 
 
 class SandboxRestAuthException(SandboxRestException):
-    """ Failed auth action """
+    """Failed auth action"""
 
     pass

cloudshell/sandbox_rest/sandbox_api.py

@@ -26,7 +26,7 @@ def lines_from_file(file_name: str) -> List[str]:
     packages=find_packages(),
     version=read_file("version.txt"),
     long_description=read_file("README.MD"),
-    long_description_content_type='text/markdown',
+    long_description_content_type="text/markdown",
     install_requires=lines_from_file("requirements.txt"),
     test_requires=lines_from_file("test-requirements.txt"),
     classifiers=[

setup.py

@@ -10,7 +10,10 @@
 @pytest.fixture(scope="session")
 def admin_session() -> SandboxRestApiSession:
     with SandboxRestApiSession(
-        host=CLOUDSHELL_SERVER, username=CLOUDSHELL_ADMIN_USER, password=CLOUDSHELL_ADMIN_PASSWORD, domain=CLOUDSHELL_DOMAIN
+        host=CLOUDSHELL_SERVER,
+        username=CLOUDSHELL_ADMIN_USER,
+        password=CLOUDSHELL_ADMIN_PASSWORD,
+        domain=CLOUDSHELL_DOMAIN,
     ) as api:
         yield api
         time.sleep(2)

tests/conftest.py

@@ -27,7 +27,7 @@ def test_get_default_blueprint(admin_session: SandboxRestApiSession):
 
 
 def test_get_and_delete_token(admin_session: SandboxRestApiSession):
-    """ get token for admin user """
+    """get token for admin user"""
     token_res = admin_session.get_token_for_target_user("admin")
     assert type(token_res) is str
     print(f"Token response: '{token_res}'")

tests/test_api _no_sandbox.py

@@ -20,7 +20,9 @@ def blueprint_id(admin_session: SandboxRestApiSession, empty_blueprint):
 @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
@@ -42,7 +44,9 @@ 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)
+    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)
@@ -73,8 +77,13 @@ def test_get_sandbox_commands(admin_session, sandbox_id):
     commands_res = admin_session.get_sandbox_commands(sandbox_id)
     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']}")
+    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):

tests/test_api_empty_sandbox.py

@@ -23,7 +23,9 @@ def blueprint_id(admin_session: SandboxRestApiSession, dut_blueprint):
 @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
@@ -32,17 +34,23 @@ def sandbox_id(admin_session: SandboxRestApiSession, blueprint_id):
 
 
 @pytest.fixture(scope="module")
-def component_id(admin_session: SandboxRestApiSession, sandbox_id: str, dut_blueprint: str):
+def component_id(
+    admin_session: SandboxRestApiSession, sandbox_id: str, dut_blueprint: str
+):
     components = admin_session.get_sandbox_components(sandbox_id)
     component_filter = [x for x in components if x["component_type"] == 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):
+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)
+    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)

tests/test_api_heath_check_sandbox.py

@@ -13,7 +13,9 @@
 @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
@@ -35,7 +37,9 @@ 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)
+    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)