From 4421c6933e010d692f82f781f590c3f9d2b9a596 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Mon, 28 Jan 2019 12:53:31 +0000
Subject: [PATCH] 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
---
 files/event_pipeline_alarm.yaml     | 13 -------------
 hooks/ceilometer_hooks.py           | 10 ----------
 unit_tests/test_ceilometer_hooks.py | 17 ++++-------------
 3 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 files/event_pipeline_alarm.yaml

diff --git a/files/event_pipeline_alarm.yaml b/files/event_pipeline_alarm.yaml
deleted file mode 100644
index 626006f..0000000
--- a/files/event_pipeline_alarm.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-sources:
-    - name: event_source
-      events:
-          - "*"
-      sinks:
-          - event_sink
-sinks:
-    - name: event_sink
-      transformers:
-      publishers:
-          - notifier://
-          - notifier://?topic=alarm.all
diff --git a/hooks/ceilometer_hooks.py b/hooks/ceilometer_hooks.py
index 6cf8106..9cb6f0f 100755
--- a/hooks/ceilometer_hooks.py
+++ b/hooks/ceilometer_hooks.py
@@ -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():
diff --git a/unit_tests/test_ceilometer_hooks.py b/unit_tests/test_ceilometer_hooks.py
index a98e334..d6a7b99 100644
--- a/unit_tests/test_ceilometer_hooks.py
+++ b/unit_tests/test_ceilometer_hooks.py
@@ -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):