Support both libssh and paramiko

* Swap to `get_file` and `copy_file` from `Connection` in `network_cli.py` to support both `libssh` and `paramiko`
* Restore the `network_cli` check

Author: timway

plugins/action/net_put.py

@@ -10,6 +10,9 @@
 import os
 import tempfile
 
+from ansible.errors import AnsibleError
+from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils.connection import ConnectionError
 from ansible.plugins.action import ActionBase
 from ansible.utils.display import Display
 from ansible.utils.hashing import checksum
@@ -28,6 +31,17 @@ def __init__(self, *args, **kwargs):
     def run(self, tmp=None, task_vars=None):
         result = super(ActionModule, self).run(task_vars=task_vars)
 
+        persistent_connection = self._play_context.connection.split(".")[-1]
+        if persistent_connection != "network_cli":
+            # It is supported only with network_cli
+            return {
+                "failed": True,
+                "msg": (
+                    "connection type %s is not valid for net_put module, please use fully "
+                    "qualified name of network_cli connection type" % self._play_context.connection
+                ),
+            }
+
         try:
             self._src = self._task.args.get("src")
         except KeyError as exc:
@@ -65,27 +79,20 @@ def run(self, tmp=None, task_vars=None):
             )
 
             try:
-                self._connection._ssh_type_conn.fetch_file(self._dest, fetched_fp, self._protocol)
+                self._connection.get_file(self._dest, fetched_fp, self._protocol)
             except Exception as exc:
+                error = to_text(exc).lower()
                 if not (
-                    "Error receiving information about file" in exc.message
-                    and "No such file or directory" in exc.message
+                    "error receiving information about file" in error
+                    or "no such file or directory" in error
                 ):
                     raise exc
-                display.vv("The file is not present on the remote device")
-            finally:
-                self._connection._ssh_type_conn.reset()
-                self._dest_checksum = checksum(fetched_fp)
+            self._dest_checksum = checksum(fetched_fp)
 
-            try:
-                if self._dest_checksum != self._rendered_checksum:
-                    self._connection._ssh_type_conn.put_file(
-                        self._loader.get_real_file(self._rendered_real_file),
-                        self._dest,
-                        self._protocol,
-                    )
-            finally:
-                self._connection._ssh_type_conn.reset()
+            if self._dest_checksum != self._rendered_checksum:
+                self._connection.copy_file(
+                    self._loader.get_real_file(self._rendered_real_file), self._dest, self._protocol
+                )
 
             return result
         finally:

plugins/connection/libssh.py

@@ -630,6 +630,8 @@ def fetch_file(self, in_path, out_path, proto="sftp"):
                 scp.get(in_path, out_path)
             except LibsshSCPException as exc:
                 raise AnsibleError("Error transferring file from %s: %s" % (out_path, to_text(exc)))
+            finally:
+                self.reset()
         else:
             raise AnsibleError("Don't know how to transfer file over protocol %s" % proto)