catocli 1.0.4__py3-none-any.whl → 1.0.6__py3-none-any.whl

catocli/Utils/clidriver.py

@@ -16,7 +16,7 @@ if "CATO_TOKEN" not in os.environ:
 CATO_TOKEN = os.getenv("CATO_TOKEN")
 CATO_DEBUG = bool(os.getenv("CATO_DEBUG", False))
 from ..parsers.raw import raw_parse
-#from ..parsers.custom import custom_parse
+from ..parsers.custom import custom_parse
 from ..parsers.query_siteLocation import query_siteLocation_parse
 from ..parsers.mutation_admin import mutation_admin_parse
 from ..parsers.mutation_container import mutation_container_parse
@@ -53,7 +53,7 @@ configuration.version = "{}".format(catocli.__version__)
 parser = argparse.ArgumentParser(prog='catocli', usage='%(prog)s <operationType> <operationName> [options]', description="CLI for query on CATO via API.")
 parser.add_argument('--version', action='version', version=catocli.__version__)
 subparsers = parser.add_subparsers()
-#custom_parsers = custom_parse(subparsers)
+custom_parsers = custom_parse(subparsers)
 raw_parsers = subparsers.add_parser('raw', help='Raw GraphQL', usage=get_help("raw"))
 raw_parser = raw_parse(raw_parsers)
 query_parser = subparsers.add_parser('query', help='Query', usage='catocli query <operationName> [options]')

catocli/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "1.0.4"
+__version__ = "1.0.6"
 __cato_host__ = "https://api.catonetworks.com/api/v1/graphql2"

catocli/parsers/custom/README.md

@@ -1,16 +1,296 @@
 
 ## CATO-CLI - object list queries:
 
-### Usage for site.search:
+### Usage for entity.account.search:
 
-`cato site list -h`
+`catocli entity account list -h`
 
-`cato site list <accountID> <json>`
+`catocli entity account list <accountID> <json>`
 
-`cato site list 12345 -s=yourSearch`
+`catocli entity account list 12345 -s=yourSearch`
 
-`cato site list 12345 -s=yourSearch -f=json -p`
+`catocli entity account list 12345 -s=yourSearch -f=json -p`
 
-#### Operation Arguments for mutation.admin.addAdmin ####
-`accountId` [ID] - (required) N/A 
-`search` [String] - (required) N/A 
+#### Operation Arguments for entity.account.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.admin.search:
+
+`catocli entity admin list -h`
+
+`catocli entity admin list <accountID> <json>`
+
+`catocli entity admin list 12345 -s=yourSearch`
+
+`catocli entity admin list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.admin.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.allocatedIP.search:
+
+`catocli entity allocatedIP list -h`
+
+`catocli entity allocatedIP list <accountID> <json>`
+
+`catocli entity allocatedIP list 12345 -s=yourSearch`
+
+`catocli entity allocatedIP list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.allocatedIP.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.any.search:
+
+`catocli entity any list -h`
+
+`catocli entity any list <accountID> <json>`
+
+`catocli entity any list 12345 -s=yourSearch`
+
+`catocli entity any list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.any.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.availablePooledUsage.search:
+
+`catocli entity availablePooledUsage list -h`
+
+`catocli entity availablePooledUsage list <accountID> <json>`
+
+`catocli entity availablePooledUsage list 12345 -s=yourSearch`
+
+`catocli entity availablePooledUsage list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.availablePooledUsage.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.availableSiteUsage.search:
+
+`catocli entity availableSiteUsage list -h`
+
+`catocli entity availableSiteUsage list <accountID> <json>`
+
+`catocli entity availableSiteUsage list 12345 -s=yourSearch`
+
+`catocli entity availableSiteUsage list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.availableSiteUsage.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.dhcpRelayGroup.search:
+
+`catocli entity dhcpRelayGroup list -h`
+
+`catocli entity dhcpRelayGroup list <accountID> <json>`
+
+`catocli entity dhcpRelayGroup list 12345 -s=yourSearch`
+
+`catocli entity dhcpRelayGroup list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.dhcpRelayGroup.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.groupSubscription.search:
+
+`catocli entity groupSubscription list -h`
+
+`catocli entity groupSubscription list <accountID> <json>`
+
+`catocli entity groupSubscription list 12345 -s=yourSearch`
+
+`catocli entity groupSubscription list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.groupSubscription.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.host.search:
+
+`catocli entity host list -h`
+
+`catocli entity host list <accountID> <json>`
+
+`catocli entity host list 12345 -s=yourSearch`
+
+`catocli entity host list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.host.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.lanFirewall.search:
+
+`catocli entity lanFirewall list -h`
+
+`catocli entity lanFirewall list <accountID> <json>`
+
+`catocli entity lanFirewall list 12345 -s=yourSearch`
+
+`catocli entity lanFirewall list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.lanFirewall.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.localRouting.search:
+
+`catocli entity localRouting list -h`
+
+`catocli entity localRouting list <accountID> <json>`
+
+`catocli entity localRouting list 12345 -s=yourSearch`
+
+`catocli entity localRouting list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.localRouting.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.location.search:
+
+`catocli entity location list -h`
+
+`catocli entity location list <accountID> <json>`
+
+`catocli entity location list 12345 -s=yourSearch`
+
+`catocli entity location list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.location.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.mailingListSubscription.search:
+
+`catocli entity mailingListSubscription list -h`
+
+`catocli entity mailingListSubscription list <accountID> <json>`
+
+`catocli entity mailingListSubscription list 12345 -s=yourSearch`
+
+`catocli entity mailingListSubscription list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.mailingListSubscription.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.networkInterface.search:
+
+`catocli entity networkInterface list -h`
+
+`catocli entity networkInterface list <accountID> <json>`
+
+`catocli entity networkInterface list 12345 -s=yourSearch`
+
+`catocli entity networkInterface list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.networkInterface.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.portProtocol.search:
+
+`catocli entity portProtocol list -h`
+
+`catocli entity portProtocol list <accountID> <json>`
+
+`catocli entity portProtocol list 12345 -s=yourSearch`
+
+`catocli entity portProtocol list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.portProtocol.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.simpleService.search:
+
+`catocli entity simpleService list -h`
+
+`catocli entity simpleService list <accountID> <json>`
+
+`catocli entity simpleService list 12345 -s=yourSearch`
+
+`catocli entity simpleService list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.simpleService.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.site.search:
+
+`catocli entity site list -h`
+
+`catocli entity site list <accountID> <json>`
+
+`catocli entity site list 12345 -s=yourSearch`
+
+`catocli entity site list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.site.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.siteRange.search:
+
+`catocli entity siteRange list -h`
+
+`catocli entity siteRange list <accountID> <json>`
+
+`catocli entity siteRange list 12345 -s=yourSearch`
+
+`catocli entity siteRange list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.siteRange.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.timezone.search:
+
+`catocli entity timezone list -h`
+
+`catocli entity timezone list <accountID> <json>`
+
+`catocli entity timezone list 12345 -s=yourSearch`
+
+`catocli entity timezone list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.timezone.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.vpnUser.search:
+
+`catocli entity vpnUser list -h`
+
+`catocli entity vpnUser list <accountID> <json>`
+
+`catocli entity vpnUser list 12345 -s=yourSearch`
+
+`catocli entity vpnUser list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.vpnUser.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A
+
+### Usage for entity.webhookSubscription.search:
+
+`catocli entity webhookSubscription list -h`
+
+`catocli entity webhookSubscription list <accountID> <json>`
+
+`catocli entity webhookSubscription list 12345 -s=yourSearch`
+
+`catocli entity webhookSubscription list 12345 -s=yourSearch -f=json -p`
+
+#### Operation Arguments for entity.webhookSubscription.search ####
+`accountId` [ID] - (required) N/A
+`search` [String] - (required) N/A

catocli/parsers/custom/__init__.py

@@ -1,29 +1,34 @@
 
-import cato.parsers.custom.customLib as customLib
+import catocli.parsers.custom.customLib as customLib
 
 def custom_parse(subparsers):
-	site_parser = subparsers.add_parser('site', help='Site', usage='cato site <operationName> [options]')
-	site_subparsers = site_parser.add_subparsers(description='valid subcommands', help='additional help')
+	entityTypes = ["account","admin","allocatedIP","any","availablePooledUsage","availableSiteUsage","dhcpRelayGroup","groupSubscription","host","lanFirewall","localRouting","location","mailingListSubscription","networkInterface","portProtocol","simpleService","site","siteRange","timezone","vpnUser","webhookSubscription"]
+	entity_parser = subparsers.add_parser('entity', help='Entity Lookup', usage='catocli entity <operationName> [options]')
+	entity_subparsers = entity_parser.add_subparsers(description='valid subcommands', help='additional help')
 
-	site_list_parser = site_subparsers.add_parser('list', 
-			help='site list', 
-			usage=get_help_custom("site_list"))
+	for entity in entityTypes:
+		item_parser = entity_subparsers.add_parser(entity, help=entity, usage='catocli entity '+entity+' <operationName> [options]')
+		item_subparsers = item_parser.add_subparsers(description='valid subcommands', help='additional help')
 
-	site_list_parser.add_argument('accountID', help='The Account ID.')
-	site_list_parser.add_argument('-s', help='Search string', default='', nargs='?')
-	site_list_parser.add_argument('-f', default="csv", choices=["json","csv"], nargs='?', 
-		help='Specify format for output')
-	site_list_parser.add_argument('-t', const=True, default=False, nargs='?', 
-		help='Print test request preview without sending api call')
-	site_list_parser.add_argument('-v', const=True, default=False, nargs='?', 
-		help='Verbose output')
-	site_list_parser.add_argument('-p', const=True, default=False, nargs='?', 
-		help='Pretty print')
-	
-	site_list_parser.set_defaults(func=customLib.entityTypeList,operation_name='site')
+		item_list_parser = item_subparsers.add_parser('list', 
+				help='entity '+entity+' list', 
+				usage=get_help_custom("entity_"+entity+"_list"))
+
+		item_list_parser.add_argument('accountID', help='The Account ID.')
+		item_list_parser.add_argument('-s', help='Search string', default='', nargs='?')
+		item_list_parser.add_argument('-f', default="csv", choices=["json","csv"], nargs='?', 
+			help='Specify format for output')
+		item_list_parser.add_argument('-t', const=True, default=False, nargs='?', 
+			help='Print test request preview without sending api call')
+		item_list_parser.add_argument('-v', const=True, default=False, nargs='?', 
+			help='Verbose output')
+		item_list_parser.add_argument('-p', const=True, default=False, nargs='?', 
+			help='Pretty print')
+		
+		item_list_parser.set_defaults(func=customLib.entityTypeList,operation_name=entity)
 
 def get_help_custom(path):
-	matchCmd = "cato "+path.replace("_"," ")
+	matchCmd = "catocli "+path.replace("_"," ")
 	import os
 	pwd = os.path.dirname(__file__)
 	# doc = path+"/README.md"

catocli/parsers/parserApiClient.py

@@ -162,7 +162,7 @@ def generateGraphqlPayload(variablesObj,operation,operationName):
 	return body
 
 def get_help(path):
-	matchCmd = "cato "+path.replace("_"," ")
+	matchCmd = "catocli "+path.replace("_"," ")
 	import os
 	pwd = os.path.dirname(__file__)
 	doc = path+"/README.md"
@@ -204,13 +204,16 @@ def validateArgs(variablesObj,operation):
 
 def loadJSON(file):
 	CONFIG = {}
+	module_dir_ary = os.path.dirname(__file__).split("/")
+	del module_dir_ary[-1]
+	del module_dir_ary[-1]
+	module_dir = "/".join(module_dir_ary)
 	try:
-		with open(file, 'r') as data:
+		with open(module_dir+'/'+file, 'r') as data:
 			CONFIG = json.load(data)
-			# logging.warning("Loaded "+file+" data")
 			return CONFIG
 	except:
-		logging.warning("File \""+file+"\" not found.")
+		logging.warning("File \""+module_dir+'/'+file+"\" not found.")
 		exit()
 
 def renderCamelCase(pathStr):

{catocli-1.0.4.dist-info → catocli-1.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: catocli
-Version: 1.0.4
+Version: 1.0.6
 Summary: Cato Networks cli wrapper for the GraphQL API.
 Home-page: https://github.com/Cato-Networks/cato-cli
 Author: Cato Networks

{catocli-1.0.4.dist-info → catocli-1.0.6.dist-info}/RECORD

@@ -1,9 +1,9 @@
-catocli/__init__.py,sha256=ohChnyXtKPdL5si0EpsWr9R-6DQ1R_I2ZGQB4bVltKg,85
+catocli/__init__.py,sha256=QwRTrUVNppTMSGRBNNfaAm9uiOGDh4GFGaxW1w2gdqo,85
 catocli/__main__.py,sha256=6Z0ns_k_kUcz1Qtrn1u7UyUnqB-3e85jM_nppOwFsv4,217
-catocli/Utils/clidriver.py,sha256=QhVEXaoiN1JiIWxbfr_ks0tYXuJWHFOjKdrhhhPNmdI,5449
-catocli/parsers/parserApiClient.py,sha256=TXN-y_yUs0yhlMVdCXjxf4hq6IOTPCd9H5iN550cmsc,13370
-catocli/parsers/custom/README.md,sha256=8jaLOT2yBLR818JhkLR9Z_zHFb88hdcVUxQnS39UVkE,339
-catocli/parsers/custom/__init__.py,sha256=pQuvdr0zw3jfnG3PcdDUFExItk4HFlODsdF2DE-6EwA,1712
+catocli/Utils/clidriver.py,sha256=RsKEW6DS5uj5ndfGFYIJkl2aJ8V5hnBzABramyKNHbY,5447
+catocli/parsers/parserApiClient.py,sha256=8LfEdp071zmgVd_Or5tsI7PgpR2_11tonLrzkjaGHxs,13500
+catocli/parsers/custom/README.md,sha256=UvCWAtF3Yh0UsvADb0ve1qJupgYHeyGu6V3Z0O5HEvo,8180
+catocli/parsers/custom/__init__.py,sha256=DafeKpnBmLPL9D77NqxqezBgmdFthhbHpznQCzByF3g,2362
 catocli/parsers/custom/customLib.py,sha256=D6v54dNg_JvTaZzrQKtWW20OerWx6KngG6LEAGEiiGs,3051
 catocli/parsers/mutation/README.md,sha256=mdOfOY0sOVGnf9q-GVgtGc7mtxFKigD9q0ILJAw8l0I,32
 catocli/parsers/mutation_admin/README.md,sha256=YzXrmiZf8gPKDd2ii__NztKfYxReu3MBOmswR3BGQHk,201
@@ -208,7 +208,7 @@ models/query.siteLocation.json,sha256=KxWQN-t26XaAq0dviN2N18mSuF0AWhdbhVxMuHdhUQ
 models/query.subDomains.json,sha256=ySJ-gsBzC8EX4WrtJpasLAGkSK7-3e3orhPbIyx_B8s,7041
 models/query.xdr.stories.json,sha256=gyU3qmf2jBwgDrf-555EhMqDyAjKWsljZp_HG37L9Tw,3796370
 models/query.xdr.story.json,sha256=UftyLpKcfJSEqHCNSTn8d2cj2AdM_7BN1Vsatnl6nl4,2806387
-schema/catolib.py,sha256=loZyGVcL0u2-YRfR0YoybkP55TBaN5YeFGkPPPxcMuM,48840
+schema/catolib.py,sha256=Ap3sP7TD3L1hW_qB2N_oT1JXFqc2OxdJgw6zIXZ4DCQ,48838
 schema/importSchema.py,sha256=9xg9N0MjgQUiPRczOpk0sTY1Nx9K2F6MRhpUyRTNqZ4,2795
 vendor/.DS_Store,sha256=I9gKQvaXL34OLI_ft7JC7sXQERkXoYOeMLyP6pLL90k,8196
 vendor/six.py,sha256=TOOfQi7nFGfMrIvtdr6wX4wyHH8M7aknmuLfo2cBBrM,34549
@@ -253,9 +253,9 @@ vendor/urllib3/util/timeout.py,sha256=4eT1FVeZZU7h7mYD1Jq2OXNe4fxekdNvhoWUkZusRp
 vendor/urllib3/util/url.py,sha256=wHORhp80RAXyTlAIkTqLFzSrkU7J34ZDxX-tN65MBZk,15213
 vendor/urllib3/util/util.py,sha256=j3lbZK1jPyiwD34T8IgJzdWEZVT-4E-0vYIJi9UjeNA,1146
 vendor/urllib3/util/wait.py,sha256=_ph8IrUR3sqPqi0OopQgJUlH4wzkGeM5CiyA7XGGtmI,4423
-catocli-1.0.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-catocli-1.0.4.dist-info/METADATA,sha256=36BOkcvC571PS6uHJ3A00agOCsRu3wW8Z5QAQ-ofFIo,1084
-catocli-1.0.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-catocli-1.0.4.dist-info/entry_points.txt,sha256=p4k9Orre6aWcqVrNmBbckmCs39h-1naMxRo2AjWmWZ4,50
-catocli-1.0.4.dist-info/top_level.txt,sha256=lH9Ok1WoqyeZsgsSyKS0ra5p53MHogpgFl6hJfT-32M,58
-catocli-1.0.4.dist-info/RECORD,,
+catocli-1.0.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+catocli-1.0.6.dist-info/METADATA,sha256=tL-PMcV15Rb4E23nOjtS8WelXHyEqOX1pbDMgP0Zbtc,1084
+catocli-1.0.6.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+catocli-1.0.6.dist-info/entry_points.txt,sha256=p4k9Orre6aWcqVrNmBbckmCs39h-1naMxRo2AjWmWZ4,50
+catocli-1.0.6.dist-info/top_level.txt,sha256=lH9Ok1WoqyeZsgsSyKS0ra5p53MHogpgFl6hJfT-32M,58
+catocli-1.0.6.dist-info/RECORD,,

schema/catolib.py

@@ -521,7 +521,7 @@ if "CATO_TOKEN" not in os.environ:
 CATO_TOKEN = os.getenv("CATO_TOKEN")
 CATO_DEBUG = bool(os.getenv("CATO_DEBUG", False))
 from ..parsers.raw import raw_parse
-#from ..parsers.custom import custom_parse
+from ..parsers.custom import custom_parse
 from ..parsers.query_siteLocation import query_siteLocation_parse
 """
 	for parserName in parsers:
@@ -538,7 +538,7 @@ configuration.version = "{}".format(catocli.__version__)
 parser = argparse.ArgumentParser(prog='catocli', usage='%(prog)s <operationType> <operationName> [options]', description="CLI for query on CATO via API.")
 parser.add_argument('--version', action='version', version=catocli.__version__)
 subparsers = parser.add_subparsers()
-#custom_parsers = custom_parse(subparsers)
+custom_parsers = custom_parse(subparsers)
 raw_parsers = subparsers.add_parser('raw', help='Raw GraphQL', usage=get_help("raw"))
 raw_parser = raw_parse(raw_parsers)
 query_parser = subparsers.add_parser('query', help='Query', usage='catocli query <operationName> [options]')