From 12d9d2602e639e5956e4e9abd694d5b07ab16693 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Tue, 1 Mar 2016 04:34:21 -0800 Subject: [PATCH] FWaaS: make use of neutron_lib constants Commit 87a79256c494c36f2d9597313f430b24c0110161 added neutron_lib for shared constants. This patch moves us to make use of the aforementioned library. Change-Id: I58fd53934fdb97f1cdb7c11df965a6e851d33ddd --- neutron_fwaas/db/firewall/firewall_db.py | 2 +- neutron_fwaas/extensions/firewall.py | 2 +- .../services/firewall/agents/varmour/varmour_router.py | 2 +- neutron_fwaas/services/firewall/agents/vyatta/vyatta_utils.py | 2 +- neutron_fwaas/services/firewall/drivers/mcafee/ngfw_fwaas.py | 2 +- .../services/firewall/plugins/cisco/cisco_fwaas_plugin.py | 2 +- .../services/firewall/agents/varmour/test_varmour_router.py | 2 +- .../unit/services/firewall/agents/vyatta/test_vyatta_utils.py | 2 +- .../services/firewall/drivers/varmour/test_varmour_fwaas.py | 2 +- requirements.txt | 1 + 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/neutron_fwaas/db/firewall/firewall_db.py b/neutron_fwaas/db/firewall/firewall_db.py index f903da7588..863c1b17fb 100644 --- a/neutron_fwaas/db/firewall/firewall_db.py +++ b/neutron_fwaas/db/firewall/firewall_db.py @@ -16,13 +16,13 @@ from neutron.callbacks import events from neutron.callbacks import registry from neutron.callbacks import resources -from neutron.common import constants from neutron.db import common_db_mixin as base_db from neutron.db import model_base from neutron.db import models_v2 from neutron.extensions import l3 from neutron import manager from neutron.plugins.common import constants as p_const +from neutron_lib import constants from oslo_config import cfg from oslo_log import log as logging from oslo_utils import uuidutils diff --git a/neutron_fwaas/extensions/firewall.py b/neutron_fwaas/extensions/firewall.py index 3a8a32563e..5d88840d2d 100644 --- a/neutron_fwaas/extensions/firewall.py +++ b/neutron_fwaas/extensions/firewall.py @@ -18,10 +18,10 @@ from neutron.api import extensions from neutron.api.v2 import attributes as attr from neutron.api.v2 import resource_helper -from neutron.common import constants from neutron.common import exceptions as nexception from neutron.plugins.common import constants as p_const from neutron.services import service_base +from neutron_lib import constants from oslo_config import cfg from oslo_log import log as logging import six diff --git a/neutron_fwaas/services/firewall/agents/varmour/varmour_router.py b/neutron_fwaas/services/firewall/agents/varmour/varmour_router.py index d68fc06697..313782c117 100755 --- a/neutron_fwaas/services/firewall/agents/varmour/varmour_router.py +++ b/neutron_fwaas/services/firewall/agents/varmour/varmour_router.py @@ -28,8 +28,8 @@ from neutron.agent.linux import interface from neutron.agent.linux import ip_lib from neutron.common import config as common_config -from neutron.common import constants as l3_constants from neutron import service as neutron_service +from neutron_lib import constants as l3_constants from oslo_config import cfg from oslo_log import log as logging from oslo_service import service diff --git a/neutron_fwaas/services/firewall/agents/vyatta/vyatta_utils.py b/neutron_fwaas/services/firewall/agents/vyatta/vyatta_utils.py index b7b8acedc6..8d95126845 100755 --- a/neutron_fwaas/services/firewall/agents/vyatta/vyatta_utils.py +++ b/neutron_fwaas/services/firewall/agents/vyatta/vyatta_utils.py @@ -15,7 +15,7 @@ # from networking_brocade.vyatta.vrouter import client as vyatta_client -from neutron.common import constants as l3_constants +from neutron_lib import constants as l3_constants from six.moves.urllib import parse TRUST_ZONE = 'Internal_Trust' diff --git a/neutron_fwaas/services/firewall/drivers/mcafee/ngfw_fwaas.py b/neutron_fwaas/services/firewall/drivers/mcafee/ngfw_fwaas.py index 30a424a6b7..ed3b8582cc 100644 --- a/neutron_fwaas/services/firewall/drivers/mcafee/ngfw_fwaas.py +++ b/neutron_fwaas/services/firewall/drivers/mcafee/ngfw_fwaas.py @@ -21,7 +21,7 @@ import netaddr -from neutron.common import constants +from neutron_lib import constants from oslo_config import cfg from oslo_log import helpers as log_helpers from oslo_log import log as logging diff --git a/neutron_fwaas/services/firewall/plugins/cisco/cisco_fwaas_plugin.py b/neutron_fwaas/services/firewall/plugins/cisco/cisco_fwaas_plugin.py index 600feca739..e5d0c09250 100644 --- a/neutron_fwaas/services/firewall/plugins/cisco/cisco_fwaas_plugin.py +++ b/neutron_fwaas/services/firewall/plugins/cisco/cisco_fwaas_plugin.py @@ -14,11 +14,11 @@ # from neutron.api.v2 import attributes as attr -from neutron.common import constants as l3_const from neutron.common import rpc as n_rpc from neutron import context as neutron_context from neutron import manager from neutron.plugins.common import constants as const +from neutron_lib import constants as l3_const from oslo_config import cfg from oslo_log import helpers as log_helpers from oslo_log import log as logging diff --git a/neutron_fwaas/tests/unit/services/firewall/agents/varmour/test_varmour_router.py b/neutron_fwaas/tests/unit/services/firewall/agents/varmour/test_varmour_router.py index 48106dddd4..d8a56d124d 100644 --- a/neutron_fwaas/tests/unit/services/firewall/agents/varmour/test_varmour_router.py +++ b/neutron_fwaas/tests/unit/services/firewall/agents/varmour/test_varmour_router.py @@ -22,9 +22,9 @@ from neutron.agent.l3 import router_info from neutron.agent.linux import interface from neutron.common import config as base_config -from neutron.common import constants as l3_constants from neutron_fwaas.services.firewall.agents.varmour import varmour_router from neutron_fwaas.tests import base +from neutron_lib import constants as l3_constants from oslo_utils import uuidutils diff --git a/neutron_fwaas/tests/unit/services/firewall/agents/vyatta/test_vyatta_utils.py b/neutron_fwaas/tests/unit/services/firewall/agents/vyatta/test_vyatta_utils.py index c2bb43a55e..50127b04d2 100644 --- a/neutron_fwaas/tests/unit/services/firewall/agents/vyatta/test_vyatta_utils.py +++ b/neutron_fwaas/tests/unit/services/firewall/agents/vyatta/test_vyatta_utils.py @@ -17,8 +17,8 @@ import mock -from neutron.common import constants as l3_constants from neutron.tests import base +from neutron_lib import constants as l3_constants from six.moves.urllib import parse # Mocking imports of 3rd party vyatta library in unit tests and all modules diff --git a/neutron_fwaas/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py b/neutron_fwaas/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py index 15a72b8872..abab8d0a5d 100644 --- a/neutron_fwaas/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py +++ b/neutron_fwaas/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py @@ -22,8 +22,8 @@ from neutron.agent.l3 import router_info from neutron.agent.linux import interface from neutron.common import config as base_config -from neutron.common import constants as l3_constants from neutron.tests import base +from neutron_lib import constants as l3_constants from oslo_utils import uuidutils from neutron_fwaas.services.firewall.agents.varmour import varmour_router diff --git a/requirements.txt b/requirements.txt index 319125eefd..22794b0c0b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,7 @@ netaddr!=0.7.16,>=0.7.12 # BSD SQLAlchemy<1.1.0,>=1.0.10 # MIT alembic>=0.8.0 # MIT six>=1.9.0 # MIT +neutron-lib>=0.0.1 # Apache-2.0 oslo.config>=3.4.0 # Apache-2.0 oslo.db>=4.1.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0