Updated inventory plugins from ansible, updated all third party packages in awx/lib/site-packages to latest versions, minor serializer fixes after package upgrades.

awx/lib/site-packages/pyrax/cloudloadbalancers.py

@@ -19,6 +19,8 @@
 
 from functools import wraps
 
+import six
+
 import pyrax
 from pyrax.client import BaseClient
 import pyrax.exceptions as exc
@@ -99,7 +101,7 @@ class CloudLoadBalancer(BaseResource):
 
 
     def update(self, name=None, algorithm=None, protocol=None, halfClosed=None,
-            port=None, timeout=None):
+            port=None, timeout=None, httpsRedirect=None):
         """
         Provides a way to modify the following attributes of a load balancer:
             - name
@@ -108,10 +110,11 @@ class CloudLoadBalancer(BaseResource):
             - halfClosed
             - port
             - timeout
+            - httpsRedirect
         """
         return self.manager.update(self, name=name, algorithm=algorithm,
                 protocol=protocol, halfClosed=halfClosed, port=port,
-                timeout=timeout)
+                timeout=timeout, httpsRedirect=httpsRedirect)
 
 
     def delete_node(self, node):
@@ -367,7 +370,7 @@ class CloudLoadBalancer(BaseResource):
         return self.manager.clear_error_page(self)
 
 
-    ## BEGIN - property definitions ##
+    # BEGIN - property definitions ##
     def _get_connection_logging(self):
         if self._connection_logging is None:
             self._connection_logging = self.manager.get_connection_logging(self)
@@ -395,7 +398,7 @@ class CloudLoadBalancer(BaseResource):
 
     def _set_session_persistence(self, val):
         if val:
-            if not isinstance(val, basestring) or (val.upper() not in
+            if not isinstance(val, six.string_types) or (val.upper() not in
                     ("HTTP_COOKIE", "SOURCE_IP")):
                 raise exc.InvalidSessionPersistenceType("Session Persistence "
                         "must be one of 'HTTP_COOKIE' or 'SOURCE_IP'. '%s' is "
@@ -417,13 +420,13 @@ class CloudLoadBalancer(BaseResource):
             _set_session_persistence, None, "The current state of session "
             "persistence. Possible values are either 'HTTP_COOKIE' or "
             "'SOURCE_IP', depending on the type of load balancing.")
-    ## END - property definitions ##
+    # END - property definitions ##
 
 
 
 class CloudLoadBalancerManager(BaseManager):
     def update(self, lb, name=None, algorithm=None, protocol=None,
-            halfClosed=None, port=None, timeout=None):
+            halfClosed=None, port=None, timeout=None, httpsRedirect=None):
         """
         Provides a way to modify the following attributes of a load balancer:
             - name
@@ -432,6 +435,7 @@ class CloudLoadBalancerManager(BaseManager):
             - halfClosed
             - port
             - timeout
+            - httpsRedirect
         """
         body = {}
         if name is not None:
@@ -446,6 +450,8 @@ class CloudLoadBalancerManager(BaseManager):
             body["port"] = port
         if timeout is not None:
             body["timeout"] = timeout
+        if httpsRedirect is not None:
+            body["httpsRedirect"] = httpsRedirect
         if not body:
             # Nothing passed
             return
@@ -467,7 +473,8 @@ class CloudLoadBalancerManager(BaseManager):
     def _create_body(self, name, port=None, protocol=None, nodes=None,
             virtual_ips=None, algorithm=None, halfClosed=None, accessList=None,
             connectionLogging=None, connectionThrottle=None, healthMonitor=None,
-            metadata=None, timeout=None, sessionPersistence=None):
+            metadata=None, timeout=None, sessionPersistence=None,
+            httpsRedirect=None):
         """
         Used to create the dict required to create a load balancer instance.
         """
@@ -501,6 +508,7 @@ class CloudLoadBalancerManager(BaseManager):
                 "metadata": metadata,
                 "timeout": timeout,
                 "sessionPersistence": sessionPersistence,
+                "httpsRedirect": httpsRedirect,
                 }}
         return body
 
@@ -1088,6 +1096,7 @@ class Node(object):
                 "port": self.port,
                 "condition": self.condition,
                 "type": self.type,
+                "id": self.id,
                 }
 
 
@@ -1146,7 +1155,7 @@ class Node(object):
         """
         diff = self._diff()
         if not diff:
-            #Nothing to do!
+            # Nothing to do!
             return
         self.parent.update_node(self, diff)
 
@@ -1295,7 +1304,7 @@ class CloudLoadBalancerClient(BaseClient):
 
     @assure_loadbalancer
     def update(self, loadbalancer, name=None, algorithm=None, protocol=None,
-            halfClosed=None, port=None, timeout=None):
+            halfClosed=None, port=None, timeout=None, httpsRedirect=None):
         """
         Provides a way to modify the following attributes of a load balancer:
             - name
@@ -1304,10 +1313,11 @@ class CloudLoadBalancerClient(BaseClient):
             - halfClosed
             - port
             - timeout
+            - httpsRedirect
         """
         return self._manager.update(loadbalancer, name=name,
                 algorithm=algorithm, protocol=protocol, halfClosed=halfClosed,
-                port=port, timeout=timeout)
+                port=port, timeout=timeout, httpsRedirect=httpsRedirect)
 
 
     @assure_loadbalancer
@@ -1643,4 +1653,4 @@ class CloudLoadBalancerClient(BaseClient):
         """
         loadbalancer.session_persistence = val
 
-    ## END pass-through methods ##
+    # END pass-through methods ##