Merge pull request #182 from Niklaus-xie/fixreq.post.to-v1.3.9-dev-08

[OPENSTACK-2880] add timeout parameter 4 token auth

Author: zhaoqin-github

icontrol/authtoken.py

@@ -63,7 +63,7 @@ class iControlRESTTokenAuth(AuthBase):
     of ``login_provider_name``.
     """
     def __init__(self, username, password, login_provider_name='tmos',
-                 verify=False, auth_provider=None):
+                 verify=False, auth_provider=None, timeout=30):
         self.username = username
         self.password = password
         self.login_provider_name = login_provider_name
@@ -74,6 +74,7 @@ def __init__(self, username, password, login_provider_name='tmos',
         self.auth_provider = auth_provider
         # We don't actually do auth at this point because we don't have a
         # hostname to authenticate to.
+        self.timeout = timeout
 
     def _check_token_validity(self):
         if not self.token:
@@ -95,7 +96,11 @@ def get_auth_providers(self, netloc):
         """
         url = "https://%s/info/system?null" % (netloc)
 
-        response = requests.get(url, verify=self.verify)
+        response = requests.get(
+            url,
+            verify=self.verify,
+            timeout=self.timeout
+        )
         if not response.ok or not hasattr(response, "json"):
             error_message = '%s Unexpected Error: %s for uri: %s\nText: %r' %\
                             (response.status_code,
@@ -147,7 +152,8 @@ def get_new_token(self, netloc):
             login_url,
             json=login_body,
             verify=self.verify,
-            auth=HTTPBasicAuth(self.username, self.password)
+            auth=HTTPBasicAuth(self.username, self.password),
+            timeout=self.timeout
         )
         self.attempts += 1
         if not response.ok or not hasattr(response, "json"):

icontrol/session.py

@@ -413,22 +413,24 @@ def __init__(self, username, password, **kwargs):
 
         # Handle token-based auth.
         if token_to_use:
-            self.session.auth = iControlRESTTokenAuth('admin', 'admin')
+            self.session.auth = iControlRESTTokenAuth('admin', 'admin', timeout=timeout)
             self.session.auth.token = token_to_use
         else:
             if auth_provider:
                 self.session.auth = iControlRESTTokenAuth(
-                    username, password, auth_provider=auth_provider, verify=verify
+                    username, password, auth_provider=auth_provider, verify=verify,
+                    timeout=timeout
                 )
             else:
                 if token_auth is True:
                     self.session.auth = iControlRESTTokenAuth(
-                        username, password, verify=verify
+                        username, password, verify=verify, timeout=timeout
                     )
                 elif token_auth:
                     # Truthy but not true: non-default loginAuthProvider
                     self.session.auth = iControlRESTTokenAuth(
-                        username, password, token_auth, verify=verify
+                        username, password, token_auth, verify=verify,
+                        timeout=timeout
                     )
                 else:
                     self.session.auth = (username, password)