added auth methods

Author: katzy687

.gitignore

@@ -1 +1,3 @@
-.idea/
+.idea/
+.pytest_cache/
+*.egg

build/lib/cloudshell/__init__.py

@@ -0,0 +1,3 @@
+__author__ = 'quali'
+from pkgutil import extend_path
+__path__ = extend_path(__path__, __name__)

build/lib/cloudshell/sandbox_rest/__init__.py

@@ -0,0 +1,3 @@
+__author__ = 'quali'
+from pkgutil import extend_path
+__path__ = extend_path(__path__, __name__)

src/sandbox_api/__init__.py …/cloudshell/sandbox_rest/flow_helpers.pysrc/sandbox_api/__init__.py renamed to build/lib/cloudshell/sandbox_rest/flow_helpers.py src/sandbox_api/__init__.py renamed to build/lib/cloudshell/sandbox_rest/flow_helpers.py

@@ -25,11 +25,10 @@ class SandboxRestApiClient:
 
     def __init__(self, host: str, username: str, password: str, domain='Global', port=82, is_https=False,
                  api_version="v2"):
-        """ logs into api and sets headers for future requests """
+        """ login to api and store headers for future requests """
         protocol = "https" if is_https else "http"
         self._base_url = f"{protocol}://{host}:{port}/api"
         self._versioned_url = f"{self._base_url}/{api_version}"
-        self._session = requests.Session()
         self._auth_headers = self._get_auth_headers(username, password, domain)
 
     def _get_auth_headers(self, user_name: str, password: str, domain: str):
@@ -65,19 +64,17 @@ def start_sandbox(self, blueprint_id: str, sandbox_name="", duration="PT2H0M",
         Create a sandbox from the provided blueprint id
         Duration format must be a valid 'ISO 8601'. (e.g 'PT23H' or 'PT4H2M')
         """
-        # sandbox name will default to blueprint name if not passed
-        if not sandbox_name:
-            sandbox_name = self.get_blueprint_details(blueprint_id)['name']
-
-        data_dict = {"duration": duration, "name": sandbox_name}
-        if permitted_users:
-            data_dict['permitted_users'] = permitted_users
-        if bp_params:
-            data_dict["params"] = [asdict(x) for x in bp_params]
-
-        response = requests.post(f'{self._versioned_url}/blueprints/{blueprint_id}/start',
-                                 headers=self._auth_headers,
-                                 data=json.dumps(data_dict))
+        url = f'{self._versioned_url}/blueprints/{blueprint_id}/start'
+        sandbox_name = sandbox_name if sandbox_name else self.get_blueprint_details(blueprint_id)['name']
+
+        data_dict = {
+            "duration": duration,
+            "name": sandbox_name,
+            "permitted_users": permitted_users if permitted_users else [],
+            "params": [asdict(x) for x in bp_params] if bp_params else []
+        }
+
+        response = requests.post(url, headers=self._auth_headers, data=json.dumps(data_dict))
         if not response.ok:
             err_msg = self._format_err(response, f"Failed to start sandbox from blueprint '{blueprint_id}'")
             raise SandboxRestException(err_msg)
@@ -86,20 +83,16 @@ def start_sandbox(self, blueprint_id: str, sandbox_name="", duration="PT2H0M",
     def start_persistent_sandbox(self, blueprint_id: str, sandbox_name="", bp_params: List[InputParam] = None,
                                  permitted_users: List[str] = None):
         """ Create a persistent sandbox from the provided blueprint id """
+        url = f'{self._versioned_url}/blueprints/{blueprint_id}/start-persistent'
 
-        # sandbox name will default to blueprint name if not passed
-        if not sandbox_name:
-            sandbox_name = self.get_blueprint_details(blueprint_id)['name']
-
-        data_dict = {"name": sandbox_name}
-        if permitted_users:
-            data_dict['permitted_users'] = permitted_users
-        if bp_params:
-            data_dict["params"] = [asdict(x) for x in bp_params]
+        sandbox_name = sandbox_name if sandbox_name else self.get_blueprint_details(blueprint_id)['name']
+        data_dict = {
+            "name": sandbox_name,
+            "permitted_users": permitted_users if permitted_users else [],
+            "params": [asdict(x) for x in bp_params] if bp_params else []
+        }
 
-        response = requests.post(f'{self._versioned_url}/blueprints/{blueprint_id}/start-persistent',
-                                 headers=self._auth_headers,
-                                 data=json.dumps(data_dict))
+        response = requests.post(url, headers=self._auth_headers, data=json.dumps(data_dict))
         if not response.ok:
             err_msg = self._format_err(response, f"Failed to start persistent sandbox from blueprint '{blueprint_id}'")
             raise SandboxRestException(err_msg)
@@ -126,7 +119,8 @@ def run_component_command(self, sandbox_id: str, component_id: str, command_name
         data_dict["params"] = params
         response = requests.post(url, data=json.dumps(data_dict), headers=self._auth_headers)
         if not response.ok:
-            raise SandboxRestException(self._format_err(response, f"failed to start component command '{command_name}'"))
+            raise SandboxRestException(
+                self._format_err(response, f"failed to start component command '{command_name}'"))
         return response.json()
 
     def extend_sandbox(self, sandbox_id: str, duration: str):

src/sandbox_api/sandbox_rest.py …b/cloudshell/sandbox_rest/sandbox_api.pysrc/sandbox_api/sandbox_rest.py renamed to build/lib/cloudshell/sandbox_rest/sandbox_api.py src/sandbox_api/sandbox_rest.py renamed to build/lib/cloudshell/sandbox_rest/sandbox_api.py

@@ -0,0 +1,3 @@
+__author__ = 'quali'
+from pkgutil import extend_path
+__path__ = extend_path(__path__, __name__)

cloudshell/__init__.py

@@ -0,0 +1,3 @@
+__author__ = 'quali'
+from pkgutil import extend_path
+__path__ = extend_path(__path__, __name__)