liberty support on R3.0

neutron plugin changes to support liberty with contrail Partial-Bug: #1547784 Change-Id: I85c37aed3d8418992f06b3df017a04f2e12be08a
Juniper · Mar 10, 2016 · f9b710e · f9b710e
1 parent 2f55600
commit f9b710e
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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