From b8226f1b6a660f3d72e59e4abbf38d5d71edd87a Mon Sep 17 00:00:00 2001 From: Boden R Date: Thu, 8 Mar 2018 14:09:10 -0700 Subject: [PATCH] use plugin common utils from neutron-lib The public APIs that are part of neutron.plugins.common.utils were rehomed into neutron-lib with Iabb155b5d2d0ec6104ebee5dd42cf292bdf3ec61 and will removed in neutron with commit I1d63cbea463e92e1d2e053f8e1a564ed52cb84f8 This patch consumes the common plugin utils from neutron-lib Change-Id: I1bd32e7a69f5f1166dbb66c4ae6c293dcad9ce95 --- tricircle/network/drivers/type_vlan.py | 2 +- tricircle/tests/unit/network/test_central_trunk_plugin.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tricircle/network/drivers/type_vlan.py b/tricircle/network/drivers/type_vlan.py index adc523bb..7a05b115 100644 --- a/tricircle/network/drivers/type_vlan.py +++ b/tricircle/network/drivers/type_vlan.py @@ -16,10 +16,10 @@ import sys from neutron_lib.plugins.ml2 import api +from neutron_lib.plugins import utils as plugin_utils from oslo_config import cfg from oslo_log import log -from neutron.plugins.common import utils as plugin_utils from neutron.plugins.ml2.drivers import type_vlan from tricircle.common import constants diff --git a/tricircle/tests/unit/network/test_central_trunk_plugin.py b/tricircle/tests/unit/network/test_central_trunk_plugin.py index 3627f4af..fa284d6a 100644 --- a/tricircle/tests/unit/network/test_central_trunk_plugin.py +++ b/tricircle/tests/unit/network/test_central_trunk_plugin.py @@ -22,9 +22,9 @@ from six.moves import xrange import neutron.conf.common as q_config from neutron.db import db_base_plugin_v2 -from neutron.plugins.common import utils from neutron_lib.api.definitions import portbindings from neutron_lib.plugins import directory +from neutron_lib.plugins import utils from oslo_config import cfg from oslo_utils import uuidutils