catocli 3.0.1__tar.gz → 3.0.3__tar.gz

{catocli-3.0.1 → catocli-3.0.3}/MANIFEST.in

@@ -3,5 +3,6 @@ include catocli/parsers/*/README.md
 include models/*.json
 include vendor/*
 include catocli/clisettings.json
+include catocli/templates/*
 prune venv/
 prune test/

{catocli-3.0.1/catocli.egg-info → catocli-3.0.3}/PKG-INFO

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

catocli-3.0.3/catocli/__init__.py

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

{catocli-3.0.1 → catocli-3.0.3}/catocli/parsers/custom/export_sites/export_sites.py

@@ -49,7 +49,31 @@ def generate_template(args):
     try:
         # Get the directory of this script to locate templates
         script_dir = os.path.dirname(os.path.abspath(__file__))
-        templates_dir = os.path.join(script_dir, '..', '..', '..', '..', 'templates')
+        
+        # Try multiple possible template directory locations
+        # 1. Development mode: go up 4 directories
+        # 2. Installed package: templates should be in the package root
+        possible_template_dirs = [
+            os.path.join(script_dir, '..', '..', '..', '..', 'templates'),  # Development
+            os.path.join(os.path.dirname(script_dir.split('catocli')[0]), 'catocli', 'templates'),  # Installed package
+        ]
+        
+        templates_dir = None
+        for potential_dir in possible_template_dirs:
+            normalized_dir = os.path.normpath(potential_dir)
+            if os.path.exists(normalized_dir):
+                templates_dir = normalized_dir
+                break
+        
+        if templates_dir is None:
+            # Fallback: look for templates directory in catocli package
+            import catocli
+            catocli_root = os.path.dirname(os.path.abspath(catocli.__file__))
+            fallback_templates_dir = os.path.join(catocli_root, 'templates')
+            if os.path.exists(fallback_templates_dir):
+                templates_dir = fallback_templates_dir
+            else:
+                raise Exception(f"Templates directory not found. Searched locations: {possible_template_dirs} and {fallback_templates_dir}")
         
         # Get the template format from export_format argument (defaults to json)
         template_format = getattr(args, 'export_format', 'json')

catocli-3.0.3/catocli/templates/Test_network_ranges.csv

@@ -0,0 +1,20 @@
+lan_interface_id,lan_interface_name,lan_interface_dest_type,lag_min_links,is_native_range,lan_interface_index,network_range_id,network_range_name,subnet,vlan,mdns_reflector,gateway,range_type,translated_subnet,internet_only,local_ip,dhcp_type,dhcp_ip_range,dhcp_relay_group_id,dhcp_relay_group_name,dhcp_microsegmentation
+,,,,,INT_5,UzU5MjQ4Mw==,Example Routed 202,10.20.2.0/24,,,10.20.1.2,Routed,172.20.1.0/24,,,ACCOUNT_DEFAULT,,,,FALSE
+,,,,,INT_5,UzU5MjQ3Ng==,Example Routed 203,10.20.3.0/24,,,10.20.1.3,Routed,,TRUE,,ACCOUNT_DEFAULT,,,,FALSE
+,,,,,INT_5,UzU5MjQ4Mg==,Example Direct 204,10.20.4.0/24,,TRUE,,Direct,172.20.3.0/24,,10.20.4.1,DHCP_RANGE,10.20.4.100-10.20.4.200,,,FALSE
+,,,,,INT_5,UzU5MjQ4MA==,Example VLAN 205,10.20.5.0/24,205,,,VLAN,,,10.20.5.1,DHCP_DISABLED,,,,FALSE
+,,,,,INT_5,UzU5MjQ4MQ==,Example VLAN 206,10.20.6.0/24,206,,,VLAN,172.20.5.0/24,,10.20.6.1,ACCOUNT_DEFAULT,,,,FALSE
+,,,,,INT_5,UzU5MjQ3OQ==,Example VLAN 207,10.20.7.0/24,207,,,VLAN,172.20.6.0/24,,10.20.7.1,DHCP_RELAY,,,dhcp_relay1,FALSE
+,,,,,INT_5,UzU5MjQ3OA==,Example VLAN 208,10.20.8.0/24,208,,,VLAN,,,10.20.8.1,DHCP_RELAY,,3625,,FALSE
+,,,,,INT_5,UzU5MjQ3Nw==,Example VLAN 209,10.20.9.0/24,209,,,VLAN,172.20.8.0/24,,10.20.9.1,DHCP_RANGE,10.20.9.100-10.20.9.200,,,TRUE
+,Example LAG Member 6,LAN_LAG_MEMBER,,,INT_6,,,,,,,,,,,,,,,FALSE
+,Example LAG Member 7,LAN_LAG_MEMBER,,,INT_7,,,,,,,,,,,,,,,FALSE
+188112,Example LAN 8,LAN,,TRUE,INT_8,TjIzNjY4MjQ=,Native Range 8,10.30.1.0/24,301,FALSE,,VLAN,,,10.30.1.1,DHCP_DISABLED,,,,FALSE
+,,,,,INT_8,UzU5MjQ3Mg==,Example Routed 302,10.30.2.0/24,,,10.30.1.2,Routed,172.30.2.0/24,,,ACCOUNT_DEFAULT,,,,FALSE
+,,,,,INT_8,UzU5MjQ2OA==,Example Routed 303,10.30.3.0/24,,,10.30.1.3,Routed,,TRUE,,ACCOUNT_DEFAULT,,,,FALSE
+,,,,,INT_8,UzU5MjQ3Mw==,Example Direct 304,10.30.4.0/24,,TRUE,,Direct,172.30.4.0/24,,10.30.4.1,DHCP_RANGE,10.30.4.100-10.30.4.200,,,FALSE
+,,,,,INT_8,UzU5MjQ3NQ==,Example VLAN 305,10.30.5.0/24,305,,,VLAN,,,10.30.5.1,DHCP_DISABLED,,,,FALSE
+,,,,,INT_8,UzU5MjQ3MQ==,Example VLAN 306,10.30.6.0/24,306,,,VLAN,172.30.6.0/24,,10.30.6.1,ACCOUNT_DEFAULT,,,,FALSE
+,,,,,INT_8,UzU5MjQ3NA==,Example VLAN 307,10.30.7.0/24,307,,,VLAN,172.30.7.0/24,,10.30.7.1,DHCP_RELAY,,,dhcp_relay1,FALSE
+,,,,,INT_8,UzU5MjQ2OQ==,Example VLAN 308,10.30.8.0/24,308,,,VLAN,,,10.30.8.1,DHCP_RELAY,,3625,,FALSE
+,,,,,INT_8,UzU5MjQ3MA==,Example VLAN 309,10.30.9.0/24,309,,,VLAN,172.30.9.0/24,,10.30.9.1,DHCP_RANGE,10.30.9.100-10.30.9.200,,,TRUE

catocli-3.0.3/catocli/templates/socket_sites.csv

@@ -0,0 +1,4 @@
+site_id,site_name,wan_interface_id,wan_interface_index,wan_interface_name,wan_upstream_bw,wan_downstream_bw,wan_role,wan_precedence,site_description,native_range_subnet,native_range_name,native_range_id,native_range_vlan,native_range_mdns_reflector,native_range_gateway,native_range_type,native_range_translated_subnet,native_range_interface_id,native_range_interface_index,native_range_interface_name,native_range_interface_dest_type,native_range_interface_lag_min_links,native_range_dhcp_type,native_range_dhcp_ip_range,native_range_dhcp_relay_group_id,native_range_dhcp_relay_group_name,native_range_dhcp_microsegmentation,native_range_local_ip,site_type,connection_type,site_location_address,site_location_city,site_location_country_code,site_location_state_code,site_location_timezone
+152415,Test,155685:INT_1,INT_1,WAN 1,25,25,wan_1,ACTIVE,,10.20.1.0/24,Native Range,TjIzNDc3MDA=,,FALSE,,Direct,,184593,INT_5,My LAN LAG MASTER,LAN_LAG_MASTER,2,DHCP_DISABLED,,,,FALSE,10.20.1.1,BRANCH,SOCKET_X1600,No address provided,Wyoming,US,US-MN,America/Chicago
+,Test,155685:INT_2,INT_2,WAN 2,25,25,wan_2,ACTIVE,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,Test,155685:INT_3,INT_3,WAN 3,25,25,wan_3,ACTIVE,,,,,,,,,,,,,,,,,,,,,,,,,,,

catocli-3.0.3/catocli/templates/socket_sites.json

@@ -0,0 +1,429 @@
+{
+    "sites": [
+        {
+            "wan_interfaces": [
+                {
+                    "id": "155685:INT_2",
+                    "index": "INT_2",
+                    "name": "WAN 2",
+                    "upstream_bandwidth": 25,
+                    "downstream_bandwidth": 25,
+                    "dest_type": "CATO",
+                    "role": "wan_2",
+                    "precedence": "ACTIVE"
+                },
+                {
+                    "id": "155685:INT_1",
+                    "index": "INT_1",
+                    "name": "WAN 1",
+                    "upstream_bandwidth": 25,
+                    "downstream_bandwidth": 25,
+                    "dest_type": "CATO",
+                    "role": "wan_1",
+                    "precedence": "ACTIVE"
+                },
+                {
+                    "id": "155685:INT_3",
+                    "index": "INT_3",
+                    "name": "WAN 3",
+                    "upstream_bandwidth": 25,
+                    "downstream_bandwidth": 25,
+                    "dest_type": "CATO",
+                    "role": "wan_3",
+                    "precedence": "ACTIVE"
+                }
+            ],
+            "lan_interfaces": [
+                {
+                    "network_ranges": [],
+                    "id": null,
+                    "name": "Example LAG Member 7",
+                    "index": "INT_7",
+                    "dest_type": "LAN_LAG_MEMBER"
+                },
+                {
+                    "network_ranges": [],
+                    "id": null,
+                    "name": "Example LAG Member 6",
+                    "index": "INT_6",
+                    "dest_type": "LAN_LAG_MEMBER"
+                },
+                {
+                    "network_ranges": [
+                        {
+                            "id": "UzU5MjQ3Mg==",
+                            "name": "Example Direct 304",
+                            "subnet": "10.30.4.0/24",
+                            "vlan": null,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "Direct",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.30.4.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "DHCP_RANGE",
+                                "ip_range": "10.30.4.100-10.30.4.200",
+                                "relay_group_id": null,
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ2OA==",
+                            "name": "Example Routed 302",
+                            "subnet": "10.30.2.0/24",
+                            "vlan": null,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "Direct",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.30.2.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "ACCOUNT_DEFAULT",
+                                "ip_range": null,
+                                "relay_group_id": null,
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ3Mw==",
+                            "name": "Example Routed 303",
+                            "subnet": "10.30.3.0/24",
+                            "vlan": null,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "Direct",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.30.3.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "ACCOUNT_DEFAULT",
+                                "ip_range": null,
+                                "relay_group_id": null,
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ3NQ==",
+                            "name": "Example VLAN 305",
+                            "subnet": "10.30.5.0/24",
+                            "vlan": 305,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "VLAN",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.30.5.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "DHCP_DISABLED",
+                                "ip_range": null,
+                                "relay_group_id": null,
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ3MQ==",
+                            "name": "Example VLAN 306",
+                            "subnet": "10.30.6.0/24",
+                            "vlan": 306,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "VLAN",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.30.6.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "ACCOUNT_DEFAULT",
+                                "ip_range": null,
+                                "relay_group_id": null,
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ3NA==",
+                            "name": "Example VLAN 307",
+                            "subnet": "10.30.7.0/24",
+                            "vlan": 307,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "VLAN",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.30.7.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "DHCP_RELAY",
+                                "ip_range": null,
+                                "relay_group_id": null,
+                                "relay_group_name": "dhcp_relay1",
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ2OQ==",
+                            "name": "Example VLAN 308",
+                            "subnet": "10.30.8.0/24",
+                            "vlan": 308,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "VLAN",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.30.8.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "DHCP_RELAY",
+                                "ip_range": null,
+                                "relay_group_id": "3625",
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ3MA==",
+                            "name": "Example VLAN 309",
+                            "subnet": "10.30.9.0/24",
+                            "vlan": 309,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "VLAN",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.30.9.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "DHCP_RANGE",
+                                "ip_range": "10.30.9.100-10.30.9.200",
+                                "relay_group_id": null,
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": true
+                            }
+                        },
+                        {
+                            "id": "TjIzNjY4MjQ=",
+                            "name": "Native Range",
+                            "subnet": "10.30.1.0/24",
+                            "vlan": null,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "Direct",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.30.1.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "DHCP_DISABLED",
+                                "ip_range": null,
+                                "relay_group_id": null,
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": false
+                            },
+                            "native_range": true
+                        }
+                    ],
+                    "id": "188112",
+                    "name": "Example LAN 8",
+                    "index": "INT_8",
+                    "dest_type": "LAN"
+                },
+                {
+                    "network_ranges": [
+                        {
+                            "id": "UzU5MjQ4Mw==",
+                            "name": "Example Direct 204",
+                            "subnet": "10.20.4.0/24",
+                            "vlan": null,
+                            "mdns_reflector": true,
+                            "gateway": null,
+                            "range_type": "Direct",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.20.4.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "DHCP_RANGE",
+                                "ip_range": "10.20.4.100-10.20.4.200",
+                                "relay_group_id": null,
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ3Ng==",
+                            "name": "Example Routed 202",
+                            "subnet": "10.20.2.0/24",
+                            "vlan": null,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "Direct",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.20.2.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "ACCOUNT_DEFAULT",
+                                "ip_range": null,
+                                "relay_group_id": null,
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ4Mg==",
+                            "name": "Example Routed 203",
+                            "subnet": "10.20.3.0/24",
+                            "vlan": null,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "Direct",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.20.3.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "ACCOUNT_DEFAULT",
+                                "ip_range": null,
+                                "relay_group_id": null,
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ4MA==",
+                            "name": "Example VLAN 205",
+                            "subnet": "10.20.5.0/24",
+                            "vlan": 205,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "VLAN",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.20.5.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "DHCP_DISABLED",
+                                "ip_range": null,
+                                "relay_group_id": null,
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ4MQ==",
+                            "name": "Example VLAN 206",
+                            "subnet": "10.20.6.0/24",
+                            "vlan": 206,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "VLAN",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.20.6.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "ACCOUNT_DEFAULT",
+                                "ip_range": null,
+                                "relay_group_id": null,
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ3OQ==",
+                            "name": "Example VLAN 207",
+                            "subnet": "10.20.7.0/24",
+                            "vlan": 207,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "VLAN",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.20.7.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "DHCP_RELAY",
+                                "ip_range": null,
+                                "relay_group_id": null,
+                                "relay_group_name": "dhcp_relay1",
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ3OA==",
+                            "name": "Example VLAN 208",
+                            "subnet": "10.20.8.0/24",
+                            "vlan": 208,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "VLAN",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.20.8.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "DHCP_RELAY",
+                                "ip_range": null,
+                                "relay_group_id": "3625",
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": false
+                            }
+                        },
+                        {
+                            "id": "UzU5MjQ3Nw==",
+                            "name": "Example VLAN 209",
+                            "subnet": "10.20.9.0/24",
+                            "vlan": 209,
+                            "mdns_reflector": false,
+                            "gateway": null,
+                            "range_type": "VLAN",
+                            "translated_subnet": null,
+                            "internet_only": null,
+                            "local_ip": "10.20.9.1",
+                            "dhcp_settings": {
+                                "dhcp_type": "DHCP_RANGE",
+                                "ip_range": "10.20.9.100-10.20.9.200",
+                                "relay_group_id": null,
+                                "relay_group_name": null,
+                                "dhcp_microsegmentation": true
+                            }
+                        }
+                    ],
+                    "default_lan": true
+                }
+            ],
+            "native_range": {
+                "interface_id": "188111",
+                "interface_name": "My LAN LAG MASTER",
+                "subnet": "10.20.1.0/24",
+                "index": "INT_5",
+                "dest_type": "LAN_LAG_MASTER",
+                "lag_min_links": "2",
+                "range_name": "Native Range",
+                "range_id": "TjIzNjY4MjA=",
+                "vlan": null,
+                "mdns_reflector": false,
+                "gateway": null,
+                "range_type": "Direct",
+                "translated_subnet": null,
+                "internet_only": null,
+                "local_ip": "10.20.1.1",
+                "dhcp_settings": {
+                    "dhcp_type": "DHCP_DISABLED",
+                    "ip_range": null,
+                    "relay_group_id": null,
+                    "relay_group_name": null,
+                    "dhcp_microsegmentation": false
+                }
+            },
+            "id": "155685",
+            "name": "Test",
+            "description": "",
+            "connection_type": "SOCKET_X1600",
+            "type": "BRANCH",
+            "site_location": {
+                "stateName": "Minnesota",
+                "countryCode": "US",
+                "countryName": "United States",
+                "address": "No address provided",
+                "city": "Wyoming",
+                "stateCode": "US-MN",
+                "timezone": "America/Chicago"
+            }
+        }
+    ]
+}

{catocli-3.0.1 → catocli-3.0.3/catocli.egg-info}/PKG-INFO

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

{catocli-3.0.1 → catocli-3.0.3}/catocli.egg-info/SOURCES.txt

@@ -405,6 +405,9 @@ catocli/parsers/query_xdr_stories/README.md
 catocli/parsers/query_xdr_story/README.md
 catocli/parsers/raw/README.md
 catocli/parsers/raw/__init__.py
+catocli/templates/Test_network_ranges.csv
+catocli/templates/socket_sites.csv
+catocli/templates/socket_sites.json
 graphql_client/__init__.py
 graphql_client/api_client.py
 graphql_client/api_client_types.py

{catocli-3.0.1 → catocli-3.0.3}/catocli.egg-info/top_level.txt

@@ -5,5 +5,4 @@ models
 queryPayloads
 schema
 scripts
-templates
 vendor

catocli-3.0.1/catocli/__init__.py

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