x/vmware-nsx
Code Issues Proposed changes

Merge "use l3 flavors api def from neutron-lib"

Browse Source
This commit is contained in:
Zuul 2017-11-13 16:24:55 +00:00 committed by Gerrit Code Review
commit 26453ac833
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,6 @@ import mock
import netaddr
from neutron.extensions import address_scope
from neutron.extensions import l3
from neutron.extensions import l3_flavors
from neutron.extensions import securitygroup as secgrp
from neutron.plugins.common import utils
from neutron.tests.unit import _test_extension_portbindings as test_bindings
@ -41,6 +40,7 @@ from neutron_lib.api.definitions import external_net as extnet_apidef
from neutron_lib.api.definitions import extra_dhcp_opt as edo_ext
from neutron_lib.api.definitions import l3 as l3_apidef
from neutron_lib.api.definitions import l3_ext_gw_mode as l3_egm_apidef
from neutron_lib.api.definitions import l3_flavors as l3fav_apidef
from neutron_lib.api.definitions import port_security as psec
from neutron_lib.api.definitions import portbindings
from neutron_lib.api.definitions import provider_net as pnet
@ -2106,7 +2106,7 @@ class TestL3ExtensionManager(object):
l3.L3().update_attributes_map(
raz_apidef.RESOURCE_ATTRIBUTE_MAP)
l3.L3().update_attributes_map(
l3_flavors.EXTENDED_ATTRIBUTES_2_0)
l3fav_apidef.RESOURCE_ATTRIBUTE_MAP)
return (l3.L3.get_resources() +
address_scope.Address_scope.get_resources())