catocli 3.0.0__py3-none-any.whl → 3.0.2__py3-none-any.whl

catocli/__init__.py

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

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/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,102 @@ 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__))
+        
+        # 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')
+        
+        # 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/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.dist-info → catocli-3.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: catocli
-Version: 3.0.0
+Version: 3.0.2
 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.dist-info → catocli-3.0.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-catocli/__init__.py,sha256=tEYo5ddj_Kr89T42Ax8XEnHSmLaIjMxDrMGGsdRZQ8Y,84
+catocli/__init__.py,sha256=2XLOXyrteS38EdDU8Rdapr0HJdmnvOI8FsQ3oo0nJAo,84
 catocli/__main__.py,sha256=6Z0ns_k_kUcz1Qtrn1u7UyUnqB-3e85jM_nppOwFsv4,217
 catocli/clisettings.json,sha256=s0NENqEgRtSzX8eJGASfOygI6cueF6mcPWSxj_oWMV4,964
 catocli/Utils/clidriver.py,sha256=lzVs1nYAiStwQjNxioxktwaKmfOF69Mmp5-9aWwsNOY,15972
@@ -15,12 +15,12 @@ catocli/parsers/custom/customLib.py,sha256=Nv-agL_ewpe1x6GbwWCRb_Ey-NVW_w9L6qWwE
 catocli/parsers/custom/eventsFeedEnhanced.py,sha256=t5vPVWBSl57CO6a3UVRyx4292YaXYVK0MEWH6qH8k_c,10736
 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=QumTMCrytgakNis6T38VzMcu-URKeOS7_IHnNhSQ9fc,77984
+catocli/parsers/custom/export_sites/__init__.py,sha256=WAiaVzSGG8tsfWjl-FcUY2JyhfjE1sA265rtIsbmeVI,2427
+catocli/parsers/custom/export_sites/export_sites.py,sha256=CTGe-xXvs6cLThiyuQUyFKz2bLUkwscM2eMytKFg-Bo,82160
 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
-catocli/parsers/custom/import_sites_to_tf/import_sites_to_tf.py,sha256=3d1PAWviAZet-mNBzUy04XhMbTI8jRDHNQL-cqiUSqU,77059
+catocli/parsers/custom/import_sites_to_tf/import_sites_to_tf.py,sha256=scZ8Pecu6b279jG-72eF4eCw-BWNSHFK7cl9JvBGT0E,78130
 catocli/parsers/custom/query_eventsFeed/__init__.py,sha256=awOFdkByn0ycDjZFYhySd9Z5zJ-vNq2-orX16B6NlYM,4405
 catocli/parsers/custom/scim/__init__.py,sha256=filQvWGXeJ-EppAzEHKJjXY12QPiT69weT6mav9TPXo,10410
 catocli/parsers/custom/scim/scim_client.py,sha256=dkObWVtWh331hoeU4Npx4xRzqAYM51MKxNx01WvVW5o,19560
@@ -395,7 +395,7 @@ catocli/parsers/query_xdr_stories/README.md,sha256=rRW1pTmVMr9-j21-_MWNlozTTQnhi
 catocli/parsers/query_xdr_story/README.md,sha256=Fl2HutndHVobrj73Wh5NlTLq56tvVN3W0iib6BuO-b0,925
 catocli/parsers/raw/README.md,sha256=qvDLcg7U12yqacIQStOPtkqTsTLltJ06SSVmbqvlZhY,739
 catocli/parsers/raw/__init__.py,sha256=fiSzQzNSG3vje-eEXuOcdhuL8pyavkufocOJumjdFXs,1356
-catocli-3.0.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+catocli-3.0.2.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
@@ -743,8 +743,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-3.0.0.dist-info/METADATA,sha256=4KHv5578jBbbXhRK0lMUHJ6UoXq_TRWJTnjyJ9IjXA0,1286
-catocli-3.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-catocli-3.0.0.dist-info/entry_points.txt,sha256=p4k9Orre6aWcqVrNmBbckmCs39h-1naMxRo2AjWmWZ4,50
-catocli-3.0.0.dist-info/top_level.txt,sha256=F4qSgcjcW5wR9EFrO8Ud06F7ZQGFr04a9qALNQDyVxU,52
-catocli-3.0.0.dist-info/RECORD,,
+catocli-3.0.2.dist-info/METADATA,sha256=WBNjBRO067-ugVqLqOws5-bhDiPithFoLabdDzKqwug,1286
+catocli-3.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+catocli-3.0.2.dist-info/entry_points.txt,sha256=p4k9Orre6aWcqVrNmBbckmCs39h-1naMxRo2AjWmWZ4,50
+catocli-3.0.2.dist-info/top_level.txt,sha256=F4qSgcjcW5wR9EFrO8Ud06F7ZQGFr04a9qALNQDyVxU,52
+catocli-3.0.2.dist-info/RECORD,,