openstack
/
neutron
Code Issues Proposed changes

Merge "[OVN] Extra DHCP options validation: Log invalid options"

This commit is contained in:
Zuul 2020-07-25 00:56:35 +00:00 committed by Gerrit Code Review
parent 4984e07046 8c4b23f812
commit 477aefe127
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py
View File

@ -512,12 +512,10 @@ class OVNMechanismDriver(api.MechanismDriver):
return return
ipv4_opts = ', '.join(result.invalid_ipv4) ipv4_opts = ', '.join(result.invalid_ipv4)
ipv6_opts = ', '.join(result.invalid_ipv6) ipv6_opts = ', '.join(result.invalid_ipv6)
msg = (_('The following extra DHCP options for port %(port_id)s ' LOG.info('The following extra DHCP options for port %(port_id)s '
'are not supported by OVN. IPv4: "%(ipv4_opts)s" and ' 'are not supported by OVN. IPv4: "%(ipv4_opts)s" and '
'IPv6: "%(ipv6_opts)s"') % 'IPv6: "%(ipv6_opts)s"', {'port_id': port['id'],
{'port_id': port['id'], 'ipv4_opts': ipv4_opts, 'ipv4_opts': ipv4_opts, 'ipv6_opts': ipv6_opts})
'ipv6_opts': ipv6_opts})
raise OVNPortUpdateError(resource='port', msg=msg)
def create_port_precommit(self, context): def create_port_precommit(self, context):
"""Allocate resources for a new port. """Allocate resources for a new port.

48
neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py
View File

@ -275,16 +275,22 @@ class TestOVNMechanismDriver(test_plugin.Ml2PluginV2TestCase):
self.assertIsNone( self.assertIsNone(
self.mech_driver._validate_port_extra_dhcp_opts(port)) self.mech_driver._validate_port_extra_dhcp_opts(port))
def test__validate_port_extra_dhcp_opts_invalid(self): @mock.patch.object(mech_driver.LOG, 'info')
def test__validate_port_extra_dhcp_opts_invalid(self, mock_log):
port_id = 'fake-port'
opt = {'opt_name': 'not-valid', opt = {'opt_name': 'not-valid',
'opt_value': 'spongebob squarepants', 'opt_value': 'spongebob squarepants',
'ip_version': 4} 'ip_version': 4}
port = {edo_ext.EXTRADHCPOPTS: [opt], 'id': 'fake-port'} port = {edo_ext.EXTRADHCPOPTS: [opt], 'id': port_id}
self.assertRaises(mech_driver.OVNPortUpdateError, self.mech_driver._validate_port_extra_dhcp_opts(port)
self.mech_driver._validate_port_extra_dhcp_opts, # Assert the log message contained the invalid DHCP options
port) expected_call = mock.call(
mock.ANY, {'port_id': port_id, 'ipv4_opts': 'not-valid',
'ipv6_opts': ''})
mock_log.assert_has_calls([expected_call])
def test_create_port_invalid_extra_dhcp_opts(self): @mock.patch.object(mech_driver.LOG, 'info')
def test_create_port_invalid_extra_dhcp_opts(self, mock_log):
extra_dhcp_opts = { extra_dhcp_opts = {
'extra_dhcp_opts': [{'ip_version': 4, 'opt_name': 'banana', 'extra_dhcp_opts': [{'ip_version': 4, 'opt_name': 'banana',
'opt_value': 'banana'}, 'opt_value': 'banana'},
@ -294,15 +300,17 @@ class TestOVNMechanismDriver(test_plugin.Ml2PluginV2TestCase):
with self.network() as n: with self.network() as n:
with self.subnet(n): with self.subnet(n):
res = self._create_port(self.fmt, n['network']['id'], res = self._create_port(self.fmt, n['network']['id'],
arg_list=('extra_dhcp_opts',), arg_list=('extra_dhcp_opts',),
**extra_dhcp_opts) **extra_dhcp_opts)
# Assert 400 (BadRequest) was returned port_id = self.deserialize(self.fmt, res)['port']['id']
self.assertEqual(400, res.status_code) # Assert the log message contained the invalid DHCP options
response = self.deserialize(self.fmt, res) expected_call = mock.call(
self.assertIn('banana', response['NeutronError']['message']) mock.ANY, {'port_id': port_id, 'ipv4_opts': 'banana',
self.assertIn('orange', response['NeutronError']['message']) 'ipv6_opts': 'orange'})
mock_log.assert_has_calls([expected_call])
def test_update_port_invalid_extra_dhcp_opts(self): @mock.patch.object(mech_driver.LOG, 'info')
def test_update_port_invalid_extra_dhcp_opts(self, mock_log):
data = { data = {
'port': {'extra_dhcp_opts': [{'ip_version': 4, 'opt_name': 'apple', 'port': {'extra_dhcp_opts': [{'ip_version': 4, 'opt_name': 'apple',
'opt_value': 'apple'}, 'opt_value': 'apple'},
@ -312,10 +320,14 @@ class TestOVNMechanismDriver(test_plugin.Ml2PluginV2TestCase):
with self.subnet(network=net) as subnet: with self.subnet(network=net) as subnet:
with self.port(subnet=subnet, with self.port(subnet=subnet,
set_context=True, tenant_id='test') as port: set_context=True, tenant_id='test') as port:
res = self._update('ports', port['port']['id'], data, port_id = port['port']['id']
expected_code=400) self._update('ports', port_id, data)
self.assertIn('apple', res['NeutronError']['message'])
self.assertIn('grape', res['NeutronError']['message']) # Assert the log message contained the invalid DHCP options
expected_call = mock.call(
mock.ANY, {'port_id': port_id, 'ipv4_opts': 'apple',
'ipv6_opts': 'grape'})
mock_log.assert_has_calls([expected_call])
def test_create_and_update_ignored_fip_port(self): def test_create_and_update_ignored_fip_port(self):
with self.network(set_context=True, tenant_id='test') as net1: with self.network(set_context=True, tenant_id='test') as net1: