openstack/neutron-dynamic-routing
Code Issues Proposed changes

Bump Neutron to 23.0.0.0b3

Browse Source 
That syncs the Neutron code with the latest neutron-lib version
released (3.8.0).

This patch also adds the "network.ha" definition extension to
the tests core plugin.

NOTE: both LP bugs must be fixed in one patch to fix the unit
tests CI job.

Closes-Bug: #2033493
Closes-Bug: #2033508
Change-Id: Ie22d9bcb943205e20380b92dc33d48f398a86470
This commit is contained in:
Rodolfo Alonso Hernandez
2023-08-30 13:52:36 +00:00
parent 24db9d0f2a
commit f7baab86ac
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
neutron_dynamic_routing/tests/unit/db/test_bgp_db.py
View File

@@ -19,7 +19,9 @@ import netaddr
from neutron.db import l3_dvr_ha_scheduler_db from neutron.db import l3_dvr_ha_scheduler_db
from neutron.tests.unit.extensions import test_l3 from neutron.tests.unit.extensions import test_l3
from neutron.tests.unit.plugins.ml2 import test_plugin from neutron.tests.unit.plugins.ml2 import test_plugin
from neutron_lib.api import attributes
from neutron_lib.api.definitions import external_net from neutron_lib.api.definitions import external_net
from neutron_lib.api.definitions import network_ha
from neutron_lib.api.definitions import portbindings from neutron_lib.api.definitions import portbindings
from neutron_lib import constants as n_const from neutron_lib import constants as n_const
from neutron_lib import exceptions as n_exc from neutron_lib import exceptions as n_exc
@@ -1525,3 +1527,7 @@ class Ml2BgpTests(test_plugin.Ml2PluginV2TestCase,
self.l3plugin = directory.get_plugin(plugin_constants.L3) self.l3plugin = directory.get_plugin(plugin_constants.L3)
self.bgp_plugin = bgp_plugin.BgpPlugin() self.bgp_plugin = bgp_plugin.BgpPlugin()
self.plugin = directory.get_plugin() self.plugin = directory.get_plugin()
# Extend network HA extension.
rname = network_ha.COLLECTION_NAME
attributes.RESOURCES[rname].update(
network_ha.RESOURCE_ATTRIBUTE_MAP[rname])

2
requirements.txt
View File

@@ -21,7 +21,7 @@ oslo.messaging>=5.29.0 # Apache-2.0
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
oslo.service!=1.28.1,>=1.24.0 # Apache-2.0 oslo.service!=1.28.1,>=1.24.0 # Apache-2.0
oslo.utils>=4.5.0 # Apache-2.0 oslo.utils>=4.5.0 # Apache-2.0
neutron>=23.0.0.0b2 # Apache-2.0 neutron>=23.0.0.0b3 # Apache-2.0
# The comment below indicates this project repo is current with neutron-lib # The comment below indicates this project repo is current with neutron-lib
# and should receive neutron-lib consumption patches as they are released # and should receive neutron-lib consumption patches as they are released