openstack/neutron
Code Issues Proposed changes

Merge "Exit fast checking the external network default"

Browse Source
This commit is contained in:
Zuul 2024-10-28 18:57:07 +00:00 committed by Gerrit Code Review
commit a5a6ecc383
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/services/auto_allocate/db.py
View File

@ -15,6 +15,7 @@
# under the License.
from neutron_lib.api.definitions import constants as api_const
from neutron_lib.api.definitions import external_net as external_net_apidef
from neutron_lib.api.definitions import l3 as l3_apidef
from neutron_lib.api.definitions import network as net_def
from neutron_lib.callbacks import events
@ -53,7 +54,8 @@ def _ensure_external_network_default_value_callback(
def _do_ensure_external_network_default_value_callback(
context, request, orig, network):
is_default = request.get(api_const.IS_DEFAULT)
if is_default is None:
is_external = request.get(external_net_apidef.EXTERNAL)
if is_default is None or not is_external:
return
if is_default:
# ensure only one default external network at any given time

34
neutron/tests/unit/services/auto_allocate/test_db.py
View File

@ -14,6 +14,7 @@
from unittest import mock
from neutron_lib.api.definitions import constants as api_const
from neutron_lib.api.definitions import external_net as external_net_apidef
from neutron_lib.callbacks import events
from neutron_lib import constants
from neutron_lib import context
@ -46,15 +47,18 @@ class AutoAllocateTestCase(testlib_api.SqlTestCase):
"context": self.ctx,
"request": {
"id": network_id,
api_const.IS_DEFAULT: True
api_const.IS_DEFAULT: True,
external_net_apidef.EXTERNAL: True,
},
"network": {
"id": network_id,
api_const.IS_DEFAULT: False
api_const.IS_DEFAULT: False,
external_net_apidef.EXTERNAL: False,
},
"original_network": {
"id": network_id,
api_const.IS_DEFAULT: False
api_const.IS_DEFAULT: False,
external_net_apidef.EXTERNAL: False,
}
}
network_mock = mock.MagicMock(network_id=network_id, is_default=False)
@ -82,11 +86,13 @@ class AutoAllocateTestCase(testlib_api.SqlTestCase):
"context": self.ctx,
"request": {
"id": network_id,
api_const.IS_DEFAULT: None
api_const.IS_DEFAULT: None,
external_net_apidef.EXTERNAL: False,
},
"network": {
"id": network_id,
api_const.IS_DEFAULT: False
api_const.IS_DEFAULT: False,
external_net_apidef.EXTERNAL: False,
},
}
network_mock = mock.MagicMock(network_id=network_id, is_default=False)
@ -112,15 +118,18 @@ class AutoAllocateTestCase(testlib_api.SqlTestCase):
"context": self.ctx,
"request": {
"id": network_id,
api_const.IS_DEFAULT: True
api_const.IS_DEFAULT: True,
external_net_apidef.EXTERNAL: True,
},
"network": {
"id": network_id,
api_const.IS_DEFAULT: True
api_const.IS_DEFAULT: True,
external_net_apidef.EXTERNAL: True,
},
"original_network": {
"id": network_id,
api_const.IS_DEFAULT: True
api_const.IS_DEFAULT: True,
external_net_apidef.EXTERNAL: True,
}
}
network_mock = mock.MagicMock(network_id=network_id, is_default=True)
@ -147,15 +156,18 @@ class AutoAllocateTestCase(testlib_api.SqlTestCase):
"context": self.ctx,
"request": {
"id": network_id,
api_const.IS_DEFAULT: True
api_const.IS_DEFAULT: True,
external_net_apidef.EXTERNAL: True,
},
"network": {
"id": network_id,
api_const.IS_DEFAULT: False
api_const.IS_DEFAULT: False,
external_net_apidef.EXTERNAL: False,
},
"original_network": {
"id": network_id,
api_const.IS_DEFAULT: False
api_const.IS_DEFAULT: False,
external_net_apidef.EXTERNAL: False,
}
}
network_mock = mock.MagicMock(network_id='fake_id', is_default=False)