Merge pull request #1011 from zhaoqin-github/concurrent-2

Concurrent patch 2 pike

Author: zhaoqin-github

f5lbaasdriver/v2/bigip/driver_v2.py

@@ -150,19 +150,19 @@ class EntityManager(object):
 
     def __init__(self, driver):
         self.driver = driver
-        self.api_dict = None
 
     def _log_entity(self, entity):
         LOG.debug("Log the entity: %s", entity.to_api_dict())
 
-    def _call_rpc(self, context, loadbalancer, entity, rpc_method, **kwargs):
+    def _call_rpc(self, context, loadbalancer, entity, api_dict,
+                  rpc_method, **kwargs):
         '''Perform operations common to create and delete for managers.'''
 
         try:
             agent_host, service = self._setup_crud(
                 context, loadbalancer, entity, **kwargs)
             rpc_callable = getattr(self.driver.agent_rpc, rpc_method)
-            rpc_callable(context, self.api_dict, service, agent_host)
+            rpc_callable(context, api_dict, service, agent_host)
         except (lbaas_agentschedulerv2.NoEligibleLbaasAgent,
                 lbaas_agentschedulerv2.NoActiveLbaasAgent) as e:
             LOG.error("Exception: %s: %s" % (rpc_method, e))
@@ -454,8 +454,7 @@ def create(self, context, listener):
         self._log_entity(listener)
 
         lb = listener.loadbalancer
-        self.api_dict = listener.to_dict(
-            loadbalancer=False, default_pool=False)
+        api_dict = listener.to_dict(loadbalancer=False, default_pool=False)
 
         def append_listeners(context, loadbalancer, service):
             self._append_listeners(context, service, listener)
@@ -472,13 +471,13 @@ def append_pools_monitors(context, loadbalancer, service):
             # Utilize default behavior to append members
             # Listener does not have l7policies.
             self._call_rpc(
-                context, lb, listener, 'create_listener',
+                context, lb, listener, api_dict, 'create_listener',
                 append_listeners=append_listeners,
                 append_pools_monitors=append_pools_monitors,
                 append_l7policies_rules=lambda *args: None
             )
         else:
-            self._call_rpc(context, lb, listener, 'create_listener')
+            self._call_rpc(context, lb, listener, api_dict, 'create_listener')
 
     @log_helpers.log_method_call
     def update(self, context, old_listener, listener):
@@ -510,8 +509,7 @@ def delete(self, context, listener):
         self._log_entity(listener)
 
         lb = listener.loadbalancer
-        self.api_dict = listener.to_dict(
-            loadbalancer=False, default_pool=False)
+        api_dict = listener.to_dict(loadbalancer=False, default_pool=False)
 
         def append_listeners(context, lb, service):
             self._append_listeners(context, service, listener)
@@ -520,14 +518,14 @@ def append_listeners(context, lb, service):
             # L7policy should already be deleted.
             # Needn't modify pool.
             self._call_rpc(
-                context, lb, listener, 'delete_listener',
+                context, lb, listener, api_dict, 'delete_listener',
                 append_listeners=append_listeners,
                 append_pools_monitors=lambda *args: None,
                 append_members=lambda *args: None,
                 append_l7policies_rules=lambda *args: None
             )
         else:
-            self._call_rpc(context, lb, listener, 'delete_listener')
+            self._call_rpc(context, lb, listener, api_dict, 'delete_listener')
 
 
 class PoolManager(EntityManager):
@@ -553,7 +551,7 @@ def create(self, context, pool):
         self._log_entity(pool)
 
         lb = pool.loadbalancer
-        self.api_dict = self._get_pool_dict(pool)
+        api_dict = self._get_pool_dict(pool)
 
         def append_listeners(context, loadbalancer, service):
             for listener in loadbalancer.listeners:
@@ -572,13 +570,13 @@ def append_pools_monitors(context, loadbalancer, service):
             # Pool has no members
             # Listener may have l7policies. Utilize default behavior.
             self._call_rpc(
-                context, lb, pool, 'create_pool',
+                context, lb, pool, api_dict, 'create_pool',
                 append_listeners=append_listeners,
                 append_pools_monitors=append_pools_monitors,
                 append_members=lambda *args: None
             )
         else:
-            self._call_rpc(context, lb, pool, 'create_pool')
+            self._call_rpc(context, lb, pool, api_dict, 'create_pool')
 
     @log_helpers.log_method_call
     def update(self, context, old_pool, pool):
@@ -609,7 +607,7 @@ def delete(self, context, pool):
         self._log_entity(pool)
 
         lb = pool.loadbalancer
-        self.api_dict = self._get_pool_dict(pool)
+        api_dict = self._get_pool_dict(pool)
 
         def append_listeners(context, loadbalancer, service):
             for listener in loadbalancer.listeners:
@@ -626,12 +624,12 @@ def append_pools_monitors(context, loadbalancer, service):
             # Pool may be associated with a listener
             # Utilize default behavior to load member, l7policy and rule
             self._call_rpc(
-                context, lb, pool, 'delete_pool',
+                context, lb, pool, api_dict, 'delete_pool',
                 append_listeners=append_listeners,
                 append_pools_monitors=append_pools_monitors
             )
         else:
-            self._call_rpc(context, lb, pool, 'delete_pool')
+            self._call_rpc(context, lb, pool, api_dict, 'delete_pool')
 
 
 class MemberManager(EntityManager):
@@ -664,21 +662,21 @@ def create(self, context, member):
                     'name': 'fake_pool_port_' + member.id,
                     portbindings.HOST_ID: agent_host}})
             LOG.debug('the port created here is: %s' % p)
-        self.api_dict = member.to_dict(pool=False)
+        api_dict = member.to_dict(pool=False)
 
         def append_pools_monitors(context, loadbalancer, service):
             self._append_pools_monitors(context, service, member.pool)
 
         if cfg.CONF.f5_driver_perf_mode in (2, 3):
             # Utilize default behavior to append all members
             self._call_rpc(
-                context, lb, member, 'create_member',
+                context, lb, member, api_dict, 'create_member',
                 append_listeners=lambda *args: None,
                 append_pools_monitors=append_pools_monitors,
                 append_l7policies_rules=lambda *args: None
             )
         else:
-            self._call_rpc(context, lb, member, 'create_member')
+            self._call_rpc(context, lb, member, api_dict, 'create_member')
 
         if self.driver.unlegacy_setting_placeholder_driver_side:
             LOG.debug('running un-legacy way for member create p2:')
@@ -736,10 +734,10 @@ def create_bulk(self, context, members):
                 p_list.append(p)
                 LOG.info('the port created here is: %s' % p)
 
-                self.api_dict = member.to_dict(pool=False)
+                api_dict = member.to_dict(pool=False)
                 subnets.append(member.subnet_id)
 
-        self._call_rpc(context, member, 'create_member')
+        self._call_rpc(context, lb, member, api_dict, 'create_member')
 
         for port in p_list:
             LOG.info('p_list details: %s' % p_list)
@@ -835,21 +833,21 @@ def create(self, context, health_monitor):
         self._log_entity(health_monitor)
 
         lb = health_monitor.pool.loadbalancer
-        self.api_dict = health_monitor.to_dict(pool=False)
+        api_dict = health_monitor.to_dict(pool=False)
 
         def append_pools_monitors(context, loadbalancer, service):
             self._append_pools_monitors(context, service, health_monitor.pool)
 
         if cfg.CONF.f5_driver_perf_mode in (2, 3):
             # Utilize default behavior to append all members
             self._call_rpc(
-                context, lb, health_monitor, 'create_health_monitor',
+                context, lb, health_monitor, api_dict, 'create_health_monitor',
                 append_listeners=lambda *args: None,
                 append_pools_monitors=append_pools_monitors,
                 append_l7policies_rules=lambda *args: None
             )
         else:
-            self._call_rpc(context, lb, health_monitor,
+            self._call_rpc(context, lb, health_monitor, api_dict,
                            'create_health_monitor')
 
     @log_helpers.log_method_call
@@ -881,21 +879,21 @@ def delete(self, context, health_monitor):
         self._log_entity(health_monitor)
 
         lb = health_monitor.pool.loadbalancer
-        self.api_dict = health_monitor.to_dict(pool=False)
+        api_dict = health_monitor.to_dict(pool=False)
 
         def append_pools_monitors(context, loadbalancer, service):
             self._append_pools_monitors(context, service, health_monitor.pool)
 
         if cfg.CONF.f5_driver_perf_mode in (2, 3):
             # Utilize default behavior to append all members
             self._call_rpc(
-                context, lb, health_monitor, 'delete_health_monitor',
+                context, lb, health_monitor, api_dict, 'delete_health_monitor',
                 append_listeners=lambda *args: None,
                 append_pools_monitors=append_pools_monitors,
                 append_l7policies_rules=lambda *args: None
             )
         else:
-            self._call_rpc(context, lb, health_monitor,
+            self._call_rpc(context, lb, health_monitor, api_dict,
                            'delete_health_monitor')
 
 
@@ -909,7 +907,7 @@ def create(self, context, policy):
         self._log_entity(policy)
 
         lb = policy.listener.loadbalancer
-        self.api_dict = policy.to_dict(listener=False, rules=False)
+        api_dict = policy.to_dict(listener=False, rules=False)
 
         def append_listeners(context, loadbalancer, service):
             self._append_listeners(context, service, policy.listener)
@@ -923,12 +921,12 @@ def append_pools_monitors(context, loadbalancer, service):
             # Listener may have default pool
             # Utilize default behavior to load members
             self._call_rpc(
-                context, lb, policy, 'create_l7policy',
+                context, lb, policy, api_dict, 'create_l7policy',
                 append_listeners=append_listeners,
                 append_pools_monitors=append_pools_monitors
             )
         else:
-            self._call_rpc(context, lb, policy, 'create_l7policy')
+            self._call_rpc(context, lb, policy, api_dict, 'create_l7policy')
 
     @log_helpers.log_method_call
     def update(self, context, old_policy, policy):
@@ -959,7 +957,7 @@ def delete(self, context, policy):
         self._log_entity(policy)
 
         lb = policy.listener.loadbalancer
-        self.api_dict = policy.to_dict(listener=False, rules=False)
+        api_dict = policy.to_dict(listener=False, rules=False)
 
         def append_listeners(context, loadbalancer, service):
             self._append_listeners(context, service, policy.listener)
@@ -973,12 +971,12 @@ def append_pools_monitors(context, loadbalancer, service):
             # Listener may have default pool
             # Utilize default behavior to load members
             self._call_rpc(
-                context, lb, policy, 'delete_l7policy',
+                context, lb, policy, api_dict, 'delete_l7policy',
                 append_listeners=append_listeners,
                 append_pools_monitors=append_pools_monitors
             )
         else:
-            self._call_rpc(context, lb, policy, 'delete_l7policy')
+            self._call_rpc(context, lb, policy, api_dict, 'delete_l7policy')
 
 
 class L7RuleManager(EntityManager):
@@ -991,7 +989,7 @@ def create(self, context, rule):
         self._log_entity(rule)
 
         lb = rule.policy.listener.loadbalancer
-        self.api_dict = rule.to_dict(policy=False)
+        api_dict = rule.to_dict(policy=False)
 
         def append_listeners(context, loadbalancer, service):
             self._append_listeners(context, service, rule.policy.listener)
@@ -1005,12 +1003,12 @@ def append_pools_monitors(context, loadbalancer, service):
             # Listener may have default pool
             # Utilize default behavior to load members
             self._call_rpc(
-                context, lb, rule, 'create_l7rule',
+                context, lb, rule, api_dict, 'create_l7rule',
                 append_listeners=append_listeners,
                 append_pools_monitors=append_pools_monitors
             )
         else:
-            self._call_rpc(context, lb, rule, 'create_l7rule')
+            self._call_rpc(context, lb, rule, api_dict, 'create_l7rule')
 
     @log_helpers.log_method_call
     def update(self, context, old_rule, rule):
@@ -1041,7 +1039,7 @@ def delete(self, context, rule):
         self._log_entity(rule)
 
         lb = rule.policy.listener.loadbalancer
-        self.api_dict = rule.to_dict(policy=False)
+        api_dict = rule.to_dict(policy=False)
 
         def append_listeners(context, loadbalancer, service):
             self._append_listeners(context, service, rule.policy.listener)
@@ -1055,9 +1053,9 @@ def append_pools_monitors(context, loadbalancer, service):
             # Listener may have default pool
             # Utilize default behavior to load members
             self._call_rpc(
-                context, lb, rule, 'delete_l7rule',
+                context, lb, rule, api_dict, 'delete_l7rule',
                 append_listeners=append_listeners,
                 append_pools_monitors=append_pools_monitors
             )
         else:
-            self._call_rpc(context, lb, rule, 'delete_l7rule')
+            self._call_rpc(context, lb, rule, api_dict, 'delete_l7rule')