Merge pull request QualiSystems#80 from QualiSystems/asaf_general

Merge help-branch to master for release 1.2.0 (8.1EA)

Author: asafc64

package/cloudshell/cm/ansible/ansible_shell.py

@@ -162,10 +162,10 @@ def _wait_for_all_hosts_to_be_deployed(self, ansi_conf, logger, output_writer):
                     host.parameters[HostVarsFile.ANSIBLE_PORT] is not None):
                 ansible_port = host.parameters[HostVarsFile.ANSIBLE_PORT]
 
-            port_ansible_port = "Ansible Timeout:" + str(ansi_conf.timeout_minutes) + " Ansible port : " + ansible_port
+            port_ansible_port = "Ansible Timeout: " + str(ansi_conf.timeout_minutes) + " Ansible port: " + ansible_port
 
             logger.info(port_ansible_port)
-            output_writer.write("Waiting for host :" + host.ip)
+            output_writer.write("Waiting for host: " + host.ip)
             output_writer.write(port_ansible_port)
 
             self.connection_service.check_connection(logger, host, ansible_port=ansible_port,

package/cloudshell/cm/ansible/domain/host_vars_file.py

@@ -33,7 +33,7 @@ def __exit__(self, type, value, traceback):
         with self.file_system.create_file(self.file_path) as file_stream:
             lines = ['---']
             for key, value in sorted(self.vars.iteritems()):
-                lines.append(str(key) + ': ' + str(value))
+                lines.append(str(key) + ': "' + str(value) + '"')
             file_stream.write(os.linesep.join(lines))
             self.logger.debug(os.linesep.join(lines))
         self.logger.info('Done.')

package/cloudshell/cm/ansible/domain/output/ansible_result.py

@@ -29,6 +29,7 @@ def _load(self):
         host_results = []
         recap_table = self._get_final_table()
         error_by_host = self._get_failing_hosts_errors()
+        general_error = self._get_parsed_error()
         for ip in self.ips:
             # Success
             if recap_table.get(ip) == True:
@@ -41,7 +42,7 @@ def _load(self):
                 host_results.append(HostResult(ip, False, self.error))
             # Didn't run at all (no information for this ip)
             else:
-                host_results.append(HostResult(ip, False, self.DID_NOT_RUN_ERROR+os.linesep+self.error))
+                host_results.append(HostResult(ip, False, self.DID_NOT_RUN_ERROR+os.linesep+general_error))
         return host_results
 
     def _get_final_table(self):
@@ -63,6 +64,15 @@ def _scan_for_groups(self, pattern):
         matches = [m.groupdict() for m in matches]
         return matches
 
+    def _get_parsed_error(self):
+        pattern = '^('+self.START+')(\[ERROR\]\:|ERROR\!)\s*(?P<txt>.*)\s*('+self.END+')\s*'
+        minimized_error = self.error.replace(os.linesep + os.linesep, os.linesep)
+        matches = list(re.finditer(pattern, minimized_error, re.MULTILINE|re.DOTALL))
+        if(matches):
+            return '\n'.join([m.groupdict()['txt'] for m in matches])
+        else:
+            return self.error
+
 
 class HostResult(object):
     def __init__(self, ip, success, error = None):

package/tests/test_ansible_result.py

@@ -12,6 +12,14 @@ class TestAnsibleResult(TestCase):
     def setUp(self):
         self.file_system = FileSystemServiceMock()
 
+    def test_result_should_fail_on_general_ansible_error(self):
+        resultTxt = """
+\033[0;31mERROR! 'tasks_SFSDFEG' is not a valid attribute for a Play"""+os.linesep+"""The error appears to have\033[0m"""
+        result = AnsibleResult('', resultTxt, ['192.168.85.11'])
+        self.assertFalse(result.success)
+        self.assertEquals('Did not run / no information for this host.'+os.linesep+'\'tasks_SFSDFEG\' is not a valid attribute for a Play'+os.linesep+'The error appears to have',
+                          get_error_for(result, '192.168.85.11'))
+
     def test_result_should_fail_on_unreachable(self):
         resultTxt = """
 PLAY [linux_servers] ***********************************************************
@@ -94,7 +102,6 @@ def test_result_should_contain_error_for_unrun_hosts(self):
             self.assertIn(AnsibleResult.DID_NOT_RUN_ERROR,
                           get_error_for(result, '192.168.85.11'))
 
-
     def test_result_to_json(self):
         result = AnsibleResult('', 'error', ['192.168.85.11','192.168.85.12'])
         json_str = result.to_json()

package/tests/test_host_vars_file.py

@@ -18,36 +18,36 @@ def test_first_call_creates_the_folder(self):
     def test_can_add_connection_type(self):
         with HostVarsFile(self.file_system, 'host1', Mock()) as f:
             f.add_connection_type('winrm')
-        self.assertEquals(os.linesep.join(['---', 'ansible_connection: winrm']),
+        self.assertEquals(os.linesep.join(['---', 'ansible_connection: "winrm"']),
                           self.file_system.read_all_lines('host_vars', 'host1'))
 
     def test_can_add_connection_type(self):
         with HostVarsFile(self.file_system, 'host1', Mock()) as f:
             f.add_username('admin')
-        self.assertEquals(os.linesep.join(['---', 'ansible_user: admin']),
+        self.assertEquals(os.linesep.join(['---', 'ansible_user: "admin"']),
                           self.file_system.read_all_lines('host_vars', 'host1'))
 
     def test_can_add_connection_type(self):
         with HostVarsFile(self.file_system, 'host1', Mock()) as f:
             f.add_password('1234')
-        self.assertEquals(os.linesep.join(['---', 'ansible_ssh_pass: 1234']),
+        self.assertEquals(os.linesep.join(['---', 'ansible_ssh_pass: "1234"']),
                           self.file_system.read_all_lines('host_vars', 'host1'))
 
     def test_can_add_connection_key_file(self):
         with HostVarsFile(self.file_system, 'host1', Mock()) as f:
             f.add_conn_file('mycert.pem')
-        self.assertEquals(os.linesep.join(['---', 'ansible_ssh_private_key_file: mycert.pem']),
+        self.assertEquals(os.linesep.join(['---', 'ansible_ssh_private_key_file: "mycert.pem"']),
                           self.file_system.read_all_lines('host_vars', 'host1'))
 
     def test_can_add_port(self):
         with HostVarsFile(self.file_system, 'host1', Mock()) as f:
             f.add_port('1234')
-        self.assertEquals(os.linesep.join(['---', 'ansible_port: 1234']),
+        self.assertEquals(os.linesep.join(['---', 'ansible_port: "1234"']),
                           self.file_system.read_all_lines('host_vars', 'host1'))
 
     def test_can_add_custom_vars(self):
         with HostVarsFile(self.file_system, 'host1', Mock()) as f:
             f.add_vars({'param1': 'abc', 'param2': '123'})
             f.add_vars({'param3': 'W'})
-        self.assertEquals(os.linesep.join(['---', 'param1: abc', 'param2: 123', 'param3: W']),
+        self.assertEquals(os.linesep.join(['---', 'param1: "abc"', 'param2: "123"', 'param3: "W"']),
                           self.file_system.read_all_lines('host_vars', 'host1'))