Fix lb load error in master neutron and neutron-lbaas

lb is broken with the master neutron and neutron-lbass.
This patch fix this issue.

This patch also replaces the 'cfg' import from oslo_config
to 'neutron.common.config'

Change-Id: I04f56857d615699be9dafbd7681efcecdbf4e699
Closes-bug: #1486579

neutron_plugin_contrail/plugins/opencontrail/contrail_plugin.py

@@ -13,14 +13,11 @@
 #    under the License.
 #
 # @author: Hampapur Ajay, Praneet Bachheti, Rudra Rugge, Atul Moghe
-try:
-    from oslo_config import cfg
-except ImportError:
-    from oslo.config import cfg
 import requests
 
 from neutron.api.v2 import attributes as attr
 from neutron.common import exceptions as exc
+from neutron.common.config import cfg
 from neutron.db import portbindings_base
 from neutron.db import quota_db  # noqa
 from neutron.extensions import allowedaddresspairs

neutron_plugin_contrail/plugins/opencontrail/contrail_plugin_base.py

@@ -15,14 +15,11 @@
 # @author: Hampapur Ajay, Praneet Bachheti, Rudra Rugge, Atul Moghe
 
 
-try:
-    from oslo_config import cfg
-except ImportError:
-    from oslo.config import cfg
 import requests
 
 from neutron.api.v2 import attributes as attr
 from neutron.common import exceptions as exc
+from neutron.common.config import cfg
 from neutron.db import portbindings_base
 from neutron.db import quota_db  # noqa
 from neutron.extensions import allowedaddresspairs

neutron_plugin_contrail/plugins/opencontrail/contrail_plugin_v3.py

@@ -14,12 +14,9 @@
 
 import time
 
-try:
-    from oslo_config import cfg
-except ImportError:
-    from oslo.config import cfg
 from neutron.api.v2 import attributes as attr
 from neutron.common import exceptions as exc
+from neutron.common.config import cfg
 import requests
 
 try:

neutron_plugin_contrail/plugins/opencontrail/loadbalancer/loadbalancer_db.py

@@ -6,7 +6,8 @@
 import time
 import uuid
 
-from oslo.config import cfg
+from neutron.common.config import cfg
+
 from cfgm_common import analytics_client
 from cfgm_common import exceptions as vnc_exc
 from neutron.common import exceptions as n_exc

neutron_plugin_contrail/plugins/opencontrail/loadbalancer/plugin.py

@@ -3,10 +3,18 @@
 #
 from loadbalancer_db import LoadBalancerPluginDb
 
+try:
+    from neutron.extensions import loadbalancer
+except ImportError:
+    from neutron_lbaas.extensions import loadbalancer
+
 
 class LoadBalancerPlugin(LoadBalancerPluginDb):
     supported_extension_aliases = ["lbaas", "extra_lbaas_opts"]
 
+    if hasattr(loadbalancer, 'LOADBALANCER_PREFIX'):
+        path_prefix = loadbalancer.LOADBALANCER_PREFIX
+
     def __init__(self):
         super(LoadBalancerPlugin, self).__init__()
 

neutron_plugin_contrail/plugins/opencontrail/vnc_client/vmi_res_handler.py

@@ -18,11 +18,8 @@
 import eventlet
 import netaddr
 from neutron.common import constants as n_constants
+from neutron.common.config import cfg
 from vnc_api import vnc_api
-try:
-    from oslo.config import cfg
-except ImportError:
-    from oslo_config import cfg
 
 import contrail_res_handler as res_handler
 import fip_res_handler