Skip to content

Add session managment in ArubaCentralBase #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jessux wants to merge 1 commit into from
Closed

Add session managment in ArubaCentralBase #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions pycentral/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class ArubaCentralBase:
"""

def __init__(self, central_info, token_store=None, logger=None,
ssl_verify=True, user_retries=10):
ssl_verify=True, user_retries=10,session=None):
"""Constructor Method initializes access token. If user provides\
access token, use the access token for API calls. Otherwise try to\
reuse token from cache or try to generate new access token via OAUTH\
Expand All @@ -112,6 +112,7 @@ def __init__(self, central_info, token_store=None, logger=None,
self.logger = None
self.ssl_verify = ssl_verify
self.user_retries = user_retries
self.session = session
# Set logger
if logger:
self.logger = logger
Expand Down Expand Up @@ -150,7 +151,10 @@ def oauthLogin(self):
)
data = data.encode("utf-8")
try:
s = requests.Session()
if self.session is None:
s = requests.Session()
else:
s = self.session
req = requests.Request(
method="POST", url=url, data=data, headers=headers)
prepped = s.prepare_request(req)
Expand Down Expand Up @@ -204,7 +208,10 @@ def oauthCode(self, csrf_token, session_token):
"Cookie": "session=" + session_token
}
try:
s = requests.Session()
if self.session is None:
s = requests.Session()
else:
s = self.session
req = requests.Request(
method="POST", url=url, data=data, headers=headers)
prepped = s.prepare_request(req)
Expand Down Expand Up @@ -249,7 +256,10 @@ def oauthAccessToken(self, auth_code):
base_url=self.central_info["base_url"], path=path, query=query)

try:
s = requests.Session()
if self.session is None:
s = requests.Session()
else:
s = self.session
req = requests.Request(method="POST", url=url)
prepped = s.prepare_request(req)
settings = s.merge_environment_settings(
Expand Down Expand Up @@ -389,7 +399,10 @@ def refreshToken(self, old_token):
base_url=self.central_info["base_url"], path=path, query=query
)

s = requests.Session()
if self.session is None:
s = requests.Session()
else:
s = self.session
req = requests.Request(method="POST", url=url)
prepped = s.prepare_request(req)
settings = s.merge_environment_settings(
Expand Down Expand Up @@ -550,7 +563,10 @@ def requestUrl(self, url, data={}, method="GET", headers={}, params={},
self.logger.error(str1)

auth = BearerAuth(self.central_info["token"]["access_token"])
s = requests.Session()
if self.session is None:
s = requests.Session()
else:
s = self.session
req = requests.Request(
method=method,
url=url,
Expand Down Expand Up @@ -686,4 +702,4 @@ def command(self, apiMethod, apiPath, apiData={}, apiParams={}, headers={},

except Exception as err:
self.logger.error(err)
exit("exiting...")
exit("exiting...")