Merge pull request #1079 from zongzw/lb-dict-stable-pike

Compat with lb dict passed from neutron_lbaas.

Author: zongzw

f5lbaasdriver/v2/bigip/agent_scheduler.py

@@ -23,6 +23,7 @@
 
 from neutron_lbaas import agent_scheduler
 from neutron_lbaas.extensions import lbaas_agentschedulerv2
+from neutron_lbaas.services.loadbalancer.data_models import LoadBalancer
 
 LOG = logging.getLogger(__name__)
 
@@ -221,6 +222,8 @@ def schedule(self, plugin, context, loadbalancer_id, env=None):
             # already above, so this db call is avoided.
             LOG.info('get_loadbalancer start inside schedule')
             loadbalancer = plugin.db.get_loadbalancer(context, loadbalancer_id)
+            loadbalancer = LoadBalancer(**loadbalancer) \
+                if type(loadbalancer) == dict else loadbalancer
             LOG.info('get_loadbalancer end inside schedule')
 
             # There is no existing loadbalancer agent binding.

f5lbaasdriver/v2/bigip/plugin_rpc.py

@@ -24,6 +24,7 @@
 
 from neutron_lbaas.db.loadbalancer import models
 from neutron_lbaas.services.loadbalancer import constants as nlb_constant
+from neutron_lbaas.services.loadbalancer.data_models import LoadBalancer
 
 from neutron_lib.api.definitions import portbindings
 from neutron_lib import constants as neutron_const
@@ -108,6 +109,7 @@ def get_service_by_loadbalancer_id(
                     context,
                     id=loadbalancer_id
                 )
+                lb = LoadBalancer(**lb) if type(lb) == dict else lb
                 agent = self.driver.plugin.db.get_agent_hosting_loadbalancer(
                     context,
                     loadbalancer_id
@@ -138,11 +140,12 @@ def get_all_loadbalancers(self, context, env, group=None, host=None):
                     agent.id
                 )
                 for lb in agent_lbs:
+                    lbobj = LoadBalancer(**lb) if type(lb) == dict else lb
                     loadbalancers.append(
                         {
                             'agent_host': agent['host'],
-                            'lb_id': lb.id,
-                            'tenant_id': lb.tenant_id
+                            'lb_id': lbobj.id,
+                            'tenant_id': lbobj.tenant_id
                         }
                     )
         if host:
@@ -166,12 +169,13 @@ def get_active_loadbalancers(self, context, env, group=None, host=None):
                     agent.id
                 )
                 for lb in agent_lbs:
-                    if lb.provisioning_status == plugin_constants.ACTIVE:
+                    lbobj = LoadBalancer(**lb) if type(lb) == dict else lb
+                    if lbobj.provisioning_status == plugin_constants.ACTIVE:
                         loadbalancers.append(
                             {
                                 'agent_host': agent['host'],
-                                'lb_id': lb.id,
-                                'tenant_id': lb.tenant_id
+                                'lb_id': lbobj.id,
+                                'tenant_id': lbobj.tenant_id
                             }
                         )
         if host:
@@ -195,13 +199,16 @@ def get_pending_loadbalancers(self, context, env, group=None, host=None):
                     agent.id
                 )
                 for lb in agent_lbs:
-                    if (lb.provisioning_status != plugin_constants.ACTIVE and
-                            lb.provisioning_status != plugin_constants.ERROR):
+                    lbobj = LoadBalancer(**lb) if type(lb) == dict else lb
+                    if (lbobj.provisioning_status !=
+                        plugin_constants.ACTIVE and
+                            lbobj.provisioning_status !=
+                            plugin_constants.ERROR):
                         loadbalancers.append(
                             {
                                 'agent_host': agent['host'],
-                                'lb_id': lb.id,
-                                'tenant_id': lb.tenant_id
+                                'lb_id': lbobj.id,
+                                'tenant_id': lbobj.tenant_id
                             }
                         )
         if host:
@@ -225,12 +232,13 @@ def get_errored_loadbalancers(self, context, env, group=None, host=None):
                     agent.id
                 )
                 for lb in agent_lbs:
-                    if (lb.provisioning_status == plugin_constants.ERROR):
+                    lbobj = LoadBalancer(**lb) if type(lb) == dict else lb
+                    if (lbobj.provisioning_status == plugin_constants.ERROR):
                         loadbalancers.append(
                             {
                                 'agent_host': agent['host'],
-                                'lb_id': lb.id,
-                                'tenant_id': lb.tenant_id
+                                'lb_id': lbobj.id,
+                                'tenant_id': lbobj.tenant_id
                             }
                         )
         if host:
@@ -711,6 +719,8 @@ def validate_loadbalancers_state(self, context, loadbalancers, host=None):
                 try:
                     lb_db = self.driver.plugin.db.get_loadbalancer(context,
                                                                    lbid)
+                    lb_db = LoadBalancer(**lb_db) \
+                        if type(lb_db) == dict else lb_db
                     lb_status[lbid] = lb_db.provisioning_status
 
                 except q_exc.NotFound: