catocli 2.1.0__py3-none-any.whl → 2.1.2__py3-none-any.whl

catocli/parsers/custom_private/__init__.py

@@ -0,0 +1,134 @@
+#!/usr/bin/env python3
+"""
+Private commands parser for custom GraphQL payloads
+Dynamically loads commands from ~/.cato/settings.json
+"""
+
+import os
+import json
+import argparse
+from ..customParserApiClient import createPrivateRequest, get_private_help
+
+
+def load_private_settings():
+    """Load private settings from ~/.cato/settings.json"""
+    settings_file = os.path.expanduser("~/.cato/settings.json")
+    try:
+        with open(settings_file, 'r') as f:
+            settings = json.load(f)
+            return settings.get('privateCommands', {})
+    except (FileNotFoundError, json.JSONDecodeError, KeyError):
+        return {}
+
+
+def private_parse(subparsers):
+    """Check for private settings and create private parser if found"""
+    private_commands = load_private_settings()
+    
+    if not private_commands:
+        return None
+    
+    # Create the private subparser
+    private_parser = subparsers.add_parser(
+        'private', 
+        help='Private custom commands (configured in ~/.cato/settings.json)',
+        usage='catocli private <command> [options]'
+    )
+    
+    private_subparsers = private_parser.add_subparsers(
+        description='Available private commands',
+        help='Private command help'
+    )
+    
+    # Dynamically create subparsers for each private command
+    for command_name, command_config in private_commands.items():
+        create_private_command_parser(
+            private_subparsers, 
+            command_name, 
+            command_config
+        )
+    
+    return private_parser
+
+
+def create_private_command_parser(subparsers, command_name, command_config):
+    """Create a parser for a specific private command"""
+    
+    # Create the command parser
+    cmd_parser = subparsers.add_parser(
+        command_name,
+        help=f'Execute private command: {command_name}',
+        usage=get_private_help(command_name, command_config)
+    )
+    
+    # Add standard arguments
+    cmd_parser.add_argument(
+        'json', 
+        nargs='?', 
+        default='{}', 
+        help='Variables in JSON format (defaults to empty object if not provided).'
+    )
+    cmd_parser.add_argument(
+        '-t', 
+        const=True, 
+        default=False, 
+        nargs='?', 
+        help='Print GraphQL query without sending API call'
+    )
+    cmd_parser.add_argument(
+        '-v', 
+        const=True, 
+        default=False, 
+        nargs='?', 
+        help='Verbose output'
+    )
+    cmd_parser.add_argument(
+        '-p', 
+        const=True, 
+        default=False, 
+        nargs='?', 
+        help='Pretty print'
+    )
+    cmd_parser.add_argument(
+        '-H', '--header', 
+        action='append', 
+        dest='headers', 
+        help='Add custom headers in "Key: Value" format. Can be used multiple times.'
+    )
+    cmd_parser.add_argument(
+        '--headers-file', 
+        dest='headers_file', 
+        help='Load headers from a file. Each line should contain a header in "Key: Value" format.'
+    )
+    
+    # Add standard accountID argument (like other commands)
+    cmd_parser.add_argument(
+        '-accountID', 
+        help='Override the account ID from profile with this value.'
+    )
+    
+    # Add dynamic arguments based on command configuration (excluding accountId since it's handled above)
+    if 'arguments' in command_config:
+        for arg in command_config['arguments']:
+            arg_name = arg.get('name')
+            # Skip accountId since it's handled by the standard -accountID argument
+            if arg_name and arg_name.lower() != 'accountid':
+                arg_type = arg.get('type', 'string')
+                arg_default = arg.get('default')
+                arg_help = f"Argument: {arg_name}"
+                
+                if arg_default:
+                    arg_help += f" (default: {arg_default})"
+                
+                cmd_parser.add_argument(
+                    f'--{arg_name}',
+                    help=arg_help,
+                    default=arg_default
+                )
+    
+    # Set the function to handle this command
+    cmd_parser.set_defaults(
+        func=createPrivateRequest, 
+        private_command=command_name,
+        private_config=command_config
+    )

catocli/parsers/mutation_accountManagement/__init__.py

@@ -1,61 +1,48 @@
 
-from ..parserApiClient import createRequest, get_help
+from ..customParserApiClient import createRequest, get_help
 
 def mutation_accountManagement_parse(mutation_subparsers):
-	mutation_accountManagement_parser = mutation_subparsers.add_parser('accountManagement', 
-			help='accountManagement() mutation operation', 
-			usage=get_help("mutation_accountManagement"))
-
-	mutation_accountManagement_subparsers = mutation_accountManagement_parser.add_subparsers()
-
-	mutation_accountManagement_addAccount_parser = mutation_accountManagement_subparsers.add_parser('addAccount', 
-			help='addAccount() accountManagement operation', 
-			usage=get_help("mutation_accountManagement_addAccount"))
-
-	mutation_accountManagement_addAccount_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
-	mutation_accountManagement_addAccount_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_accountManagement_addAccount_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
-	mutation_accountManagement_addAccount_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
-	mutation_accountManagement_addAccount_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
-	mutation_accountManagement_addAccount_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
-	mutation_accountManagement_addAccount_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
-	mutation_accountManagement_addAccount_parser.set_defaults(func=createRequest,operation_name='mutation.accountManagement.addAccount')
-
-	mutation_accountManagement_disableAccount_parser = mutation_accountManagement_subparsers.add_parser('disableAccount', 
-			help='disableAccount() accountManagement operation', 
-			usage=get_help("mutation_accountManagement_disableAccount"))
-
-	mutation_accountManagement_disableAccount_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
-	mutation_accountManagement_disableAccount_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_accountManagement_disableAccount_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
-	mutation_accountManagement_disableAccount_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
-	mutation_accountManagement_disableAccount_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
-	mutation_accountManagement_disableAccount_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
-	mutation_accountManagement_disableAccount_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
-	mutation_accountManagement_disableAccount_parser.set_defaults(func=createRequest,operation_name='mutation.accountManagement.disableAccount')
-
-	mutation_accountManagement_removeAccount_parser = mutation_accountManagement_subparsers.add_parser('removeAccount', 
-			help='removeAccount() accountManagement operation', 
-			usage=get_help("mutation_accountManagement_removeAccount"))
-
-	mutation_accountManagement_removeAccount_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
-	mutation_accountManagement_removeAccount_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_accountManagement_removeAccount_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
-	mutation_accountManagement_removeAccount_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
-	mutation_accountManagement_removeAccount_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
-	mutation_accountManagement_removeAccount_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
-	mutation_accountManagement_removeAccount_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
-	mutation_accountManagement_removeAccount_parser.set_defaults(func=createRequest,operation_name='mutation.accountManagement.removeAccount')
-
-	mutation_accountManagement_updateAccount_parser = mutation_accountManagement_subparsers.add_parser('updateAccount', 
-			help='updateAccount() accountManagement operation', 
-			usage=get_help("mutation_accountManagement_updateAccount"))
-
-	mutation_accountManagement_updateAccount_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
-	mutation_accountManagement_updateAccount_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_accountManagement_updateAccount_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
-	mutation_accountManagement_updateAccount_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
-	mutation_accountManagement_updateAccount_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
-	mutation_accountManagement_updateAccount_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
-	mutation_accountManagement_updateAccount_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
-	mutation_accountManagement_updateAccount_parser.set_defaults(func=createRequest,operation_name='mutation.accountManagement.updateAccount')
+    mutation_accountManagement_parser = mutation_subparsers.add_parser('accountManagement', 
+            help='accountManagement() mutation operation', 
+            usage=get_help("mutation_accountManagement"))
+
+    mutation_accountManagement_subparsers = mutation_accountManagement_parser.add_subparsers()
+
+    mutation_accountManagement_addAccount_parser = mutation_accountManagement_subparsers.add_parser('addAccount', 
+            help='addAccount() accountManagement operation', 
+            usage=get_help("mutation_accountManagement_addAccount"))
+
+    mutation_accountManagement_addAccount_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    mutation_accountManagement_addAccount_parser.add_argument('-accountID', help='The cato account ID to use for this operation. Overrides the account_id value in the profile setting.  This is use for reseller and MSP accounts to run queries against cato sub accounts from the parent account.')
+    mutation_accountManagement_addAccount_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    mutation_accountManagement_addAccount_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    mutation_accountManagement_addAccount_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    mutation_accountManagement_addAccount_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    mutation_accountManagement_addAccount_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    mutation_accountManagement_addAccount_parser.set_defaults(func=createRequest,operation_name='mutation.accountManagement.addAccount')
+
+    mutation_accountManagement_updateAccount_parser = mutation_accountManagement_subparsers.add_parser('updateAccount', 
+            help='updateAccount() accountManagement operation', 
+            usage=get_help("mutation_accountManagement_updateAccount"))
+
+    mutation_accountManagement_updateAccount_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    mutation_accountManagement_updateAccount_parser.add_argument('-accountID', help='The cato account ID to use for this operation. Overrides the account_id value in the profile setting.  This is use for reseller and MSP accounts to run queries against cato sub accounts from the parent account.')
+    mutation_accountManagement_updateAccount_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    mutation_accountManagement_updateAccount_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    mutation_accountManagement_updateAccount_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    mutation_accountManagement_updateAccount_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    mutation_accountManagement_updateAccount_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    mutation_accountManagement_updateAccount_parser.set_defaults(func=createRequest,operation_name='mutation.accountManagement.updateAccount')
+
+    mutation_accountManagement_removeAccount_parser = mutation_accountManagement_subparsers.add_parser('removeAccount', 
+            help='removeAccount() accountManagement operation', 
+            usage=get_help("mutation_accountManagement_removeAccount"))
+
+    mutation_accountManagement_removeAccount_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    mutation_accountManagement_removeAccount_parser.add_argument('-accountID', help='The cato account ID to use for this operation. Overrides the account_id value in the profile setting.  This is use for reseller and MSP accounts to run queries against cato sub accounts from the parent account.')
+    mutation_accountManagement_removeAccount_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    mutation_accountManagement_removeAccount_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    mutation_accountManagement_removeAccount_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    mutation_accountManagement_removeAccount_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    mutation_accountManagement_removeAccount_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    mutation_accountManagement_removeAccount_parser.set_defaults(func=createRequest,operation_name='mutation.accountManagement.removeAccount')

catocli/parsers/mutation_accountManagement_addAccount/README.md

@@ -1,6 +1,6 @@
 
 ## CATO-CLI - mutation.accountManagement.addAccount:
-[Click here](https://api.catonetworks.com/documentation/#mutation-addAccount) for documentation on this operation.
+[Click here](https://api.catonetworks.com/documentation/#mutation-mutation.accountManagement.addAccount) for documentation on this operation.
 
 ### Usage for mutation.accountManagement.addAccount:
 
@@ -8,10 +8,12 @@
 
 `catocli mutation accountManagement addAccount <json>`
 
-`catocli mutation accountManagement addAccount "$(cat < addAccount.json)"`
+`catocli mutation accountManagement addAccount "$(cat < mutation.accountManagement.addAccount.json)"`
+
+`catocli mutation accountManagement addAccount '{"addAccountInput":{"description":"string","name":"string","tenancy":"SINGLE_TENANT","timezone":"example_value","type":"CUSTOMER"}}'`
 
-`catocli mutation accountManagement addAccount '{"addAccountInput": {"description": {"description": "String"}, "name": {"name": "String"}, "tenancy": {"tenancy": "enum(AccountTenancy)"}, "timezone": {"timezone": "TimeZone"}, "type": {"type": "enum(AccountProfileType)"}}}'`
 
 #### Operation Arguments for mutation.accountManagement.addAccount ####
-`accountId` [ID] - (required) N/A 
-`addAccountInput` [AddAccountInput] - (required) N/A 
+
+`accountId` [ID] - (required) N/A    
+`addAccountInput` [AddAccountInput] - (required) N/A    

catocli/parsers/mutation_accountManagement_removeAccount/README.md

@@ -1,6 +1,6 @@
 
 ## CATO-CLI - mutation.accountManagement.removeAccount:
-[Click here](https://api.catonetworks.com/documentation/#mutation-removeAccount) for documentation on this operation.
+[Click here](https://api.catonetworks.com/documentation/#mutation-mutation.accountManagement.removeAccount) for documentation on this operation.
 
 ### Usage for mutation.accountManagement.removeAccount:
 
@@ -8,9 +8,8 @@
 
 `catocli mutation accountManagement removeAccount <json>`
 
-`catocli mutation accountManagement removeAccount "$(cat < removeAccount.json)"`
-
-`catocli mutation accountManagement removeAccount '{}'`
+`catocli mutation accountManagement removeAccount "$(cat < mutation.accountManagement.removeAccount.json)"`
 
 #### Operation Arguments for mutation.accountManagement.removeAccount ####
-`accountId` [ID] - (required) N/A 
+
+`accountId` [ID] - (required) N/A    

catocli/parsers/mutation_accountManagement_updateAccount/README.md

@@ -1,6 +1,6 @@
 
 ## CATO-CLI - mutation.accountManagement.updateAccount:
-[Click here](https://api.catonetworks.com/documentation/#mutation-updateAccount) for documentation on this operation.
+[Click here](https://api.catonetworks.com/documentation/#mutation-mutation.accountManagement.updateAccount) for documentation on this operation.
 
 ### Usage for mutation.accountManagement.updateAccount:
 
@@ -8,10 +8,12 @@
 
 `catocli mutation accountManagement updateAccount <json>`
 
-`catocli mutation accountManagement updateAccount "$(cat < updateAccount.json)"`
+`catocli mutation accountManagement updateAccount "$(cat < mutation.accountManagement.updateAccount.json)"`
+
+`catocli mutation accountManagement updateAccount '{"updateAccountInput":{"description":"string"}}'`
 
-`catocli mutation accountManagement updateAccount '{"updateAccountInput": {"description": {"description": "String"}}}'`
 
 #### Operation Arguments for mutation.accountManagement.updateAccount ####
-`accountId` [ID] - (required) N/A 
-`updateAccountInput` [UpdateAccountInput] - (required) N/A 
+
+`accountId` [ID] - (required) N/A    
+`updateAccountInput` [UpdateAccountInput] - (required) N/A    

catocli/parsers/mutation_admin/__init__.py

@@ -1,48 +1,87 @@
 
-from ..parserApiClient import createRequest, get_help
+from ..customParserApiClient import createRequest, get_help
 
 def mutation_admin_parse(mutation_subparsers):
-	mutation_admin_parser = mutation_subparsers.add_parser('admin', 
-			help='admin() mutation operation', 
-			usage=get_help("mutation_admin"))
-
-	mutation_admin_subparsers = mutation_admin_parser.add_subparsers()
-
-	mutation_admin_addAdmin_parser = mutation_admin_subparsers.add_parser('addAdmin', 
-			help='addAdmin() admin operation', 
-			usage=get_help("mutation_admin_addAdmin"))
-
-	mutation_admin_addAdmin_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
-	mutation_admin_addAdmin_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_admin_addAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
-	mutation_admin_addAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
-	mutation_admin_addAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
-	mutation_admin_addAdmin_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
-	mutation_admin_addAdmin_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
-	mutation_admin_addAdmin_parser.set_defaults(func=createRequest,operation_name='mutation.admin.addAdmin')
-
-	mutation_admin_removeAdmin_parser = mutation_admin_subparsers.add_parser('removeAdmin', 
-			help='removeAdmin() admin operation', 
-			usage=get_help("mutation_admin_removeAdmin"))
-
-	mutation_admin_removeAdmin_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
-	mutation_admin_removeAdmin_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_admin_removeAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
-	mutation_admin_removeAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
-	mutation_admin_removeAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
-	mutation_admin_removeAdmin_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
-	mutation_admin_removeAdmin_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
-	mutation_admin_removeAdmin_parser.set_defaults(func=createRequest,operation_name='mutation.admin.removeAdmin')
-
-	mutation_admin_updateAdmin_parser = mutation_admin_subparsers.add_parser('updateAdmin', 
-			help='updateAdmin() admin operation', 
-			usage=get_help("mutation_admin_updateAdmin"))
-
-	mutation_admin_updateAdmin_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
-	mutation_admin_updateAdmin_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_admin_updateAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
-	mutation_admin_updateAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
-	mutation_admin_updateAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
-	mutation_admin_updateAdmin_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
-	mutation_admin_updateAdmin_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
-	mutation_admin_updateAdmin_parser.set_defaults(func=createRequest,operation_name='mutation.admin.updateAdmin')
+    mutation_admin_parser = mutation_subparsers.add_parser('admin', 
+            help='admin() mutation operation', 
+            usage=get_help("mutation_admin"))
+
+    mutation_admin_subparsers = mutation_admin_parser.add_subparsers()
+
+    mutation_admin_addAdmin_parser = mutation_admin_subparsers.add_parser('addAdmin', 
+            help='addAdmin() admin operation', 
+            usage=get_help("mutation_admin_addAdmin"))
+
+    mutation_admin_addAdmin_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    mutation_admin_addAdmin_parser.add_argument('-accountID', help='The cato account ID to use for this operation. Overrides the account_id value in the profile setting.  This is use for reseller and MSP accounts to run queries against cato sub accounts from the parent account.')
+    mutation_admin_addAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    mutation_admin_addAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    mutation_admin_addAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    mutation_admin_addAdmin_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    mutation_admin_addAdmin_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    mutation_admin_addAdmin_parser.set_defaults(func=createRequest,operation_name='mutation.admin.addAdmin')
+
+    mutation_admin_addServicePrincipalAdmin_parser = mutation_admin_subparsers.add_parser('addServicePrincipalAdmin', 
+            help='addServicePrincipalAdmin() admin operation', 
+            usage=get_help("mutation_admin_addServicePrincipalAdmin"))
+
+    mutation_admin_addServicePrincipalAdmin_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    mutation_admin_addServicePrincipalAdmin_parser.add_argument('-accountID', help='The cato account ID to use for this operation. Overrides the account_id value in the profile setting.  This is use for reseller and MSP accounts to run queries against cato sub accounts from the parent account.')
+    mutation_admin_addServicePrincipalAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    mutation_admin_addServicePrincipalAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    mutation_admin_addServicePrincipalAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    mutation_admin_addServicePrincipalAdmin_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    mutation_admin_addServicePrincipalAdmin_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    mutation_admin_addServicePrincipalAdmin_parser.set_defaults(func=createRequest,operation_name='mutation.admin.addServicePrincipalAdmin')
+
+    mutation_admin_removeAdmin_parser = mutation_admin_subparsers.add_parser('removeAdmin', 
+            help='removeAdmin() admin operation', 
+            usage=get_help("mutation_admin_removeAdmin"))
+
+    mutation_admin_removeAdmin_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    mutation_admin_removeAdmin_parser.add_argument('-accountID', help='The cato account ID to use for this operation. Overrides the account_id value in the profile setting.  This is use for reseller and MSP accounts to run queries against cato sub accounts from the parent account.')
+    mutation_admin_removeAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    mutation_admin_removeAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    mutation_admin_removeAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    mutation_admin_removeAdmin_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    mutation_admin_removeAdmin_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    mutation_admin_removeAdmin_parser.set_defaults(func=createRequest,operation_name='mutation.admin.removeAdmin')
+
+    mutation_admin_removeServicePrincipalAdmin_parser = mutation_admin_subparsers.add_parser('removeServicePrincipalAdmin', 
+            help='removeServicePrincipalAdmin() admin operation', 
+            usage=get_help("mutation_admin_removeServicePrincipalAdmin"))
+
+    mutation_admin_removeServicePrincipalAdmin_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    mutation_admin_removeServicePrincipalAdmin_parser.add_argument('-accountID', help='The cato account ID to use for this operation. Overrides the account_id value in the profile setting.  This is use for reseller and MSP accounts to run queries against cato sub accounts from the parent account.')
+    mutation_admin_removeServicePrincipalAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    mutation_admin_removeServicePrincipalAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    mutation_admin_removeServicePrincipalAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    mutation_admin_removeServicePrincipalAdmin_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    mutation_admin_removeServicePrincipalAdmin_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    mutation_admin_removeServicePrincipalAdmin_parser.set_defaults(func=createRequest,operation_name='mutation.admin.removeServicePrincipalAdmin')
+
+    mutation_admin_updateAdmin_parser = mutation_admin_subparsers.add_parser('updateAdmin', 
+            help='updateAdmin() admin operation', 
+            usage=get_help("mutation_admin_updateAdmin"))
+
+    mutation_admin_updateAdmin_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    mutation_admin_updateAdmin_parser.add_argument('-accountID', help='The cato account ID to use for this operation. Overrides the account_id value in the profile setting.  This is use for reseller and MSP accounts to run queries against cato sub accounts from the parent account.')
+    mutation_admin_updateAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    mutation_admin_updateAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    mutation_admin_updateAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    mutation_admin_updateAdmin_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    mutation_admin_updateAdmin_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    mutation_admin_updateAdmin_parser.set_defaults(func=createRequest,operation_name='mutation.admin.updateAdmin')
+
+    mutation_admin_updateServicePrincipalAdmin_parser = mutation_admin_subparsers.add_parser('updateServicePrincipalAdmin', 
+            help='updateServicePrincipalAdmin() admin operation', 
+            usage=get_help("mutation_admin_updateServicePrincipalAdmin"))
+
+    mutation_admin_updateServicePrincipalAdmin_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    mutation_admin_updateServicePrincipalAdmin_parser.add_argument('-accountID', help='The cato account ID to use for this operation. Overrides the account_id value in the profile setting.  This is use for reseller and MSP accounts to run queries against cato sub accounts from the parent account.')
+    mutation_admin_updateServicePrincipalAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    mutation_admin_updateServicePrincipalAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    mutation_admin_updateServicePrincipalAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    mutation_admin_updateServicePrincipalAdmin_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    mutation_admin_updateServicePrincipalAdmin_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    mutation_admin_updateServicePrincipalAdmin_parser.set_defaults(func=createRequest,operation_name='mutation.admin.updateServicePrincipalAdmin')

catocli/parsers/mutation_admin_addAdmin/README.md

@@ -1,6 +1,6 @@
 
 ## CATO-CLI - mutation.admin.addAdmin:
-[Click here](https://api.catonetworks.com/documentation/#mutation-addAdmin) for documentation on this operation.
+[Click here](https://api.catonetworks.com/documentation/#mutation-mutation.admin.addAdmin) for documentation on this operation.
 
 ### Usage for mutation.admin.addAdmin:
 
@@ -8,10 +8,12 @@
 
 `catocli mutation admin addAdmin <json>`
 
-`catocli mutation admin addAdmin "$(cat < addAdmin.json)"`
+`catocli mutation admin addAdmin "$(cat < mutation.admin.addAdmin.json)"`
+
+`catocli mutation admin addAdmin '{"addAdminInput":{"adminType":"LOGIN","email":"string","firstName":"string","lastName":"string","passwordNeverExpires":true,"updateAdminRoleInput":{"allowedAccounts":["id1","id2"],"allowedEntities":{"id":"id","name":"string","type":"account"},"role":{"id":"id","name":"string"}}}}'`
 
-`catocli mutation admin addAdmin '{"addAdminInput": {"adminType": {"adminType": "enum(AdminType)"}, "email": {"email": "String"}, "firstName": {"firstName": "String"}, "lastName": {"lastName": "String"}, "passwordNeverExpires": {"passwordNeverExpires": "Boolean"}, "updateAdminRoleInput": {"allowedAccounts": {"allowedAccounts": ["ID"]}, "allowedEntities": {"id": {"id": "ID"}, "name": {"name": "String"}, "type": {"type": "enum(EntityType)"}}, "role": {"id": {"id": "ID"}, "name": {"name": "String"}}}}}'`
 
 #### Operation Arguments for mutation.admin.addAdmin ####
-`accountId` [ID] - (required) N/A 
-`addAdminInput` [AddAdminInput] - (required) N/A 
+
+`accountId` [ID] - (required) N/A    
+`addAdminInput` [AddAdminInput] - (required) N/A    

catocli/parsers/mutation_admin_addServicePrincipalAdmin/README.md

@@ -0,0 +1,19 @@
+
+## CATO-CLI - mutation.admin.addServicePrincipalAdmin:
+[Click here](https://api.catonetworks.com/documentation/#mutation-mutation.admin.addServicePrincipalAdmin) for documentation on this operation.
+
+### Usage for mutation.admin.addServicePrincipalAdmin:
+
+`catocli mutation admin addServicePrincipalAdmin -h`
+
+`catocli mutation admin addServicePrincipalAdmin <json>`
+
+`catocli mutation admin addServicePrincipalAdmin "$(cat < mutation.admin.addServicePrincipalAdmin.json)"`
+
+`catocli mutation admin addServicePrincipalAdmin '{"addServicePrincipalAdminInput":{"email":"string","name":"string","updateAdminRoleInput":{"allowedAccounts":["id1","id2"],"allowedEntities":{"id":"id","name":"string","type":"account"},"role":{"id":"id","name":"string"}}}}'`
+
+
+#### Operation Arguments for mutation.admin.addServicePrincipalAdmin ####
+
+`accountId` [ID] - (required) N/A    
+`addServicePrincipalAdminInput` [AddServicePrincipalAdminInput] - (required) N/A    

catocli/parsers/mutation_admin_removeAdmin/README.md

@@ -1,6 +1,6 @@
 
 ## CATO-CLI - mutation.admin.removeAdmin:
-[Click here](https://api.catonetworks.com/documentation/#mutation-removeAdmin) for documentation on this operation.
+[Click here](https://api.catonetworks.com/documentation/#mutation-mutation.admin.removeAdmin) for documentation on this operation.
 
 ### Usage for mutation.admin.removeAdmin:
 
@@ -8,10 +8,12 @@
 
 `catocli mutation admin removeAdmin <json>`
 
-`catocli mutation admin removeAdmin "$(cat < removeAdmin.json)"`
+`catocli mutation admin removeAdmin "$(cat < mutation.admin.removeAdmin.json)"`
+
+`catocli mutation admin removeAdmin '{"adminID":"id"}'`
 
-`catocli mutation admin removeAdmin '{"adminID": "ID"}'`
 
 #### Operation Arguments for mutation.admin.removeAdmin ####
-`accountId` [ID] - (required) N/A 
-`adminID` [ID] - (required) N/A 
+
+`accountId` [ID] - (required) N/A    
+`adminID` [ID] - (required) N/A    

catocli/parsers/mutation_admin_removeServicePrincipalAdmin/README.md

@@ -0,0 +1,19 @@
+
+## CATO-CLI - mutation.admin.removeServicePrincipalAdmin:
+[Click here](https://api.catonetworks.com/documentation/#mutation-mutation.admin.removeServicePrincipalAdmin) for documentation on this operation.
+
+### Usage for mutation.admin.removeServicePrincipalAdmin:
+
+`catocli mutation admin removeServicePrincipalAdmin -h`
+
+`catocli mutation admin removeServicePrincipalAdmin <json>`
+
+`catocli mutation admin removeServicePrincipalAdmin "$(cat < mutation.admin.removeServicePrincipalAdmin.json)"`
+
+`catocli mutation admin removeServicePrincipalAdmin '{"adminID":"id"}'`
+
+
+#### Operation Arguments for mutation.admin.removeServicePrincipalAdmin ####
+
+`accountId` [ID] - (required) N/A    
+`adminID` [ID] - (required) N/A    

catocli/parsers/mutation_admin_updateAdmin/README.md

@@ -1,6 +1,6 @@
 
 ## CATO-CLI - mutation.admin.updateAdmin:
-[Click here](https://api.catonetworks.com/documentation/#mutation-updateAdmin) for documentation on this operation.
+[Click here](https://api.catonetworks.com/documentation/#mutation-mutation.admin.updateAdmin) for documentation on this operation.
 
 ### Usage for mutation.admin.updateAdmin:
 
@@ -8,11 +8,13 @@
 
 `catocli mutation admin updateAdmin <json>`
 
-`catocli mutation admin updateAdmin "$(cat < updateAdmin.json)"`
+`catocli mutation admin updateAdmin "$(cat < mutation.admin.updateAdmin.json)"`
+
+`catocli mutation admin updateAdmin '{"adminID":"id","updateAdminInput":{"firstName":"string","lastName":"string","passwordNeverExpires":true,"updateAdminRoleInput":{"allowedAccounts":["id1","id2"],"allowedEntities":{"id":"id","name":"string","type":"account"},"role":{"id":"id","name":"string"}}}}'`
 
-`catocli mutation admin updateAdmin '{"adminID": "ID", "updateAdminInput": {"firstName": {"firstName": "String"}, "lastName": {"lastName": "String"}, "passwordNeverExpires": {"passwordNeverExpires": "Boolean"}, "updateAdminRoleInput": {"allowedAccounts": {"allowedAccounts": ["ID"]}, "allowedEntities": {"id": {"id": "ID"}, "name": {"name": "String"}, "type": {"type": "enum(EntityType)"}}, "role": {"id": {"id": "ID"}, "name": {"name": "String"}}}}}'`
 
 #### Operation Arguments for mutation.admin.updateAdmin ####
-`accountId` [ID] - (required) N/A 
-`adminID` [ID] - (required) N/A 
-`updateAdminInput` [UpdateAdminInput] - (required) N/A 
+
+`accountId` [ID] - (required) N/A    
+`adminID` [ID] - (required) N/A    
+`updateAdminInput` [UpdateAdminInput] - (required) N/A    

catocli/parsers/mutation_admin_updateServicePrincipalAdmin/README.md

@@ -0,0 +1,20 @@
+
+## CATO-CLI - mutation.admin.updateServicePrincipalAdmin:
+[Click here](https://api.catonetworks.com/documentation/#mutation-mutation.admin.updateServicePrincipalAdmin) for documentation on this operation.
+
+### Usage for mutation.admin.updateServicePrincipalAdmin:
+
+`catocli mutation admin updateServicePrincipalAdmin -h`
+
+`catocli mutation admin updateServicePrincipalAdmin <json>`
+
+`catocli mutation admin updateServicePrincipalAdmin "$(cat < mutation.admin.updateServicePrincipalAdmin.json)"`
+
+`catocli mutation admin updateServicePrincipalAdmin '{"adminID":"id","updateServicePrincipalAdminInput":{"name":"string","updateAdminRoleInput":{"allowedAccounts":["id1","id2"],"allowedEntities":{"id":"id","name":"string","type":"account"},"role":{"id":"id","name":"string"}}}}'`
+
+
+#### Operation Arguments for mutation.admin.updateServicePrincipalAdmin ####
+
+`accountId` [ID] - (required) N/A    
+`adminID` [ID] - (required) N/A    
+`updateServicePrincipalAdminInput` [UpdateServicePrincipalAdminInput] - (required) N/A