catocli 3.0.0__tar.gz → 3.0.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: catocli
-Version: 3.0.0
+Version: 3.0.1
 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/__init__.py

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

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

@@ -18,6 +18,10 @@ def export_sites_parse(subparsers):
     socket_sites_parser.add_argument('-f', '--format', dest='export_format', choices=['json', 'csv'], default='json', 
                                     help='Export format: json (default) or csv')
     
+    # Template generation option
+    socket_sites_parser.add_argument('--generate-template', '-gt', dest='generate_template', action='store_true', 
+                                    help='Generate template files instead of exporting data (use -f to specify format: csv or json)')
+    
     # Filename arguments (updated for both formats)
     socket_sites_parser.add_argument('--json-filename', dest='json_filename', help='Override JSON file name (default: socket_sites_{account_id}.json)')
     socket_sites_parser.add_argument('--csv-filename', dest='csv_filename', help='Override CSV file name (default: socket_sites_{account_id}.csv)')

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

@@ -4,6 +4,7 @@ import traceback
 import sys
 import ipaddress
 import csv
+import shutil
 from datetime import datetime
 from graphql_client.api.call_api import ApiClient, CallApi
 from graphql_client.api_client import ApiException
@@ -41,10 +42,78 @@ def calculateLocalIp(subnet):
         # Invalid subnet format
         return None
 
+def generate_template(args):
+    """
+    Generate template files from embedded templates directory
+    """
+    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')
+        
+        # Get the template format from export_format argument (defaults to json)
+        template_format = getattr(args, 'export_format', 'json')
+        
+        # Determine output directory
+        output_dir = getattr(args, 'output_directory', None)
+        if output_dir is None:
+            output_dir = '.'
+        if not os.path.isabs(output_dir):
+            output_dir = os.path.join(os.getcwd(), output_dir)
+        
+        os.makedirs(output_dir, exist_ok=True)
+        
+        copied_files = []
+        
+        if template_format == 'csv':
+            # Copy CSV template files
+            template_files = ['socket_sites.csv', 'Test_network_ranges.csv']
+            for template_file in template_files:
+                src_path = os.path.join(templates_dir, template_file)
+                dst_path = os.path.join(output_dir, template_file)
+                
+                if os.path.exists(src_path):
+                    shutil.copy2(src_path, dst_path)
+                    copied_files.append(dst_path)
+                    if hasattr(args, 'verbose') and args.verbose:
+                        print(f"Copied template: {src_path} -> {dst_path}")
+                else:
+                    print(f"Warning: Template file not found: {src_path}")
+        
+        elif template_format == 'json':
+            # Copy JSON template file
+            template_file = 'socket_sites.json'
+            src_path = os.path.join(templates_dir, template_file)
+            dst_path = os.path.join(output_dir, template_file)
+            
+            if os.path.exists(src_path):
+                shutil.copy2(src_path, dst_path)
+                copied_files.append(dst_path)
+                if hasattr(args, 'verbose') and args.verbose:
+                    print(f"Copied template: {src_path} -> {dst_path}")
+            else:
+                print(f"Warning: Template file not found: {src_path}")
+        
+        if copied_files:
+            print(f"Successfully generated {template_format.upper()} template files:")
+            for file_path in copied_files:
+                print(f"  {file_path}")
+            return [{"success": True, "template_format": template_format, "copied_files": copied_files}]
+        else:
+            return [{"success": False, "error": f"No template files found for format: {template_format}"}]
+    
+    except Exception as e:
+        print(f"Error generating template: {str(e)}")
+        return [{"success": False, "error": str(e)}]
+
 def export_socket_sites_dispatcher(args, configuration):
     """
     Dispatcher function that routes to JSON or CSV export based on format argument
     """
+    # Check if template generation is requested
+    if hasattr(args, 'generate_template') and args.generate_template:
+        return generate_template(args)
+    
     export_format = getattr(args, 'export_format', 'json')
     
     if export_format == 'csv':

{catocli-3.0.0 → catocli-3.0.1}/catocli/parsers/custom/import_sites_to_tf/import_sites_to_tf.py

@@ -1098,9 +1098,13 @@ def load_site_network_ranges_csv(site, ranges_csv_file):
                     if default_interface_index and lan_interface_index == default_interface_index:
                         is_default_interface = True
                 
+                # Check if this is a LAN_LAG_MEMBER interface (special case)
+                is_lan_lag_member = row.get('lan_interface_dest_type', '').strip() == 'LAN_LAG_MEMBER'
+                
                 # If this row has a LAN interface ID, create/update the interface
                 # OR if this is a default interface, get details from parent CSV
-                if (has_lan_interface_id or is_default_interface) and lan_interface_index:
+                # OR if this is a LAN_LAG_MEMBER interface
+                if (has_lan_interface_id or is_default_interface or is_lan_lag_member) and lan_interface_index:
                     
                     # Create or get the interface data
                     if lan_interface_index not in interfaces:
@@ -1115,6 +1119,17 @@ def load_site_network_ranges_csv(site, ranges_csv_file):
                                 'default_lan': True,  # Mark as default interface
                                 'network_ranges': []
                             }
+                        elif is_lan_lag_member:
+                            # For LAN_LAG_MEMBER interfaces, they don't have interface_id but need to be tracked for import
+                            interfaces[lan_interface_index] = {
+                                'id': None,  # LAN LAG members don't have interface_id in CSV
+                                'name': row.get('lan_interface_name', ''),
+                                'index': lan_interface_index,
+                                'dest_type': row.get('lan_interface_dest_type', 'LAN_LAG_MEMBER'),
+                                'default_lan': False,
+                                'network_ranges': [],
+                                'is_lag_member': True  # Special flag for LAN LAG members
+                            }
                         else:
                             # For regular interfaces, get details from CSV row
                             interfaces[lan_interface_index] = {

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

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

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

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

catocli-3.0.0/catocli/__init__.py

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