openstack/aodh
Code Issues Proposed changes

Removed unused method in compute agent manger

Browse Source 
Removed the unused methods in compute agent manager due to the nova
notifier changes made in https://review.openstack.org/22759

Change-Id: If1e719a3c120bed81edaf33c17d274f0f25cb2cf
This commit is contained in:
Lianhao Lu 2013-11-28 15:17:21 +08:00
parent f76027ccb7
commit 38a230b443
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ceilometer/compute/manager.py
View File

@ -75,19 +75,6 @@ class AgentManager(agent.AgentManager):
def create_polling_task(self): def create_polling_task(self):
return PollingTask(self) return PollingTask(self)
def setup_notifier_task(self):
"""For nova notifier usage."""
task = PollingTask(self)
for pollster in self.pollster_manager.extensions:
task.add(
pollster,
self.pipeline_manager.pipelines)
self.notifier_task = task
def poll_instance(self, context, instance):
"""Poll one instance."""
self.notifier_task.poll_and_publish_instances([instance])
@property @property
def inspector(self): def inspector(self):
return self._inspector return self._inspector

7
ceilometer/tests/compute/test_manager.py
View File

@ -66,13 +66,6 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
'instance_get_all_by_host', 'instance_get_all_by_host',
side_effect=lambda *x: [self.instance, stillborn_instance])) side_effect=lambda *x: [self.instance, stillborn_instance]))
def test_notifier_task(self):
self.mgr.setup_notifier_task()
self.mgr.poll_instance(None, self.instance)
self.assertEqual(len(self.Pollster.samples), 1)
pub = self.mgr.pipeline_manager.pipelines[0].publishers[0]
self.assertEqual(pub.samples[0], self.Pollster.test_data)
def test_setup_polling_tasks(self): def test_setup_polling_tasks(self):
super(TestRunTasks, self).test_setup_polling_tasks() super(TestRunTasks, self).test_setup_polling_tasks()
self.assertTrue(self.Pollster.samples[0][1] is self.instance) self.assertTrue(self.Pollster.samples[0][1] is self.instance)