diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/listener.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/listener.py index 7f7c559..da90c04 100644 --- a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/listener.py +++ b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/listener.py @@ -10,7 +10,11 @@ except ImportError: from oslo_log import log as logging -from neutron.openstack.common import uuidutils +try: + from neutron.openstack.common import uuidutils +except ImportError: + from oslo_utils import uuidutils + from vnc_api.vnc_api import IdPermsType, NoIdError from vnc_api.vnc_api import InstanceIp, VirtualMachineInterface from vnc_api.vnc_api import SecurityGroup diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer.py index 3b8597d..4bfb5ba 100644 --- a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer.py +++ b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer.py @@ -12,7 +12,11 @@ except ImportError: from oslo_log import log as logging -from neutron.openstack.common import uuidutils +try: + from neutron.openstack.common import uuidutils +except ImportError: + from oslo_utils import uuidutils + from vnc_api.vnc_api import IdPermsType, NoIdError from vnc_api.vnc_api import InstanceIp, VirtualMachineInterface from vnc_api.vnc_api import SecurityGroup diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_db.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_db.py index ed1a9fe..feaf84c 100644 --- a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_db.py +++ b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_db.py @@ -6,7 +6,11 @@ import time import uuid -from oslo.config import cfg +try: + from oslo.config import cfg +except ImportError: + from oslo_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 diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_healthmonitor.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_healthmonitor.py index e616887..e481086 100644 --- a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_healthmonitor.py +++ b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_healthmonitor.py @@ -5,7 +5,11 @@ import uuid from neutron_lbaas.extensions import loadbalancerv2 -from neutron.openstack.common import uuidutils +try: + from neutron.openstack.common import uuidutils +except ImportError: + from oslo_utils import uuidutils + from vnc_api.vnc_api import IdPermsType from vnc_api.vnc_api import LoadbalancerHealthmonitor from vnc_api.vnc_api import LoadbalancerHealthmonitorType diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_member.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_member.py index e8ea8de..8906175 100644 --- a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_member.py +++ b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_member.py @@ -5,7 +5,11 @@ import uuid from neutron_lbaas.extensions import loadbalancerv2 -from neutron.openstack.common import uuidutils +try: + from neutron.openstack.common import uuidutils +except ImportError: + from oslo_utils import uuidutils + from neutron.common import exceptions as n_exc from vnc_api.vnc_api import IdPermsType, NoIdError diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_pool.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_pool.py index 9df138e..a92443c 100644 --- a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_pool.py +++ b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_pool.py @@ -9,7 +9,10 @@ from neutron.plugins.common import constants from neutron.services import provider_configuration as pconf -from neutron.openstack.common import uuidutils +try: + from neutron.openstack.common import uuidutils +except ImportError: + from oslo_utils import uuidutils from vnc_api.vnc_api import * from .. resource_manager import ResourceManager