Added NTTCIS specific alortithms to the Algorithm class
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/65d45f98 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/65d45f98 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/65d45f98 Branch: refs/heads/trunk Commit: 65d45f986a43e66cfb2516d2b706a4dd1e1b7b63 Parents: 6c50be1 Author: mitch <[email protected]> Authored: Thu Oct 25 09:58:12 2018 -0400 Committer: mitch <[email protected]> Committed: Thu Oct 25 09:58:12 2018 -0400 ---------------------------------------------------------------------- libcloud/compute/drivers/nttcis.py | 2 +- libcloud/loadbalancer/base.py | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/65d45f98/libcloud/compute/drivers/nttcis.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/nttcis.py b/libcloud/compute/drivers/nttcis.py index a45f487..3a615f8 100644 --- a/libcloud/compute/drivers/nttcis.py +++ b/libcloud/compute/drivers/nttcis.py @@ -54,7 +54,7 @@ from libcloud.common.nttcis import API_ENDPOINTS, DEFAULT_REGION from libcloud.common.nttcis import TYPES_URN from libcloud.common.nttcis import NETWORK_NS, GENERAL_NS from libcloud.utils.py3 import urlencode, ensure_string -from libcloud.utils.xml import fixxpath, findtext, findall, return_all +from libcloud.utils.xml import fixxpath, findtext, findall from libcloud.utils.py3 import basestring from libcloud.compute.types import NodeState, Provider http://git-wip-us.apache.org/repos/asf/libcloud/blob/65d45f98/libcloud/loadbalancer/base.py ---------------------------------------------------------------------- diff --git a/libcloud/loadbalancer/base.py b/libcloud/loadbalancer/base.py index 600dbc3..d3cbfb5 100644 --- a/libcloud/loadbalancer/base.py +++ b/libcloud/loadbalancer/base.py @@ -123,12 +123,17 @@ class Algorithm(object): Represents a load balancing algorithm. """ ROUND_ROBIN = 1 - LEAST_CONNECTIONS_MEMBER = 2 - LEAST_CONNECTIONS_NODE = 3 - OBSERVED_MEMBER = 4 - OBSERVED_NODE = 4 - PREDICTIVE_MEMBER = 5 - PREDICTIVE_NODE = 6 + LEAST_CONNECTIONS = 2 + WEIGHTED_ROUND_ROBIN = 3 + WEIGHTED_LEAST_CONNECTIONS = 4 + SHORTEST_RESPONSE = 5 + PERSISTENT_IP = 6 + LEAST_CONNECTIONS_MEMBER = 7 + LEAST_CONNECTIONS_NODE = 8 + OBSERVED_MEMBER = 9 + OBSERVED_NODE = 10 + PREDICTIVE_MEMBER = 11 + PREDICTIVE_NODE = 12 DEFAULT_ALGORITHM = Algorithm.ROUND_ROBIN
