Fix import errors when using with latest neutron

Change-Id: I09ce9e81bd487e757141b6727310af4e5471d2bf
Juniper · Jan 30, 2015 · 4b429e5 · 4b429e5
1 parent f867f65
commit 4b429e5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/neutron_plugin_contrail/plugins/opencontrail/contrail_plugin.py b/neutron_plugin_contrail/plugins/opencontrail/contrail_plugin.py
@@ -27,8 +27,16 @@
 from neutron.extensions import portbindings
 from neutron.extensions import securitygroup
 from neutron import neutron_plugin_base_v2
-from neutron.openstack.common import importutils
-from neutron.openstack.common import jsonutils as json
+try:
+    from neutron.openstack.common import importutils
+except ImportError:
+    from oslo_utils import importutils
+
+try:
+    from neutron.openstack.common import jsonutils as json
+except ImportError:
+    from oslo_serialization import jsonutils as json
+
 from neutron.openstack.common import log as logging
 from simplejson import JSONDecodeError
 

diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/driver.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/driver.py
@@ -6,7 +6,10 @@
 
 from neutron.common import exceptions as n_exc
 from neutron.openstack.common import log as logging
-import neutron.services.loadbalancer.drivers.abstract_driver as abstract_driver
+try:
+    from neutron.services.loadbalancer.drivers import abstract_driver
+except ImportError:
+    from neutron_lbaas.services.loadbalancer.drivers import abstract_driver
 
 from vnc_api.vnc_api import ServiceInstance, ServiceInstanceType
 from vnc_api.vnc_api import ServiceScaleOutType, ServiceInstanceInterfaceType