Merge pull request #733 from globocom/remove_exception_handling_ssh

Remove exception handling ssh

Author: ricardosdias

dbaas/physical/ssh.py

@@ -13,18 +13,19 @@
 
 def connect_host(func):
     def wrapper(self, *args, **kw):
-        try:
-            self.connect()
-            return func(self, *args, **kw)
-        except (paramiko.ssh_exception.BadHostKeyException,
-                paramiko.ssh_exception.AuthenticationException,
-                paramiko.ssh_exception.SSHException,
-                socket.error) as e:
-            msg = "We caught an exception: {}.".format(e)
-            LOG.warning(msg)
-            self.output['exception'] = str(e)
-            return self.output
-
+        # try:
+        #     self.connect()
+        #     return func(self, *args, **kw)
+        # except (paramiko.ssh_exception.BadHostKeyException,
+        #         paramiko.ssh_exception.AuthenticationException,
+        #         paramiko.ssh_exception.SSHException,
+        #         socket.error) as e:
+        #     msg = "We caught an exception: {}.".format(e)
+        #     LOG.warning(msg)
+        #     self.output['exception'] = str(e)
+        #     return self.output
+        self.connect()
+        return func(self, *args, **kw)
     return wrapper
 
 

dbaas/physical/tests/test_host_ssh.py

@@ -58,65 +58,65 @@ def test_call_connect_when_not_error(self, connect_mock):
         self.assertEqual(output['stdout'], 'fake_stdout')
         self.assertEqual(output['exception'], '')
 
-    @patch.object(HostSSH, 'connect',
-                  side_effect=BadHostKeyException(
-                      'fake_hostname', MagicMock(), MagicMock()
-                  ))
-    def test_call_connect_bad_host_exception(self, connect_mock):
-        output = self.decorated(self.host_ssh)
-
-        self.assertTrue(connect_mock.called)
-        self.assertFalse(self.fake_func.called)
-        self.assertEqual(output['stdout'], '')
-        self.assertIn(
-            "fake_hostname",
-            output['exception']
-        )
-
-    @patch.object(HostSSH, 'connect',
-                  side_effect=SSHException(
-                      'fake err msg'
-                  ))
-    def test_call_connect_ssh_exception(self, connect_mock):
-        output = self.decorated(self.host_ssh)
-
-        self.assertTrue(connect_mock.called)
-        self.assertFalse(self.fake_func.called)
-        self.assertEqual(output['stdout'], '')
-        self.assertEqual(
-            "fake err msg",
-            output['exception']
-        )
-
-    @patch.object(HostSSH, 'connect',
-                  side_effect=AuthenticationException(
-                      'fake err msg'
-                  ))
-    def test_call_connect_auth_exception(self, connect_mock):
-        output = self.decorated(self.host_ssh)
-
-        self.assertTrue(connect_mock.called)
-        self.assertFalse(self.fake_func.called)
-        self.assertEqual(output['stdout'], '')
-        self.assertEqual(
-            "fake err msg",
-            output['exception']
-        )
-
-    @patch.object(HostSSH, 'connect',
-                  side_effect=socker_err(
-                      'fake err msg'
-                  ))
-    def test_call_connect_socket_exception(self, connect_mock):
-        output = self.decorated(self.host_ssh)
-
-        self.assertTrue(connect_mock.called)
-        self.assertFalse(self.fake_func.called)
-        self.assertEqual(output['stdout'], '')
-        self.assertEqual(
-            "fake err msg",
-            output['exception']
-        )
+    # @patch.object(HostSSH, 'connect',
+    #               side_effect=BadHostKeyException(
+    #                   'fake_hostname', MagicMock(), MagicMock()
+    #               ))
+    # def test_call_connect_bad_host_exception(self, connect_mock):
+    #     output = self.decorated(self.host_ssh)
+    #
+    #     self.assertTrue(connect_mock.called)
+    #     self.assertFalse(self.fake_func.called)
+    #     self.assertEqual(output['stdout'], '')
+    #     self.assertIn(
+    #         "fake_hostname",
+    #         output['exception']
+    #     )
+
+    # @patch.object(HostSSH, 'connect',
+    #               side_effect=SSHException(
+    #                   'fake err msg'
+    #               ))
+    # def test_call_connect_ssh_exception(self, connect_mock):
+    #     output = self.decorated(self.host_ssh)
+    #
+    #     self.assertTrue(connect_mock.called)
+    #     self.assertFalse(self.fake_func.called)
+    #     self.assertEqual(output['stdout'], '')
+    #     self.assertEqual(
+    #         "fake err msg",
+    #         output['exception']
+    #     )
+
+    # @patch.object(HostSSH, 'connect',
+    #               side_effect=AuthenticationException(
+    #                   'fake err msg'
+    #               ))
+    # def test_call_connect_auth_exception(self, connect_mock):
+    #     output = self.decorated(self.host_ssh)
+    #
+    #     self.assertTrue(connect_mock.called)
+    #     self.assertFalse(self.fake_func.called)
+    #     self.assertEqual(output['stdout'], '')
+    #     self.assertEqual(
+    #         "fake err msg",
+    #         output['exception']
+    #     )
+
+    # @patch.object(HostSSH, 'connect',
+    #               side_effect=socker_err(
+    #                   'fake err msg'
+    #               ))
+    # def test_call_connect_socket_exception(self, connect_mock):
+    #     output = self.decorated(self.host_ssh)
+    #
+    #     self.assertTrue(connect_mock.called)
+    #     self.assertFalse(self.fake_func.called)
+    #     self.assertEqual(output['stdout'], '')
+    #     self.assertEqual(
+    #         "fake err msg",
+    #         output['exception']
+    #     )
 
 
 class InitTestCase(TestCase):