Merge pull request #1249 from dineshbaburam91/file_copy

Introduced optional argument routing-instance for fs.cp() API

lib/jnpr/junos/utils/fs.py

@@ -392,14 +392,18 @@ def rm(self, path):
     # cp - local file copy
     # -------------------------------------------------------------------------
 
-    def cp(self, from_path, to_path):
+    def cp(self, from_path, to_path, routing_instance=None, **kvargs):
         """
         Perform a local file copy where **from_path** and **to_path** can be
         any valid Junos path argument.  Refer to the Junos "file copy" command
         documentation for details.
 
         :param str from_path: source file-path
         :param str to_path: destination file-path
+        :param str routing_instance: (optional) routing_instance name
+        :param dict kvargs: Any additional parameters to the 'file copy' command can
+                            be passed within **kvargs**, following the RPC syntax
+                            methodology (dash-2-underscore,etc.)
 
         .. notes: Valid Junos file-path can include URL, such as ``http://``.
                   this is handy for copying files for webservers.
@@ -409,7 +413,15 @@ def cp(self, from_path, to_path):
         # this RPC returns True if it is OK.  If the file does not exist
         # this RPC will generate an RpcError exception, so just return False
         try:
-            self._dev.rpc.file_copy(source=from_path, destination=to_path)
+            if routing_instance is None:
+                self._dev.rpc.file_copy(source=from_path, destination=to_path, **kvargs)
+            else:
+                self._dev.rpc.file_copy(
+                    source=from_path,
+                    destination=to_path,
+                    routing_instance=routing_instance,
+                    **kvargs
+                )
         except:
             return False
         return True

tests/unit/utils/test_fs.py

@@ -221,6 +221,26 @@ def test_copy_return_true(self):
             source="test/abc", destination="test/xyz"
         )
 
+    def test_copy_routing_instance_return_true(self):
+        self.fs.dev.rpc.file_copy = MagicMock()
+        initial = "test/abc"
+        final = "test/xyz"
+        ri_name = "test_ri"
+        self.assertTrue(self.fs.cp(initial, final, routing_instance=ri_name))
+        self.fs.dev.rpc.file_copy.assert_called_once_with(
+            source="test/abc", destination="test/xyz", routing_instance="test_ri"
+        )
+
+    def test_copy_source_address_return_true(self):
+        self.fs.dev.rpc.file_copy = MagicMock()
+        initial = "test/abc"
+        final = "test/xyz"
+        s_add = "0.0.0.0"
+        self.assertTrue(self.fs.cp(initial, final, source_address=s_add))
+        self.fs.dev.rpc.file_copy.assert_called_once_with(
+            source="test/abc", destination="test/xyz", source_address="0.0.0.0"
+        )
+
     def test_copy_return_false(self):
         initial = "test/abc"
         final = "test/xyz"