Merge pull request #246 from bsquizz/update_reqs

[1LP][RFR] Remove need to pin python-novaclient with s/HTTPClient/SessionClient

requirements.txt

@@ -1,5 +1,4 @@
 six
-boto
 cached_property
 enum34
 fauxfactory>=2.0.7
@@ -11,20 +10,17 @@ pyvmomi>=6.5.0.2017.5.post1
 python-cinderclient
 python-ironicclient
 python-keystoneclient
-python-novaclient<7.0.0
+python-novaclient==7.1.2
 python-heatclient
 pywinrm
 requests
-
-
-
-
 tzlocal
 wait_for
 websocket_client
 dateparser
 boto3==1.6.6
 botocore==1.9.6
+boto
 packaging
 azure>=3.0.0
 azure-storage-common>=1.0

wrapanapi/openstack.py

@@ -119,8 +119,8 @@ def api(self):
                                         timeout=30)
             # replace the client request method with our version that
             # can handle timeouts; uses explicit binding (versus
-            # replacing the method directly on the HTTPClient class)
-            # so we can still call out to HTTPClient's original request
+            # replacing the method directly on the SessionClient class)
+            # so we can still call out to SessionClient's original request
             # method in the timeout handler method
             self._api.client._cfme_logger = self.logger
             self._api.client.request = _request_timeout_handler.__get__(self._api.client,

wrapanapi/openstack_infra.py

@@ -4,7 +4,7 @@
 from ironicclient import client as iclient
 from keystoneclient.v2_0 import client as oskclient
 from novaclient import client as osclient
-from novaclient.client import HTTPClient
+from novaclient.client import SessionClient
 from requests.exceptions import Timeout
 
 from .base import WrapanapiAPIBaseVM
@@ -24,7 +24,7 @@
 def _request_timeout_handler(self, url, method, retry_count=0, **kwargs):
     try:
         # Use the original request method to do the actual work
-        return HTTPClient.request(self, url, method, **kwargs)
+        return SessionClient.request(self, url, method, **kwargs)
     except Timeout:
         if retry_count >= 3:
             self._cfme_logger.error('nova request timed out after {} retries'.format(retry_count))
@@ -79,12 +79,12 @@ def api(self):
                                         timeout=30)
             # replace the client request method with our version that
             # can handle timeouts; uses explicit binding (versus
-            # replacing the method directly on the HTTPClient class)
-            # so we can still call out to HTTPClient's original request
+            # replacing the method directly on the SessionClient class)
+            # so we can still call out to SessionClient's original request
             # method in the timeout handler method
             self._api.client._cfme_logger = self.logger
             self._api.client.request = _request_timeout_handler.__get__(self._api.client,
-                HTTPClient)
+                SessionClient)
         return self._api
 
     @property