Merge pull request #1060 from rahkumar651991/cli_return_exception

Raise exception when dev.cli fails with exception

lib/jnpr/junos/device.py

@@ -724,12 +724,18 @@ def cli(self, command, format="text", warning=True):
             if rsp.tag == "rpc":
                 return rsp[0]
             return rsp
-        except EzErrors.ConnectClosedError as ex:
+        except (
+            EzErrors.ConnectClosedError,
+            EzErrors.RpcError,
+            EzErrors.RpcTimeoutError,
+        ) as ex:
             raise ex
-        except EzErrors.RpcError as ex:
-            return "invalid command: %s: %s" % (command, ex)
         except Exception as ex:
-            return "invalid command: " + command
+            warnings.warn(
+                "An unknown exception occurred : %s - please report." % ex,
+                RuntimeWarning,
+            )
+            raise ex
 
     # ------------------------------------------------------------------------
     # execute
@@ -828,7 +834,7 @@ def execute(self, rpc_cmd, ignore_warning=False, **kvargs):
         # Something unexpected happened - raise it up
         except Exception as err:
             warnings.warn(
-                "An unknown exception occured - please report.", RuntimeWarning
+                "An unknown exception occurred - please report.", RuntimeWarning
             )
             raise
 

tests/unit/test_device.py

@@ -710,16 +710,26 @@ def test_device_cli_rpc(self, mock_execute):
             "get-system-uptime-information",
         )
 
-    def test_device_cli_exception(self):
-        self.dev.rpc.cli = MagicMock(side_effect=AttributeError)
-        val = self.dev.cli("show version")
-        self.assertEqual(val, "invalid command: show version")
+    def test_device_cli_connection_exception(self):
+        self.dev.connected = False
+        self.assertRaises(EzErrors.ConnectClosedError, self.dev.cli, "foo")
 
     @patch("jnpr.junos.Device.execute")
     def test_device_cli_rpc_exception(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        val = self.dev.cli("foo")
-        self.assertEqual(val, "invalid command: foo: RpcError")
+        self.assertRaises(EzErrors.RpcError, self.dev.cli, "foo")
+
+    def test_device_cli_timeout_exception(self):
+        self.dev._conn.rpc = MagicMock(side_effect=TimeoutExpiredError)
+        self.assertRaises(EzErrors.RpcTimeoutError, self.dev.cli, "foo")
+
+    @patch("jnpr.junos.device.warnings")
+    def test_device_cli_unknown_exception(self, mock_warnings):
+        class MyException(Exception):
+            pass
+
+        self.dev._conn.rpc = MagicMock(side_effect=MyException)
+        self.assertRaises(MyException, self.dev.cli, "foo")
 
     @patch("jnpr.junos.Device.execute")
     def test_device_display_xml_rpc(self, mock_execute):