openstack
/
neutron-vpnaas
Code Issues Proposed changes

Migrate neutron.plugins.common to neutron-lib 

Change-Id: I227911fe15990f5e2e67d052c16869d57d5bbe58
Depends-On: I6e86d737064f97d82e36a4e82a9f2a22fd38febe
This commit is contained in:
Cao Xuan Hoang 2017-03-27 14:04:21 +07:00
parent d13c5298b7
commit 7589fc5ed1
17 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron_vpnaas/db/vpn/vpn_db.py
View File

@ -20,10 +20,10 @@ from neutron.callbacks import resources
from neutron.db import common_db_mixin as base_db
from neutron.db.models import l3agent
from neutron.db import models_v2
from neutron.plugins.common import constants as p_constants
from neutron.plugins.common import utils
from neutron_lib import constants as lib_constants
from neutron_lib.exceptions import l3 as l3_exception
from neutron_lib.plugins import constants as p_constants
from neutron_lib.plugins import directory
from oslo_log import log as logging
from oslo_utils import excutils
@ -184,7 +184,7 @@ class VPNPluginDb(vpnaas.VPNPluginBase,
dpd_interval=ipsec_sitecon['dpd_interval'],
dpd_timeout=ipsec_sitecon['dpd_timeout'],
admin_state_up=ipsec_sitecon['admin_state_up'],
status=p_constants.PENDING_CREATE,
status=lib_constants.PENDING_CREATE,
vpnservice_id=vpnservice_id,
ikepolicy_id=ipsec_sitecon['ikepolicy_id'],
ipsecpolicy_id=ipsec_sitecon['ipsecpolicy_id'],
@ -483,7 +483,7 @@ class VPNPluginDb(vpnaas.VPNPluginBase,
subnet_id=vpns['subnet_id'],
router_id=vpns['router_id'],
admin_state_up=vpns['admin_state_up'],
status=p_constants.PENDING_CREATE)
status=lib_constants.PENDING_CREATE)
context.session.add(vpnservice_db)
return self._make_vpnservice_dict(vpnservice_db)

2
neutron_vpnaas/extensions/vpn_endpoint_groups.py
View File

@ -17,11 +17,11 @@ import abc
import six
from neutron.api.v2 import resource_helper
from neutron.plugins.common import constants as nconstants
from neutron_lib.api import converters
from neutron_lib.api import extensions
from neutron_lib.db import constants as db_const
from neutron_lib.plugins import constants as nconstants
from neutron_vpnaas.services.vpn.common import constants

2
neutron_vpnaas/extensions/vpnaas.py
View File

@ -20,12 +20,12 @@ from neutron_lib.api import extensions
from neutron_lib.api import validators as validators
from neutron_lib.db import constants as db_const
from neutron_lib import exceptions as nexception
from neutron_lib.plugins import constants as nconstants
from neutron_lib.services import base as service_base
import six
from neutron.api.v2 import resource_helper
from neutron.plugins.common import constants as nconstants
from neutron_vpnaas._i18n import _

2
neutron_vpnaas/services/vpn/device_drivers/cisco_ipsec.py
View File

@ -16,8 +16,8 @@ import collections
import requests
from neutron.common import rpc as n_rpc
from neutron.plugins.common import constants
from neutron.plugins.common import utils as plugin_utils
from neutron_lib import constants
from neutron_lib import context as ctx
from neutron_lib import exceptions as nexception
from oslo_concurrency import lockutils

2
neutron_vpnaas/services/vpn/device_drivers/ipsec.py
View File

@ -28,9 +28,9 @@ from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils as agent_utils
from neutron.common import rpc as n_rpc
from neutron.common import utils as n_utils
from neutron.plugins.common import constants
from neutron.plugins.common import utils as plugin_utils
from neutron_lib.api import validators
from neutron_lib import constants
from neutron_lib import context
from neutron_lib.utils import file as file_utils
from oslo_concurrency import lockutils

2
neutron_vpnaas/services/vpn/device_drivers/strongswan_ipsec.py
View File

@ -20,7 +20,7 @@ from oslo_log import log as logging
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
from neutron.plugins.common import constants
from neutron_lib import constants
from neutron_vpnaas._i18n import _
from neutron_vpnaas.services.vpn.device_drivers import ipsec

2
neutron_vpnaas/services/vpn/plugin.py
View File

@ -15,9 +15,9 @@
# under the License.
from neutron.db import servicetype_db as st_db
from neutron.plugins.common import constants
from neutron.services import provider_configuration as pconf
from neutron.services import service_base
from neutron_lib.plugins import constants
from oslo_log import log as logging

7
neutron_vpnaas/tests/functional/common/test_scenario.py
View File

@ -26,15 +26,14 @@ from neutron.agent.linux import external_process
from neutron.agent.linux import interface
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils as linux_utils
from neutron.common import constants as l3_constants
from neutron.common import utils as common_utils
from neutron.conf.agent import common as agent_config
from neutron.conf import common as common_config
from neutron.plugins.common import constants
from neutron.services.provider_configuration import serviceprovider_opts
from neutron.tests.common import l3_test_common
from neutron.tests.common import net_helpers
from neutron.tests.functional import base
from neutron_lib import constants
from neutron_lib.utils import net as n_utils
from oslo_config import cfg
from oslo_log import log as logging
@ -263,7 +262,7 @@ class SiteInfoWithHaRouter(SiteInfo):
super(SiteInfoWithHaRouter, self).generate_router_info()
self.info['ha'] = True
self.info['ha_vr_id'] = 1
self.info[l3_constants.HA_INTERFACE_KEY] = (
self.info[constants.HA_INTERFACE_KEY] = (
l3_test_common.get_ha_interface())
# Mock router namespace name, for when router is created
self.get_ns_name.return_value = "qrouter-{0}-{1}".format(
@ -272,7 +271,7 @@ class SiteInfoWithHaRouter(SiteInfo):
def generate_backup_router_info(self):
# Clone router info, using different HA interface (using same ID)
info = copy.deepcopy(self.info)
info[l3_constants.HA_INTERFACE_KEY] = (
info[constants.HA_INTERFACE_KEY] = (
l3_test_common.get_ha_interface(ip='169.254.192.2',
mac='22:22:22:22:22:22'))
# Mock router namespace name, for when router is created

2
neutron_vpnaas/tests/functional/strongswan/test_strongswan_driver.py
View File

@ -18,8 +18,8 @@ import os
from neutron.agent.l3 import legacy_router
from neutron.conf.agent.l3 import config as l3_config
from neutron.plugins.common import constants
from neutron.tests.functional import base
from neutron_lib import constants
from oslo_config import cfg
from oslo_utils import uuidutils

4
neutron_vpnaas/tests/unit/db/vpn/test_vpn_db.py
View File

@ -25,13 +25,13 @@ from neutron.db import agentschedulers_db
from neutron.db import l3_agentschedulers_db
from neutron.db import servicetype_db as sdb
from neutron import extensions as nextensions
from neutron.plugins.common import constants as nconstants
from neutron.scheduler import l3_agent_scheduler
from neutron.tests.unit.db import test_db_base_plugin_v2 as test_db_plugin
from neutron.tests.unit.extensions import test_l3 as test_l3_plugin
from neutron_lib import constants as lib_constants
from neutron_lib import context
from neutron_lib.exceptions import l3 as l3_exception
from neutron_lib.plugins import constants as nconstants
from neutron_lib.plugins import directory
from oslo_db import exception as db_exc
from oslo_utils import uuidutils
@ -423,7 +423,7 @@ class VPNTestMixin(object):
adminContext,
model,
resource_id)
resource_db.status = nconstants.ACTIVE
resource_db.status = lib_constants.ACTIVE
class VPNPluginDbTestCase(VPNTestMixin,

2
neutron_vpnaas/tests/unit/db/vpn/test_vpn_validator.py
View File

@ -18,10 +18,10 @@ import socket
from neutron.db import l3_db
from neutron.db import servicetype_db as st_db
from neutron.plugins.common import constants as nconstants
from neutron_lib import constants as lconstants
from neutron_lib import context as n_ctx
from neutron_lib import exceptions as nexception
from neutron_lib.plugins import constants as nconstants
from neutron_lib.plugins import directory
from oslo_utils import uuidutils
from sqlalchemy.orm import query

2
neutron_vpnaas/tests/unit/extensions/test_vpn_endpoint_groups.py
View File

@ -18,8 +18,8 @@ import mock
from oslo_utils import uuidutils
from webob import exc
from neutron.plugins.common import constants as nconstants
from neutron.tests.unit.api.v2 import test_base as test_api_v2
from neutron_lib.plugins import constants as nconstants
from neutron_vpnaas.extensions import vpn_endpoint_groups
from neutron_vpnaas.extensions import vpnaas

2
neutron_vpnaas/tests/unit/extensions/test_vpnaas.py
View File

@ -15,8 +15,8 @@
import copy
import mock
from neutron.plugins.common import constants as nconstants
from neutron.tests.unit.api.v2 import test_base as test_api_v2
from neutron_lib.plugins import constants as nconstants
from oslo_utils import uuidutils
from webob import exc

2
neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py
View File

@ -16,7 +16,7 @@ import copy
import operator
import mock
from neutron.plugins.common import constants
from neutron_lib import constants
from neutron_lib import context
from oslo_utils import uuidutils

2
neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_ipsec.py
View File

@ -23,7 +23,7 @@ from neutron.agent.l3 import dvr_edge_router
from neutron.agent.l3 import dvr_snat_ns
from neutron.agent.l3 import legacy_router
from neutron.agent.linux import iptables_manager
from neutron.plugins.common import constants
from neutron_lib import constants
from oslo_config import cfg
from oslo_utils import uuidutils

2
neutron_vpnaas/tests/unit/services/vpn/service_drivers/test_cisco_ipsec.py
View File

@ -16,10 +16,10 @@ import mock
from six import moves
from neutron.db import servicetype_db as st_db
from neutron.plugins.common import constants
from neutron.tests.unit import testlib_api
from neutron_lib import constants as lib_const
from neutron_lib import context as n_ctx
from neutron_lib.plugins import constants
from neutron_lib.plugins import directory
from oslo_config import cfg
from oslo_utils import uuidutils

4
neutron_vpnaas/tests/unit/services/vpn/test_plugin.py
View File

@ -15,12 +15,12 @@
import contextlib
import mock
from neutron.plugins.common import constants as p_constants
from neutron.tests.unit.db import test_agentschedulers_db
from neutron.tests.unit.extensions import test_agent as test_agent_ext_plugin
from neutron_lib import constants as lib_constants
from neutron_lib import context
from neutron_lib.plugins import constants as p_constants
from neutron_lib.plugins import directory
from neutron_vpnaas.db.vpn import vpn_validator
@ -164,4 +164,4 @@ class TestVPNDriverPlugin(test_db_vpnaas.TestVpnaas,
vpnservices = service_plugin._get_agent_hosting_vpn_services(
self.adminContext, FAKE_HOST)
vpnservice_db = vpnservices[0]
self.assertEqual(p_constants.ACTIVE, vpnservice_db['status'])
self.assertEqual(lib_constants.ACTIVE, vpnservice_db['status'])