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

catocli/Utils/clidriver.py

@@ -47,21 +47,22 @@ from ..parsers.query_hardware import query_hardware_parse
 from ..parsers.query_enterpriseDirectory import query_enterpriseDirectory_parse
 from ..parsers.query_devices import query_devices_parse
 from ..parsers.query_catalogs import query_catalogs_parse
-from ..parsers.query_site import query_site_parse
 from ..parsers.query_xdr import query_xdr_parse
+from ..parsers.query_site import query_site_parse
 from ..parsers.query_groups import query_groups_parse
 from ..parsers.query_policy import query_policy_parse
 from ..parsers.mutation_xdr import mutation_xdr_parse
-from ..parsers.mutation_sites import mutation_sites_parse
 from ..parsers.mutation_site import mutation_site_parse
+from ..parsers.mutation_sites import mutation_sites_parse
+from ..parsers.mutation_policy import mutation_policy_parse
 from ..parsers.mutation_container import mutation_container_parse
 from ..parsers.mutation_admin import mutation_admin_parse
 from ..parsers.mutation_accountManagement import mutation_accountManagement_parse
 from ..parsers.mutation_sandbox import mutation_sandbox_parse
-from ..parsers.mutation_hardware import mutation_hardware_parse
+from ..parsers.mutation_licensing import mutation_licensing_parse
 from ..parsers.mutation_groups import mutation_groups_parse
-from ..parsers.mutation_policy import mutation_policy_parse
 from ..parsers.mutation_enterpriseDirectory import mutation_enterpriseDirectory_parse
+from ..parsers.mutation_hardware import mutation_hardware_parse
 
 def show_version_info(args, configuration=None):
     print(f"catocli version {catocli.__version__}")
@@ -181,21 +182,22 @@ query_hardware_parser = query_hardware_parse(query_subparsers)
 query_enterpriseDirectory_parser = query_enterpriseDirectory_parse(query_subparsers)
 query_devices_parser = query_devices_parse(query_subparsers)
 query_catalogs_parser = query_catalogs_parse(query_subparsers)
-query_site_parser = query_site_parse(query_subparsers)
 query_xdr_parser = query_xdr_parse(query_subparsers)
+query_site_parser = query_site_parse(query_subparsers)
 query_groups_parser = query_groups_parse(query_subparsers)
 query_policy_parser = query_policy_parse(query_subparsers)
 mutation_xdr_parser = mutation_xdr_parse(mutation_subparsers)
-mutation_sites_parser = mutation_sites_parse(mutation_subparsers)
 mutation_site_parser = mutation_site_parse(mutation_subparsers)
+mutation_sites_parser = mutation_sites_parse(mutation_subparsers)
+mutation_policy_parser = mutation_policy_parse(mutation_subparsers)
 mutation_container_parser = mutation_container_parse(mutation_subparsers)
 mutation_admin_parser = mutation_admin_parse(mutation_subparsers)
 mutation_accountManagement_parser = mutation_accountManagement_parse(mutation_subparsers)
 mutation_sandbox_parser = mutation_sandbox_parse(mutation_subparsers)
-mutation_hardware_parser = mutation_hardware_parse(mutation_subparsers)
+mutation_licensing_parser = mutation_licensing_parse(mutation_subparsers)
 mutation_groups_parser = mutation_groups_parse(mutation_subparsers)
-mutation_policy_parser = mutation_policy_parse(mutation_subparsers)
 mutation_enterpriseDirectory_parser = mutation_enterpriseDirectory_parse(mutation_subparsers)
+mutation_hardware_parser = mutation_hardware_parse(mutation_subparsers)
 
 
 def parse_headers(header_strings):

catocli/Utils/cliutils.py

@@ -39,15 +39,56 @@ def load_cli_settings():
     Load clisettings.json from multiple possible locations:
     1. Package resource (for installed packages)
     2. Repository location (for development)
+    3. Adjacent file location (for development)
+    4. Embedded defaults as final fallback
     
     Returns:
-        dict: The loaded settings or default settings if loading fails
+        dict: The loaded settings or embedded default settings if all loading fails
     """
+    # Embedded default settings as final fallback
+    default_settings = {
+        "export_by_socket_type": {
+            "SOCKET_X1500": True,
+            "SOCKET_X1600": True,
+            "SOCKET_X1600_LTE": True,
+            "SOCKET_X1700": True
+        },
+        "default_socket_interface_map": {
+            "SOCKET_X1500": "LAN1",
+            "SOCKET_X1600": "INT_5",
+            "SOCKET_X1600_LTE": "INT_5",
+            "SOCKET_X1700": "INT_3"
+        },
+        "childOperationParent": {
+            "xdr": True,
+            "policy": True,
+            "groups": True,
+            "newGroups": True,
+            "site": True
+        },
+        "childOperationObjects": {
+            "ipAddressRange": True,
+            "fqdn": True,
+            "PolicyQueries": True,
+            "GroupsQueries": True,
+            "ContainerQueries": True,
+            "SiteQueries": True
+        },
+        "queryOperationCsvOutput": {
+            "query.appStats": "format_app_stats_to_csv",
+            "query.appStatsTimeSeries": "format_app_stats_timeseries_to_csv",
+            "query.accountMetrics": "format_account_metrics_to_csv",
+            "query.socketPortMetricsTimeSeries": "format_socket_port_metrics_timeseries_to_csv"
+        }
+    }
+    
     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'))
+        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'))
     ]
     
     for i, load_func in enumerate(settings_locations):
@@ -59,8 +100,8 @@ def load_cli_settings():
             # Continue to next location
             continue
     
-    # If all locations fail, return default settings for socket export
-    return {}
+    # If all locations fail, return embedded default settings
+    return default_settings
 
 
 def get_cli_settings_path():

catocli/__init__.py

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

catocli/clisettings.json

@@ -0,0 +1,35 @@
+{
+    "export_by_socket_type": {
+        "SOCKET_X1500":true,
+        "SOCKET_X1600":true,
+        "SOCKET_X1600_LTE":true,
+        "SOCKET_X1700":true
+    },
+    "default_socket_interface_map": {
+        "SOCKET_X1500":"LAN1",
+        "SOCKET_X1600":"INT_5",
+        "SOCKET_X1600_LTE":"INT_5",
+        "SOCKET_X1700":"INT_3"
+    },
+    "childOperationParent": {
+        "xdr": true,
+        "policy": true,
+        "groups": true,
+        "newGroups": true,
+        "site": true
+    },
+    "childOperationObjects": {
+        "ipAddressRange": true,
+        "fqdn": true,
+        "PolicyQueries": true,
+        "GroupsQueries": true,
+        "ContainerQueries": true,
+        "SiteQueries": true
+    },
+    "queryOperationCsvOutput": {
+        "query.appStats": "format_app_stats_to_csv",
+        "query.appStatsTimeSeries": "format_app_stats_timeseries_to_csv",
+        "query.accountMetrics": "format_account_metrics_to_csv",
+        "query.socketPortMetricsTimeSeries": "format_socket_port_metrics_timeseries_to_csv"
+    }
+}

catocli/parsers/custom/export_sites/__init__.py

@@ -6,17 +6,28 @@ def export_sites_parse(subparsers):
     # Create the socket_sites parser (direct command, no subparsers)
     socket_sites_parser = subparsers.add_parser(
         'socket_sites', 
-        help='Export consolidated site and socket data to JSON format',
+        help='Export consolidated site and socket data to JSON or CSV format',
         usage='catocli export socket_sites [-accountID <account_id>] [options]'
     )
     
     socket_sites_parser.add_argument('-accountID', help='Account ID to export data from (uses CATO_ACCOUNT_ID environment variable if not specified)', required=False)
     socket_sites_parser.add_argument('--site-ids', '-siteIDs', dest='siteIDs', help='Comma-separated list of site IDs to filter and export (e.g., "1234,1235,1236"). If not specified, exports all sites.', required=False)
     socket_sites_parser.add_argument('-clip', '--calculate-local-ip', action='store_true', help='Calculate local IP addresses from subnet ranges (first usable IP)')
+    
+    # Format selection
+    socket_sites_parser.add_argument('-f', '--format', dest='export_format', choices=['json', 'csv'], default='json', 
+                                    help='Export format: json (default) or csv')
+    
+    # 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('--append-timestamp', dest='append_timestamp', action='store_true', help='Append timestamp to the JSON file name')
+    socket_sites_parser.add_argument('--csv-filename', dest='csv_filename', help='Override CSV file name (default: socket_sites_{account_id}.csv)')
+    socket_sites_parser.add_argument('--append-timestamp', dest='append_timestamp', action='store_true', help='Append timestamp to file names')
+    socket_sites_parser.add_argument('--output-directory', dest='output_directory', help='Output directory for exported files (default: config_data)')
+    
     socket_sites_parser.add_argument('-v', '--verbose', action='store_true', help='Verbose output')
     
-    socket_sites_parser.set_defaults(func=export_sites.export_socket_site_to_json)
+    socket_sites_parser.set_defaults(func=export_sites.export_socket_sites_dispatcher)
     
     return socket_sites_parser
+
+