openstack/charm-nova-compute
Code Issues Proposed changes

[niedbalski,r=wolsen] Check nrpe relation is made before configuring nrpe

Browse Source 
Fixes-Bug: LP #1448143
This commit is contained in:
Billy Olsen 2015-04-24 09:18:42 -07:00
commit 2cbb839e72
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hooks/nova_compute_hooks.py
View File

@ -137,7 +137,8 @@ def config_changed():
for rid in relation_ids('zeromq-configuration'):
zeromq_configuration_relation_joined(rid)
update_nrpe_config()
if is_relation_made("nrpe-external-master"):
update_nrpe_config()
CONFIGS.write_all()
@ -325,7 +326,9 @@ def relation_broken():
def upgrade_charm():
for r_id in relation_ids('amqp'):
amqp_joined(relation_id=r_id)
update_nrpe_config()
if is_relation_made('nrpe-external-master'):
update_nrpe_config()
@hooks.hook('nova-ceilometer-relation-changed')

18
unit_tests/test_nova_compute_hooks.py
View File

@ -206,6 +206,24 @@ class NovaComputeRelationsTests(CharmTestCase):
self.git_install.assert_called_with(projects_yaml)
self.assertFalse(self.do_openstack_upgrade.called)
@patch.object(hooks, 'compute_joined')
def test_config_changed_no_nrpe(self, compute_joined):
self.git_install_requested.return_value = False
self.openstack_upgrade_available.return_value = False
self.migration_enabled.return_value = False
self.is_relation_made.return_value = False
hooks.config_changed()
self.assertFalse(self.update_nrpe_config.called)
@patch.object(hooks, 'compute_joined')
def test_config_changed_nrpe(self, compute_joined):
self.git_install_requested.return_value = False
self.openstack_upgrade_available.return_value = False
self.migration_enabled.return_value = False
self.is_relation_made.return_value = True
hooks.config_changed()
self.update_nrpe_config.assert_called_once()
def test_amqp_joined(self):
hooks.amqp_joined()
self.relation_set.assert_called_with(