catocli 2.1.6__py3-none-any.whl → 2.1.8__py3-none-any.whl

catocli/Utils/cliutils.py

@@ -85,10 +85,10 @@ def load_cli_settings():
     settings_locations = [
         # Try package resource first (for installed packages)
         lambda: json.loads(get_package_resource('catocli', 'clisettings.json')),
-        # Try repository location (for development)
-        lambda: json.load(open(os.path.join(os.path.dirname(__file__), '../../clisettings.json'), 'r', encoding='utf-8')),
         # Try adjacent file location (for development - new location)
-        lambda: json.load(open(os.path.join(os.path.dirname(__file__), '../clisettings.json'), 'r', encoding='utf-8'))
+        lambda: json.load(open(os.path.join(os.path.dirname(__file__), '../clisettings.json'), 'r', encoding='utf-8')),
+        # Try repository location (for development - fallback)
+        lambda: json.load(open(os.path.join(os.path.dirname(__file__), '../../clisettings.json'), 'r', encoding='utf-8'))
     ]
     
     for i, load_func in enumerate(settings_locations):
@@ -112,7 +112,9 @@ def get_cli_settings_path():
         str or None: Path to the settings file if found, None otherwise
     """
     possible_paths = [
-        # Repository location (for development)
+        # Adjacent file location (for development - new location)
+        os.path.join(os.path.dirname(__file__), '../clisettings.json'),
+        # Repository location (for development - fallback)
         os.path.join(os.path.dirname(__file__), '../../clisettings.json'),
         # Current directory
         os.path.join(os.getcwd(), 'clisettings.json'),

catocli/__init__.py

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

catocli/parsers/custom/export_sites/export_sites.py

@@ -237,7 +237,7 @@ def export_socket_site_to_json(args, configuration):
                 nr_relay_group_name = nr_helper_fields.get('XXXXX', None)
                 nr_gateway = nr_helper_fields.get('XXXXX', None)
                 nr_translated_subnet = nr_helper_fields.get('XXXXX', None)
-                # nr_internet_only = nr_helper_fields.get('XXXXX', None)
+                nr_internet_only = nr_helper_fields.get('XXXXX', None)  # Default to None for JSON
                 nr_local_ip = nr_helper_fields.get('XXXXX', None)
                 nr_range_type = nr_helper_fields.get('XXXXX', None)
                 # Adding logic to pre-populate with default value
@@ -271,8 +271,7 @@ def export_socket_site_to_json(args, configuration):
                             cur_range['gateway'] = nr_gateway
                             cur_range['range_type'] = nr_range_type
                             cur_range['translated_subnet'] = nr_translated_subnet
-                            # # Not available to set for native_range via API today
-                            # cur_range['internet_only'] = nr_internet_only
+                            cur_range['internet_only'] = nr_internet_only
                             cur_range['local_ip'] = nr_local_ip  # Use the calculated or original value
                             cur_range['dhcp_settings'] = {
                                 'dhcp_type': nr_dhcp_type,
@@ -291,8 +290,7 @@ def export_socket_site_to_json(args, configuration):
                         site_native_range['gateway'] = nr_gateway
                         site_native_range['range_type'] = nr_range_type
                         site_native_range['translated_subnet'] = nr_translated_subnet
-                        # # Not available to set for native_range via API today
-                        # site_native_range['internet_only'] = nr_internet_only
+                        site_native_range['internet_only'] = nr_internet_only
                         site_native_range['local_ip'] = nr_local_ip
                         site_native_range['dhcp_settings'] = {
                             'dhcp_type': nr_dhcp_type,
@@ -314,8 +312,7 @@ def export_socket_site_to_json(args, configuration):
                         cur_range['gateway'] = nr_gateway
                         cur_range['range_type'] = nr_range_type
                         cur_range['translated_subnet'] = nr_translated_subnet
-                        # # Not available to set for native_range via API today
-                        # cur_range['internet_only'] = nr_internet_only
+                        cur_range['internet_only'] = nr_internet_only
                         cur_range['local_ip'] = nr_local_ip  # Use the calculated or original value
                         cur_range['dhcp_settings'] = {
                             'dhcp_type': nr_dhcp_type,
@@ -594,6 +591,7 @@ def get_processed_site_data(args, configuration):
             nr_relay_group_name = None
             nr_gateway = None
             nr_translated_subnet = None
+            nr_internet_only = None  # Default to None for JSON
             nr_local_ip = None
             nr_range_type = "VLAN" if nr_vlan != None else "Direct"
             
@@ -612,7 +610,7 @@ def get_processed_site_data(args, configuration):
                         cur_range = {
                             'id': range_id, 'name': range_name, 'subnet': nr_subnet, 'vlan': nr_vlan,
                             'mdns_reflector': nr_mdns_reflector, 'gateway': nr_gateway, 'range_type': nr_range_type,
-                            'translated_subnet': nr_translated_subnet, 'local_ip': nr_local_ip,
+                            'translated_subnet': nr_translated_subnet, 'internet_only': nr_internet_only, 'local_ip': nr_local_ip,
                             'dhcp_settings': {
                                 'dhcp_type': nr_dhcp_type, 'ip_range': nr_ip_range, 'relay_group_id': None,
                                 'relay_group_name': nr_relay_group_name, 'dhcp_microsegmentation': nr_dhcp_microsegmentation
@@ -627,6 +625,7 @@ def get_processed_site_data(args, configuration):
                     site_native_range['gateway'] = nr_gateway
                     site_native_range['range_type'] = nr_range_type
                     site_native_range['translated_subnet'] = nr_translated_subnet
+                    site_native_range['internet_only'] = nr_internet_only
                     site_native_range['local_ip'] = nr_local_ip
                     site_native_range['dhcp_settings'] = {
                         'dhcp_type': nr_dhcp_type, 'ip_range': nr_ip_range, 'relay_group_id': None,
@@ -638,7 +637,7 @@ def get_processed_site_data(args, configuration):
                     cur_range = {
                         'id': range_id, 'name': range_name, 'subnet': nr_subnet, 'vlan': nr_vlan,
                         'mdns_reflector': nr_mdns_reflector, 'gateway': nr_gateway, 'range_type': nr_range_type,
-                        'translated_subnet': nr_translated_subnet, 'local_ip': nr_local_ip,
+                        'translated_subnet': nr_translated_subnet, 'internet_only': nr_internet_only, 'local_ip': nr_local_ip,
                         'dhcp_settings': {
                             'dhcp_type': nr_dhcp_type, 'ip_range': nr_ip_range, 'relay_group_id': None,
                             'relay_group_name': nr_relay_group_name, 'dhcp_microsegmentation': nr_dhcp_microsegmentation
@@ -857,7 +856,7 @@ def export_network_ranges_to_csv(site, args, account_id):
         'lan_interface_id', 'lan_interface_name', 'lan_interface_dest_type', 'is_native_range', 'lan_interface_index',
         # Network Range columns (populated on all rows)
         'network_range_id', 'network_range_name', 'subnet', 'vlan', 'mdns_reflector', 
-        'gateway', 'range_type', 'translated_subnet', 'local_ip', 
+        'gateway', 'range_type', 'translated_subnet', 'internet_only', 'local_ip', 
         'dhcp_type', 'dhcp_ip_range', 'dhcp_relay_group_id', 'dhcp_relay_group_name', 'dhcp_microsegmentation'
     ]
     
@@ -911,6 +910,7 @@ def export_network_ranges_to_csv(site, args, account_id):
                         'gateway': network_range.get('gateway', ''),
                         'range_type': network_range.get('range_type', ''),
                         'translated_subnet': network_range.get('translated_subnet', ''),
+                        'internet_only': network_range.get('internet_only', ''),
                         'local_ip': network_range.get('local_ip', ''),
                         'dhcp_type': network_range.get('dhcp_settings', {}).get('dhcp_type', ''),
                         'dhcp_ip_range': network_range.get('dhcp_settings', {}).get('ip_range', ''),
@@ -958,6 +958,7 @@ def export_network_ranges_to_csv(site, args, account_id):
                 'gateway': '',
                 'range_type': '',
                 'translated_subnet': '',
+                'internet_only': '',
                 'local_ip': '',
                 'dhcp_type': '',
                 'dhcp_ip_range': '',
@@ -992,8 +993,9 @@ def export_network_ranges_to_csv(site, args, account_id):
                     'gateway': network_range.get('gateway', ''),
                     'range_type': network_range.get('range_type', ''),
                     'translated_subnet': network_range.get('translated_subnet', ''),
-                        'local_ip': network_range.get('local_ip', ''),
-                        'dhcp_type': network_range.get('dhcp_settings', {}).get('dhcp_type', ''),
+                    'internet_only': network_range.get('internet_only', ''),
+                    'local_ip': network_range.get('local_ip', ''),
+                    'dhcp_type': network_range.get('dhcp_settings', {}).get('dhcp_type', ''),
                     'dhcp_ip_range': network_range.get('dhcp_settings', {}).get('ip_range', ''),
                     'dhcp_relay_group_id': network_range.get('dhcp_settings', {}).get('relay_group_id', ''),
                     'dhcp_relay_group_name': network_range.get('dhcp_settings', {}).get('relay_group_name', ''),

catocli/parsers/customParserApiClient.py

@@ -695,23 +695,30 @@ def loadJSON(file):
     Enhanced JSON loading with better error handling and path resolution
     """
     module_dir = os.path.dirname(__file__)
-    # Navigate up two directory levels (from parsers/ to catocli/ to root)
-    module_dir = os.path.dirname(module_dir)  # Go up from parsers/
-    module_dir = os.path.dirname(module_dir)  # Go up from catocli/
     
-    try:
+    # Special handling for clisettings.json - it's in catocli/ directory
+    if file == "clisettings.json":
+        # From parsers/ go up to catocli/ and look for clisettings.json
+        catocli_dir = os.path.dirname(module_dir)  # Go up from parsers/ to catocli/
+        file_path = os.path.join(catocli_dir, file)
+    else:
+        # For other files (like models), navigate up two directory levels (from parsers/ to catocli/ to root)
+        module_dir = os.path.dirname(module_dir)  # Go up from parsers/
+        module_dir = os.path.dirname(module_dir)  # Go up from catocli/
         file_path = os.path.join(module_dir, file)
+    
+    try:
         with open(file_path, 'r') as data:
             config = json.load(data)
             return config
     except FileNotFoundError:
-        logging.error(f"File \"{os.path.join(module_dir, file)}\" not found.")
+        logging.error(f"File \"{file_path}\" not found.")
         raise
     except json.JSONDecodeError as e:
-        logging.error(f"Invalid JSON in file \"{os.path.join(module_dir, file)}\": {e}")
+        logging.error(f"Invalid JSON in file \"{file_path}\": {e}")
         raise
     except Exception as e:
-        logging.error(f"Error loading file \"{os.path.join(module_dir, file)}\": {e}")
+        logging.error(f"Error loading file \"{file_path}\": {e}")
         raise
 
 

{catocli-2.1.6.dist-info → catocli-2.1.8.dist-info}/METADATA

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

{catocli-2.1.6.dist-info → catocli-2.1.8.dist-info}/RECORD

@@ -1,12 +1,12 @@
-catocli/__init__.py,sha256=VG2jsKAa0bPnfVUC7WJE8-vjFBVX26ASFCoPra0SxJU,84
+catocli/__init__.py,sha256=ZhBcDUk-7qfuMgqngq1dhNqPKdjTBzu15-UjAJQxl8I,84
 catocli/__main__.py,sha256=6Z0ns_k_kUcz1Qtrn1u7UyUnqB-3e85jM_nppOwFsv4,217
 catocli/clisettings.json,sha256=Xxdm9qaeKQaK2hk35PeV5OljSYOJylqJfsgPzaj0D2s,1029
 catocli/Utils/clidriver.py,sha256=29H5qNLW6JUi4jJbGvdr06QihC4n7yr0s7fGpLY8S4c,15965
-catocli/Utils/cliutils.py,sha256=ulXjQJHVHH-JFAAN7q6HkAa1EH8vvKX2IGp6dZKwUtQ,6784
+catocli/Utils/cliutils.py,sha256=SxKaqjn2eU0NDh-bJF8WMQx3W4jBFXEDDk6eGzGlbio,6944
 catocli/Utils/csv_formatter.py,sha256=4MnFlsau-KfeflJGTBAZ98wFt0QKWpAKsIPNeFV3rzk,23038
 catocli/Utils/profile_manager.py,sha256=Stch-cU2rLA7r07hETIRsvG_JxpQx3Q42QwpfD7Qd2I,6379
 catocli/Utils/version_checker.py,sha256=tCtsCn7xxMIxOm6cWJSA_yPt0j4mNMK4iWSJej0yM6A,6696
-catocli/parsers/customParserApiClient.py,sha256=Xpiv9wh3bkZgz6bzmcGJZ099LE4TXdIefBnZEsyMEgk,69387
+catocli/parsers/customParserApiClient.py,sha256=21McO4QYY7_jLgqLEug1fnVf-P9XdFNBIVsZEVyxep8,69699
 catocli/parsers/configure/__init__.py,sha256=Kq4OYGq_MXOQBHm8vxNkzJqCXp7zremYBfQ4Ai3_Lb4,3286
 catocli/parsers/configure/configure.py,sha256=GyaOeuf0ZK3-wsZaczmO1OsKVJiPK04h6iI1u-EaKQc,12217
 catocli/parsers/custom/README.md,sha256=UvCWAtF3Yh0UsvADb0ve1qJupgYHeyGu6V3Z0O5HEvo,8180
@@ -15,7 +15,7 @@ catocli/parsers/custom/customLib.py,sha256=Nv-agL_ewpe1x6GbwWCRb_Ey-NVW_w9L6qWwE
 catocli/parsers/custom/export_rules/__init__.py,sha256=vst8auriTCLwy5AT2_ySM2puq3PIg920ZWa5yy03K_8,1813
 catocli/parsers/custom/export_rules/export_rules.py,sha256=gXig4NC29yC5nW48ri-j0FEnaTz_kxKiuLF5y-5fZ_4,15646
 catocli/parsers/custom/export_sites/__init__.py,sha256=z8K5IIq2N-muOTuDfEEE4pUiOaITEvhfKCLzB9e5Rok,2140
-catocli/parsers/custom/export_sites/export_sites.py,sha256=OR2rJ7a75ks1FX1ZcKLf9NACZOujIoEV1zUlaXiJh8U,66583
+catocli/parsers/custom/export_sites/export_sites.py,sha256=61rqH_QBNvYEvX-x7QkMxvD33d7BG96pXpRP-7FrzEQ,66771
 catocli/parsers/custom/import_rules_to_tf/__init__.py,sha256=jFCFceFv8zDW7nGLZOXkFE6NXAMPYRwKQwTbhSawYdM,3908
 catocli/parsers/custom/import_rules_to_tf/import_rules_to_tf.py,sha256=WlyTDxUtWchu9CDs73ILHDfNXCAh7jFARBEKk5WWhwM,18714
 catocli/parsers/custom/import_sites_to_tf/__init__.py,sha256=1ayoaaKIxWf5JBN62CO9F7-yaP9MqizTBCedqCyEc4k,4339
@@ -366,7 +366,7 @@ catocli/parsers/query_xdr_stories/README.md,sha256=eQJ81YiergQEhABkxi1yyzE_UXtS0
 catocli/parsers/query_xdr_story/README.md,sha256=_JYyMJ8GYOZ1dv61QqLyhVoEubXAm2p3QqFKdfohQOE,813
 catocli/parsers/raw/README.md,sha256=qvDLcg7U12yqacIQStOPtkqTsTLltJ06SSVmbqvlZhY,739
 catocli/parsers/raw/__init__.py,sha256=fiSzQzNSG3vje-eEXuOcdhuL8pyavkufocOJumjdFXs,1356
-catocli-2.1.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+catocli-2.1.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 graphql_client/__init__.py,sha256=2nxD4YsWoOnALXi5cXbmtIN_i0NL_eyDTQRTxs52mkI,315
 graphql_client/api_client.py,sha256=2Rc1Zo1xH9Jnk1AO68kLSofTShkZwSVF-WkVtczfIc4,5786
 graphql_client/api_client_types.py,sha256=dM3zl6FA5SSp6nR6KmLfTL1BKaXX9uPMCZAm4v_FiUs,11569
@@ -640,7 +640,7 @@ models/query.socketPortMetricsTimeSeries.json,sha256=PHT_x1YaP8NQpaHXA4VWsZ4kC7W
 models/query.subDomains.json,sha256=BkReQmylHZMv1iIakX984na9EKd_m0sPC0a-COsCxRI,7036
 models/query.xdr.stories.json,sha256=a3rQ9j8Ru-iidGztB1yFnYSTTlJpPcDkhoI3phMdByk,714509
 models/query.xdr.story.json,sha256=A3M-_cBIfup6vxG5nvAEH0EGRdEwkg_-G2lQR6eveB8,152375
-schema/catolib.py,sha256=7Yw_hiOIi5zAm-2vfsp32hNHp-Ut1nHn4_VJ64qDsHE,74779
+schema/catolib.py,sha256=D2uCN6tTBbtHuIxdQBJQR5NodxiIgnhemrTpkaU4hlo,74803
 schema/importSchema.py,sha256=LvXjylxsOWDcdceDE8nazOG1xcstxLGwyoVWSzW2Eg4,2508
 scripts/catolib.py,sha256=6QaGZaHj1waZuta8gUFsfXmyoDiLabpU9gwnyq7pSXg,2145
 scripts/export_if_rules_to_json.py,sha256=sTYzUbAtiFTy9vKpnyO8Sljshvg0qKd2gadanpeRVAM,10076
@@ -688,8 +688,8 @@ 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-2.1.6.dist-info/METADATA,sha256=aSGkRqhkRgpLCvfxMZJoFECo8I3e9LtATzUfAPC0lEw,1286
-catocli-2.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-catocli-2.1.6.dist-info/entry_points.txt,sha256=p4k9Orre6aWcqVrNmBbckmCs39h-1naMxRo2AjWmWZ4,50
-catocli-2.1.6.dist-info/top_level.txt,sha256=F4qSgcjcW5wR9EFrO8Ud06F7ZQGFr04a9qALNQDyVxU,52
-catocli-2.1.6.dist-info/RECORD,,
+catocli-2.1.8.dist-info/METADATA,sha256=QFHIdGnW6t8YqVLR6iPbXEtG8MyLYXlIPuEN1lvwDJw,1286
+catocli-2.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+catocli-2.1.8.dist-info/entry_points.txt,sha256=p4k9Orre6aWcqVrNmBbckmCs39h-1naMxRo2AjWmWZ4,50
+catocli-2.1.8.dist-info/top_level.txt,sha256=F4qSgcjcW5wR9EFrO8Ud06F7ZQGFr04a9qALNQDyVxU,52
+catocli-2.1.8.dist-info/RECORD,,

schema/catolib.py

@@ -94,7 +94,7 @@ def parseSchema(schema):
     print("  - Loading settings and initializing...")
     
     # Load settings to get childOperationParent and childOperationObjects configuration
-    settings = loadJSON("../clisettings.json")
+    settings = loadJSON("../catocli/clisettings.json")
     childOperationParent = settings.get("childOperationParent", {})
     childOperationObjects = settings.get("childOperationObjects", {})
     
@@ -968,7 +968,7 @@ def writeOperationParsers(catoApiSchema):
     parserMapping = {"query":{},"mutation":{}}
     
     # Load settings to get CSV-supported operations
-    settings = loadJSON("../clisettings.json")
+    settings = loadJSON("../catocli/clisettings.json")
     csv_supported_operations = settings.get("queryOperationCsvOutput", {})
     
     ## Write the raw query parser ##
@@ -1363,7 +1363,7 @@ def renderSubParser(subParser, parentParserPath):
     if not isinstance(subParser, dict):
         return ""
         
-    settings = loadJSON("../clisettings.json")
+    settings = loadJSON("../catocli/clisettings.json")
     csv_supported_operations = settings.get("queryOperationCsvOutput", {})
 
     cliDriverStr = f"""