diff --git a/neutron_plugin_contrail/plugins/opencontrail/contrail_plugin.py b/neutron_plugin_contrail/plugins/opencontrail/contrail_plugin.py index 6935a84..97041ff 100644 --- 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 index a9747ff..bf2daa5 100644 --- 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