From 7bfb0a412ba6fe0f0ccd6961c684646bd72dd8f4 Mon Sep 17 00:00:00 2001 From: grimblenz Date: Mon, 10 Aug 2020 15:29:12 -0600 Subject: [PATCH 1/3] Adding support for different base URL for Next env Next environment uses a different base URL, need to support that for testing. --- caspyr/session.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/caspyr/session.py b/caspyr/session.py index 2907241..f5ce307 100644 --- a/caspyr/session.py +++ b/caspyr/session.py @@ -32,8 +32,8 @@ def __init__(self, auth_token): self.baseurl = 'https://api.mgmt.cloud.vmware.com' @classmethod - def login(self, refresh_token): - baseurl = 'https://api.mgmt.cloud.vmware.com' + def login(self, refresh_token, baseurl = 'https://api.mgmt.cloud.vmware.com'): + self.baseurl = baseurl uri = '/iaas/api/login' headers = {'Content-Type': 'application/json'} body = { From 16068e77009651674e0031f7339a908895e42d40 Mon Sep 17 00:00:00 2001 From: Andrew Stockman Date: Mon, 10 Aug 2020 16:00:56 -0600 Subject: [PATCH 2/3] Fixed whitespace --- caspyr/session.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caspyr/session.py b/caspyr/session.py index f5ce307..b142358 100644 --- a/caspyr/session.py +++ b/caspyr/session.py @@ -33,7 +33,7 @@ def __init__(self, auth_token): @classmethod def login(self, refresh_token, baseurl = 'https://api.mgmt.cloud.vmware.com'): - self.baseurl = baseurl + self.baseurl = baseurl uri = '/iaas/api/login' headers = {'Content-Type': 'application/json'} body = { From 14cfbff74aaca798fe798b243bdff8cee6e7fba1 Mon Sep 17 00:00:00 2001 From: Andrew Stockman Date: Mon, 10 Aug 2020 22:11:30 -0600 Subject: [PATCH 3/3] adding baseurl to constructor --- caspyr/session.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/caspyr/session.py b/caspyr/session.py index b142358..3c96632 100644 --- a/caspyr/session.py +++ b/caspyr/session.py @@ -24,16 +24,15 @@ class Session(object): Requires refresh token from VMware Cloud Services portal to instantiate. """ - def __init__(self, auth_token): + def __init__(self, auth_token, baseurl = 'https://api.mgmt.cloud.vmware.com'): self.token = auth_token self.headers = {'Content-Type': 'application/json', 'Authorization': f'Bearer {self.token}', 'csp-auth-token': f'{self.token}'} - self.baseurl = 'https://api.mgmt.cloud.vmware.com' + self.baseurl = baseurl @classmethod def login(self, refresh_token, baseurl = 'https://api.mgmt.cloud.vmware.com'): - self.baseurl = baseurl uri = '/iaas/api/login' headers = {'Content-Type': 'application/json'} body = { @@ -54,7 +53,7 @@ def login(self, refresh_token, baseurl = 'https://api.mgmt.cloud.vmware.com'): r.raise_for_status() logger.info('Authenticated successfully.') auth_token = r.json()['token'] - return self(auth_token) + return self(auth_token, baseurl) except requests.exceptions.HTTPError as e: logger.error('Failed to authenticate.') logger.error(f'Error message {r.json()["message"]}',