catocli 2.1.1__py3-none-any.whl → 2.1.3__py3-none-any.whl

catocli/parsers/query_auditFeed/README.md

@@ -1,6 +1,6 @@
 
 ## CATO-CLI - query.auditFeed:
-[Click here](https://api.catonetworks.com/documentation/#query-auditFeed) for documentation on this operation.
+[Click here](https://api.catonetworks.com/documentation/#query-query.auditFeed) for documentation on this operation.
 
 ### Usage for query.auditFeed:
 
@@ -8,13 +8,15 @@
 
 `catocli query auditFeed <json>`
 
-`catocli query auditFeed "$(cat < auditFeed.json)"`
+`catocli query auditFeed "$(cat < query.auditFeed.json)"`
+
+`catocli query auditFeed '{"accountIDs":["id1","id2"],"auditFieldFilterInput":{"fieldNameInput":{"AuditFieldName":"admin"},"operator":"is","values":["string1","string2"]},"fieldNames":"admin","marker":"string","timeFrame":"example_value"}'`
 
-`catocli query auditFeed '{"accountIDs": ["ID"], "auditFieldFilterInput": {"fieldNameInput": {"AuditFieldName": {"AuditFieldName": "enum(AuditFieldName)"}}, "operator": {"operator": "enum(ElasticOperator)"}, "values": {"values": ["String"]}}, "fieldNames": "enum(AuditFieldName)", "marker": "String", "timeFrame": "TimeFrame"}'`
 
 #### Operation Arguments for query.auditFeed ####
-`accountIDs` [ID[]] - (optional) List of Unique Account Identifiers. 
-`auditFieldFilterInput` [AuditFieldFilterInput[]] - (optional) N/A 
-`fieldNames` [AuditFieldName[]] - (optional) N/A Default Value: ['admin', 'apiKey', 'model_name', 'admin_id', 'module', 'audit_creation_type', 'insertion_date', 'change_type', 'creation_date', 'model_type', 'account', 'account_id']
-`marker` [String] - (optional) Marker to use to get results from 
-`timeFrame` [TimeFrame] - (required) N/A 
+
+`accountIDs` [ID[]] - (required) List of Unique Account Identifiers.    
+`auditFieldFilterInput` [AuditFieldFilterInput[]] - (required) N/A    
+`fieldNames` [AuditFieldName[]] - (required) N/A Default Value: ['admin', 'apiKey', 'model_name', 'admin_id', 'module', 'audit_creation_type', 'insertion_date', 'change_type', 'creation_date', 'model_type', 'account', 'account_id']   
+`marker` [String] - (required) Marker to use to get results from    
+`timeFrame` [TimeFrame] - (required) N/A    

catocli/parsers/query_auditFeed/__init__.py

@@ -1,16 +1,16 @@
 
-from ..parserApiClient import createRequest, get_help
+from ..customParserApiClient import createRequest, get_help
 
 def query_auditFeed_parse(query_subparsers):
-	query_auditFeed_parser = query_subparsers.add_parser('auditFeed', 
-			help='auditFeed() query operation', 
-			usage=get_help("query_auditFeed"))
+    query_auditFeed_parser = query_subparsers.add_parser('auditFeed', 
+            help='auditFeed() query operation', 
+            usage=get_help("query_auditFeed"))
 
-	query_auditFeed_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
-	query_auditFeed_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_auditFeed_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
-	query_auditFeed_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
-	query_auditFeed_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
-	query_auditFeed_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
-	query_auditFeed_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
-	query_auditFeed_parser.set_defaults(func=createRequest,operation_name='query.auditFeed')
+    query_auditFeed_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    query_auditFeed_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.')
+    query_auditFeed_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    query_auditFeed_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    query_auditFeed_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    query_auditFeed_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    query_auditFeed_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    query_auditFeed_parser.set_defaults(func=createRequest,operation_name='query.auditFeed')

catocli/parsers/query_catalogs/README.md

@@ -1,6 +1,6 @@
 
 ## CATO-CLI - query.catalogs:
-[Click here](https://api.catonetworks.com/documentation/#query-catalogs) for documentation on this operation.
+[Click here](https://api.catonetworks.com/documentation/#query-query.catalogs) for documentation on this operation.
 
 ### Usage for query.catalogs:
 
@@ -8,12 +8,14 @@
 
 `catocli query catalogs <json>`
 
-`catocli query catalogs "$(cat < catalogs.json)"`
+`catocli query catalogs "$(cat < query.catalogs.json)"`
+
+`catocli query catalogs '{"applicationRefInput":{"by":"ID","input":"string"},"catalogApplicationContentTypeGroupListInput":{"catalogApplicationContentTypeGroupFilterInput":{"contentType":{"id":{"eq":"id","in":["id1","id2"],"neq":"id","nin":["id1","id2"]},"name":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"id":{"eq":"id","in":["id1","id2"],"neq":"id","nin":["id1","id2"]},"name":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"catalogApplicationContentTypeGroupSortInput":{"name":{"direction":"ASC","priority":1}},"pagingInput":{"from":1,"limit":1}},"catalogApplicationListInput":{"catalogApplicationFilterInput":{"activity":{"hasAny":{"by":"ID","input":"string"}},"capability":{"hasAny":"APP_CONTROL_INLINE"},"category":{"hasAny":{"by":"ID","input":"string"}},"id":{"eq":"id","in":["id1","id2"],"neq":"id","nin":["id1","id2"]},"name":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"recentlyAdded":{"eq":true,"neq":true},"risk":{"between":[1,2],"eq":1,"gt":1,"gte":1,"in":[1,2],"lt":1,"lte":1,"neq":1,"nin":[1,2]},"type":{"eq":"APPLICATION","in":"APPLICATION","neq":"APPLICATION","nin":"APPLICATION"}},"catalogApplicationSortInput":{"category":{"name":{"direction":"ASC","priority":1}},"description":{"direction":"ASC","priority":1},"name":{"direction":"ASC","priority":1},"risk":{"direction":"ASC","priority":1},"type":{"direction":"ASC","priority":1}},"pagingInput":{"from":1,"limit":1}}}'`
 
-`catocli query catalogs '{"applicationRefInput": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "catalogApplicationContentTypeGroupListInput": {"catalogApplicationContentTypeGroupFilterInput": {"contentType": {"id": {"eq": {"eq": "ID"}, "in": {"in": ["ID"]}, "neq": {"neq": "ID"}, "nin": {"nin": ["ID"]}}, "name": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "id": {"eq": {"eq": "ID"}, "in": {"in": ["ID"]}, "neq": {"neq": "ID"}, "nin": {"nin": ["ID"]}}, "name": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "catalogApplicationContentTypeGroupSortInput": {"name": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "pagingInput": {"from": {"from": "Int"}, "limit": {"limit": "Int"}}}, "catalogApplicationListInput": {"catalogApplicationFilterInput": {"activity": {"hasAny": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}}, "capability": {"hasAny": {"hasAny": "enum(CatalogApplicationCapability)"}}, "category": {"hasAny": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}}, "id": {"eq": {"eq": "ID"}, "in": {"in": ["ID"]}, "neq": {"neq": "ID"}, "nin": {"nin": ["ID"]}}, "name": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "recentlyAdded": {"eq": {"eq": "Boolean"}, "neq": {"neq": "Boolean"}}, "risk": {"between": {"between": ["Int"]}, "eq": {"eq": "Int"}, "gt": {"gt": "Int"}, "gte": {"gte": "Int"}, "in": {"in": ["Int"]}, "lt": {"lt": "Int"}, "lte": {"lte": "Int"}, "neq": {"neq": "Int"}, "nin": {"nin": ["Int"]}}, "type": {"eq": {"eq": "enum(CatalogApplicationType)"}, "in": {"in": "enum(CatalogApplicationType)"}, "neq": {"neq": "enum(CatalogApplicationType)"}, "nin": {"nin": "enum(CatalogApplicationType)"}}}, "catalogApplicationSortInput": {"category": {"name": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "description": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "name": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "risk": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "type": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "pagingInput": {"from": {"from": "Int"}, "limit": {"limit": "Int"}}}}'`
 
 #### Operation Arguments for query.catalogs ####
-`accountId` [ID] - (required) N/A 
-`applicationRefInput` [ApplicationRefInput] - (required) N/A 
-`catalogApplicationContentTypeGroupListInput` [CatalogApplicationContentTypeGroupListInput] - (required) N/A 
-`catalogApplicationListInput` [CatalogApplicationListInput] - (required) N/A 
+
+`accountId` [ID] - (required) N/A    
+`applicationRefInput` [ApplicationRefInput] - (required) N/A    
+`catalogApplicationContentTypeGroupListInput` [CatalogApplicationContentTypeGroupListInput] - (required) N/A    
+`catalogApplicationListInput` [CatalogApplicationListInput] - (required) N/A    

catocli/parsers/query_catalogs/__init__.py

@@ -1,16 +1,16 @@
 
-from ..parserApiClient import createRequest, get_help
+from ..customParserApiClient import createRequest, get_help
 
 def query_catalogs_parse(query_subparsers):
-	query_catalogs_parser = query_subparsers.add_parser('catalogs', 
-			help='catalogs() query operation', 
-			usage=get_help("query_catalogs"))
+    query_catalogs_parser = query_subparsers.add_parser('catalogs', 
+            help='catalogs() query operation', 
+            usage=get_help("query_catalogs"))
 
-	query_catalogs_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
-	query_catalogs_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_catalogs_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
-	query_catalogs_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
-	query_catalogs_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
-	query_catalogs_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
-	query_catalogs_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
-	query_catalogs_parser.set_defaults(func=createRequest,operation_name='query.catalogs')
+    query_catalogs_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    query_catalogs_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.')
+    query_catalogs_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    query_catalogs_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    query_catalogs_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    query_catalogs_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    query_catalogs_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    query_catalogs_parser.set_defaults(func=createRequest,operation_name='query.catalogs')

catocli/parsers/query_container/README.md

@@ -1,6 +1,6 @@
 
 ## CATO-CLI - query.container:
-[Click here](https://api.catonetworks.com/documentation/#query-container) for documentation on this operation.
+[Click here](https://api.catonetworks.com/documentation/#query-query.container) for documentation on this operation.
 
 ### Usage for query.container:
 
@@ -8,16 +8,18 @@
 
 `catocli query container <json>`
 
-`catocli query container "$(cat < container.json)"`
+`catocli query container "$(cat < query.container.json)"`
+
+`catocli query container '{"containerSearchInput":{"containerRefInput":{"by":"ID","input":"string"},"types":"IP_RANGE"},"downloadFqdnContainerFileInput":{"by":"ID","input":"string"},"downloadIpAddressRangeContainerFileInput":{"by":"ID","input":"string"},"fqdnContainerSearchFqdnInput":{"fqdn":"example_value"},"fqdnContainerSearchInput":{"containerRefInput":{"by":"ID","input":"string"}},"ipAddressRangeContainerSearchInput":{"containerRefInput":{"by":"ID","input":"string"}},"ipAddressRangeContainerSearchIpAddressRangeInput":{"ipAddressRangeInput":{"from":"example_value","to":"example_value"}}}'`
 
-`catocli query container '{"containerSearchInput": {"containerRefInput": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "types": {"types": "enum(ContainerType)"}}, "downloadFqdnContainerFileInput": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "downloadIpAddressRangeContainerFileInput": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "fqdnContainerSearchFqdnInput": {"fqdn": {"fqdn": "Fqdn"}}, "fqdnContainerSearchInput": {"containerRefInput": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}}, "ipAddressRangeContainerSearchInput": {"containerRefInput": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}}, "ipAddressRangeContainerSearchIpAddressRangeInput": {"ipAddressRangeInput": {"from": {"from": "IPAddress"}, "to": {"to": "IPAddress"}}}}'`
 
 #### Operation Arguments for query.container ####
-`accountId` [ID] - (required) N/A 
-`containerSearchInput` [ContainerSearchInput] - (required) N/A 
-`downloadFqdnContainerFileInput` [DownloadFqdnContainerFileInput] - (required) N/A 
-`downloadIpAddressRangeContainerFileInput` [DownloadIpAddressRangeContainerFileInput] - (required) N/A 
-`fqdnContainerSearchFqdnInput` [FqdnContainerSearchFqdnInput] - (required) N/A 
-`fqdnContainerSearchInput` [FqdnContainerSearchInput] - (required) N/A 
-`ipAddressRangeContainerSearchInput` [IpAddressRangeContainerSearchInput] - (required) N/A 
-`ipAddressRangeContainerSearchIpAddressRangeInput` [IpAddressRangeContainerSearchIpAddressRangeInput] - (required) N/A 
+
+`accountId` [ID] - (required) N/A    
+`containerSearchInput` [ContainerSearchInput] - (required) N/A    
+`downloadFqdnContainerFileInput` [DownloadFqdnContainerFileInput] - (required) N/A    
+`downloadIpAddressRangeContainerFileInput` [DownloadIpAddressRangeContainerFileInput] - (required) N/A    
+`fqdnContainerSearchFqdnInput` [FqdnContainerSearchFqdnInput] - (required) N/A    
+`fqdnContainerSearchInput` [FqdnContainerSearchInput] - (required) N/A    
+`ipAddressRangeContainerSearchInput` [IpAddressRangeContainerSearchInput] - (required) N/A    
+`ipAddressRangeContainerSearchIpAddressRangeInput` [IpAddressRangeContainerSearchIpAddressRangeInput] - (required) N/A    

catocli/parsers/query_container/__init__.py

@@ -1,16 +1,16 @@
 
-from ..parserApiClient import createRequest, get_help
+from ..customParserApiClient import createRequest, get_help
 
 def query_container_parse(query_subparsers):
-	query_container_parser = query_subparsers.add_parser('container', 
-			help='container() query operation', 
-			usage=get_help("query_container"))
+    query_container_parser = query_subparsers.add_parser('container', 
+            help='container() query operation', 
+            usage=get_help("query_container"))
 
-	query_container_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
-	query_container_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_container_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
-	query_container_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
-	query_container_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
-	query_container_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
-	query_container_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
-	query_container_parser.set_defaults(func=createRequest,operation_name='query.container')
+    query_container_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    query_container_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.')
+    query_container_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    query_container_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    query_container_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    query_container_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    query_container_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    query_container_parser.set_defaults(func=createRequest,operation_name='query.container')

catocli/parsers/query_devices/README.md

@@ -1,6 +1,6 @@
 
 ## CATO-CLI - query.devices:
-[Click here](https://api.catonetworks.com/documentation/#query-devices) for documentation on this operation.
+[Click here](https://api.catonetworks.com/documentation/#query-query.devices) for documentation on this operation.
 
 ### Usage for query.devices:
 
@@ -8,13 +8,15 @@
 
 `catocli query devices <json>`
 
-`catocli query devices "$(cat < devices.json)"`
+`catocli query devices "$(cat < query.devices.json)"`
+
+`catocli query devices '{"deviceAttributeCatalogInput":{"pagingInput":{"from":1,"limit":1},"sortOrderInput":{"direction":"ASC","priority":1},"stringFilterInput":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"deviceV2Input":{"deviceSortInput":{"category":{"direction":"ASC","priority":1},"confidence":{"direction":"ASC","priority":1},"firstSeen":{"direction":"ASC","priority":1},"hw":{"manufacturer":{"direction":"ASC","priority":1},"model":{"direction":"ASC","priority":1},"type":{"direction":"ASC","priority":1}},"id":{"direction":"ASC","priority":1},"ip":{"direction":"ASC","priority":1},"lastSeen":{"direction":"ASC","priority":1},"name":{"direction":"ASC","priority":1},"network":{"networkName":{"direction":"ASC","priority":1},"subnet":{"direction":"ASC","priority":1}},"nic":{"macAddress":{"direction":"ASC","priority":1},"vendor":{"direction":"ASC","priority":1}},"os":{"product":{"direction":"ASC","priority":1},"vendor":{"direction":"ASC","priority":1},"version":{"direction":"ASC","priority":1}},"riskScore":{"direction":"ASC","priority":1},"site":{"id":{"direction":"ASC","priority":1},"name":{"direction":"ASC","priority":1}},"user":{"id":{"direction":"ASC","priority":1},"name":{"direction":"ASC","priority":1}}},"deviceV2FilterInput":{"category":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"confidence":{"eq":"LOW","in":"LOW","neq":"LOW","nin":"LOW"},"firstSeen":{"between":["example1","example2"],"eq":"example_value","gt":"example_value","gte":"example_value","in":["example1","example2"],"lt":"example_value","lte":"example_value","neq":"example_value","nin":["example1","example2"]},"hw":{"manufacturer":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"model":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"type":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"id":{"eq":"id","in":["id1","id2"],"neq":"id","nin":["id1","id2"]},"ip":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"lastSeen":{"between":["example1","example2"],"eq":"example_value","gt":"example_value","gte":"example_value","in":["example1","example2"],"lt":"example_value","lte":"example_value","neq":"example_value","nin":["example1","example2"]},"name":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"network":{"networkName":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"subnet":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"nic":{"macAddress":{"eq":"example_value","in":["example1","example2"],"neq":"example_value","nin":["example1","example2"]},"vendor":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"os":{"product":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"vendor":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"version":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"riskScore":{"between":[1,2],"eq":1,"gt":1,"gte":1,"in":[1,2],"lt":1,"lte":1,"neq":1,"nin":[1,2]},"site":{"eq":{"by":"ID","input":"string"},"in":{"by":"ID","input":"string"},"neq":{"by":"ID","input":"string"},"nin":{"by":"ID","input":"string"}},"user":{"eq":{"by":"ID","input":"string"},"in":{"by":"ID","input":"string"},"neq":{"by":"ID","input":"string"},"nin":{"by":"ID","input":"string"}}},"pagingInput":{"from":1,"limit":1}},"jobId":"id","sortOrderInput":{"direction":"ASC","priority":1}}'`
 
-`catocli query devices '{"deviceAttributeCatalogInput": {"pagingInput": {"from": {"from": "Int"}, "limit": {"limit": "Int"}}, "sortOrderInput": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "stringFilterInput": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "deviceV2Input": {"deviceSortInput": {"category": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "confidence": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "firstSeen": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "hw": {"manufacturer": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "model": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "type": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "id": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "ip": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "lastSeen": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "name": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "network": {"networkName": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "subnet": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "nic": {"macAddress": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "vendor": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "os": {"product": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "vendor": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "version": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "riskScore": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "site": {"id": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "name": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "user": {"id": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "name": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}}, "deviceV2FilterInput": {"category": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "confidence": {"eq": {"eq": "enum(DeviceConfidenceLevel)"}, "in": {"in": "enum(DeviceConfidenceLevel)"}, "neq": {"neq": "enum(DeviceConfidenceLevel)"}, "nin": {"nin": "enum(DeviceConfidenceLevel)"}}, "firstSeen": {"between": {"between": ["DateTime"]}, "eq": {"eq": "DateTime"}, "gt": {"gt": "DateTime"}, "gte": {"gte": "DateTime"}, "in": {"in": ["DateTime"]}, "lt": {"lt": "DateTime"}, "lte": {"lte": "DateTime"}, "neq": {"neq": "DateTime"}, "nin": {"nin": ["DateTime"]}}, "hw": {"manufacturer": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "model": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "type": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "id": {"eq": {"eq": "ID"}, "in": {"in": ["ID"]}, "neq": {"neq": "ID"}, "nin": {"nin": ["ID"]}}, "ip": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "lastSeen": {"between": {"between": ["DateTime"]}, "eq": {"eq": "DateTime"}, "gt": {"gt": "DateTime"}, "gte": {"gte": "DateTime"}, "in": {"in": ["DateTime"]}, "lt": {"lt": "DateTime"}, "lte": {"lte": "DateTime"}, "neq": {"neq": "DateTime"}, "nin": {"nin": ["DateTime"]}}, "name": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "network": {"networkName": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "subnet": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "nic": {"macAddress": {"eq": {"eq": "MacAddress"}, "in": {"in": ["MacAddress"]}, "neq": {"neq": "MacAddress"}, "nin": {"nin": ["MacAddress"]}}, "vendor": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "os": {"product": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "vendor": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "version": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "riskScore": {"between": {"between": ["Int"]}, "eq": {"eq": "Int"}, "gt": {"gt": "Int"}, "gte": {"gte": "Int"}, "in": {"in": ["Int"]}, "lt": {"lt": "Int"}, "lte": {"lte": "Int"}, "neq": {"neq": "Int"}, "nin": {"nin": ["Int"]}}, "site": {"eq": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "in": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "neq": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "nin": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}}, "user": {"eq": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "in": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "neq": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "nin": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}}}, "pagingInput": {"from": {"from": "Int"}, "limit": {"limit": "Int"}}}, "jobId": "ID", "sortOrderInput": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}'`
 
 #### Operation Arguments for query.devices ####
-`accountId` [ID] - (required) N/A 
-`deviceAttributeCatalogInput` [DeviceAttributeCatalogInput] - (optional) N/A 
-`deviceV2Input` [DeviceV2Input] - (optional) N/A 
-`jobId` [ID] - (required) N/A 
-`sortOrderInput` [SortOrderInput] - (optional) N/A 
+
+`accountId` [ID] - (required) N/A    
+`deviceAttributeCatalogInput` [DeviceAttributeCatalogInput] - (required) N/A    
+`deviceV2Input` [DeviceV2Input] - (required) N/A    
+`jobId` [ID] - (required) N/A    
+`sortOrderInput` [SortOrderInput] - (required) N/A    

catocli/parsers/query_devices/__init__.py

@@ -1,16 +1,16 @@
 
-from ..parserApiClient import createRequest, get_help
+from ..customParserApiClient import createRequest, get_help
 
 def query_devices_parse(query_subparsers):
-	query_devices_parser = query_subparsers.add_parser('devices', 
-			help='devices() query operation', 
-			usage=get_help("query_devices"))
+    query_devices_parser = query_subparsers.add_parser('devices', 
+            help='devices() query operation', 
+            usage=get_help("query_devices"))
 
-	query_devices_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
-	query_devices_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_devices_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
-	query_devices_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
-	query_devices_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
-	query_devices_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
-	query_devices_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
-	query_devices_parser.set_defaults(func=createRequest,operation_name='query.devices')
+    query_devices_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    query_devices_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.')
+    query_devices_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    query_devices_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    query_devices_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    query_devices_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    query_devices_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    query_devices_parser.set_defaults(func=createRequest,operation_name='query.devices')

catocli/parsers/query_enterpriseDirectory/README.md

@@ -0,0 +1,19 @@
+
+## CATO-CLI - query.enterpriseDirectory:
+[Click here](https://api.catonetworks.com/documentation/#query-query.enterpriseDirectory) for documentation on this operation.
+
+### Usage for query.enterpriseDirectory:
+
+`catocli query enterpriseDirectory -h`
+
+`catocli query enterpriseDirectory <json>`
+
+`catocli query enterpriseDirectory "$(cat < query.enterpriseDirectory.json)"`
+
+`catocli query enterpriseDirectory '{"enterpriseDirectoryLocationListInput":{"locationFilterInput":{"account":{"accountInclusion":"ALL_ACCOUNTS","in":["id1","id2"]},"countryCode":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"freeText":{"search":"string"},"id":{"eq":"id","in":["id1","id2"],"neq":"id","nin":["id1","id2"]},"includeArchived":true,"isShippingLocation":true,"name":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"type":{"eq":"BRANCH","in":"BRANCH","neq":"BRANCH","nin":"BRANCH"}},"locationSortInput":{"country":{"direction":"ASC","priority":1},"name":{"direction":"ASC","priority":1},"type":{"direction":"ASC","priority":1}},"pagingInput":{"from":1,"limit":1}}}'`
+
+
+#### Operation Arguments for query.enterpriseDirectory ####
+
+`accountId` [ID] - (required) N/A    
+`enterpriseDirectoryLocationListInput` [EnterpriseDirectoryLocationListInput] - (required) N/A    

catocli/parsers/query_enterpriseDirectory/__init__.py

@@ -0,0 +1,16 @@
+
+from ..customParserApiClient import createRequest, get_help
+
+def query_enterpriseDirectory_parse(query_subparsers):
+    query_enterpriseDirectory_parser = query_subparsers.add_parser('enterpriseDirectory', 
+            help='enterpriseDirectory() query operation', 
+            usage=get_help("query_enterpriseDirectory"))
+
+    query_enterpriseDirectory_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    query_enterpriseDirectory_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.')
+    query_enterpriseDirectory_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    query_enterpriseDirectory_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    query_enterpriseDirectory_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    query_enterpriseDirectory_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    query_enterpriseDirectory_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    query_enterpriseDirectory_parser.set_defaults(func=createRequest,operation_name='query.enterpriseDirectory')

catocli/parsers/query_entityLookup/README.md

@@ -1,6 +1,6 @@
 
 ## CATO-CLI - query.entityLookup:
-[Click here](https://api.catonetworks.com/documentation/#query-entityLookup) for documentation on this operation.
+[Click here](https://api.catonetworks.com/documentation/#query-query.entityLookup) for documentation on this operation.
 
 ### Usage for query.entityLookup:
 
@@ -8,24 +8,26 @@
 
 `catocli query entityLookup <json>`
 
-`catocli query entityLookup "$(cat < entityLookup.json)"`
+`catocli query entityLookup "$(cat < query.entityLookup.json)"`
+
+`catocli query entityLookup '{"entityIDs":["id1","id2"],"entityInput":{"id":"id","name":"string","type":"account"},"from":1,"helperFields":["string1","string2"],"limit":1,"lookupFilterInput":{"filter":"filterByConnectionTypeFamily","value":"string"},"search":"string","sortInput":{"field":"string","order":"asc"},"type":"account"}'`
 
-`catocli query entityLookup '{"entityIDs": ["ID"], "entityInput": {"id": {"id": "ID"}, "name": {"name": "String"}, "type": {"type": "enum(EntityType)"}}, "from": "Int", "helperFields": ["String"], "limit": "Int", "lookupFilterInput": {"filter": {"filter": "enum(LookupFilterType)"}, "value": {"value": "String"}}, "search": "String", "sortInput": {"field": {"field": "String"}, "order": {"order": "enum(DirectionInput)"}}, "type": "enum(EntityType)"}'`
 
 #### Operation Arguments for query.entityLookup ####
-`accountID` [ID] - (required) The account ID (or 0 for non-authenticated requests) 
-`entityIDs` [ID[]] - (optional) Adds additional search criteria to fetch by the selected list of entity IDs. This option is not
+
+`accountID` [ID] - (required) The account ID (or 0 for non-authenticated requests)    
+`entityIDs` [ID[]] - (required) Adds additional search criteria to fetch by the selected list of entity IDs. This option is not
 universally available, and may not be applicable specific Entity types. If used on non applicable entity
-type, an error will be generated. 
-`entityInput` [EntityInput] - (optional) Return items under a parent entity (can be site, vpn user, etc),
-used to filter for networks that belong to a specific site for example 
-`from` [Int] - (optional) Sets the offset number of items (for paging) 
-`helperFields` [String[]] - (optional) Additional helper fields 
-`limit` [Int] - (optional) Sets the maximum number of items to retrieve 
-`lookupFilterInput` [LookupFilterInput[]] - (optional) Custom filters for entityLookup 
-`search` [String] - (optional) Adds additional search parameters for the lookup. Available options:
+type, an error will be generated.    
+`entityInput` [EntityInput] - (required) Return items under a parent entity (can be site, vpn user, etc),
+used to filter for networks that belong to a specific site for example    
+`from` [Int] - (required) Sets the offset number of items (for paging)    
+`helperFields` [String[]] - (required) Additional helper fields    
+`limit` [Int] - (required) Sets the maximum number of items to retrieve    
+`lookupFilterInput` [LookupFilterInput[]] - (required) Custom filters for entityLookup    
+`search` [String] - (required) Adds additional search parameters for the lookup. Available options:
 country lookup: "removeExcluded" to return only allowed countries
-countryState lookup: country code ("US", "CN", etc) to get country's states 
-`sortInput` [SortInput[]] - (optional) Adds additional sort criteria(s) for the lookup.
-This option is not universally available, and may not be applicable specific Entity types. 
-`type` [EntityType] - (required) Type of entity to lookup for Default Value: ['account', 'site', 'vpnUser', 'country', 'countryState', 'timezone', 'host', 'any', 'networkInterface', 'location', 'admin', 'localRouting', 'lanFirewall', 'allocatedIP', 'siteRange', 'simpleService', 'availableSiteUsage', 'availablePooledUsage', 'dhcpRelayGroup', 'portProtocol', 'city', 'groupSubscription', 'mailingListSubscription', 'webhookSubscription']
+countryState lookup: country code ("US", "CN", etc) to get country's states    
+`sortInput` [SortInput[]] - (required) Adds additional sort criteria(s) for the lookup.
+This option is not universally available, and may not be applicable specific Entity types.    
+`type` [EntityType] - (required) Type of entity to lookup for Default Value: ['account', 'site', 'vpnUser', 'country', 'countryState', 'timezone', 'host', 'any', 'networkInterface', 'location', 'admin', 'localRouting', 'lanFirewall', 'allocatedIP', 'siteRange', 'simpleService', 'availableSiteUsage', 'availablePooledUsage', 'dhcpRelayGroup', 'portProtocol', 'city', 'groupSubscription', 'mailingListSubscription', 'webhookSubscription']   

catocli/parsers/query_entityLookup/__init__.py

@@ -1,16 +1,16 @@
 
-from ..parserApiClient import createRequest, get_help
+from ..customParserApiClient import createRequest, get_help
 
 def query_entityLookup_parse(query_subparsers):
-	query_entityLookup_parser = query_subparsers.add_parser('entityLookup', 
-			help='entityLookup() query operation', 
-			usage=get_help("query_entityLookup"))
+    query_entityLookup_parser = query_subparsers.add_parser('entityLookup', 
+            help='entityLookup() query operation', 
+            usage=get_help("query_entityLookup"))
 
-	query_entityLookup_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
-	query_entityLookup_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_entityLookup_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
-	query_entityLookup_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
-	query_entityLookup_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
-	query_entityLookup_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
-	query_entityLookup_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
-	query_entityLookup_parser.set_defaults(func=createRequest,operation_name='query.entityLookup')
+    query_entityLookup_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    query_entityLookup_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.')
+    query_entityLookup_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    query_entityLookup_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    query_entityLookup_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    query_entityLookup_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    query_entityLookup_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    query_entityLookup_parser.set_defaults(func=createRequest,operation_name='query.entityLookup')

catocli/parsers/query_events/README.md

@@ -1,6 +1,6 @@
 
 ## CATO-CLI - query.events:
-[Click here](https://api.catonetworks.com/documentation/#query-events) for documentation on this operation.
+[Click here](https://api.catonetworks.com/documentation/#query-query.events) for documentation on this operation.
 
 ### Usage for query.events:
 
@@ -8,16 +8,18 @@
 
 `catocli query events <json>`
 
-`catocli query events "$(cat < events.json)"`
+`catocli query events "$(cat < query.events.json)"`
+
+`catocli query events '{"eventsDimension":{"fieldName":"access_method"},"eventsFilter":{"fieldName":"access_method","operator":"is","values":["string1","string2"]},"eventsMeasure":{"aggType":"sum","fieldName":"access_method","trend":true},"eventsSort":{"fieldName":"access_method","order":"asc"},"from":1,"limit":1,"timeFrame":"example_value"}'`
 
-`catocli query events '{"eventsDimension": {"fieldName": {"fieldName": "enum(EventFieldName)"}}, "eventsFilter": {"fieldName": {"fieldName": "enum(EventFieldName)"}, "operator": {"operator": "enum(FilterOperator)"}, "values": {"values": ["String"]}}, "eventsMeasure": {"aggType": {"aggType": "enum(AggregationType)"}, "fieldName": {"fieldName": "enum(EventFieldName)"}, "trend": {"trend": "Boolean"}}, "eventsSort": {"fieldName": {"fieldName": "enum(EventFieldName)"}, "order": {"order": "enum(DirectionEnum)"}}, "from": "Int", "limit": "Int", "timeFrame": "TimeFrame"}'`
 
 #### Operation Arguments for query.events ####
-`accountID` [ID] - (required) Account ID 
-`eventsDimension` [EventsDimension[]] - (optional) N/A 
-`eventsFilter` [EventsFilter[]] - (optional) N/A 
-`eventsMeasure` [EventsMeasure[]] - (optional) N/A 
-`eventsSort` [EventsSort[]] - (optional) N/A 
-`from` [Int] - (optional) N/A 
-`limit` [Int] - (optional) N/A 
-`timeFrame` [TimeFrame] - (required) N/A 
+
+`accountID` [ID] - (required) Account ID    
+`eventsDimension` [EventsDimension[]] - (required) N/A    
+`eventsFilter` [EventsFilter[]] - (required) N/A    
+`eventsMeasure` [EventsMeasure[]] - (required) N/A    
+`eventsSort` [EventsSort[]] - (required) N/A    
+`from` [Int] - (required) N/A    
+`limit` [Int] - (required) N/A    
+`timeFrame` [TimeFrame] - (required) N/A    

catocli/parsers/query_events/__init__.py

@@ -1,16 +1,16 @@
 
-from ..parserApiClient import createRequest, get_help
+from ..customParserApiClient import createRequest, get_help
 
 def query_events_parse(query_subparsers):
-	query_events_parser = query_subparsers.add_parser('events', 
-			help='events() query operation', 
-			usage=get_help("query_events"))
+    query_events_parser = query_subparsers.add_parser('events', 
+            help='events() query operation', 
+            usage=get_help("query_events"))
 
-	query_events_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
-	query_events_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_events_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
-	query_events_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
-	query_events_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
-	query_events_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
-	query_events_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
-	query_events_parser.set_defaults(func=createRequest,operation_name='query.events')
+    query_events_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
+    query_events_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.')
+    query_events_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+    query_events_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+    query_events_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+    query_events_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+    query_events_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+    query_events_parser.set_defaults(func=createRequest,operation_name='query.events')

catocli/parsers/query_eventsFeed/README.md

@@ -1,6 +1,6 @@
 
 ## CATO-CLI - query.eventsFeed:
-[Click here](https://api.catonetworks.com/documentation/#query-eventsFeed) for documentation on this operation.
+[Click here](https://api.catonetworks.com/documentation/#query-query.eventsFeed) for documentation on this operation.
 
 ### Usage for query.eventsFeed:
 
@@ -8,12 +8,14 @@
 
 `catocli query eventsFeed <json>`
 
-`catocli query eventsFeed "$(cat < eventsFeed.json)"`
+`catocli query eventsFeed "$(cat < query.eventsFeed.json)"`
+
+`catocli query eventsFeed '{"accountIDs":["id1","id2"],"eventFeedFieldFilterInput":{"fieldName":"event_sub_type","operator":"is","values":["string1","string2"]},"fieldNames":"access_method","marker":"string"}'`
 
-`catocli query eventsFeed '{"accountIDs": ["ID"], "eventFeedFieldFilterInput": {"fieldName": {"fieldName": "enum(EventFeedFilterFieldName)"}, "operator": {"operator": "enum(EventFeedFilterOperator)"}, "values": {"values": ["String"]}}, "fieldNames": "enum(EventFieldName)", "marker": "String"}'`
 
 #### Operation Arguments for query.eventsFeed ####
-`accountIDs` [ID[]] - (optional) List of Unique Account Identifiers. 
-`eventFeedFieldFilterInput` [EventFeedFieldFilterInput[]] - (optional) N/A 
-`fieldNames` [EventFieldName[]] - (optional) N/A Default Value: ['access_method', 'account_id', 'action', 'actions_taken', 'ad_name', 'alert_id', 'always_on_configuration', 'analyst_verdict', 'api_name', 'api_type', 'app_activity', 'app_activity_category', 'app_activity_type', 'app_stack', 'application_id', 'application_name', 'application_risk', 'auth_method', 'authentication_type', 'bgp_cato_asn', 'bgp_cato_ip', 'bgp_error_code', 'bgp_peer_asn', 'bgp_peer_ip', 'bgp_route_cidr', 'bgp_suberror_code', 'bypass_duration_sec', 'bypass_method', 'bypass_reason', 'categories', 'cato_app', 'classification', 'client_cert_expires', 'client_cert_name', 'client_class', 'client_version', 'collaborator_name', 'collaborators', 'confidence_level', 'configured_host_name', 'congestion_algorithm', 'connect_on_boot', 'connection_origin', 'connector_name', 'connector_status', 'connector_type', 'container_name', 'correlation_id', 'criticality', 'custom_category_id', 'custom_category_name', 'dest_country', 'dest_country_code', 'dest_group_id', 'dest_group_name', 'dest_ip', 'dest_is_site_or_vpn', 'dest_pid', 'dest_port', 'dest_process_cmdline', 'dest_process_parent_path', 'dest_process_parent_pid', 'dest_process_path', 'dest_site_id', 'dest_site_name', 'detection_name', 'detection_stage', 'device_categories', 'device_certificate', 'device_id', 'device_manufacturer', 'device_model', 'device_name', 'device_os_type', 'device_posture_profile', 'device_type', 'directory_host_name', 'directory_ip', 'directory_sync_result', 'directory_sync_type', 'disinfect_result', 'dlp_fail_mode', 'dlp_profiles', 'dlp_scan_types', 'dns_protection_category', 'dns_query', 'domain_name', 'egress_pop_name', 'egress_site_name', 'email_subject', 'endpoint_id', 'engine_type', 'epp_engine_type', 'epp_profile', 'event_count', 'event_id', 'event_message', 'event_sub_type', 'event_type', 'failure_reason', 'file_hash', 'file_name', 'file_operation', 'file_size', 'file_type', 'final_object_status', 'flows_cardinality', 'full_path_url', 'guest_user', 'host_ip', 'host_mac', 'http_request_method', 'incident_aggregation', 'incident_id', 'indication', 'indicator', 'initial_object_status', 'internalId', 'ip_protocol', 'is_admin', 'is_admin_activity', 'is_compliant', 'is_managed', 'is_sanctioned_app', 'is_sinkhole', 'ISP_name', 'key_name', 'labels', 'link_health_is_congested', 'link_health_jitter', 'link_health_latency', 'link_health_pkt_loss', 'link_type', 'logged_in_user', 'login_type', 'matched_data_types', 'mitre_attack_subtechniques', 'mitre_attack_tactics', 'mitre_attack_techniques', 'network_access', 'network_rule', 'notification_api_error', 'notification_description', 'object_id', 'object_name', 'object_type', 'office_mode', 'os_type', 'os_version', 'out_of_band_access', 'owner', 'pac_file', 'parent_connector_name', 'pop_name', 'precedence', 'processes_count', 'producer', 'projects', 'prompt_action', 'provider_name', 'public_ip', 'qos_priority', 'qos_reported_time', 'quarantine_folder_path', 'quarantine_uuid', 'raw_data', 'recommended_actions', 'reference_url', 'referer_url', 'region_name', 'registration_code', 'resource_id', 'risk_level', 'rule_id', 'rule_name', 'severity', 'sharing_scope', 'sign_in_event_types', 'signature_id', 'socket_interface', 'socket_interface_id', 'socket_new_version', 'socket_old_version', 'socket_reset', 'socket_role', 'socket_serial', 'socket_version', 'split_tunnel_configuration', 'src_country', 'src_country_code', 'src_ip', 'src_is_site_or_vpn', 'src_isp_ip', 'src_pid', 'src_port', 'src_process_cmdline', 'src_process_parent_path', 'src_process_parent_pid', 'src_process_path', 'src_site_id', 'src_site_name', 'static_host', 'status', 'story_id', 'subnet_name', 'subscription_name', 'targets_cardinality', 'tcp_acceleration', 'tenant_id', 'tenant_name', 'tenant_restriction_rule_name', 'threat_confidence', 'threat_name', 'threat_reference', 'threat_score', 'threat_type', 'threat_verdict', 'time', 'time_str', 'title', 'tls_certificate_error', 'tls_error_description', 'tls_error_type', 'tls_inspection', 'tls_rule_name', 'tls_version', 'traffic_direction', 'translated_client_ip', 'translated_server_ip', 'trigger', 'trust_type', 'trusted_networks', 'tunnel_ip_protocol', 'tunnel_protocol', 'upgrade_end_time', 'upgrade_initiated_by', 'upgrade_start_time', 'url', 'user_agent', 'user_awareness_method', 'user_id', 'user_name', 'user_reference_id', 'user_risk_level', 'vendor', 'vendor_collaborator_id', 'vendor_device_id', 'vendor_device_name', 'vendor_event_id', 'vendor_user_id', 'visible_device_id', 'vpn_lan_access', 'vpn_user_email', 'windows_domain_name', 'xff']
-`marker` [String] - (optional) Marker to use to get results from 
+
+`accountIDs` [ID[]] - (required) List of Unique Account Identifiers.    
+`eventFeedFieldFilterInput` [EventFeedFieldFilterInput[]] - (required) N/A    
+`fieldNames` [EventFieldName[]] - (required) N/A Default Value: ['access_method', 'account_id', 'action', 'actions_taken', 'ad_name', 'alert_id', 'always_on_configuration', 'analyst_verdict', 'api_name', 'api_type', 'app_activity', 'app_activity_category', 'app_activity_type', 'app_stack', 'application_id', 'application_name', 'application_risk', 'auth_method', 'authentication_type', 'bgp_cato_asn', 'bgp_cato_ip', 'bgp_error_code', 'bgp_peer_asn', 'bgp_peer_ip', 'bgp_route_cidr', 'bgp_suberror_code', 'bypass_duration_sec', 'bypass_method', 'bypass_reason', 'categories', 'cato_app', 'classification', 'client_cert_expires', 'client_cert_name', 'client_class', 'client_version', 'collaborator_name', 'collaborators', 'confidence_level', 'configured_host_name', 'congestion_algorithm', 'connect_on_boot', 'connection_origin', 'connector_name', 'connector_status', 'connector_type', 'container_name', 'correlation_id', 'criticality', 'custom_category_id', 'custom_category_name', 'dest_country', 'dest_country_code', 'dest_group_id', 'dest_group_name', 'dest_ip', 'dest_is_site_or_vpn', 'dest_pid', 'dest_port', 'dest_process_cmdline', 'dest_process_parent_path', 'dest_process_parent_pid', 'dest_process_path', 'dest_site_id', 'dest_site_name', 'detection_name', 'detection_stage', 'device_categories', 'device_certificate', 'device_id', 'device_manufacturer', 'device_model', 'device_name', 'device_os_type', 'device_posture_profile', 'device_type', 'directory_host_name', 'directory_ip', 'directory_sync_result', 'directory_sync_type', 'disinfect_result', 'dlp_fail_mode', 'dlp_profiles', 'dlp_scan_types', 'dns_protection_category', 'dns_query', 'domain_name', 'egress_pop_name', 'egress_site_name', 'email_subject', 'endpoint_id', 'engine_type', 'epp_engine_type', 'epp_profile', 'event_count', 'event_id', 'event_message', 'event_sub_type', 'event_type', 'failure_reason', 'file_hash', 'file_name', 'file_operation', 'file_size', 'file_type', 'final_object_status', 'flows_cardinality', 'full_path_url', 'guest_user', 'host_ip', 'host_mac', 'http_request_method', 'incident_aggregation', 'incident_id', 'indication', 'indicator', 'initial_object_status', 'internalId', 'ip_protocol', 'is_admin', 'is_admin_activity', 'is_compliant', 'is_managed', 'is_sanctioned_app', 'is_sinkhole', 'ISP_name', 'key_name', 'labels', 'link_health_is_congested', 'link_health_jitter', 'link_health_latency', 'link_health_pkt_loss', 'link_type', 'logged_in_user', 'login_type', 'matched_data_types', 'mitre_attack_subtechniques', 'mitre_attack_tactics', 'mitre_attack_techniques', 'network_access', 'network_rule', 'notification_api_error', 'notification_description', 'object_id', 'object_name', 'object_type', 'office_mode', 'os_type', 'os_version', 'out_of_band_access', 'owner', 'pac_file', 'parent_connector_name', 'pop_name', 'precedence', 'processes_count', 'producer', 'projects', 'prompt_action', 'provider_name', 'public_ip', 'qos_priority', 'qos_reported_time', 'quarantine_folder_path', 'quarantine_uuid', 'raw_data', 'recommended_actions', 'reference_url', 'referer_url', 'region_name', 'registration_code', 'resource_id', 'risk_level', 'rule_id', 'rule_name', 'severity', 'sharing_scope', 'sign_in_event_types', 'signature_id', 'socket_interface', 'socket_interface_id', 'socket_new_version', 'socket_old_version', 'socket_reset', 'socket_role', 'socket_serial', 'socket_version', 'split_tunnel_configuration', 'src_country', 'src_country_code', 'src_ip', 'src_is_site_or_vpn', 'src_isp_ip', 'src_pid', 'src_port', 'src_process_cmdline', 'src_process_parent_path', 'src_process_parent_pid', 'src_process_path', 'src_site_id', 'src_site_name', 'static_host', 'status', 'story_id', 'subnet_name', 'subscription_name', 'targets_cardinality', 'tcp_acceleration', 'tenant_id', 'tenant_name', 'tenant_restriction_rule_name', 'threat_confidence', 'threat_name', 'threat_reference', 'threat_score', 'threat_type', 'threat_verdict', 'time', 'time_str', 'title', 'tls_certificate_error', 'tls_error_description', 'tls_error_type', 'tls_inspection', 'tls_rule_name', 'tls_version', 'traffic_direction', 'translated_client_ip', 'translated_server_ip', 'trigger', 'trust_type', 'trusted_networks', 'tunnel_ip_protocol', 'tunnel_protocol', 'upgrade_end_time', 'upgrade_initiated_by', 'upgrade_start_time', 'url', 'user_agent', 'user_awareness_method', 'user_id', 'user_name', 'user_reference_id', 'user_risk_level', 'vendor', 'vendor_collaborator_id', 'vendor_device_id', 'vendor_device_name', 'vendor_event_id', 'vendor_user_id', 'visible_device_id', 'vpn_lan_access', 'vpn_user_email', 'windows_domain_name', 'xff']   
+`marker` [String] - (required) Marker to use to get results from