Move persistent connections to only use registered variables (#45616)

* Try to intuit proper plugins to send to ansible-connection

* Move sub-plugins to init so that vars will be populated in executor

* Fix connection unit tests

test/units/plugins/connection/test_connection.py

@@ -41,6 +41,7 @@ from ansible.plugins.connection.ssh import Connection as SSHConnection
 from ansible.plugins.connection.docker import Connection as DockerConnection
 # from ansible.plugins.connection.winrm import Connection as WinRmConnection
 from ansible.plugins.connection.network_cli import Connection as NetworkCliConnection
+from ansible.plugins.connection.httpapi import Connection as HttpapiConnection
 
 PY3 = sys.version_info[0] == 3
 
@@ -162,11 +163,16 @@ class TestConnectionBaseClass(unittest.TestCase):
 #        self.assertIsInstance(WinRmConnection(), WinRmConnection)
 
     def test_network_cli_connection_module(self):
+        self.play_context.network_os = 'eos'
         self.assertIsInstance(NetworkCliConnection(self.play_context, self.in_stream), NetworkCliConnection)
 
     def test_netconf_connection_module(self):
         self.assertIsInstance(NetconfConnection(self.play_context, self.in_stream), NetconfConnection)
 
+    def test_httpapi_connection_module(self):
+        self.play_context.network_os = 'eos'
+        self.assertIsInstance(HttpapiConnection(self.play_context, self.in_stream), HttpapiConnection)
+
     def test_check_password_prompt(self):
         local = (
             b'[sudo via ansible, key=ouzmdnewuhucvuaabtjmweasarviygqq] password: \n'

test/units/plugins/connection/test_netconf.py

@@ -58,9 +58,7 @@ class TestNetconfConnectionClass(unittest.TestCase):
 
     def test_netconf_init(self):
         pc = PlayContext()
-        new_stdin = StringIO()
-
-        conn = netconf.Connection(pc, new_stdin)
+        conn = connection_loader.get('netconf', pc, '/dev/null')
 
         self.assertEqual('default', conn._network_os)
         self.assertIsNone(conn._manager)
@@ -69,14 +67,11 @@ class TestNetconfConnectionClass(unittest.TestCase):
     @patch("ansible.plugins.connection.netconf.netconf_loader")
     def test_netconf__connect(self, mock_netconf_loader):
         pc = PlayContext()
-        new_stdin = StringIO()
-
-        conn = connection_loader.get('netconf', pc, new_stdin)
+        conn = connection_loader.get('netconf', pc, '/dev/null')
 
         mock_manager = MagicMock()
         mock_manager.session_id = '123456789'
         netconf.manager.connect = MagicMock(return_value=mock_manager)
-        conn._play_context.network_os = 'default'
 
         rc, out, err = conn._connect()
 
@@ -87,9 +82,8 @@ class TestNetconfConnectionClass(unittest.TestCase):
 
     def test_netconf_exec_command(self):
         pc = PlayContext()
-        new_stdin = StringIO()
+        conn = connection_loader.get('netconf', pc, '/dev/null')
 
-        conn = netconf.Connection(pc, new_stdin)
         conn._connected = True
 
         mock_reply = MagicMock(name='reply')
@@ -105,9 +99,8 @@ class TestNetconfConnectionClass(unittest.TestCase):
 
     def test_netconf_exec_command_invalid_request(self):
         pc = PlayContext()
-        new_stdin = StringIO()
+        conn = connection_loader.get('netconf', pc, '/dev/null')
 
-        conn = netconf.Connection(pc, new_stdin)
         conn._connected = True
 
         mock_manager = MagicMock(name='self._manager')

test/units/plugins/connection/test_network_cli.py

@@ -30,7 +30,6 @@ from ansible.compat.tests.mock import patch, MagicMock
 
 from ansible.errors import AnsibleConnectionFailure
 from ansible.playbook.play_context import PlayContext
-from ansible.plugins.connection import network_cli
 from ansible.plugins.loader import connection_loader
 
 
@@ -39,39 +38,30 @@ class TestConnectionClass(unittest.TestCase):
     @patch("ansible.plugins.connection.paramiko_ssh.Connection._connect")
     def test_network_cli__connect_error(self, mocked_super):
         pc = PlayContext()
-        new_stdin = StringIO()
-
+        pc.network_os = 'ios'
         conn = connection_loader.get('network_cli', pc, '/dev/null')
+
         conn.ssh = MagicMock()
         conn.receive = MagicMock()
-        conn._terminal = MagicMock()
-        pc.network_os = None
+        conn._network_os = 'does not exist'
+
         self.assertRaises(AnsibleConnectionFailure, conn._connect)
 
-    @patch("ansible.plugins.connection.paramiko_ssh.Connection._connect")
-    def test_network_cli__invalid_os(self, mocked_super):
+    def test_network_cli__invalid_os(self):
         pc = PlayContext()
-        new_stdin = StringIO()
-
-        conn = connection_loader.get('network_cli', pc, '/dev/null')
-        conn.ssh = MagicMock()
-        conn.receive = MagicMock()
-        conn._terminal = MagicMock()
         pc.network_os = None
-        self.assertRaises(AnsibleConnectionFailure, conn._connect)
+
+        self.assertRaises(AnsibleConnectionFailure, connection_loader.get, 'network_cli', pc, '/dev/null')
 
     @patch("ansible.plugins.connection.network_cli.terminal_loader")
     @patch("ansible.plugins.connection.paramiko_ssh.Connection._connect")
     def test_network_cli__connect(self, mocked_super, mocked_terminal_loader):
         pc = PlayContext()
         pc.network_os = 'ios'
-        new_stdin = StringIO()
-
         conn = connection_loader.get('network_cli', pc, '/dev/null')
 
         conn.ssh = MagicMock()
         conn.receive = MagicMock()
-        conn._terminal = MagicMock()
 
         conn._connect()
         self.assertTrue(conn._terminal.on_open_shell.called)
@@ -88,8 +78,8 @@ class TestConnectionClass(unittest.TestCase):
     @patch("ansible.plugins.connection.paramiko_ssh.Connection.close")
     def test_network_cli_close(self, mocked_super):
         pc = PlayContext()
-        new_stdin = StringIO()
-        conn = network_cli.Connection(pc, new_stdin)
+        pc.network_os = 'ios'
+        conn = connection_loader.get('network_cli', pc, '/dev/null')
 
         terminal = MagicMock(supports_multiplexing=False)
         conn._terminal = terminal
@@ -105,8 +95,8 @@ class TestConnectionClass(unittest.TestCase):
     @patch("ansible.plugins.connection.paramiko_ssh.Connection._connect")
     def test_network_cli_exec_command(self, mocked_super):
         pc = PlayContext()
-        new_stdin = StringIO()
-        conn = network_cli.Connection(pc, new_stdin)
+        pc.network_os = 'ios'
+        conn = connection_loader.get('network_cli', pc, '/dev/null')
 
         mock_send = MagicMock(return_value=b'command response')
         conn.send = mock_send
@@ -124,8 +114,9 @@ class TestConnectionClass(unittest.TestCase):
 
     def test_network_cli_send(self):
         pc = PlayContext()
-        new_stdin = StringIO()
-        conn = network_cli.Connection(pc, new_stdin)
+        pc.network_os = 'ios'
+        conn = connection_loader.get('network_cli', pc, '/dev/null')
+
         mock__terminal = MagicMock()
         mock__terminal.terminal_stdout_re = [re.compile(b'device#')]
         mock__terminal.terminal_stderr_re = [re.compile(b'^ERROR')]