Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable/22.03] Bail out configuring ovs if no OVNSDB available #97

Merged
merged 1 commit into from
Oct 9, 2024
Merged

[stable/22.03] Bail out configuring ovs if no OVNSDB available #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions lib/charms/ovn_charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,20 +1099,28 @@ def configure_ovs(self, sb_conn, mlockall_changed):
self.options.ovn_cert,
self.options.ovn_ca_cert)

# The local ``ovn-controller`` process will retrieve information about
# how to connect to OVN from the local Open vSwitch database.
cmd = ('ovs-vsctl',)
for ovs_ext_id in ('external-ids:ovn-encap-type=geneve',
'external-ids:ovn-encap-ip={}'
.format(self.get_data_ip()),
'external-ids:system-id={}'
.format(self.get_ovs_hostname()),
'external-ids:ovn-remote={}'.format(sb_conn),
'external_ids:ovn-match-northd-version={}'
.format(self.options.enable_version_pinning),
):
cmd = cmd + ('--', 'set', 'open-vswitch', '.', ovs_ext_id)
self.run(*cmd)
if sb_conn:
# The local ``ovn-controller`` process will retrieve information
# about how to connect to OVN from the local Open vSwitch
# database.
cmd = ('ovs-vsctl',)
for ovs_ext_id in ('external-ids:ovn-encap-type=geneve',
'external-ids:ovn-encap-ip={}'
.format(self.get_data_ip()),
'external-ids:system-id={}'
.format(self.get_ovs_hostname()),
'external-ids:ovn-remote={}'.format(sb_conn),
'external_ids:ovn-match-northd-version={}'
.format(self.options.enable_version_pinning),
):
cmd = cmd + ('--', 'set', 'open-vswitch', '.', ovs_ext_id)
self.run(*cmd)
else:
ch_core.hookenv.log('could not configure ovs due to unavailable '
'sbdb connection info - ovn-central relation '
'no longer available?',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just have a nit on the message, should make it look like the one at the beginning of the function, something like:

'Could not configure Open vSwitch due to unavailable SBDB connection info - ovn-central relation no longer available?'

So what is the solution when this happens? Can we add more info to help get past it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thats a fair point re the msg, could get that fixed on master. this is is really fixing the case where the application is being uninstalled e.g. when the node is being released to stop it raising an exception. Therefore it is not something that will need resolving.

level=ch_core.hookenv.WARNING)

if self.enable_openstack:
# OpenStack Nova expects the local OVSDB server to listen to
# TCP port 6640 on localhost. We use this for the OVN metadata
Expand Down
10 changes: 9 additions & 1 deletion unit_tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,21 @@

import sys

import mock

sys.path.append('lib')

# Mock out charmhelpers so that we can test without it.
import charms_openstack.test_mocks # noqa

# charms.openstack (commit b90327) re-introduced a dependency on charmhelpers
# so we need to mock that out explicitly here since we do not install
# charmhelpers as a test dependency.
sys.modules['charmhelpers.contrib.openstack.utils'] = mock.MagicMock()
sys.modules['charmhelpers.contrib.openstack.utils'].\
CompareOpenStackReleases = mock.MagicMock()
charms_openstack.test_mocks.mock_charmhelpers()

import mock
import charms


Expand Down
20 changes: 20 additions & 0 deletions unit_tests/test_reactive_ovn_chassis_charm_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,26 @@ def test_configure_ovs(self):
self.charm.configure_iptables_rules.assert_called_once_with()
self.charm.assess_status.assert_called_once_with()

def test_configure_ovs_no_sb_conn(self):
self.patch_object(handlers.reactive, 'endpoint_from_flag')
self.patch_object(handlers.charm, 'optional_interfaces')
self.patch_object(handlers.reactive, 'set_flag')
self.patch_object(handlers.reactive, 'is_flag_set', return_value=True)
ovsdb = mock.MagicMock()
ovsdb.db_sb_connection_strs = []
self.endpoint_from_flag.return_value = ovsdb
handlers.configure_ovs()
self.charm.configure_ovs.assert_called_once_with(
','.join(ovsdb.db_sb_connection_strs), True)
self.charm.render_with_interfaces.assert_called_once_with(
self.optional_interfaces((ovsdb,),
'nova-compute.connected',
'amqp.connected'))
self.set_flag.assert_called_once_with('config.rendered')
self.charm.configure_bridges.assert_called_once_with()
self.charm.configure_iptables_rules.assert_called_once_with()
self.charm.assess_status.assert_called_once_with()

def test_configure_nrpe(self):
self.patch_object(handlers.reactive, 'endpoint_from_flag')
self.endpoint_from_flag.return_value = 'nrpe-external-master'
Expand Down