added network_cli option

Author: katzy687

2G-Service/ansible-config-2g/shell-definition.yaml

@@ -42,12 +42,12 @@ node_types:
         type: string
         tags: [ user_input ]
       Connection Method:
-        description: For Linux / Windows connections
+        description: Specifies the "ansible_connection" host variable
         type: string
         tags: [user_input]
-        default: SSH
+        default: ssh
         constraints:
-          - valid_values: [ SSH, WinRM ]
+          - valid_values: [ ssh, winrm, network_cli ]
       Script Parameters:
         description: (Optional) key pair values passed playbook VARS file to be accesible in script. Pass in following format - key1,val1;key2,val2.
         type: string

2G-Service/ansible-config-2g/src/driver.py

@@ -11,6 +11,7 @@
 from helper_code.resource_helpers import get_resource_attribute_gen_agostic
 from helper_code.parse_script_params import get_params_list_from_semicolon_sep_str
 from helper_code.gitlab_api_url_validator import is_base_path_gitlab_api
+from helper_code.validate_protocols import is_path_supported_protocol
 from cloudshell.core.logger.qs_logger import get_qs_logger
 from ansible_configuration import AnsibleConfiguration, HostConfiguration
 
@@ -59,7 +60,7 @@ def execute_playbook(self, context, cancellation_context, playbook_path):
         return completed_msg
 
     def _is_path_supported_protocol(self, path):
-        return any(path.startswith(protocol) for protocol in self.supported_protocols)
+        return is_path_supported_protocol(path, self.supported_protocols)
 
     @staticmethod
     def _append_gitlab_url_suffix(url, branch):
@@ -256,7 +257,7 @@ def _get_ansible_config_json(self, context, api, reporter, playbook_path):
         if curr_password:
             new_obj["repositoryDetails"]["password"] = "*******"
         json_copy = json.dumps(new_obj, indent=4)
-        reporter.debug_out("=== Ansible Configuration JSON ===\n{}".format(json_copy), log_only=True)
+        reporter.info_out("=== Ansible Configuration JSON ===\n{}".format(json_copy), log_only=True)
 
         return ansi_conf_json
 

2G-Service/ansible-config-2g/src/drivermetadata.xml

@@ -6,7 +6,7 @@
             <Parameters>
                 <Parameter Name="playbook_path" Type="String"
                            DisplayName="Playbook Path"
-                           Description="Can pass the Full URL OR a shortened path that will be combined with base path attribute"
+                           Description="Can pass the Full URL OR a shortened path that will be combined with base path attribute. Will Fallback to value defined on service."
                            Mandatory="False"/>
             </Parameters>
         </Command>

2G-Service/ansible-config-2g/src/helper_code/validate_protocols.py

@@ -0,0 +1,14 @@
+def is_path_supported_protocol(path, supported_protocols):
+    """
+    :param str path:
+    :param list [str] protocols:
+    :return:
+    """
+    path = path.lower()
+    return any(path.startswith(protocol) for protocol in supported_protocols)
+
+
+if __name__ == "__main__":
+    protocols = ["http", "https"]
+    path = "httpS://www.lol.com"
+    print(is_path_supported_protocol(path, protocols))

2G-Service/ansible-config-2g/test_requirements.txt

@@ -4,4 +4,5 @@ unittest2
 mock
 teamcity-messages
 jsonpickle
-nose-exclude
+nose-exclude
+pytest

2G-Service/ansible-config-2g/tests/test_ansible-config-2g.py

@@ -4,10 +4,11 @@
 """
 Tests for `AnsibleConfig2GDriver`
 """
+from driver import AnsibleConfig2GDriver
 
 import unittest
 
-from driver import AnsibleConfig2GDriver
+
 
 
 class TestAnsibleConfig2GDriver(unittest.TestCase):

package/cloudshell/cm/ansible/domain/Helpers/ansible_connection_helper.py

@@ -1,20 +1,26 @@
 class AnsibleConnectionHelper(object):
+    CONNECTION_METHOD_WIN_RM = 'winrm'
     WIN_RM_SECURED_PORT = '5986'
     WIN_RM_PORT = '5985'
-    CONNECTION_METHOD_WIN_RM = 'winrm'
     CONNECTION_METHOD_SSH = 'ssh'
+    CONNECTION_METHOD_NETWORK_CLI = "network_cli"
     SSH_PORT = '22'
+    CONNECTION_METHOD_VM_WARE = "vmware_tools"
+    VM_WARE_PORT = '443'
 
     def __init__(self):
         pass
 
     def get_ansible_port(self, host):
-        ansible_port = None
         if host.connection_method == self.CONNECTION_METHOD_WIN_RM:
             if host.connection_secured:
-                ansible_port = self.WIN_RM_SECURED_PORT
+                return self.WIN_RM_SECURED_PORT
             else:
-                ansible_port = self.WIN_RM_PORT
+                return self.WIN_RM_PORT
         if host.connection_method == self.CONNECTION_METHOD_SSH:
-            ansible_port = self.SSH_PORT
-        return ansible_port
+            return self.SSH_PORT
+        if host.connection_method == self.CONNECTION_METHOD_VM_WARE:
+            return self.VM_WARE_PORT
+        if host.connection_method == self.CONNECTION_METHOD_NETWORK_CLI:
+            return self.SSH_PORT
+