Merge "Extend tcpcloud configuration"

os_faults/ansible/executor.py

@@ -122,7 +122,8 @@ Options = collections.namedtuple(
 
 class AnsibleRunner(object):
     def __init__(self, remote_user='root', password=None, forks=100,
-                 jump_host=None, private_key_file=None, become=None):
+                 jump_host=None, jump_user=None, private_key_file=None,
+                 become=None):
         super(AnsibleRunner, self).__init__()
 
         ssh_common_args = SSH_COMMON_ARGS
@@ -130,7 +131,7 @@ class AnsibleRunner(object):
             ssh_common_args += (
                 ' -o ProxyCommand="ssh -i %(key)s -W %%h:%%p %(ssh_args)s '
                 '%(user)s@%(host)s"'
-                % dict(key=private_key_file, user=remote_user,
+                % dict(key=private_key_file, user=jump_user or remote_user,
                        host=jump_host, ssh_args=SSH_COMMON_ARGS))
 
         self.options = Options(

os_faults/drivers/tcpcloud.py

@@ -165,7 +165,9 @@ class TCPCloudManagement(cloud_management.CloudManagement):
             'address': {'type': 'string'},
             'username': {'type': 'string'},
             'private_key_file': {'type': 'string'},
-
+            'slave_username': {'type': 'string'},
+            'master_sudo': {'type': 'boolean'},
+            'slave_sudo': {'type': 'boolean'},
         },
         'required': ['address', 'username'],
         'additionalProperties': False,
@@ -176,14 +178,21 @@ class TCPCloudManagement(cloud_management.CloudManagement):
 
         self.master_node_address = cloud_management_params['address']
         self.username = cloud_management_params['username']
+        self.slave_username = cloud_management_params.get(
+            'slave_username', self.username)
         self.private_key_file = cloud_management_params.get('private_key_file')
 
         self.master_node_executor = executor.AnsibleRunner(
-            remote_user=self.username, private_key_file=self.private_key_file)
+            remote_user=self.username,
+            private_key_file=self.private_key_file,
+            become=cloud_management_params.get('master_sudo'))
 
         self.cloud_executor = executor.AnsibleRunner(
-            remote_user=self.username, private_key_file=self.private_key_file,
-            jump_host=self.master_node_address)
+            remote_user=self.slave_username,
+            private_key_file=self.private_key_file,
+            jump_host=self.master_node_address,
+            jump_user=self.username,
+            become=cloud_management_params.get('slave_sudo'))
 
         self.cached_cloud_hosts = list()
         self.fqdn_to_hosts = dict()

os_faults/tests/unit/ansible/test_executor.py

@@ -11,6 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import ddt
 import mock
 
 from os_faults.ansible import executor
@@ -98,6 +99,7 @@ class MyCallbackTestCase(test.TestCase):
         mock_store.assert_called_once_with(result, executor.STATUS_UNREACHABLE)
 
 
+@ddt.ddt
 class AnsibleRunnerTestCase(test.TestCase):
 
     @mock.patch('os_faults.ansible.executor.os.path.exists')
@@ -112,46 +114,57 @@ class AnsibleRunnerTestCase(test.TestCase):
         r = executor.resolve_relative_path('')
         self.assertIsNotNone(r)
 
-    def test___init__jump_host(self):
-        host = 'my_host'
-        ssh_common_args = executor.SSH_COMMON_ARGS
-        ar = executor.AnsibleRunner(jump_host=host)
-        self.assertLess(len(ssh_common_args), len(ar.options.ssh_common_args))
-
     @mock.patch.object(executor, 'Options')
-    def test___init__options(self, mock_options):
-        executor.AnsibleRunner()
+    @ddt.data((
+        {},
+        dict(become=None, become_method='sudo', become_user='root',
+             check=False, connection='smart', forks=100,
+             password=None, private_key_file=None,
+             remote_user='root', scp_extra_args=None, sftp_extra_args=None,
+             ssh_common_args=executor.SSH_COMMON_ARGS,
+             ssh_extra_args=None, verbosity=100)
+    ), (
+        dict(remote_user='root', jump_host='jhost.com',
+             private_key_file='/path/my.key'),
+        dict(become=None, become_method='sudo', become_user='root',
+             check=False, connection='smart', forks=100,
+             password=None,
+             private_key_file='/path/my.key',
+             remote_user='root', scp_extra_args=None, sftp_extra_args=None,
+             ssh_common_args=('-o UserKnownHostsFile=/dev/null '
+                              '-o StrictHostKeyChecking=no '
+                              '-o ProxyCommand='
+                              '"ssh -i /path/my.key '
+                              '-W %h:%p '
+                              '-o UserKnownHostsFile=/dev/null '
+                              '-o StrictHostKeyChecking=no '
+                              'root@jhost.com"'),
+             ssh_extra_args=None, verbosity=100)
+    ), (
+        dict(remote_user='root', jump_host='jhost.com', jump_user='juser',
+             private_key_file='/path/my.key'),
+        dict(become=None, become_method='sudo', become_user='root',
+             check=False, connection='smart', forks=100,
+             password=None,
+             private_key_file='/path/my.key',
+             remote_user='root', scp_extra_args=None, sftp_extra_args=None,
+             ssh_common_args=('-o UserKnownHostsFile=/dev/null '
+                              '-o StrictHostKeyChecking=no '
+                              '-o ProxyCommand='
+                              '"ssh -i /path/my.key '
+                              '-W %h:%p '
+                              '-o UserKnownHostsFile=/dev/null '
+                              '-o StrictHostKeyChecking=no '
+                              'juser@jhost.com"'),
+             ssh_extra_args=None, verbosity=100)
+    ))
+    @ddt.unpack
+    def test___init__options(self, config, options_args, mock_options):
+        executor.AnsibleRunner(**config)
         module_path = executor.resolve_relative_path(
             'os_faults/ansible/modules')
-        mock_options.assert_called_once_with(
-            become=None, become_method='sudo', become_user='root',
-            check=False, connection='smart', forks=100,
-            module_path=module_path, password=None, private_key_file=None,
-            remote_user='root', scp_extra_args=None, sftp_extra_args=None,
-            ssh_common_args=executor.SSH_COMMON_ARGS,
-            ssh_extra_args=None, verbosity=100)
-
-    @mock.patch.object(executor, 'Options')
-    def test___init__options_jump_host(self, mock_options):
-        executor.AnsibleRunner(remote_user='root', jump_host='jhost.com',
-                               private_key_file='/path/my.key', )
-        module_path = executor.resolve_relative_path(
-            'os_faults/ansible/modules')
-        mock_options.assert_called_once_with(
-            become=None, become_method='sudo', become_user='root',
-            check=False, connection='smart', forks=100,
-            module_path=module_path, password=None,
-            private_key_file='/path/my.key',
-            remote_user='root', scp_extra_args=None, sftp_extra_args=None,
-            ssh_common_args=('-o UserKnownHostsFile=/dev/null '
-                             '-o StrictHostKeyChecking=no '
-                             '-o ProxyCommand='
-                             '"ssh -i /path/my.key '
-                             '-W %h:%p '
-                             '-o UserKnownHostsFile=/dev/null '
-                             '-o StrictHostKeyChecking=no '
-                             'root@jhost.com"'),
-            ssh_extra_args=None, verbosity=100)
+        mock_options.assert_called_once_with(module_path=module_path,
+                                             **options_args)
 
     @mock.patch.object(executor.task_queue_manager, 'TaskQueueManager')
     @mock.patch('ansible.playbook.play.Play.load')

os_faults/tests/unit/drivers/test_tcpcloud.py

@@ -46,6 +46,39 @@ class TCPCloudManagementTestCase(test.TestCase):
         self.get_nodes_cmd = (
             "salt -E '(ctl*|cmp*)' network.interfaces --out=yaml")
 
+    @mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
+    @ddt.data((
+        dict(address='tcp.local', username='root'),
+        (mock.call(become=None, private_key_file=None, remote_user='root'),
+         mock.call(become=None, jump_host='tcp.local', jump_user='root',
+                   private_key_file=None, remote_user='root'))
+    ), (
+        dict(address='tcp.local', username='ubuntu',
+             slave_username='root', master_sudo=True,
+             private_key_file='/path/id_rsa'),
+        (mock.call(become=True, private_key_file='/path/id_rsa',
+                   remote_user='ubuntu'),
+         mock.call(become=None, jump_host='tcp.local', jump_user='ubuntu',
+                   private_key_file='/path/id_rsa', remote_user='root'))
+    ), (
+        dict(address='tcp.local', username='ubuntu',
+             slave_username='root', slave_sudo=True,
+             private_key_file='/path/id_rsa'),
+        (mock.call(become=None, private_key_file='/path/id_rsa',
+                   remote_user='ubuntu'),
+         mock.call(become=True, jump_host='tcp.local', jump_user='ubuntu',
+                   private_key_file='/path/id_rsa', remote_user='root'))
+    ))
+    @ddt.unpack
+    def test_init(self, config, expected_runner_calls, mock_ansible_runner):
+        ansible_runner_inst = mock_ansible_runner.return_value
+
+        tcp_managment = tcpcloud.TCPCloudManagement(config)
+
+        mock_ansible_runner.assert_has_calls(expected_runner_calls)
+        self.assertIs(tcp_managment.master_node_executor, ansible_runner_inst)
+        self.assertIs(tcp_managment.cloud_executor, ansible_runner_inst)
+
     @mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
     def test_verify(self, mock_ansible_runner):
         ansible_runner_inst = mock_ansible_runner.return_value