Revert "Add hypervisor inspector sanity check"6.1.4

This change have introduced an issue, when the libvirt unix socket
is created after Ceilometer start. The pollster is disabled when
it should wait that libvirt come up.

The intent of the original bug was only to have a cosmetic logs
when the configuration file is wrong.

Also I don't see a safe way to disable the pollster when we can't
connect to libvirt, the reason is always unknown from Ceilometer PoV.

This reverts commit d17e75d2675c1acf09adc27249b1e968450c5229.

Closes-bug: #1649921
Change-Id: I63479d19fcf4a99fb198859c2e6ae370ff0e24e1
(cherry picked from commit 72b5a1e2bc9f4fc3f551a41aa0e40cd59f8ab5c9)

5 files changed, 0 insertions, 49 deletions

diff --git a/ceilometer/compute/pollsters/__init__.py b/ceilometer/compute/pollsters/__init__.py
index f56122b1..0b69c97c 100644
--- a/ceilometer/compute/pollsters/__init__.py
+++ b/ceilometer/compute/pollsters/__init__.py
@@ -24,11 +24,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 484bf82f..245fc2df 100644
--- a/ceilometer/compute/virt/inspector.py
+++ b/ceilometer/compute/virt/inspector.py
@@ -184,22 +184,10 @@ class NoDataException(InspectorException):
     pass
 
 
-class NoSanityException(InspectorException):
-    pass
-
-
 # Main virt inspector abstraction layering over the hypervisor API.
 #
 class Inspector(object):
 
-    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 6f879c32..770430af 100644
--- a/ceilometer/compute/virt/libvirt/inspector.py
+++ b/ceilometer/compute/virt/libvirt/inspector.py
@@ -82,10 +82,6 @@ class LibvirtInspector(virt_inspector.Inspector):
 
         return self.connection
 
-    def check_sanity(self):
-        if not self._get_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 824d689a..e3a1dde5 100644
--- a/ceilometer/tests/unit/agent/test_manager.py
+++ b/ceilometer/tests/unit/agent/test_manager.py
@@ -44,9 +44,6 @@ class TestPollsterBuilder(agentbase.TestPollster):
         return [('builder1', cls()), ('builder2', cls())]
 
 
-@mock.patch('ceilometer.compute.pollsters.'
-            'BaseComputePollster.setup_environment',
-            mock.Mock(return_value=None))
 class TestManager(base.BaseTestCase):
     def setUp(self):
         super(TestManager, self).setUp()
@@ -219,9 +216,6 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
             resource_metadata=agentbase.default_test_data.resource_metadata)
 
     @staticmethod
-    @mock.patch('ceilometer.compute.pollsters.'
-                'BaseComputePollster.setup_environment',
-                mock.Mock(return_value=None))
     def create_manager():
         return manager.AgentManager()
 
diff --git a/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py b/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py
index 16220cfa..2d2f758a 100644
--- a/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py
+++ b/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py
@@ -350,25 +350,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.inspector = libvirt_inspector.LibvirtInspector()
-        libvirt_inspector.libvirt = mock.Mock()
-
-    @mock.patch('ceilometer.compute.virt.libvirt.inspector.'
-                'LibvirtInspector._get_connection',
-                mock.Mock(return_value=None))
-    def test_init_error(self):
-        self.assertRaises(virt_inspector.NoSanityException,
-                          self.inspector.check_sanity)
-
-    @mock.patch('ceilometer.compute.virt.libvirt.inspector.'
-                'LibvirtInspector._get_connection',
-                mock.Mock(side_effect=virt_inspector.NoDataException))
-    def test_init_exception(self):
-        self.assertRaises(virt_inspector.NoDataException,
-                          self.inspector.check_sanity)