x/vmware-nsx
Code Issues Proposed changes

use neutron-lib address scope apidef

Browse Source 
neutron-lib contains the address scope API definition and neutron is
moving to it in Ib11b90500e871ecf3f23ba262c3c9199611cc6a7. This patch
changes all such references to use lib's API def.

Change-Id: Iffe789aedeb9555ddbb0d0956069c56599fff426
This commit is contained in:
Boden R 2017-07-28 13:52:45 -06:00
parent a82ff4c208
commit edd402ab7a
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsx/plugins/common/plugin.py
View File

@ -21,7 +21,7 @@ from neutron.db import api as db_api
from neutron.db import db_base_plugin_v2
from neutron.db import l3_db
from neutron.db import models_v2
from neutron.extensions import address_scope as ext_address_scope
from neutron_lib.api.definitions import address_scope as ext_address_scope
from neutron_lib.api.definitions import network as net_def
from neutron_lib.api.definitions import port as port_def
from neutron_lib.api.definitions import subnet as subnet_def

2
vmware_nsx/services/dynamic_routing/nsx_v/driver.py
View File

@ -20,8 +20,8 @@ from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import excutils
from neutron.extensions import address_scope
from neutron.extensions import external_net
from neutron_lib.api.definitions import address_scope
from neutron_lib import constants as n_const
from neutron_lib import exceptions as n_exc
from neutron_lib.plugins import directory

3
vmware_nsx/tests/unit/nsx_v/test_plugin.py
View File

@ -41,6 +41,7 @@ import neutron.tests.unit.extensions.test_l3_ext_gw_mode as test_ext_gw_mode
import neutron.tests.unit.extensions.test_portsecurity as test_psec
import neutron.tests.unit.extensions.test_securitygroup as ext_sg
from neutron.tests.unit import testlib_api
from neutron_lib.api.definitions import address_scope as addr_apidef
from neutron_lib.api.definitions import extra_dhcp_opt as edo_ext
from neutron_lib.api.definitions import portbindings
from neutron_lib.api.definitions import provider_net as pnet
@ -2097,7 +2098,7 @@ class TestL3ExtensionManager(object):
attributes.RESOURCE_ATTRIBUTE_MAP.update(
l3.RESOURCE_ATTRIBUTE_MAP)
attributes.RESOURCE_ATTRIBUTE_MAP.update(
address_scope.RESOURCE_ATTRIBUTE_MAP)
addr_apidef.RESOURCE_ATTRIBUTE_MAP)
return (l3.L3.get_resources() +
address_scope.Address_scope.get_resources())

3
vmware_nsx/tests/unit/nsx_v3/test_plugin.py
View File

@ -37,6 +37,7 @@ from neutron.tests.unit.extensions \
from neutron.tests.unit.scheduler \
import test_dhcp_agent_scheduler as test_dhcpagent
from neutron_lib.api.definitions import address_scope as addr_apidef
from neutron_lib.api.definitions import portbindings
from neutron_lib.api.definitions import provider_net as pnet
from neutron_lib import constants
@ -539,7 +540,7 @@ class TestL3ExtensionManager(object):
attributes.RESOURCE_ATTRIBUTE_MAP.update(
l3.RESOURCE_ATTRIBUTE_MAP)
attributes.RESOURCE_ATTRIBUTE_MAP.update(
address_scope.RESOURCE_ATTRIBUTE_MAP)
addr_apidef.RESOURCE_ATTRIBUTE_MAP)
return (l3.L3.get_resources() +
address_scope.Address_scope.get_resources())

2
vmware_nsx/tests/unit/services/dynamic_routing/test_nsxv_bgp_driver.py
View File

@ -16,11 +16,11 @@ import contextlib
import mock
from neutron.api import extensions
from neutron.extensions import address_scope
from neutron_dynamic_routing.db import bgp_db # noqa
from neutron_dynamic_routing import extensions as dr_extensions
from neutron_dynamic_routing.extensions import bgp as ext_bgp
from neutron_dynamic_routing.tests.unit.db import test_bgp_db
from neutron_lib.api.definitions import address_scope
from neutron_lib import context
from neutron_lib import exceptions as n_exc
from neutron_lib.plugins import directory