From dbd0f29488b65c07ea3b8a08f553b9d679acca11 Mon Sep 17 00:00:00 2001 From: asarfaty Date: Thu, 24 Sep 2020 06:04:52 +0200 Subject: [PATCH] Use the networking-l2gw project new location networking-l2gw and networking-l2gw-tempest-plugin are imported to new location now and supposed to be retired from openstack/namespace. Cherry picked from: I902ea79cdd3a8e56540ab44a7bd2f986f5d18bca Change-Id: I912ae6d8bcc6c5350485bb80eeca3f3e29b7672c --- .zuul.yaml | 92 +++++++++++++++++-- tox.ini | 2 +- vmware_nsx/tests/unit/nsx_v/test_plugin.py | 15 +++ vmware_nsx/tests/unit/nsx_v3/test_plugin.py | 3 + .../dynamic_routing/test_nsxv_bgp_driver.py | 18 ++++ 5 files changed, 121 insertions(+), 9 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 5b8c8ea830..71bd1363fc 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,10 +1,93 @@ +- project: + templates: + - build-openstack-docs-pti + - openstack-python-jobs-neutron + - openstack-python35-jobs-neutron + check: + jobs: + - vmware-tox-lower-constraints + - openstack-tox-pep8: + required-projects: + - openstack/neutron + - x/networking-l2gw + - openstack/networking-sfc + - openstack/neutron-lbaas + - x/vmware-nsxlib + - openstack/neutron-fwaas + - openstack/neutron-dynamic-routing + - openstack/neutron-vpnaas + - x/tap-as-a-service + - openstack-tox-py27: + timeout: 5400 + required-projects: + - openstack/neutron + - x/networking-l2gw + - openstack/networking-sfc + - openstack/neutron-lbaas + - x/vmware-nsxlib + - openstack/neutron-fwaas + - openstack/neutron-dynamic-routing + - openstack/neutron-vpnaas + - x/tap-as-a-service + - openstack-tox-py35: + timeout: 5400 + required-projects: + - openstack/neutron + - x/networking-l2gw + - openstack/networking-sfc + - openstack/neutron-lbaas + - x/vmware-nsxlib + - openstack/neutron-fwaas + - openstack/neutron-dynamic-routing + - openstack/neutron-vpnaas + - x/tap-as-a-service + gate: + queue: vmware-nsx + jobs: + - vmware-tox-lower-constraints + - openstack-tox-pep8: + required-projects: + - openstack/neutron + - x/networking-l2gw + - openstack/networking-sfc + - openstack/neutron-lbaas + - x/vmware-nsxlib + - openstack/neutron-fwaas + - openstack/neutron-dynamic-routing + - openstack/neutron-vpnaas + - x/tap-as-a-service + - openstack-tox-py27: + timeout: 5400 + required-projects: + - openstack/neutron + - x/networking-l2gw + - openstack/networking-sfc + - openstack/neutron-lbaas + - x/vmware-nsxlib + - openstack/neutron-fwaas + - openstack/neutron-dynamic-routing + - openstack/neutron-vpnaas + - x/tap-as-a-service + - openstack-tox-py35: + timeout: 5400 + required-projects: + - openstack/neutron + - x/networking-l2gw + - openstack/networking-sfc + - openstack/neutron-lbaas + - x/vmware-nsxlib + - openstack/neutron-fwaas + - openstack/neutron-dynamic-routing + - openstack/neutron-vpnaas + - x/tap-as-a-service + - job: name: vmware-tox-lower-constraints parent: openstack-tox-lower-constraints timeout: 5400 required-projects: - openstack/neutron - - openstack/networking-l2gw + - x/networking-l2gw - openstack/networking-sfc - openstack/neutron-lbaas - x/vmware-nsxlib @@ -12,10 +95,3 @@ - openstack/neutron-dynamic-routing - openstack/neutron-vpnaas - x/tap-as-a-service -- project: - check: - jobs: - - vmware-tox-lower-constraints - gate: - jobs: - - vmware-tox-lower-constraints \ No newline at end of file diff --git a/tox.ini b/tox.ini index c73826f3e4..dab95ce9e7 100644 --- a/tox.ini +++ b/tox.ini @@ -28,7 +28,7 @@ commands = false # https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs # note that order is important to ensure dependencies don't override commands = - pip install -q -e "git+https://git.openstack.org/openstack/networking-l2gw@stable/queens#egg=networking_l2gw" + pip install -q -e "git+https://git.openstack.org/x/networking-l2gw@stable/queens#egg=networking_l2gw" pip install -q -e "git+https://git.openstack.org/openstack/networking-sfc@stable/queens#egg=networking_sfc" pip install -q -e "git+https://git.openstack.org/openstack/neutron-lbaas@stable/queens#egg=neutron_lbaas" pip install -q -e "git+https://git.openstack.org/openstack/neutron-fwaas@stable/queens#egg=neutron_fwaas" diff --git a/vmware_nsx/tests/unit/nsx_v/test_plugin.py b/vmware_nsx/tests/unit/nsx_v/test_plugin.py index 542ff55776..97b706db2f 100644 --- a/vmware_nsx/tests/unit/nsx_v/test_plugin.py +++ b/vmware_nsx/tests/unit/nsx_v/test_plugin.py @@ -2895,6 +2895,12 @@ class TestExclusiveRouterTestCase(L3NatTest, L3NatTestCaseBase, if validate_ext_gw: pass + def test_update_router_interface_port_ipv6_subnet_ext_ra(self): + self.skipTest('not supported') + + def test_router_add_gateway_notifications(self): + self.skipTest('not supported') + def test_router_create_with_gwinfo_and_l3_ext_net(self): self._test_router_create_with_gwinfo_and_l3_ext_net() @@ -4127,6 +4133,12 @@ class TestVdrTestCase(L3NatTest, L3NatTestCaseBase, TestVdrTestCase, self).test_router_update_gateway_with_different_external_subnet() + def test_update_router_interface_port_ipv6_subnet_ext_ra(self): + self.skipTest('not supported') + + def test_router_add_gateway_notifications(self): + self.skipTest('not supported') + def test_floatingip_multi_external_one_internal(self): self.skipTest('skipped') @@ -4571,6 +4583,9 @@ class TestNSXvAllowedAddressPairs(NsxVPluginV2TestCase, def test_create_overlap_with_fixed_ip(self): pass + def test_router_add_gateway_notifications(self): + self.skipTest('not supported') + def test_create_port_with_cidr_address_pair(self): with self.network() as net: address_pairs = [{'mac_address': '00:00:00:00:00:01', diff --git a/vmware_nsx/tests/unit/nsx_v3/test_plugin.py b/vmware_nsx/tests/unit/nsx_v3/test_plugin.py index fb26a69439..6ce365d255 100644 --- a/vmware_nsx/tests/unit/nsx_v3/test_plugin.py +++ b/vmware_nsx/tests/unit/nsx_v3/test_plugin.py @@ -1665,6 +1665,9 @@ class TestL3NatTestCase(L3NatTest, super(TestL3NatTestCase, self).test_floatingip_update( expected_status=constants.FLOATINGIP_STATUS_DOWN) + def test_router_add_gateway_notifications(self): + self.skipTest('not supported') + def test_floatingip_with_invalid_create_port(self): self._test_floatingip_with_invalid_create_port(self._plugin_name) diff --git a/vmware_nsx/tests/unit/services/dynamic_routing/test_nsxv_bgp_driver.py b/vmware_nsx/tests/unit/services/dynamic_routing/test_nsxv_bgp_driver.py index f3125ab1a0..b1cc5990ba 100644 --- a/vmware_nsx/tests/unit/services/dynamic_routing/test_nsxv_bgp_driver.py +++ b/vmware_nsx/tests/unit/services/dynamic_routing/test_nsxv_bgp_driver.py @@ -278,6 +278,24 @@ class TestNSXvBgpPlugin(test_plugin.NsxVPluginV2TestCase, # base class tests uses no-snat router with floating ips self.skipTest('No SNAT with floating ips not supported') + def test_get_external_networks_for_port_same_address_scope_v6(self): + self.skipTest('No IPv6 support') + + def test_get_external_networks_for_port_different_address_scope_v6(self): + self.skipTest('No IPv6 support') + + def test__get_dvr_fixed_ip_routes_by_bgp_speaker_different_scope(self): + self.skipTest('Not supported') + + def test_get_external_networks_for_port_different_address_scope_v4(self): + self.skipTest('Not supported') + + def test__get_dvr_fixed_ip_routes_by_bgp_speaker_no_scope(self): + self.skipTest('Not supported') + + def test__get_dvr_fixed_ip_routes_by_bgp_speaker_same_scope(self): + self.skipTest('Not supported') + def test_add_bgp_peer_with_bad_id(self): with self.subnetpool_with_address_scope( 4, prefixes=['8.0.0.0/8']) as sp: