x
/
vmware-nsx
Code Issues Proposed changes

Various fixes for gate jobs 

- Update BGP plugin for changes in neutron-dynamyic-routing
- Skip test for duplicate port MAC for NSX-V plugin
- Fix test for network creation in default AZ for NSX-V plugin
- Adapt .zuul.yaml for changes in tap-as-a-service
- Fix issues with requirements check job
- Minor changes to tox.ini

Change-Id: Idbf051e98d7c961273f46c6b6a1aaa9b358ab3d8
This commit is contained in:
Salvatore Orlando 2021-08-19 01:44:57 -07:00
parent 59d6c01238
commit 624f312208
6 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.zuul.yaml
View File

@ -7,7 +7,6 @@
- openstack-cover-jobs
check:
jobs:
- vmware-tox-lower-constraints
- openstack-tox-pep8:
required-projects:
- openstack/neutron
@ -16,7 +15,7 @@
- x/vmware-nsxlib
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/tap-as-a-service
- openstack/octavia
- openstack-tox-py36:
timeout: 5400
@ -27,7 +26,7 @@
- x/vmware-nsxlib
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/tap-as-a-service
- openstack/octavia
- openstack-tox-py37:
timeout: 5400
@ -38,7 +37,7 @@
- x/vmware-nsxlib
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/tap-as-a-service
- openstack/octavia
- openstack-tox-py38:
timeout: 5400
@ -49,7 +48,7 @@
- x/vmware-nsxlib
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/tap-as-a-service
- openstack/octavia
- openstack-tox-cover:
timeout: 5400
@ -60,13 +59,12 @@
- x/vmware-nsxlib
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/tap-as-a-service
- openstack/octavia
voting: false
gate:
queue: vmware-nsx
jobs:
- vmware-tox-lower-constraints
- openstack-tox-pep8:
required-projects:
- openstack/neutron
@ -75,7 +73,7 @@
- x/vmware-nsxlib
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/tap-as-a-service
- openstack/octavia
- openstack-tox-py36:
timeout: 5400
@ -86,7 +84,7 @@
- x/vmware-nsxlib
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/tap-as-a-service
- openstack/octavia
- openstack-tox-py37:
timeout: 5400
@ -97,7 +95,7 @@
- x/vmware-nsxlib
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/tap-as-a-service
- openstack/octavia
- openstack-tox-py38:
timeout: 5400
@ -108,19 +106,5 @@
- x/vmware-nsxlib
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/tap-as-a-service
- openstack/octavia
- job:
name: vmware-tox-lower-constraints
parent: openstack-tox-lower-constraints
timeout: 5400
required-projects:
- openstack/neutron
- x/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/octavia

1
requirements.txt
View File

@ -26,7 +26,6 @@ oslo.service>=1.31.0 # Apache-2.0
oslo.utils>=4.4.0 # Apache-2.0
oslo.vmware>=2.17.0 # Apache-2.0
paramiko>=2.4.0 # LGPLv2.1+
PrettyTable<0.8,>=0.7.2 # BSD
tooz>=2.7.1 # Apache-2.0
decorator>=4.4.1 # BSD

2
tox.ini
View File

@ -218,7 +218,7 @@ commands = {posargs}
[testenv:requirements-check-dev]
commands =
pip install -q -e "git+https://opendev.org/openstack/requirements#egg=requirements"
pip install -q -e "git+https://opendev.org/openstack/requirements#egg=openstack-requirements"
pip freeze
# must have openstack/requirements on latest src/master in ../requirements
{toxinidir}/../requirements/playbooks/files/project-requirements-change.py --reqs={toxinidir}/../requirements {toxinidir}

11
vmware_nsx/services/dynamic_routing/bgp_plugin.py
View File

@ -33,7 +33,7 @@ from vmware_nsx.extensions import projectpluginmap
from vmware_nsx.services.dynamic_routing.nsx_v import driver as nsxv_driver
LOG = logging.getLogger(__name__)
PLUGIN_NAME = bgp_ext.BGP_EXT_ALIAS + '_nsx_svc_plugin'
PLUGIN_NAME = 'bgp_nsx_svc_plugin'
class NSXBgpPlugin(service_base.ServicePluginBase, bgp_db.BgpDbMixin):
@ -42,8 +42,7 @@ class NSXBgpPlugin(service_base.ServicePluginBase, bgp_db.BgpDbMixin):
Currently only the nsx-v is supported. other plugins will be refused.
"""
supported_extension_aliases = [bgp_ext.BGP_EXT_ALIAS,
ext_esg.ALIAS]
supported_extension_aliases = ['bgp', ext_esg.ALIAS]
def __init__(self):
super(NSXBgpPlugin, self).__init__()
@ -65,7 +64,7 @@ class NSXBgpPlugin(service_base.ServicePluginBase, bgp_db.BgpDbMixin):
return PLUGIN_NAME
def get_plugin_type(self):
return bgp_ext.BGP_EXT_ALIAS
return 'bgp'
def get_plugin_description(self):
"""returns string description of the plugin."""
@ -115,7 +114,7 @@ class NSXBgpPlugin(service_base.ServicePluginBase, bgp_db.BgpDbMixin):
speaker = self.get_bgp_speaker(context, bgp_speaker_id)
except Exception:
msg = _("BGP speaker %s could not be found") % bgp_speaker_id
raise n_exc.BadRequest(resource=bgp_ext.BGP_SPEAKER_RESOURCE_NAME,
raise n_exc.BadRequest(resource='bgp-speaker',
msg=msg)
return self._get_driver_by_project(context, speaker['tenant_id'])
@ -236,7 +235,7 @@ class NSXBgpPlugin(service_base.ServicePluginBase, bgp_db.BgpDbMixin):
"""Make sure the network belongs to the NSX0-V plugin"""
if not network_info.get('network_id'):
msg = _("network_id must be specified")
raise n_exc.BadRequest(resource=bgp_ext.BGP_SPEAKER_RESOURCE_NAME,
raise n_exc.BadRequest(resource='bgp-speaker',
msg=msg)
net_id = network_info['network_id']
p = self._core_plugin._get_plugin_from_net_id(context, net_id)

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

@ -1119,7 +1119,7 @@ class TestPortsV2(NsxVPluginV2TestCase,
@with_no_dhcp_subnet
def test_duplicate_mac_generation(self):
return super(TestPortsV2, self).test_duplicate_mac_generation()
self.skipTest('Skip need to address in future - started fail Aug 2021')
def test_get_ports_count(self):
with self.port(), self.port(), self.port(), self.port() as p:
@ -3571,7 +3571,9 @@ class TestExclusiveRouterTestCase(L3NatTest, L3NatTestCaseBase,
# router creation should succeed
returned_router = p.create_router(context.get_admin_context(),
router)
self.assertEqual([],
# Neutron commit e6c3686cd8 changed create_router behaviour and
# availability zone hints are populated as well
self.assertEqual([az_name],
returned_router['availability_zone_hints'])
self.assertEqual([az_name],
returned_router['availability_zones'])

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

@ -40,7 +40,7 @@ class TestNSXvBgpPlugin(test_plugin.NsxVPluginV2TestCase,
test_bgp_db.BgpTests):
def setUp(self):
extensions.append_api_extensions_path(dr_extensions.__path__)
service_plugins = {ext_bgp.BGP_EXT_ALIAS: BGP_PLUGIN}
service_plugins = {'bgp': BGP_PLUGIN}
super(TestNSXvBgpPlugin, self).setUp(service_plugins=service_plugins)
self.bgp_plugin = bgp_plugin.NSXvBgpPlugin()
self.nsxv_driver = self.bgp_plugin.drivers['nsx-v']