openstack
/
neutron
Code Issues Proposed changes

Register SG opts when testing test_firewall 

In some debuggers (Pycharm), when OVSFirewallDriver is loaded,
the project configuration is not fully populated and does not
include some variables, e.g.:
  cfg.CONF.SECURITYGROUP.permitted_ethertypes.

This will generate a configuration exception:
  oslo_config.cfg.NoSuchOptError: no such option SECURITYGROUP in group
  [DEFAULT]

By loading the SG groups options before the OVSFirewallDriver class, we
can solve this issue.

Trivial-Fix

Change-Id: I96580635b8a21f68df86b302e528d622ba3cfffc
This commit is contained in:
Rodolfo Alonso Hernandez 2019-07-11 13:54:50 +00:00
parent 3b2521a894
commit 11380ff5da
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/tests/unit/agent/linux/openvswitch_firewall/test_firewall.py
View File

@ -24,6 +24,7 @@ from neutron.agent.common import utils
from neutron.agent.linux.openvswitch_firewall import constants as ovsfw_consts
from neutron.agent.linux.openvswitch_firewall import exceptions
from neutron.agent.linux.openvswitch_firewall import firewall as ovsfw
from neutron.conf.agent import securitygroups_rpc
from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants \
as ovs_consts
from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.native \
@ -359,6 +360,7 @@ class TestOVSFirewallDriver(base.BaseTestCase):
super(TestOVSFirewallDriver, self).setUp()
mock_bridge = mock.patch.object(
ovs_lib, 'OVSBridge', autospec=True).start()
securitygroups_rpc.register_securitygroups_opts()
self.firewall = ovsfw.OVSFirewallDriver(mock_bridge)
self.mock_bridge = self.firewall.int_br
self.mock_bridge.reset_mock()
@ -758,6 +760,7 @@ class TestCookieContext(base.BaseTestCase):
return_value=bridge.deferred(
full_ordered=True, use_bundle=True)).start()
securitygroups_rpc.register_securitygroups_opts()
self.firewall = ovsfw.OVSFirewallDriver(bridge)
# Remove calls from firewall initialization
self.execute.reset_mock()