Merge "FWaaS: make use of neutron_lib constants"

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

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

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

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'

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

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

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
 
 

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

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

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