rename ACTIVE_PENDING to ACTIVE_PENDING_STATUSES

Looking at the lbaas code it's not very obvious that constants.ACTIVE_PENDING
is a list of statuses that contain statuses that are ACTIVE or
PENDING. This patch renames ACTIVE_PENDING to ACTIVE_PENDING_STATUSES so
it's obvious that this is a list and not just a string called ACTIVE_PENDING.

Closes-bug: #1295790

Change-Id: I7af96bcc6b145c6ab809c0b032ccb18baad9c98e

diff --git a/neutron/plugins/common/constants.py b/neutron/plugins/common/constants.py
index d2af7e4731e481d47281ac4f30631aa694ed388e..abf18507f8259afec80651bb59ecf9d9215f4a53 100644 (file)
--- a/neutron/plugins/common/constants.py
+++ b/neutron/plugins/common/constants.py
@@ -58,7 +58,7 @@ PENDING_DELETE = "PENDING_DELETE"
 INACTIVE = "INACTIVE"
 ERROR = "ERROR"
 
-ACTIVE_PENDING = (
+ACTIVE_PENDING_STATUSES = (
     ACTIVE,
     PENDING_CREATE,
     PENDING_UPDATE

diff --git a/neutron/services/loadbalancer/drivers/common/agent_driver_base.py b/neutron/services/loadbalancer/drivers/common/agent_driver_base.py
index ac352fadd69d5dc0a58061e1d95172839d7d3b60..9584fbe65da316109d3faf3cf26f91395b2a88ae 100644 (file)
--- a/neutron/services/loadbalancer/drivers/common/agent_driver_base.py
+++ b/neutron/services/loadbalancer/drivers/common/agent_driver_base.py
@@ -84,7 +84,8 @@ class LoadBalancerCallbacks(object):
             qry = context.session.query(loadbalancer_db.Pool.id)
             qry = qry.filter(loadbalancer_db.Pool.id.in_(pool_ids))
             qry = qry.filter(
-                loadbalancer_db.Pool.status.in_(constants.ACTIVE_PENDING))
+                loadbalancer_db.Pool.status.in_(
+                    constants.ACTIVE_PENDING_STATUSES))
             up = True  # makes pep8 and sqlalchemy happy
             qry = qry.filter(loadbalancer_db.Pool.admin_state_up == up)
             return [id for id, in qry]
@@ -116,13 +117,13 @@ class LoadBalancerCallbacks(object):
             retval['members'] = [
                 self.plugin._make_member_dict(m)
                 for m in pool.members if (
-                    m.status in constants.ACTIVE_PENDING or
+                    m.status in constants.ACTIVE_PENDING_STATUSES or
                     m.status == constants.INACTIVE)
             ]
             retval['healthmonitors'] = [
                 self.plugin._make_health_monitor_dict(hm.healthmonitor)
                 for hm in pool.monitors
-                if hm.status in constants.ACTIVE_PENDING
+                if hm.status in constants.ACTIVE_PENDING_STATUSES
             ]
             retval['driver'] = (
                 self.plugin.drivers[pool.provider.provider_name].device_driver)
@@ -136,18 +137,19 @@ class LoadBalancerCallbacks(object):
             pool = qry.one()
 
             # set all resources to active
-            if pool.status in constants.ACTIVE_PENDING:
+            if pool.status in constants.ACTIVE_PENDING_STATUSES:
                 pool.status = constants.ACTIVE
 
-            if pool.vip and pool.vip.status in constants.ACTIVE_PENDING:
+            if (pool.vip and pool.vip.status in
+                    constants.ACTIVE_PENDING_STATUSES):
                 pool.vip.status = constants.ACTIVE
 
             for m in pool.members:
-                if m.status in constants.ACTIVE_PENDING:
+                if m.status in constants.ACTIVE_PENDING_STATUSES:
                     m.status = constants.ACTIVE
 
             for hm in pool.monitors:
-                if hm.status in constants.ACTIVE_PENDING:
+                if hm.status in constants.ACTIVE_PENDING_STATUSES:
                     hm.status = constants.ACTIVE
 
     def update_status(self, context, obj_type, obj_id, status):
@@ -366,7 +368,7 @@ class AgentDriverBase(abstract_driver.LoadBalancerAbstractDriver):
 
     def update_vip(self, context, old_vip, vip):
         agent = self.get_pool_agent(context, vip['pool_id'])
-        if vip['status'] in constants.ACTIVE_PENDING:
+        if vip['status'] in constants.ACTIVE_PENDING_STATUSES:
             self.agent_rpc.update_vip(context, old_vip, vip, agent['host'])
         else:
             self.agent_rpc.delete_vip(context, vip, agent['host'])
@@ -386,7 +388,7 @@ class AgentDriverBase(abstract_driver.LoadBalancerAbstractDriver):
 
     def update_pool(self, context, old_pool, pool):
         agent = self.get_pool_agent(context, pool['id'])
-        if pool['status'] in constants.ACTIVE_PENDING:
+        if pool['status'] in constants.ACTIVE_PENDING_STATUSES:
             self.agent_rpc.update_pool(context, old_pool, pool,
                                        agent['host'])
         else:

diff --git a/neutron/services/loadbalancer/drivers/haproxy/cfg.py b/neutron/services/loadbalancer/drivers/haproxy/cfg.py
index 74447c6b55704b929936901b50fe7596c52ba24c..e3576f82f7fb0788d1c3761fa745e413f6f04fb9 100644 (file)
--- a/neutron/services/loadbalancer/drivers/haproxy/cfg.py
+++ b/neutron/services/loadbalancer/drivers/haproxy/cfg.py
@@ -47,7 +47,7 @@ STATS_MAP = {
     constants.STATS_RESPONSE_ERRORS: 'eresp'
 }
 
-ACTIVE_PENDING = qconstants.ACTIVE_PENDING
+ACTIVE_PENDING_STATUSES = qconstants.ACTIVE_PENDING_STATUSES
 INACTIVE = qconstants.INACTIVE
 
 
@@ -138,7 +138,7 @@ def _build_backend(config):
 
     # add the members
     for member in config['members']:
-        if ((member['status'] in ACTIVE_PENDING or
+        if ((member['status'] in ACTIVE_PENDING_STATUSES or
              member['status'] == INACTIVE)
             and member['admin_state_up']):
             server = (('server %(id)s %(address)s:%(protocol_port)s '

diff --git a/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py b/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py
index 91fadb5151ed890e8d5afe9adf575b7c766f470d..6bb971be3e45478af51620285e083a9f0b538ea8 100644 (file)
--- a/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py
+++ b/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py
@@ -267,7 +267,8 @@ class HaproxyNSDriver(agent_device_driver.AgentDeviceDriver):
     def deploy_instance(self, logical_config):
         # do actual deploy only if vip is configured and active
         if ('vip' not in logical_config or
-            logical_config['vip']['status'] not in constants.ACTIVE_PENDING or
+            (logical_config['vip']['status'] not in
+             constants.ACTIVE_PENDING_STATUSES) or
             not logical_config['vip']['admin_state_up']):
             return