diff --git a/ceilometer/compute/pollsters/__init__.py b/ceilometer/compute/pollsters/__init__.py index 579a60db1a..f33602708a 100644 --- a/ceilometer/compute/pollsters/__init__.py +++ b/ceilometer/compute/pollsters/__init__.py @@ -25,11 +25,6 @@ from ceilometer.compute.virt import inspector as virt_inspector @six.add_metaclass(abc.ABCMeta) class BaseComputePollster(plugin_base.PollsterBase): - def setup_environment(self): - super(BaseComputePollster, self).setup_environment() - # propagate exception from check_sanity - self.inspector.check_sanity() - @property def inspector(self): try: diff --git a/ceilometer/compute/virt/inspector.py b/ceilometer/compute/virt/inspector.py index dfbe09e1e8..3ab69dce76 100644 --- a/ceilometer/compute/virt/inspector.py +++ b/ceilometer/compute/virt/inspector.py @@ -216,10 +216,6 @@ class NoDataException(InspectorException): pass -class NoSanityException(InspectorException): - pass - - # Main virt inspector abstraction layering over the hypervisor API. # class Inspector(object): @@ -227,14 +223,6 @@ class Inspector(object): def __init__(self, conf): self.conf = conf - def check_sanity(self): - """Check the sanity of hypervisor inspector. - - Each subclass could overwrite it to throw any exception - when detecting mis-configured inspector - """ - pass - def inspect_cpus(self, instance): """Inspect the CPU statistics for an instance. diff --git a/ceilometer/compute/virt/libvirt/inspector.py b/ceilometer/compute/virt/libvirt/inspector.py index 44310a9531..6b5230c06c 100644 --- a/ceilometer/compute/virt/libvirt/inspector.py +++ b/ceilometer/compute/virt/libvirt/inspector.py @@ -83,10 +83,6 @@ class LibvirtInspector(virt_inspector.Inspector): return self._connection - def check_sanity(self): - if not self.connection: - raise virt_inspector.NoSanityException() - @retry_on_disconnect def _lookup_by_uuid(self, instance): instance_name = util.instance_name(instance) diff --git a/ceilometer/tests/unit/agent/test_manager.py b/ceilometer/tests/unit/agent/test_manager.py index 2544915edf..06a98839c1 100644 --- a/ceilometer/tests/unit/agent/test_manager.py +++ b/ceilometer/tests/unit/agent/test_manager.py @@ -50,9 +50,6 @@ class TestPollsterBuilder(agentbase.TestPollster): return [('builder1', cls(conf)), ('builder2', cls(conf))] -@mock.patch('ceilometer.compute.pollsters.' - 'BaseComputePollster.setup_environment', - mock.Mock(return_value=None)) class TestManager(base.BaseTestCase): def setUp(self): super(TestManager, self).setUp() @@ -245,9 +242,6 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase): timestamp=agentbase.default_test_data.timestamp, resource_metadata=agentbase.default_test_data.resource_metadata) - @mock.patch('ceilometer.compute.pollsters.' - 'BaseComputePollster.setup_environment', - mock.Mock(return_value=None)) def create_manager(self): return manager.AgentManager(0, self.CONF) diff --git a/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py b/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py index 6055c519fb..b922e5ee5b 100644 --- a/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py +++ b/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py @@ -473,25 +473,3 @@ class TestLibvirtInspectionWithError(base.BaseTestCase): def test_inspect_unknown_error(self): self.assertRaises(virt_inspector.InspectorException, self.inspector.inspect_cpus, 'foo') - - -class TestLibvirtInitWithError(base.BaseTestCase): - - def setUp(self): - super(TestLibvirtInitWithError, self).setUp() - self.CONF = self.useFixture(fixture_config.Config()).conf - self.inspector = libvirt_inspector.LibvirtInspector(self.CONF) - libvirt_inspector.libvirt = mock.Mock() - - def test_init_error(self): - with mock.patch.object(libvirt_inspector.libvirt, - 'openReadOnly', - return_value=None): - self.assertRaises(virt_inspector.NoSanityException, - self.inspector.check_sanity) - - def test_init_exception(self): - with mock.patch.object(libvirt_inspector.libvirt, - 'openReadOnly', - side_effect=ImportError): - self.assertRaises(ImportError, self.inspector.check_sanity)