merge up
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/4bf96358 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/4bf96358 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/4bf96358 Branch: refs/heads/trunk Commit: 4bf96358d20e2252f48582bedf870e9b0a48cd6a Parents: 32cfa2e Author: Anthony Shaw <[email protected]> Authored: Mon Sep 5 21:45:28 2016 +1000 Committer: Anthony Shaw <[email protected]> Committed: Mon Sep 5 21:45:28 2016 +1000 ---------------------------------------------------------------------- libcloud/loadbalancer/drivers/dimensiondata.py | 24 +++++++++++++++++++++ 1 file changed, 24 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/4bf96358/libcloud/loadbalancer/drivers/dimensiondata.py ---------------------------------------------------------------------- diff --git a/libcloud/loadbalancer/drivers/dimensiondata.py b/libcloud/loadbalancer/drivers/dimensiondata.py index e81fa65..e000242 100644 --- a/libcloud/loadbalancer/drivers/dimensiondata.py +++ b/libcloud/loadbalancer/drivers/dimensiondata.py @@ -188,7 +188,11 @@ class DimensionDataLBDriver(Driver): """ params = None if ex_network_domain_id is not None: +<<<<<<< 32cfa2e7584562b19a0e4c9f464e82d5f8600e21 params = {"networkDomainId": ex_network_domain_id} +======= + params = { "networkDomainId": ex_network_domain_id } +>>>>>>> Uptdating based on comments on pull request: https://github.com/apache/libcloud/pull/855 return self._to_balancers( self.connection @@ -693,15 +697,20 @@ class DimensionDataLBDriver(Driver): status=State.RUNNING ) +<<<<<<< 32cfa2e7584562b19a0e4c9f464e82d5f8600e21 <<<<<<< 37bb40852e0cb0946edb77027adeffe8c9ea654d def ex_get_pools(self, ex_network_domain_id=None): ======= def ex_get_pools(self, network_id=None): >>>>>>> Enhance get_list_of_xx calls by allowing for filter by network id +======= + def ex_get_pools(self, ex_network_domain_id=None): +>>>>>>> Uptdating based on comments on pull request: https://github.com/apache/libcloud/pull/855 """ Get all of the pools inside the current geography or in given network. +<<<<<<< 32cfa2e7584562b19a0e4c9f464e82d5f8600e21 <<<<<<< 37bb40852e0cb0946edb77027adeffe8c9ea654d :param ex_network_domain_id: UUID of Network Domain if not None returns only balancers in the given network @@ -713,11 +722,18 @@ class DimensionDataLBDriver(Driver): if None then returns all pools for the organization :type network_id: ``str`` >>>>>>> Enhance get_list_of_xx calls by allowing for filter by network id +======= + :param ex_network_domain_id: UUID of Network Domain + if not None returns only balancers in the given network + if None then returns all pools for the organization + :type ex_network_domain_id: ``str`` +>>>>>>> Uptdating based on comments on pull request: https://github.com/apache/libcloud/pull/855 :return: Returns a ``list`` of type ``DimensionDataPool`` :rtype: ``list`` of ``DimensionDataPool`` """ params = None +<<<<<<< 32cfa2e7584562b19a0e4c9f464e82d5f8600e21 <<<<<<< 37bb40852e0cb0946edb77027adeffe8c9ea654d if ex_network_domain_id is not None: params = {"networkDomainId": ex_network_domain_id} @@ -728,6 +744,10 @@ class DimensionDataLBDriver(Driver): ======= if ( network_id is not None ): params = { "networkDomainId": network_id } +======= + if ex_network_domain_id is not None: + params = { "networkDomainId": ex_network_domain_id } +>>>>>>> Uptdating based on comments on pull request: https://github.com/apache/libcloud/pull/855 pools = self.connection \ .request_with_orgId_api_2('networkDomainVip/pool', params=params).object @@ -885,7 +905,11 @@ class DimensionDataLBDriver(Driver): """ params = None if ex_network_domain_id is not None: +<<<<<<< 32cfa2e7584562b19a0e4c9f464e82d5f8600e21 params = {"networkDomainId": ex_network_domain_id} +======= + params = { "networkDomainId": ex_network_domain_id } +>>>>>>> Uptdating based on comments on pull request: https://github.com/apache/libcloud/pull/855 nodes = self.connection \ .request_with_orgId_api_2('networkDomainVip/node', \
