commit cb619864ae1472c489fb3a8ea304419f97440720
author Anthony Shaw <anthonyshaw@apache.org> Mon Sep 05 21:55:21 2016 +1000
committer Anthony Shaw <anthonyshaw@apache.org> Mon Sep 05 21:55:21 2016 +1000
tree f4e593b9b3f16be38f3d448c7ae503982eba95bd
parent dfe9a3d3c628ef08295b6aa18066d823a213aaf5
parent 3cf068409eaa448556a46b556e3f165f82b86116

merge up

libcloud/common/openstack_identity.py

diff --git a/libcloud/common/openstack_identity.py b/libcloud/common/openstack_identity.py
index 9532163..3a81219 100644
--- a/libcloud/common/openstack_identity.py
+++ b/libcloud/common/openstack_identity.py
@@ -1480,6 +1480,7 @@
                                              missing required elements', e)
             body = 'code: %s body:%s' % (response.status, response.body)
         else:
+            body = 'code: %s body:%s' % (response.status, response.body)
             raise MalformedResponseError('Malformed response', body=body,
                                          driver=self.driver)
 

libcloud/loadbalancer/drivers/dimensiondata.py

diff --git a/libcloud/loadbalancer/drivers/dimensiondata.py b/libcloud/loadbalancer/drivers/dimensiondata.py
index 46bddea..9cc3d3a 100644
--- a/libcloud/loadbalancer/drivers/dimensiondata.py
+++ b/libcloud/loadbalancer/drivers/dimensiondata.py
@@ -707,12 +707,14 @@
         :rtype: ``list`` of ``DimensionDataPool``
         """
         params = None
+
         if ex_network_domain_id is not None:
             params = {"networkDomainId": ex_network_domain_id}
 
         pools = self.connection \
             .request_with_orgId_api_2('networkDomainVip/pool',
                                       params=params).object
+
         return self._to_pools(pools)
 
     def ex_get_pool(self, pool_id):