illumio-pylo 0.3.8__py3-none-any.whl → 0.3.10__py3-none-any.whl

illumio_pylo/cli/commands/ven_duplicate_remover.py

@@ -4,7 +4,7 @@ import click
 import argparse
 
 import illumio_pylo as pylo
-from illumio_pylo import ArraysToExcel, ExcelHeader, ExcelHeaderSet
+from illumio_pylo import ExcelHeader
 
 from .utils.misc import make_filename_with_timestamp
 from . import Command
@@ -12,6 +12,7 @@ from . import Command
 command_name = 'ven-duplicate-remover'
 objects_load_filter = ['labels']
 
+
 def fill_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--verbose', '-v', action='store_true',
                         help='')
@@ -40,14 +41,11 @@ def fill_parser(parser: argparse.ArgumentParser):
                         help='Directory where to write the report file(s)')
 
 
-
 def __main(args, org: pylo.Organization, pce_cache_was_used: bool, **kwargs):
-
-    report_wanted_format: List[Literal['csv','xlsx']] = args['report_format']
+    report_wanted_format: List[Literal['csv', 'xlsx']] = args['report_format']
     if report_wanted_format is None:
         report_wanted_format = ['xlsx']
 
-
     arg_verbose = args['verbose']
     arg_proceed_with_deletion = args['proceed_with_deletion'] is True
     arg_do_not_require_deletion_confirmation = args['do_not_require_deletion_confirmation'] is True
@@ -59,32 +57,29 @@ def __main(args, org: pylo.Organization, pce_cache_was_used: bool, **kwargs):
     arg_limit_number_of_deleted_workloads = args['limit_number_of_deleted_workloads']
     arg_report_output_dir: str = args['output_dir']
 
-
     output_file_prefix = make_filename_with_timestamp('ven-duplicate-removal_', arg_report_output_dir)
     output_file_csv = output_file_prefix + '.csv'
     output_file_excel = output_file_prefix + '.xlsx'
 
-
     csv_report_headers = pylo.ExcelHeaderSet([
-        ExcelHeader(name = 'name', max_width = 40),
-        ExcelHeader(name = 'hostname', max_width = 40)
+        ExcelHeader(name='name', max_width=40),
+        ExcelHeader(name='hostname', max_width=40)
     ])
     # insert all label dimensions
     for label_type in org.LabelStore.label_types:
-        csv_report_headers.append(ExcelHeader(name= f'label_{label_type}', wrap_text= False))
+        csv_report_headers.append(ExcelHeader(name=f'label_{label_type}', wrap_text=False))
 
     csv_report_headers.extend([
         'online',
-        ExcelHeader(name = 'last_heartbeat', max_width = 15, wrap_text = False),
-        ExcelHeader(name = 'created_at', max_width = 15, wrap_text = False),
+        ExcelHeader(name='last_heartbeat', max_width=15, wrap_text=False),
+        ExcelHeader(name='created_at', max_width=15, wrap_text=False),
         'action',
-        ExcelHeader(name = 'link_to_pce', max_width = 15, wrap_text = False, url_text = 'See in PCE', is_url = True),
-        ExcelHeader(name = 'href', max_width = 15, wrap_text = False)
+        ExcelHeader(name='link_to_pce', max_width=15, wrap_text=False, url_text='See in PCE', is_url=True),
+        ExcelHeader(name='href', max_width=15, wrap_text=False)
     ])
     csv_report = pylo.ArraysToExcel()
     sheet: pylo.ArraysToExcel.Sheet = csv_report.create_sheet('duplicates', csv_report_headers, force_all_wrap_text=True, multivalues_cell_delimiter=',')
 
-
     filter_labels: List[pylo.Label] = []  # the list of labels to filter the workloads against
     if args['filter_label'] is not None:
         for label_name in args['filter_label']:
@@ -138,17 +133,17 @@ def __main(args, org: pylo.Organization, pce_cache_was_used: bool, **kwargs):
     def add_workload_to_report(workload: pylo.Workload, action: str):
         url_link_to_pce = workload.get_pce_ui_url()
         new_row = {
-                'hostname': workload.hostname,
-                'online': workload.online,
-                'last_heartbeat': workload.ven_agent.get_last_heartbeat_date().strftime('%Y-%m-%d %H:%M'),
-                'created_at': workload.created_at_datetime().strftime('%Y-%m-%d %H:%M'),
-                'href': workload.href,
-                'link_to_pce': url_link_to_pce,
-                'action': action
+            'hostname': workload.hostname,
+            'online': workload.online,
+            'last_heartbeat': workload.ven_agent.get_last_heartbeat_date().strftime('%Y-%m-%d %H:%M'),
+            'created_at': workload.created_at_datetime().strftime('%Y-%m-%d %H:%M'),
+            'href': workload.href,
+            'link_to_pce': url_link_to_pce,
+            'action': action
         }
 
         for label_type in org.LabelStore.label_types:
-            new_row['label_'+label_type] = workload.get_label_name(label_type, '')
+            new_row['label_' + label_type] = workload.get_label_name(label_type, '')
 
         sheet.add_line_from_object(new_row)
 
@@ -173,9 +168,9 @@ def __main(args, org: pylo.Organization, pce_cache_was_used: bool, **kwargs):
             continue
 
         print("  - hostname '{}' has duplicates. ({} online, {} offline, {} unmanaged)".format(dup_hostname,
-                                                                                         len(dup_record.online),
-                                                                                         len(dup_record.offline),
-                                                                                         len(dup_record.unmanaged)))
+                                                                                               len(dup_record.online),
+                                                                                               len(dup_record.offline),
+                                                                                               len(dup_record.unmanaged)))
 
         latest_created_workload = dup_record.find_latest_created_at()
         latest_heartbeat_workload = dup_record.find_latest_heartbeat()
@@ -195,7 +190,7 @@ def __main(args, org: pylo.Organization, pce_cache_was_used: bool, **kwargs):
             add_workload_to_report(wkl, "ignored (VEN is online)")
 
         for wkl in dup_record.offline:
-            if arg_do_not_delete_the_most_recent_workload and  wkl is latest_created_workload:
+            if arg_do_not_delete_the_most_recent_workload and wkl is latest_created_workload:
                 print("    - IGNORED: wkl {}/{} is the most recent".format(wkl.get_name_stripped_fqdn(), wkl.href))
                 add_workload_to_report(wkl, "ignored (it is the most recently created)")
             elif arg_do_not_delete_the_most_recently_heartbeating_workload and wkl is latest_heartbeat_workload:
@@ -212,7 +207,6 @@ def __main(args, org: pylo.Organization, pce_cache_was_used: bool, **kwargs):
                     delete_tracker.add_workload(wkl)
                     print("    - added offline wkl {}/{} to the delete list".format(wkl.get_name_stripped_fqdn(), wkl.href))
 
-
         for wkl in dup_record.unmanaged:
             if arg_limit_number_of_deleted_workloads is not None and delete_tracker.count_entries() >= arg_limit_number_of_deleted_workloads:
                 print("    - IGNORED: wkl {}/{} because the limit of {} workloads to be deleted was reached".format(wkl.get_name_stripped_fqdn(), wkl.href, arg_limit_number_of_deleted_workloads))
@@ -269,7 +263,7 @@ def __main(args, org: pylo.Organization, pce_cache_was_used: bool, **kwargs):
         if len(report_wanted_format) < 1:
             print(" * No report format was specified, no report will be generated")
         else:
-            sheet.reorder_lines(['hostname']) # sort by hostname for better readability
+            sheet.reorder_lines(['hostname'])  # sort by hostname for better readability
             for report_format in report_wanted_format:
                 output_filename = output_file_prefix + '.' + report_format
                 print(" * Writing report file '{}' ... ".format(output_filename), end='', flush=True)
@@ -294,7 +288,7 @@ class DuplicateRecordManager:
         def __init__(self, pce_offline_timer_override: Optional[int] = None):
             self.offline = []
             self.online = []
-            self.unmanaged= []
+            self.unmanaged = []
             self.all: List[pylo.Workload] = []
             self._pce_offline_timer_override: Optional[int] = pce_offline_timer_override
 
@@ -330,7 +324,7 @@ class DuplicateRecordManager:
                 return True
             return False
 
-        def find_latest_created_at(self)-> 'pylo.Workload':
+        def find_latest_created_at(self) -> 'pylo.Workload':
             latest: Optional[pylo.Workload] = None
             for wkl in self.all:
                 if wkl.unmanaged:
@@ -339,7 +333,7 @@ class DuplicateRecordManager:
                     latest = wkl
             return latest
 
-        def find_latest_heartbeat(self)-> 'pylo.Workload':
+        def find_latest_heartbeat(self) -> 'pylo.Workload':
             latest: Optional[pylo.Workload] = None
             for wkl in self.all:
                 if wkl.unmanaged:

illumio_pylo/cli/commands/ven_idle_to_visibility.py

@@ -1,8 +1,6 @@
-from typing import Dict, List, Any, Union
+from typing import Dict, Union
 from dataclasses import dataclass
-import sys
 import argparse
-import math
 import illumio_pylo as pylo
 from .utils.misc import make_filename_with_timestamp
 from . import Command
@@ -265,7 +263,7 @@ def __main(args, org: pylo.Organization, native_parsers: MyBuiltInParser, **kwar
         print(myformat(" - Agents with successful report count:", agent_green_count))
     print(myformat(" - SKIPPED because not online count:", agent_skipped_not_online))
     print(myformat(" - SKIPPED because report was not found:", agent_has_no_report_count))
-    print(myformat(" - Agents with failed reports:", agent_report_failed_count ))
+    print(myformat(" - Agents with failed reports:", agent_report_failed_count))
 
     print()
     print(" * Writing report file '{}' ... ".format(output_file_csv), end='', flush=True)

illumio_pylo/cli/commands/ven_upgrader.py

@@ -1,8 +1,7 @@
-from typing import Dict, List, Any
+from typing import List
 import sys
 import argparse
 import illumio_pylo as pylo
-from .utils.misc import make_filename_with_timestamp
 from . import Command
 
 

illumio_pylo/cli/commands/workload_import.py

@@ -1,4 +1,4 @@
-from typing import Dict, List, Any, Union
+from typing import Dict, List, Any
 from dataclasses import dataclass
 import sys
 import argparse
@@ -52,7 +52,6 @@ def fill_parser(parser: argparse.ArgumentParser):
                         help='If set, the script will proceed with the creation of the workloads and labels without asking for confirmation')
 
 
-
 def __main(args, org: pylo.Organization, **kwargs):
     input_file = args['input_file']
     input_file_delimiter: str = args['input_file_delimiter']
@@ -84,8 +83,7 @@ def __main(args, org: pylo.Organization, **kwargs):
 
     # each label type/dimension is optional
     for label_type in org.LabelStore.label_types:
-        csv_expected_fields.append({'name': f"{settings_header_label_prefix}{label_type}"  , 'optional': True})
-
+        csv_expected_fields.append({'name': f"{settings_header_label_prefix}{label_type}", 'optional': True})
 
     csv_report_headers = ExcelHeaderSet(['name', 'hostname', 'ip', 'description'])
     for label_type in org.LabelStore.label_types:
@@ -97,13 +95,12 @@ def __main(args, org: pylo.Organization, **kwargs):
     csv_report = ArraysToExcel()
     csv_sheet = csv_report.create_sheet('Workloads', csv_report_headers)
 
-
     print(" * Loading CSV input file '{}'...".format(input_file), flush=True, end='')
     csv_data = pylo.CsvExcelToObject(input_file, expected_headers=csv_expected_fields, csv_delimiter=input_file_delimiter)
     print('OK')
     print("   - CSV has {} columns and {} lines (headers don't count)".format(csv_data.count_columns(), csv_data.count_lines()))
 
-    #check if CSV has all headers for each labels types
+    # check if CSV has all headers for each labels types
     if not settings_ignore_missing_headers:
         for label_type in org.LabelStore.label_types:
             header_name = f"{settings_header_label_prefix}{label_type}".lower()
@@ -111,7 +108,6 @@ def __main(args, org: pylo.Organization, **kwargs):
                 raise pylo.PyloEx(f"CSV/Excel file is missing the column '{header_name}' for label type '{label_type}'. "
                                   "If this was intended use --ignore-missing-headers flag")
 
-
     detect_workloads_name_collisions(csv_data, org, settings_ignore_all_sorts_collisions, settings_ignore_hostname_collision)
 
     detect_ip_collisions(csv_data, org, settings_ignore_all_sorts_collisions, settings_ignore_empty_ip_entries, settings_ignore_ip_collision)
@@ -149,7 +145,7 @@ def __main(args, org: pylo.Organization, **kwargs):
         print(" * No Workloads to create, all were ignored due to collisions or missing data.")
         # still want to save the CSV/Excel files in the end so don't exit
     else:
-        if not settings_proceed_with_creation is True:
+        if settings_proceed_with_creation is not True:
             print(" * No workload will be created because the --proceed-with-creation/-p flag was not set. Yet report will be generated")
             for object_to_create in csv_objects_to_create:
                 if '**not_created_reason**' not in object_to_create:
@@ -238,6 +234,7 @@ class WorkloadCollisionItem:
     workload_object: pylo.Workload = None
     csv_object: Dict[str, Any] = None
 
+
 def detect_workloads_name_collisions(csv_data, org: pylo.Organization, ignore_all_sorts_collisions, ignore_hostname_collision):
     print(" * Checking for name/hostname collisions inside the PCE:", flush=True)
     name_cache: Dict[str, WorkloadCollisionItem] = {}
@@ -278,14 +275,14 @@ def detect_workloads_name_collisions(csv_data, org: pylo.Organization, ignore_al
                     else:
                         print(
                             "  - WARNING: CSV has an entry for workload name '{}' at line #{} but it exists already in the PCE. It will be ignored.".format(
-                            lower_name, csv_object['*line*']))
+                                lower_name, csv_object['*line*']))
 
         if csv_object['hostname'] is not None and len(csv_object['hostname']) > 0:
             lower_hostname = csv_object['hostname'].lower()
             if lower_name != lower_hostname:
                 if lower_hostname not in name_cache:
                     name_cache[lower_hostname] = WorkloadCollisionItem(from_pce=False, csv_object=csv_object,
-                                                                               managed=False)
+                                                                       managed=False)
                 else:
                     if not name_cache[lower_hostname].from_pce:
                         raise pylo.PyloEx('CSV contains workloads with duplicates name/hostname: {}'.format(lower_name))
@@ -295,7 +292,7 @@ def detect_workloads_name_collisions(csv_data, org: pylo.Organization, ignore_al
                         else:
                             print(
                                 "  - WARNING: CSV has an entry for workload hostname '{}' at line #{} but it exists already in the PCE. It will be ignored.".format(
-                                lower_hostname, csv_object['*line*']))
+                                    lower_hostname, csv_object['*line*']))
     print("  * DONE")
 
 
@@ -348,9 +345,10 @@ def detect_ip_collisions(csv_data, org: pylo.Organization, ignore_all_sorts_coll
             else:
                 count_duplicate_ip_addresses_in_csv += 1
                 if not ignore_all_sorts_collisions and not settings_ignore_ip_collision:
-                    pylo.log.warn(indent+"Duplicate IP address {} found in the PCE and CSV/Excel at line #{} (name={}  hostname={}). "
-                          "(look for --options to bypass this if you know what you are doing)"
-                          .format(ip, csv_object['*line*'], csv_object['name'], csv_object['hostname']))
+                    pylo.log.warn(
+                        indent + "Duplicate IP address {} found in the PCE and CSV/Excel at line #{} (name={}  hostname={}). "
+                                 "(look for --options to bypass this if you know what you are doing)"
+                        .format(ip, csv_object['*line*'], csv_object['name'], csv_object['hostname']))
                     csv_object['**not_created_reason**'] = "Duplicate IP address {} found in the PCE".format(ip)
 
     if ignore_all_sorts_collisions or settings_ignore_ip_collision:

illumio_pylo/cli/commands/workload_reset_names_to_null.py

@@ -1,10 +1,8 @@
 from typing import List
 import illumio_pylo as pylo
 import argparse
-import sys
 import math
 import colorama
-from .utils.misc import make_filename_with_timestamp
 from . import Command
 
 command_name = 'workload-reset-ven-names-to-null'
@@ -29,9 +27,9 @@ def __main(args, org: pylo.Organization, **kwargs):
     workloads_with_forced_names: List[pylo.Workload] = []
     workloads_with_mismatching_names: List[pylo.Workload] = []
 
-    #iterate through each workload
+    # iterate through each workload
     for wkl in org.WorkloadStore.itemsByHRef.values():
-        #only care about Managed workloads
+        # only care about Managed workloads
         if wkl.unmanaged:
             continue
 
@@ -53,26 +51,26 @@ def __main(args, org: pylo.Organization, **kwargs):
 
     # <editor-fold desc="JSON Payloads generation">
 
-    #for each batch of workloads, generate a JSON payload to send to the PCE to reset name to null
-    #the payload will be a list of objects with the following structure:
-    # {
-    #     "href": "string",
-    #     "name": null
+    # for each batch of workloads, generate a JSON payload to send to the PCE to reset name to null
+    # the payload will be a list of objects with the following structure:
+    #  {
+    #      "href": "string",
+    #      "name": null
     # }
 
     if not confirmed_changes:
         print(colorama.Fore.YELLOW + "Changes have not been confirmed. Use the --confirm flag to confirm the changes and push to the PCE")
-        #reset colorama colors
+        # reset colorama colors
         print(colorama.Style.RESET_ALL)
         return
 
     # for loop for each batch of workloads
     for i in range(math.ceil(len(workloads_with_mismatching_names) / batch_size)):
-        #get the next batch of workloads
+        # get the next batch of workloads
         batch = workloads_with_mismatching_names[i * batch_size: (i + 1) * batch_size]
-        #create a list of objects with the structure described above
+        # create a list of objects with the structure described above
         payload = [{"href": wkl.href, "name": wkl.static_name_stripped_fqdn(wkl.hostname)} for wkl in batch]
-        #debug display
+        # debug display
         print(f"Sending payload for batch {i + 1} of {math.ceil(len(workloads_with_mismatching_names) / batch_size)} ({len(payload)} workloads)")
 
         org.connector.objects_workload_update_bulk(payload)
@@ -80,4 +78,4 @@ def __main(args, org: pylo.Organization, **kwargs):
     # </editor-fold>
 
 
-command_object = Command(command_name, __main, fill_parser, objects_load_filter)
+command_object = Command(command_name, __main, fill_parser, objects_load_filter)

illumio_pylo/cli/commands/workload_update.py

@@ -4,7 +4,7 @@ import argparse
 import sys
 
 import illumio_pylo as pylo
-from illumio_pylo import ArraysToExcel, ExcelHeader, ExcelHeaderSet
+from illumio_pylo import ArraysToExcel, ExcelHeaderSet
 from .utils.LabelCreation import generate_list_of_labels_to_create, create_labels
 from .utils.misc import make_filename_with_timestamp, default_label_columns_prefix
 from . import Command
@@ -54,7 +54,7 @@ class ContextSingleton:
 
     def __init__(self, org: pylo.Organization):
         self.org: pylo.Organization = org
-        self.csv_data: List[Dict[str, Union[str,bool,int, None]]] = []
+        self.csv_data: List[Dict[str, Union[str, bool, int, None]]] = []
         self.settings_label_type_header_prefix: str = ''
         self.settings_blank_labels_means_remove: bool = False
         self.csv_ip_index: Dict[str, Dict] = {}  # ip -> csv_data
@@ -64,9 +64,10 @@ class ContextSingleton:
         self.csv_report_sheet: Optional[pylo.ArraysToExcel.Sheet] = None
         self.ignored_workloads_count = 0
         self.stats_count_csv_entries_with_no_match = 0
-        self.workloads_previous_labels: Dict[pylo.Workload,Dict[str, pylo.Label]] = {}
+        self.workloads_previous_labels: Dict[pylo.Workload, Dict[str, pylo.Label]] = {}
         self.csv_input_missing_label_types: List[str] = []
 
+
 def __main(args, org: pylo.Organization, **kwargs):
     
     context = ContextSingleton(org=org)
@@ -98,7 +99,6 @@ def __main(args, org: pylo.Organization, **kwargs):
 
     context.ignored_workloads_count = 0
 
-
     csv_report_headers = ExcelHeaderSet(['name', 'hostname'])
     for label_type in org.LabelStore.label_types:
         csv_report_headers.append(f'{context.settings_label_type_header_prefix}{label_type}')
@@ -106,7 +106,7 @@ def __main(args, org: pylo.Organization, **kwargs):
         csv_report_headers.append(f'new_{label_type}')
     csv_report_headers.extend(['**updated**', '**reason**', 'href'])
 
-    context.csv_report = csv_report = ArraysToExcel()
+    context.csv_report = ArraysToExcel()
     context.csv_report_sheet = context.csv_report.create_sheet('Workloads Update Report', csv_report_headers)
 
     # <editor-fold desc="CSV input file data extraction">
@@ -120,7 +120,6 @@ def __main(args, org: pylo.Organization, **kwargs):
     for label_type in org.LabelStore.label_types:
         csv_expected_fields.append({'name': f'{context.settings_label_type_header_prefix}{label_type}', 'optional': True})
 
-
     print(" * Loading CSV input file '{}'...".format(settings_input_file), flush=True, end='')
     csv_input_object = pylo.CsvExcelToObject(settings_input_file, expected_headers=csv_expected_fields, csv_delimiter=settings_input_file_delimiter)
     for label_type in org.LabelStore.label_types:
@@ -132,7 +131,6 @@ def __main(args, org: pylo.Organization, **kwargs):
     context.csv_data = csv_input_object.objects()
     # </editor-fold desc="CSV input file data extraction">
 
-
     if not input_match_on_ip and not input_match_on_hostname and not input_match_on_href:
         pylo.log.error('You must specify at least one (or several) property to match on for workloads vs input: href, ip or hostname')
         sys.exit(1)
@@ -142,11 +140,11 @@ def __main(args, org: pylo.Organization, **kwargs):
     # </editor-fold desc="CSV input basic checks">
 
     # <editor-fold desc="Filter the list of Workloads to be edited">
-    workloads_to_update: Dict[str, pylo.Workload] = org.WorkloadStore.itemsByHRef.copy() # start with a list of all workloads from  the PCE
+    workloads_to_update: Dict[str, pylo.Workload] = org.WorkloadStore.itemsByHRef.copy()  # start with a list of all workloads from  the PCE
     print(" * PCE has {} workloads. Now applying requested filters...".format(len(workloads_to_update)))
 
     context.ignored_workloads_count += filter_pce_workloads(context, workloads_to_update, settings_filter_managed_only,
-                                                    settings_filter_unmanaged_only)
+                                                            settings_filter_unmanaged_only)
 
     print("  * DONE! {} Workloads remain to be updated".format(len(workloads_to_update)))
     # </editor-fold>
@@ -154,14 +152,13 @@ def __main(args, org: pylo.Organization, **kwargs):
     # <editor-fold desc="Matching between CSV/Excel and Managed Workloads">
     workloads_to_update_match_csv: Dict[pylo.Workload, Dict]  # Workloads from the PCE and CSV data associated to it
     workloads_to_update_match_csv = match_pce_workloads_vs_csv(context,
-                                                                input_match_on_hostname,
-                                                                input_match_on_href,
-                                                                input_match_on_ip,
-                                                                workloads_to_update)
+                                                               input_match_on_hostname,
+                                                               input_match_on_href,
+                                                               input_match_on_ip,
+                                                               workloads_to_update)
     add_unmatched_csv_lines_to_report(context, workloads_to_update_match_csv)
     # </editor-fold>
 
-
     # <editor-fold desc="List missing Labels and exclude Workloads which require no changes">
     print(" * Looking for any missing label which need to be created and Workloads which already have the right labels:")
     labels_to_be_created = generate_list_of_labels_to_create(workloads_to_update_match_csv.values(), org, context.settings_label_type_header_prefix)
@@ -172,14 +169,12 @@ def __main(args, org: pylo.Organization, **kwargs):
     # </editor-fold>
 
     # <editor-fold desc="Compare remaining workloads and CSV data to generate update payloads later">
-    print(" * Comparing remaining {} Workloads and CSV data to generate update payloads later...".format(len(workloads_to_update)) , flush=True)
+    print(" * Comparing remaining {} Workloads and CSV data to generate update payloads later...".format(len(workloads_to_update)), flush=True)
     compare_workloads_vs_csv_data_to_generate_changes(context, workloads_to_update, workloads_to_update_match_csv)
 
-
     print("  * DONE - {} Workloads remain to be updated".format(len(workloads_to_update_match_csv)))
     # </editor-fold desc="Compare remaining workloads and CSV data to generate update payloads later">
 
-
     # <editor-fold desc="Workloads updates Push to API">
     if len(workloads_to_update) == 0:
         print(" * No Workloads to update")
@@ -227,7 +222,7 @@ def __main(args, org: pylo.Organization, **kwargs):
             print("*************")
             for workload in workloads_to_update.values():
                 context.csv_report_sheet.add_line_from_object(workload_to_csv_report(context, workload, 'Potentially', reason='No confirmation was given to proceed with the update'))
-                #new_labels = workloads_list_changed_labels_for_report[workload]))
+                # new_labels = workloads_list_changed_labels_for_report[workload]))
     # </editor-fold>
 
     print(" * Writing report file '{}' ... ".format(output_file_csv), end='', flush=True)
@@ -238,7 +233,8 @@ def __main(args, org: pylo.Organization, **kwargs):
     print("DONE")
 
 
-def compare_workloads_vs_csv_data_to_generate_changes(context: ContextSingleton,workloads_to_update, workloads_to_update_match_csv):
+def compare_workloads_vs_csv_data_to_generate_changes(context: ContextSingleton, workloads_to_update,
+                                                      workloads_to_update_match_csv):
     for workload, csv_data in workloads_to_update_match_csv.copy().items():
         workload.api_stacked_updates_start()
         if 'name' in csv_data:
@@ -264,7 +260,6 @@ def compare_workloads_vs_csv_data_to_generate_changes(context: ContextSingleton,
                                           format(csv_data[csv_label_column_name], csv_data['*line*']))
                     found_labels.append(found_label)
 
-
         context.workloads_previous_labels[workload] = workload.get_labels_dict()
         workload.api_update_labels(found_labels, missing_label_type_means_no_change=context.settings_blank_labels_means_remove)
 
@@ -385,14 +380,14 @@ def match_pce_workloads_vs_csv(context: ContextSingleton,
                 print("    - No matching IP address found in CSV/Excel, this Workload will not be relabeled")
                 del workloads_to_relabel[workload_href]
                 context.ignored_workloads_count += 1
-                #context.csv_report.add_line_from_object(workload_to_csv_report(context, workload, False,
+                # context.csv_report.add_line_from_object(workload_to_csv_report(context, workload, False,
                 #                                                       'No IP match was found in CSV/Excel input'))
                 continue
             if len(ip_matches) > 1:
                 print("    - Found more than 1 IP matches in CSV/Excel, this Workload will not be relabeled")
                 del workloads_to_relabel[workload_href]
                 context.ignored_workloads_count += 1
-                #context.csv_report.add_line_from_object(workload_to_csv_report(context, workload, False,
+                # context.csv_report.add_line_from_object(workload_to_csv_report(context, workload, False,
                 #                                                       'Too many IP matches were found in CSV/Excel input'))
                 continue
             this_workload_matched_on_ip = ip_matches[0]
@@ -405,7 +400,7 @@ def match_pce_workloads_vs_csv(context: ContextSingleton,
                 del workloads_to_relabel[workload_href]
                 print("  NOT FOUND")
                 context.ignored_workloads_count += 1
-                #context.csv_report.add_line_from_object(workload_to_csv_report(context, workload, False,
+                # context.csv_report.add_line_from_object(workload_to_csv_report(context, workload, False,
                 #                                                       'No hostname match was found in CSV/Excel input'))
                 continue
 
@@ -420,7 +415,7 @@ def match_pce_workloads_vs_csv(context: ContextSingleton,
                 del workloads_to_relabel[workload_href]
                 print("  NOT FOUND")
                 context.ignored_workloads_count += 1
-                #context.csv_report.add_line_from_object(workload_to_csv_report(context, workload, False,
+                # context.csv_report.add_line_from_object(workload_to_csv_report(context, workload, False,
                 #                                                       'No href match was found in CSV/Excel input'))
                 continue
 
@@ -463,7 +458,7 @@ def filter_pce_workloads(context: ContextSingleton, workloads_to_update: Dict[st
                 del workloads_to_update[workload_href]
                 ignored_workloads_count += 1
                 context.csv_report_sheet.add_line_from_object(workload_to_csv_report(context, workload, False,
-                                                                       'Managed Workload was filtered out'))
+                                                                                     'Managed Workload was filtered out'))
     if filter_managed_only:
         print("   - Filtering out Unmanaged Workloads...")
         for workload_href in list(workloads_to_update.keys()):
@@ -472,13 +467,13 @@ def filter_pce_workloads(context: ContextSingleton, workloads_to_update: Dict[st
                 del workloads_to_update[workload_href]
                 ignored_workloads_count += 1
                 context.csv_report_sheet.add_line_from_object(workload_to_csv_report(context, workload, False,
-                                                                       'Unmanaged Workload was filtered out'))
+                                                                                     'Unmanaged Workload was filtered out'))
 
     print("  * DONE! {} Workloads were ignored".format(ignored_workloads_count))
     return ignored_workloads_count
 
 
-def workload_to_csv_report(context: ContextSingleton, workload: pylo.Workload, updated: Union[bool,str],
+def workload_to_csv_report(context: ContextSingleton, workload: pylo.Workload, updated: Union[bool, str],
                            reason: str = ''):
 
     record = {
@@ -488,7 +483,6 @@ def workload_to_csv_report(context: ContextSingleton, workload: pylo.Workload, u
         '**reason**':  reason
     }
 
-
     for label_type in context.org.LabelStore.label_types:
         previous_label = context.workloads_previous_labels[workload].get(label_type)
         record[f'{context.settings_label_type_header_prefix}{label_type}'] = previous_label.name if previous_label is not None else ''
@@ -508,11 +502,13 @@ def workload_to_csv_report(context: ContextSingleton, workload: pylo.Workload, u
 
 command_object = Command(command_name, __main, fill_parser, objects_load_filter)
 
+
 class ChangedLabelRecord(TypedDict):
     name: Optional[str]
     href: Optional[str]
 
-ChangedLabelRecordCollection = Dict[pylo.Workload, Dict[str,ChangedLabelRecord]]
+
+ChangedLabelRecordCollection = Dict[pylo.Workload, Dict[str, ChangedLabelRecord]]
 
 
 def add_unmatched_csv_lines_to_report(context: ContextSingleton,
@@ -540,6 +536,5 @@ def add_unmatched_csv_lines_to_report(context: ContextSingleton,
             new_data['**reason**'] = 'No matching Workload was found in the PCE'
             context.csv_report_sheet.add_line_from_object(new_data)
 
-
     print(" * {} CSV lines were not matched with any Workload. They are added to the report now".
           format(context.stats_count_csv_entries_with_no_match))

illumio_pylo/cli/commands/workload_used_in_rule_finder.py

@@ -40,8 +40,8 @@ def __main(args, org: pylo.Organization, **kwargs):
                 global_concerned_rules[concerned_rule] = True
 
                 if concerned_ruleset not in concerned_rulesets:
-                        concerned_rulesets[concerned_ruleset] = {concerned_rule: concerned_rule}
-                        count_concerned_rules = count_concerned_rules + 1
+                    concerned_rulesets[concerned_ruleset] = {concerned_rule: concerned_rule}
+                    count_concerned_rules = count_concerned_rules + 1
                 else:
                     if concerned_rule not in concerned_rulesets[concerned_ruleset]:
                         concerned_rulesets[concerned_ruleset][concerned_rule] = concerned_rule
@@ -67,9 +67,9 @@ def __main(args, org: pylo.Organization, **kwargs):
         print("  - '{}' HREF: {} URL: {}".format(ruleset.name, ruleset.href, ruleset_url))
 
     print("\n*****  DONE with workloads & rules parsing  *****")
-    print("** Total: {} Workloads used in {} Rulesets and {} Rules".format(   global_count_concerned_workloads,
-                                                                                len(global_concerned_rulesets),
-                                                                                len(global_concerned_rules)))
+    print("** Total: {} Workloads used in {} Rulesets and {} Rules".format(global_count_concerned_workloads,
+                                                                           len(global_concerned_rulesets),
+                                                                           len(global_concerned_rules)))
 
     print("\n**** END OF SCRIPT ****\n")
 

illumio_pylo/tmp.py

@@ -5,6 +5,7 @@ import illumio_pylo as pylo
 
 log = logging.getLogger('PYLO')
 
+
 def init_logger():
     console_logger = logging.StreamHandler()
     formatter = logging.Formatter('%(asctime)s %(levelname)s %(name)s/%(filename)s:%(lineno)d - %(message)s')

illumio_pylo/utilities/resources/workloads-import-example.csv

@@ -1,2 +1,2 @@
-name,hostname,ip,role,app,env,loc
+name,hostname,ip,label:role,label:app,label:env,label:loc
 VEN-KFMGF,hostdd,192.168.50.12,R_WEB,A_APPC,E_DEV,L_AMER

{illumio_pylo-0.3.8.dist-info → illumio_pylo-0.3.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: illumio_pylo
-Version: 0.3.8
+Version: 0.3.10
 Summary: A set of tools and library for working with Illumio PCE
 Home-page: https://github.com/cpainchaud/pylo
 Author: Christophe Painchaud
@@ -187,7 +187,7 @@ Requires-Python: >=3.11
 License-File: LICENSE
 Requires-Dist: click ==8.1.7
 Requires-Dist: colorama ~=0.4.4
-Requires-Dist: cryptography ==42.0.7
+Requires-Dist: cryptography ==43.0.1
 Requires-Dist: openpyxl ~=3.1.3
 Requires-Dist: paramiko ~=3.4.0
 Requires-Dist: prettytable ~=3.10.0