merge up
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/dfe9a3d3 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/dfe9a3d3 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/dfe9a3d3 Branch: refs/heads/trunk Commit: dfe9a3d3c628ef08295b6aa18066d823a213aaf5 Parents: 2d91f81 Author: Anthony Shaw <[email protected]> Authored: Mon Sep 5 21:52:29 2016 +1000 Committer: Anthony Shaw <[email protected]> Committed: Mon Sep 5 21:52:29 2016 +1000 ---------------------------------------------------------------------- libcloud/common/openstack_identity.py | 4 ++-- libcloud/loadbalancer/drivers/dimensiondata.py | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/dfe9a3d3/libcloud/common/openstack_identity.py ---------------------------------------------------------------------- diff --git a/libcloud/common/openstack_identity.py b/libcloud/common/openstack_identity.py index 05f53c4..3a81219 100644 --- a/libcloud/common/openstack_identity.py +++ b/libcloud/common/openstack_identity.py @@ -780,8 +780,8 @@ class OpenStackIdentity_1_0_Connection(OpenStackIdentityConnection): self.auth_user_info = None if not self.auth_token: - raise MalformedResponseError('Missing X-Auth-Token in \ - response headers') + raise MalformedResponseError('Missing X-Auth-Token in' + ' response headers') return self http://git-wip-us.apache.org/repos/asf/libcloud/blob/dfe9a3d3/libcloud/loadbalancer/drivers/dimensiondata.py ---------------------------------------------------------------------- diff --git a/libcloud/loadbalancer/drivers/dimensiondata.py b/libcloud/loadbalancer/drivers/dimensiondata.py index 584d408..e79f1f9 100644 --- a/libcloud/loadbalancer/drivers/dimensiondata.py +++ b/libcloud/loadbalancer/drivers/dimensiondata.py @@ -192,8 +192,8 @@ class DimensionDataLBDriver(Driver): return self._to_balancers( self.connection - .request_with_orgId_api_2('networkDomainVip/virtualListener', \ - params=params).object) + .request_with_orgId_api_2('networkDomainVip/virtualListener', + params=params).object) def get_balancer(self, balancer_id): """ @@ -713,8 +713,8 @@ class DimensionDataLBDriver(Driver): params = {"networkDomainId": ex_network_domain_id} pools = self.connection \ - .request_with_orgId_api_2('networkDomainVip/pool', \ - params=params).object + .request_with_orgId_api_2('networkDomainVip/pool', + params=params).object return self._to_pools(pools) @@ -873,9 +873,8 @@ class DimensionDataLBDriver(Driver): nodes = self.connection \ - .request_with_orgId_api_2('networkDomainVip/node', \ - params=params).object - + .request_with_orgId_api_2('networkDomainVip/node', + params=params).object return self._to_nodes(nodes) def ex_get_node(self, node_id):
