From 3f18ad707721a83828f1dc75aee1d7a2a5292653 Mon Sep 17 00:00:00 2001 From: Rudra Rugge Date: Fri, 25 Mar 2016 10:16:51 -0700 Subject: [PATCH] Fix LBAASv1 import for liberty Import uuidutils from oslo instead of neutron Change-Id: If0cf90518cc05ebb4c5fcf3795679af7ed3c9dca Partial-Bug: 1561808 --- .../opencontrail/loadbalancer/loadbalancer_member.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/loadbalancer_member.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/loadbalancer_member.py index 83b5849..c538f56 100644 --- a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/loadbalancer_member.py +++ b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/loadbalancer_member.py @@ -9,7 +9,11 @@ except ImportError: from neutron_lbaas.extensions import loadbalancer -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