openstack/neutron
Code Issues Proposed changes

Merge "Consume DuplicatedHANetwork constant from neutron-lib"

Browse Source
This commit is contained in:
Zuul
2025-06-13 01:53:05 +00:00
committed by Gerrit Code Review
parent 7e3f5d2bac d1c835f666
commit 683945dd89
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/db/l3_hamode_db.py
View File

@ -65,11 +65,6 @@ LOG = logging.getLogger(__name__)
l3_hamode_db.register_db_l3_hamode_opts()
# TODO(ralonsoh): move to neutron-lib
class DuplicatedHANetwork(n_exc.Conflict):
message = _('Project %(project_id)s already has a HA network.')
@registry.has_registry_receivers
class L3_HA_NAT_db_mixin(l3_dvr_db.L3_NAT_with_dvr_db_mixin,
router_az_db.RouterAvailabilityZoneMixin):
@ -213,7 +208,7 @@ class L3_HA_NAT_db_mixin(l3_dvr_db.L3_NAT_with_dvr_db_mixin,
try:
ha_network.create()
except obj_base.NeutronDbObjectDuplicateEntry:
raise DuplicatedHANetwork(project_id=context.project_id)
raise l3ha_exc.DuplicatedHANetwork(project_id=context.project_id)
def _add_ha_network_settings(self, network):
if cfg.CONF.l3_ha_network_type:

2
neutron/tests/unit/db/test_l3_hamode_db.py
View File

@ -705,7 +705,7 @@ class L3HATestCase(L3HATestFramework):
self.assertEqual(project_id, ha_network.project_id)
self.assertEqual(network['id'], ha_network.network_id)
with testtools.ExpectedException(l3_hamode_db.DuplicatedHANetwork):
with testtools.ExpectedException(l3ha_exc.DuplicatedHANetwork):
network[network_ha.HA] = True
ctx = self.admin_ctx # That will create a new admin context
ctx.project_id = project_id