openstack
/
neutron
Code Issues Proposed changes

FIP QoS: check policy id before blindly updating FIP 

[1] changed FIP OvO for QoS update, but it seems that
it introduced a regression when FIP is updated without
QoS policy in the request.

[1]: https://review.opendev.org/c/833667

Closes-Bug: #2041609
Change-Id: I254e1625c1a157e562df22ae2fd5c6e28971f812
This commit is contained in:
elajkat 2023-10-27 11:25:23 +02:00
parent d2b5ad4ac5
commit 37384a4705
2 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/db/l3_db.py
View File

@ -1607,7 +1607,7 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase,
old_floatingip = self._make_floatingip_dict(floatingip_obj)
old_fixed_port_id = floatingip_obj.fixed_port_id
assoc_result = self._update_fip_assoc(context, fip, floatingip_obj)
if self._is_fip_qos_supported:
if self._is_fip_qos_supported and 'qos_policy_id' in fip:
floatingip_obj.qos_policy_id = fip.get(qos_const.QOS_POLICY_ID)
floatingip_obj.update()

77
neutron/tests/unit/db/test_l3_db.py
View File

@ -242,6 +242,83 @@ class TestL3_NAT_dbonly_mixin(
db._get_sync_floating_ips(context, [])
self.assertFalse(context.session.query.called)
@mock.patch.object(l3_db.L3_NAT_dbonly_mixin, '_get_floatingip')
@mock.patch.object(l3_db.L3_NAT_dbonly_mixin, '_is_fip_qos_supported')
@mock.patch.object(l3_obj.FloatingIP, 'update')
@mock.patch.object(l3_obj.FloatingIP, 'get_object')
@mock.patch.object(l3_db.L3_NAT_dbonly_mixin, '_make_floatingip_dict')
def test__update_floatingip_no_update_existing_qos(self, make_fip_dict,
mock_get_fip_ovo,
mock_update_fip_ovo,
mock_qos_support,
mock_get_fip):
fip_id = uuidutils.generate_uuid()
qos_p_id = uuidutils.generate_uuid()
db = l3_db.L3_NAT_dbonly_mixin()
contxt = mock.Mock()
mock_qos_support.return_value = True
mock_get_fip.return_value = l3_obj.FloatingIP(
id=fip_id, qos_policy_id=qos_p_id
)
mock_update_fip_ovo.return_value = None
mock_get_fip_ovo.return_value = l3_obj.FloatingIP(
id=fip_id, qos_policy_id=qos_p_id
)
make_fip_dict.return_value = {
'id': mock.sentinel.fip_ip,
'qos_policy_id': qos_p_id
}
new_fip = {'floatingip': {'name': 'new_name'}}
old_fip, fip_dict = db._update_floatingip(contxt, fip_id, new_fip)
self.assertEqual(qos_p_id, fip_dict['qos_policy_id'])
@mock.patch.object(l3_db.L3_NAT_dbonly_mixin, '_get_floatingip')
@mock.patch.object(l3_db.L3_NAT_dbonly_mixin, '_is_fip_qos_supported')
@mock.patch.object(l3_obj.FloatingIP, 'update')
@mock.patch.object(l3_obj.FloatingIP, 'get_object')
@mock.patch.object(l3_db.L3_NAT_dbonly_mixin, '_make_floatingip_dict')
def test__update_floatingip_update_existing_qos(self, make_fip_dict,
mock_get_fip_ovo,
mock_update_fip_ovo,
mock_qos_support,
mock_get_fip):
fip_id = uuidutils.generate_uuid()
qos_p_id = uuidutils.generate_uuid()
db = l3_db.L3_NAT_dbonly_mixin()
contxt = context.get_admin_context()
mock_qos_support.return_value = True
fip_ovo = l3_obj.FloatingIP(
id=fip_id, qos_policy_id=qos_p_id
)
mock_get_fip.return_value = fip_ovo
mock_get_fip_ovo.return_value = fip_ovo
make_fip_dict.return_value = {
'id': mock.sentinel.fip_ip,
'qos_policy_id': qos_p_id
}
# Update the QoS Id with a new one
new_qos_id = uuidutils.generate_uuid()
new_fip = {'floatingip': {'qos_policy_id': new_qos_id}}
db._update_floatingip(contxt, fip_id, new_fip)
mock_update_fip_ovo.assert_called_once()
self.assertEqual(2, make_fip_dict.call_count)
# Remove the QoS Id (update to None):
make_fip_dict.reset_mock()
mock_update_fip_ovo.reset_mock()
new_fip = {'floatingip': {'qos_policy_id': None}}
db._update_floatingip(contxt, fip_id, new_fip)
mock_update_fip_ovo.assert_called_once()
self.assertEqual(2, make_fip_dict.call_count)
@mock.patch.object(l3_db.L3_NAT_dbonly_mixin, '_make_floatingip_dict')
def test__make_floatingip_dict_with_scope(self, make_fip_dict):
db = l3_db.L3_NAT_dbonly_mixin()