Remove redundant code

Commit 3838010a added code that was subsequently made redundant
by commit 668a2898 but never removed. This patch cleans things
up.

Change-Id: I59fcea6f5bb19e0bc57856600a85a18419cf8730
This commit is contained in:
Edward Hope-Morley 2019-01-28 12:53:31 +00:00
parent 36b8e9a8bd
commit 4421c6933e
3 changed files with 4 additions and 36 deletions

View File

@ -1,13 +0,0 @@
---
sources:
- name: event_source
events:
- "*"
sinks:
- event_sink
sinks:
- name: event_sink
transformers:
publishers:
- notifier://
- notifier://?topic=alarm.all

View File

@ -15,7 +15,6 @@
# limitations under the License.
import base64
import shutil
import subprocess
import sys
import os
@ -215,7 +214,6 @@ def config_changed():
if openstack_upgrade_available('ceilometer-common'):
status_set('maintenance', 'Upgrading to new OpenStack release')
do_openstack_upgrade(CONFIGS)
install_event_pipeline_setting()
update_nrpe_config()
CONFIGS.write_all()
# NOTE(jamespage): Drop when charm switches to apache2+mod_wsgi
@ -247,14 +245,6 @@ def config_changed():
ha_joined(rid)
def install_event_pipeline_setting():
src_file = 'files/event_pipeline_alarm.yaml'
dest_file = '/etc/ceilometer/event_pipeline_alarm.yaml'
if not os.path.isdir(os.path.dirname(dest_file)):
os.makedirs(os.path.dirname(dest_file))
shutil.copy(src_file, dest_file)
@hooks.hook('upgrade-charm')
@harden()
def upgrade_charm():

View File

@ -182,66 +182,57 @@ class CeilometerHooksTest(CharmTestCase):
self.assertEqual(cluster_joined.call_count, 3)
any_changed.assert_called_once()
@patch.object(hooks, 'install_event_pipeline_setting')
@patch('charmhelpers.core.hookenv.config')
@patch.object(hooks, 'ceilometer_joined')
def test_config_changed_no_upgrade(self,
joined, mock_config, event_pipe):
joined, mock_config):
self.openstack_upgrade_available.return_value = False
hooks.hooks.execute(['hooks/config-changed'])
self.openstack_upgrade_available.\
assert_called_with('ceilometer-common')
self.assertFalse(self.do_openstack_upgrade.called)
self.assertTrue(event_pipe.called)
self.assertTrue(self.CONFIGS.write_all.called)
self.assertTrue(joined.called)
self.assertTrue(self.reload_systemd.called)
self.open_port.assert_called_with(hooks.CEILOMETER_PORT)
@patch.object(hooks, 'install_event_pipeline_setting')
@patch('charmhelpers.core.hookenv.config')
@patch.object(hooks, 'ceilometer_joined')
def test_config_changed_queens(self,
joined, mock_config, event_pipe):
joined, mock_config):
self.openstack_upgrade_available.return_value = False
self.get_os_codename_install_source.return_value = 'queens'
hooks.hooks.execute(['hooks/config-changed'])
self.openstack_upgrade_available.\
assert_called_with('ceilometer-common')
self.assertFalse(self.do_openstack_upgrade.called)
self.assertTrue(event_pipe.called)
self.assertTrue(self.CONFIGS.write_all.called)
self.assertTrue(joined.called)
self.assertTrue(self.reload_systemd.called)
self.close_port.assert_called_with(hooks.CEILOMETER_PORT)
self.open_port.assert_not_called()
@patch.object(hooks, 'install_event_pipeline_setting')
@patch('charmhelpers.core.hookenv.config')
@patch.object(hooks, 'ceilometer_joined')
def test_config_changed_upgrade(self,
joined, mock_config, event_pipe):
joined, mock_config):
self.openstack_upgrade_available.return_value = True
hooks.hooks.execute(['hooks/config-changed'])
self.openstack_upgrade_available.\
assert_called_with('ceilometer-common')
self.assertTrue(self.do_openstack_upgrade.called)
self.assertTrue(event_pipe.called)
self.assertTrue(self.CONFIGS.write_all.called)
self.assertTrue(joined.called)
self.assertTrue(self.reload_systemd.called)
self.open_port.assert_called_with(hooks.CEILOMETER_PORT)
@patch.object(hooks, 'install_event_pipeline_setting')
def test_config_changed_with_openstack_upgrade_action(self,
event_pipe):
def test_config_changed_with_openstack_upgrade_action(self):
self.openstack_upgrade_available.return_value = True
self.test_config.set('action-managed-upgrade', True)
hooks.hooks.execute(['hooks/config-changed'])
self.assertFalse(self.do_openstack_upgrade.called)
self.assertTrue(event_pipe.called)
self.open_port.assert_called_with(hooks.CEILOMETER_PORT)
def test_keystone_credentials_joined(self):