Merge lp:~billy-olsen/charms/trusty/ceilometer/lp1541618 into lp:~openstack-charmers-archive/charms/trusty/ceilometer/next

[Billy Olsen]

[James Page (james-page)]

+1 conditional on OSCI +1 as well; but looks sane to me!

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #126 ceilometer-next for billy-olsen mp285003
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/126/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #126 ceilometer-next for billy-olsen mp285003
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/126/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #20 ceilometer-next for billy-olsen mp285003
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/20/

=== modified file 'hooks/ceilometer_hooks.py'
--- hooks/ceilometer_hooks.py	2015-10-16 11:59:37 +0000
+++ hooks/ceilometer_hooks.py	2016-02-04 01:23:23 +0000
@@ -57,7 +57,10 @@
     get_hacluster_config,
     is_elected_leader
 )
-from charmhelpers.contrib.peerstorage import peer_store
+from charmhelpers.contrib.peerstorage import (
+    peer_retrieve,
+    peer_store,
+)
 from charmhelpers.payload.execd import execd_preinstall
 
 hooks = Hooks()
@@ -185,7 +188,7 @@
             'cluster-relation-departed')
 @restart_on_change(restart_map(), stopstart=True)
 def cluster_changed():
-    shared_secret = relation_get('shared_secret')
+    shared_secret = peer_retrieve('shared_secret')
     if shared_secret is None or shared_secret.strip() == '':
         log('waiting for shared secret to be provided by leader')
     elif not shared_secret == get_shared_secret():

=== modified file 'unit_tests/test_ceilometer_hooks.py'
--- unit_tests/test_ceilometer_hooks.py	2016-01-06 21:38:19 +0000
+++ unit_tests/test_ceilometer_hooks.py	2016-02-04 01:23:23 +0000
@@ -16,7 +16,6 @@
 TO_PATCH = [
     'relation_get',
     'relation_set',
-    'relation_get',
     'configure_installation_source',
     'openstack_upgrade_available',
     'do_openstack_upgrade',
@@ -33,6 +32,7 @@
     'get_packages',
     'service_restart',
     'update_nrpe_config',
+    'peer_retrieve',
     'peer_store',
     'configure_https',
     'status_set',
@@ -234,7 +234,7 @@
     @patch('charmhelpers.core.hookenv.config')
     @patch.object(hooks, 'set_shared_secret')
     def test_cluster_changed(self, shared_secret, mock_config):
-        self.relation_get.return_value = None
+        self.peer_retrieve.return_value = None
         hooks.hooks.execute(['hooks/cluster-relation-changed'])
         self.assertFalse(shared_secret.called)
 
@@ -243,7 +243,7 @@
     @patch.object(hooks, 'set_shared_secret')
     def test_cluster_changed_new_secret(self, mock_set_secret, mock_get_secret,
                                         mock_config):
-        self.relation_get.return_value = "leader_secret"
+        self.peer_retrieve.return_value = "leader_secret"
         mock_get_secret.return_value = "my_secret"
         hooks.hooks.execute(['hooks/cluster-relation-changed'])
         mock_set_secret.assert_called_with("leader_secret")
@@ -253,7 +253,7 @@
     @patch.object(hooks, 'set_shared_secret')
     def test_cluster_changed_old_secret(self, mock_set_secret, mock_get_secret,
                                         mock_config):
-        self.relation_get.return_value = "leader_secret"
+        self.peer_retrieve.return_value = "leader_secret"
         mock_get_secret.return_value = "leader_secret"
         hooks.hooks.execute(['hooks/cluster-relation-changed'])
         self.assertEquals(mock_set_secret.call_count, 0)