illumio-pylo 0.3.7__py3-none-any.whl → 0.3.9__py3-none-any.whl

illumio_pylo/Rule.py

@@ -264,7 +264,7 @@ class RuleServiceContainer(pylo.Referencer):
         self._direct_services: List[DirectServiceInRule] = []
         self._cached_port_map: Optional[PortMap] = None
 
-    def load_from_json(self, data_list: List[RuleServiceReferenceObjectJsonStructure|RuleDirectServiceReferenceObjectJsonStructure]):
+    def load_from_json(self, data_list: List[RuleServiceReferenceObjectJsonStructure | RuleDirectServiceReferenceObjectJsonStructure]):
         ss_store = self.owner.owner.owner.owner.ServiceStore  # make it a local variable for fast lookups
 
         for data in data_list:
@@ -312,7 +312,7 @@ class RuleServiceContainer(pylo.Referencer):
 
         for i in range(0, len(self._direct_services)):
             if self._direct_services[i] is service:
-                del(self._direct_services[i])
+                del self._direct_services[i]
                 return True
         return False
 

illumio_pylo/Ruleset.py

@@ -26,10 +26,10 @@ class RulesetScope:
         result = ''
         for scope in self.scope_entries.keys():
             if len(result) < 1:
-                result += scope.to_string(label_separator,use_href=use_href)
+                result += scope.to_string(label_separator, use_href=use_href)
             else:
                 result += scope_separator
-                result += scope.to_string(label_separator,use_href=use_href)
+                result += scope.to_string(label_separator, use_href=use_href)
 
         return result
 
@@ -39,6 +39,7 @@ class RulesetScope:
                 return True
         return False
 
+
 class RulesetScopeEntry:
 
     __slots__ = ['owner', '_labels']
@@ -48,7 +49,7 @@ class RulesetScopeEntry:
         self._labels: Dict[str, Union['pylo.Label', 'pylo.LabelGroup']] = {}
 
     def load_from_json(self, data: List[RulesetScopeEntryLineJsonStructure]):
-        #log.error(pylo.nice_json(data))
+        # log.error(pylo.nice_json(data))
         l_store = self.owner.owner.owner.owner.LabelStore
         for label_json in data:
             label_entry = label_json.get('label')
@@ -64,7 +65,8 @@ class RulesetScopeEntry:
             if label is None:
                 raise pylo.PyloEx("Cannot find label with href '{}' in Ruleset '{}' scope: {}".format(href_entry,
                                                                                                       self.owner.owner.name,
-                                                                                      pylo.nice_json(data)))
+                                                                                                      pylo.nice_json(
+                                                                                                          data)))
 
             if label.type not in self.owner.owner.owner.owner.LabelStore.label_types_as_set:
                 raise pylo.PyloEx("Unsupported label type '{}' named '{}' in scope of ruleset '{}'/'{}'".format(label.type_string(),
@@ -103,8 +105,7 @@ class RulesetScopeEntry:
         """
         return {label.href: label for label in self._labels.values()}
 
-
-    def to_string(self, label_separator = '|', use_href=False):
+    def to_string(self, label_separator='|', use_href=False):
         string = ''
         for label_type in self.owner.owner.owner.owner.LabelStore.label_types:
             label = self._labels.get(label_type)
@@ -192,7 +193,6 @@ class Ruleset:
                 rules.append(rule)
         return rules
 
-
     def load_from_json(self, data: RulesetObjectJsonStructure):
         if 'name' not in data:
             raise pylo.PyloEx("Cannot find Ruleset name in JSON data: \n" + pylo.Helpers.nice_json(data))

illumio_pylo/RulesetStore.py

@@ -1,7 +1,7 @@
 from typing import Optional, List, Union, Dict
 
 import illumio_pylo as pylo
-from illumio_pylo import log, Organization, PyloEx, Rule, Ruleset
+from illumio_pylo import log, PyloEx, Ruleset
 from .Helpers import nice_json
 
 

illumio_pylo/SecurityPrincipal.py

@@ -26,7 +26,6 @@ class SecurityPrincipal(pylo.ReferenceTracker):
         self.deleted = data['deleted']
 
 
-
 class SecurityPrincipalStore:
     def __init__(self, owner: 'pylo.Organization'):
         self.owner = owner
@@ -59,7 +58,3 @@ class SecurityPrincipalStore:
 
     def find_by_href(self, href: str) -> Optional[SecurityPrincipal]:
         return self.itemsByHRef.get(href)
-
-
-
-

illumio_pylo/Workload.py

@@ -1,10 +1,7 @@
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Optional, List, Union
 
-import illumio_pylo as pylo
 from illumio_pylo.API.JsonPayloadTypes import WorkloadObjectJsonStructure, WorkloadObjectCreateJsonStructure
-from illumio_pylo import log
 from .AgentStore import VENAgent
 from .Helpers import *
 from .Exception import PyloEx
@@ -43,8 +40,6 @@ class WorkloadApiUpdateStack:
         return len(self.json_payload)
 
 
-
-
 class Workload(pylo.ReferenceTracker, pylo.Referencer, LabeledObject):
 
     __slots__ = ['owner', 'name', 'href', 'forced_name', 'hostname', 'description', 'interfaces', 'online', 'os_id',
@@ -127,10 +122,10 @@ class Workload(pylo.ReferenceTracker, pylo.Referencer, LabeledObject):
             self.ven_agent = self.owner.owner.AgentStore.create_ven_agent_from_workload_record(self, agent_json)
             self.online = data['online']
             self.os_id = data.get('os_id')
-            #if self.os_id is None:
+            # if self.os_id is None:
             #    raise PyloEx("Workload named '{}' has no os_id record:\n%s".format(self.name), data)
             self.os_detail = data.get('os_detail')
-            #if self.os_detail is None:
+            # if self.os_detail is None:
             #    raise PyloEx("Workload named '{}' has no os_detail record:\n%s".format(self.name), data)
 
         self.description = data.get('description')
@@ -162,7 +157,7 @@ class Workload(pylo.ReferenceTracker, pylo.Referencer, LabeledObject):
                     if not self.deleted:
                         raise pylo.PyloObjectNotFound(
                             "Workload '%s'/'%s' is referencing label href '%s' which does not exist" % (
-                            self.name, self.href, href))
+                                self.name, self.href, href))
 
                 self.set_label(label_object)
                 # print("Workload '%s'/'%s' is referencing label '%s'/'%s'" % (self.name, self.hostname, label_object.type, label_object.name))
@@ -206,11 +201,9 @@ class Workload(pylo.ReferenceTracker, pylo.Referencer, LabeledObject):
     def created_at(self) -> str:
         return self.raw_json['created_at']
 
-
     def created_at_datetime(self) -> datetime:
         return pylo.illumio_date_time_string_to_datetime(self.created_at)
 
-
     def api_update_description(self, new_description: str):
         if new_description is None or len(new_description) == 0:
             if self.description is None or self.description == '':
@@ -355,7 +348,6 @@ class Workload(pylo.ReferenceTracker, pylo.Referencer, LabeledObject):
 
         return labels
 
-
     def get_appgroup_str(self, separator: str = '|') -> str:
         labels = ''
 
@@ -498,7 +490,7 @@ class WorkloadApiUpdateStackExecutionManager:
         if len(self.workloads) == 0:
             return
 
-        #self split in list of lists of 500
+        # self split in list of lists of 500
         batches: List[List[pylo.Workload]] = [self.workloads[i:i + amount_per_batch] for i in range(0, len(self.workloads), amount_per_batch)]
 
         for batch in batches:
@@ -527,7 +519,6 @@ class WorkloadApiUpdateStackExecutionManager:
                 else:
                     self.message[index] = result['message']
 
-
     def get_all_results(self) -> List[Result]:
         results = []
         for i in range(len(self.workloads)):

illumio_pylo/WorkloadStoreSubClasses.py

@@ -14,9 +14,8 @@ class UnmanagedWorkloadDraft(LabeledObject):
             self.name: str = name
             self.ip: str = ip
 
-
     def __init__(self, owner: 'pylo.WorkloadStore', name: Optional[str] = None, hostname: Optional[str] = None,
-                 description: Optional[str] = None, ip_single_or_list: Optional[str|Iterable[str]] = None,
+                 description: Optional[str] = None, ip_single_or_list: Optional[str | Iterable[str]] = None,
                  labels: Optional[List['pylo.Label']] = None):
         super().__init__()
         self.owner = owner
@@ -57,6 +56,7 @@ class UnmanagedWorkloadDraft(LabeledObject):
         api_results = api.objects_workload_create_single_unmanaged(self.generate_json_payload())
         return self.owner.add_workload_from_json(api_results)
 
+
 @dataclass
 class CreationTracker:
     draft: UnmanagedWorkloadDraft
@@ -70,7 +70,6 @@ class CreationTracker:
 class UnmanagedWorkloadDraftMultiCreatorManager:
     def __init__(self, owner: 'pylo.WorkloadStore'):
 
-
         self.owner = owner
         self.drafts: List[UnmanagedWorkloadDraft] = []
         self._external_tracker_ids: List[Any] = []
@@ -84,7 +83,9 @@ class UnmanagedWorkloadDraftMultiCreatorManager:
         self._external_tracker_ids.append(external_tracker_id)
         return draft
 
-    def create_all_in_pce(self, amount_created_per_batch = 500, retrieve_workloads_after_creation = False) -> List[CreationTracker]:
+    def create_all_in_pce(self, amount_created_per_batch=500, retrieve_workloads_after_creation=False) \
+            -> List[CreationTracker]:
+
         results: List[CreationTracker] = []
 
         if retrieve_workloads_after_creation:
@@ -98,7 +99,6 @@ class UnmanagedWorkloadDraftMultiCreatorManager:
 
             return results
 
-
         batches: List[List[UnmanagedWorkloadDraft]] = []
 
         # slice the drafts into arrays of arrays of size=amount_created_per_batch
@@ -112,7 +112,7 @@ class UnmanagedWorkloadDraftMultiCreatorManager:
 
             api = self.owner.owner.connector
 
-            try :
+            try:
                 api_results = api.objects_workload_create_bulk_unmanaged(multi_create_payload)
                 for i in range(len(api_results)):
                     if api_results[i]["status"] == "created":
@@ -133,7 +133,4 @@ class UnmanagedWorkloadDraftMultiCreatorManager:
                                                    success=False,
                                                    message=str(e)))
 
-
-
-
-        return results
+        return results

illumio_pylo/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.7"
+__version__ = "0.3.9"
 
 from typing import Callable
 

illumio_pylo/cli/__init__.py

@@ -65,7 +65,6 @@ def run(forced_command_name: Optional[str] = None):
                 add_native_parser_to_argparse(parser, command.native_parsers)
             selected_command = command
 
-
     # version is a special command that does not require a PCE
     # if first argument is --version, we print the version and exit
     if len(sys.argv) > 1:
@@ -94,7 +93,6 @@ def run(forced_command_name: Optional[str] = None):
     
     print("* Started Pylo CLI version {}".format(pylo.__version__))
 
-
     if not selected_command.credentials_manager_mode:
         timer_start = time.perf_counter()
         # credential_profile_name is required for all commands except the credential manager

illumio_pylo/cli/commands/credential_manager.py

@@ -13,7 +13,6 @@ from illumio_pylo.API.CredentialsManager import get_all_credentials, create_cred
     get_credentials_from_file, encrypt_api_key_with_paramiko_ssh_key_chacha20poly1305, \
     decrypt_api_key_with_paramiko_ssh_key_chacha20poly1305, get_supported_keys_from_ssh_agent, is_encryption_available
 
-from illumio_pylo import log
 from . import Command
 
 
@@ -31,17 +30,17 @@ def fill_parser(parser: argparse.ArgumentParser):
 
     create_parser = sub_parser.add_parser('create', help='Create a new credential')
     create_parser.add_argument('--name', required=False, type=str, default=None,
-                     help='Name of the credential')
+                               help='Name of the credential')
     create_parser.add_argument('--fqdn', required=False, type=str, default=None,
-                                 help='FQDN of the PCE')
+                               help='FQDN of the PCE')
     create_parser.add_argument('--port', required=False, type=int, default=None,
-                                 help='Port of the PCE')
+                               help='Port of the PCE')
     create_parser.add_argument('--org', required=False, type=int, default=None,
-                                 help='Organization ID')
+                               help='Organization ID')
     create_parser.add_argument('--api-user', required=False, type=str, default=None,
-                                    help='API user')
+                               help='API user')
     create_parser.add_argument('--verify-ssl', required=False, type=bool, default=None,
-                                 help='Verify SSL')
+                               help='Verify SSL')
 
 
 def __main(args, **kwargs):
@@ -92,7 +91,6 @@ def __main(args, **kwargs):
         if wanted_verify_ssl is None:
             wanted_verify_ssl = click.prompt('> Verify SSL/TLS certificate? Y/N', type=bool)
 
-
         print()
         print("Recap:")
         print("Name: {}".format(wanted_name))
@@ -103,7 +101,6 @@ def __main(args, **kwargs):
         print("Verify SSL: {}".format(wanted_verify_ssl))
         print()
 
-
         # prompt of API key from user input, single line, hidden
         api_key = click.prompt('> API Key', hide_input=True)
 
@@ -145,11 +142,9 @@ def __main(args, **kwargs):
         else:
             print(" * encryption is not available (no SSH agent or compatible key found), storing API key in plain text...")
 
-
         cwd = os.getcwd()
         create_in_current_workdir = click.prompt('> Create in current workdir ({})? If not then user homedir will be used.   Y/N '.format(cwd), type=bool)
 
-
         print("* Creating credential...", flush=True, end="")
         if create_in_current_workdir:
             file_path = create_credential_in_file(file_full_path=cwd, data=credentials_data)
@@ -192,9 +187,7 @@ def __main(args, **kwargs):
 command_object = Command(command_name, __main, fill_parser, credentials_manager_mode=True)
 
 
-def print_keys(keys: list[paramiko.AgentKey], display_index = True) -> None:
-
-    args_for_print = []
+def print_keys(keys: list[paramiko.AgentKey], display_index=True) -> None:
 
     column_properties = [  # (name, width)
         ("ID#", 4),
@@ -207,11 +200,9 @@ def print_keys(keys: list[paramiko.AgentKey], display_index = True) -> None:
         # remove tuple with name "ID#"
         column_properties = [item for item in column_properties if item[0] != "ID#"]
 
-
     table = PrettyTable()
     table.field_names = [item[0] for item in column_properties]
 
-
     for i, key in enumerate(keys):
         display_values = []
         if display_index:
@@ -223,5 +214,3 @@ def print_keys(keys: list[paramiko.AgentKey], display_index = True) -> None:
         table.add_row(display_values)
 
     print(table)
-
-

illumio_pylo/cli/commands/iplist_analyzer.py

@@ -8,9 +8,11 @@ from . import Command
 command_name = "iplist-analyzer"
 objects_load_filter = ['iplists', 'workloads']
 
+
 def fill_parser(parser: argparse.ArgumentParser):
     pass
 
+
 def __main(args, org: pylo.Organization, **kwargs):
     now = datetime.now()
     report_file = 'iplist-analyzer_{}.csv'.format(now.strftime("%Y%m%d-%H%M%S"))
@@ -24,7 +26,6 @@ def __main(args, org: pylo.Organization, **kwargs):
 
     csv_report: pylo.ArrayToExport = pylo.ArrayToExport(csv_report_headers)
 
-
     # <editor-fold desc="Building Workloads ip4 Cache">
     workloads_ip4maps_cache: Dict[pylo.Workload, pylo.IP4Map] = {}
     print(" * Building Workloads IP4 mapping... ", end='')
@@ -43,13 +44,11 @@ def __main(args, org: pylo.Organization, **kwargs):
     print("OK")
     # </editor-fold>
 
-
     print(" * Now analyzing IPLists:", flush=True)
     for (iplist, ip_map) in iplists_ip4maps_cache.items():
         add_iplist_to_report(iplist, workloads_ip4maps_cache, csv_report)
 
     print(" ** DONE **")
-
     print()
     print(" * Writing report file '{}' ... ".format(report_file), end='', flush=True)
     csv_report.write_to_csv(report_file)
@@ -62,11 +61,9 @@ def __main(args, org: pylo.Organization, **kwargs):
         print("\n** WARNING: no entry matched your filters so reports are empty !\n")
 
 
-
 command_object = Command(command_name, __main, fill_parser, objects_load_filter)
 
 
-
 def add_iplist_to_report(iplist: pylo.IPList, workloads_ip4maps_cache: Dict[pylo.Workload, pylo.IP4Map],
                          csv_report: pylo.ArrayToExport):
 
@@ -92,8 +89,7 @@ def add_iplist_to_report(iplist: pylo.IPList, workloads_ip4maps_cache: Dict[pylo
             print("matched workload   {}".format(workload.get_name()))
             matched_workloads.append(workload)
             appgroup_tracker[workload.get_appgroup_str()] = True
-        #print(ip_map.print_to_std(header="after subtraction", padding="     "))
-
+        # print(ip_map.print_to_std(header="after subtraction", padding="     "))
 
     new_row['ip4_uncovered_count'] = ip_map.count_ips()
     new_row['covered_workloads_count'] = len(matched_workloads)
@@ -101,5 +97,3 @@ def add_iplist_to_report(iplist: pylo.IPList, workloads_ip4maps_cache: Dict[pylo
     new_row['covered_workloads_appgroups'] = pylo.string_list_to_text(appgroup_tracker.keys(), "\n")
 
     csv_report.add_line_from_object(new_row)
-
-

illumio_pylo/cli/commands/iplist_import_from_file.py

@@ -1,8 +1,12 @@
+from typing import List
+
 import illumio_pylo as pylo
 import argparse
 import sys
+import click
 from .utils.misc import make_filename_with_timestamp
 from . import Command
+from ...API.JsonPayloadTypes import IPListObjectCreationJsonStructure
 
 command_name = 'iplist-import'
 objects_load_filter = ['iplists']
@@ -14,20 +18,32 @@ def fill_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--input-file-delimiter', type=str, required=False, default=',',
                         help='CSV field delimiter')
 
+    parser.add_argument('--output-dir', '-o', type=str, required=False, default='output',
+                        help='Directory where the output files will be saved')
+
     parser.add_argument('--ignore-if-iplist-exists', action='store_true',
                         help='If an IPList with same same exists, ignore CSV entry')
 
     parser.add_argument('--network-delimiter', type=str, required=False, default=',', nargs='?', const=True,
                         help='If an IPList with same same exists, ignore CSV entry')
 
+    parser.add_argument('--proceed', '-p', action='store_true',
+                        help='If set, the script will proceed with the creation of iplists')
 
-def __main(args, org: pylo.Organization, **kwargs):
-    input_file = args['input_file']
-    input_file_delimiter = args['input_file_delimiter']
-    ignore_if_iplist_exists = args['ignore_if_iplist_exists']
-    network_delimiter = args['network_delimiter']
+    parser.add_argument('--no-confirmation-required', '-n', action='store_true',
+                        help='If set, the script will proceed with the creation of iplists without asking for confirmation')
 
-    output_file_prefix = make_filename_with_timestamp('import-iplists-results_')
+
+def __main(args, org: pylo.Organization, **kwargs):
+    setting_input_file = args['input_file']
+    settings_input_file_delimiter = args['input_file_delimiter']
+    settings_ignore_if_iplist_exists = args['ignore_if_iplist_exists']
+    settings_network_delimiter = args['network_delimiter']
+    settings_proceed = args['proceed']
+    settings_no_confirmation_required = args['no_confirmation_required']
+    settings_output_dir: str = args['output_dir']
+
+    output_file_prefix = make_filename_with_timestamp('import-iplists-results_', settings_output_dir)
     output_file_csv = output_file_prefix + '.csv'
     output_file_excel = output_file_prefix + '.xlsx'
 
@@ -44,8 +60,8 @@ def __main(args, org: pylo.Organization, **kwargs):
     pylo.file_clean(output_file_csv)
     pylo.file_clean(output_file_excel)
 
-    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(" * Loading CSV input file '{}'...".format(setting_input_file), flush=True, end='')
+    csv_data = pylo.CsvExcelToObject(setting_input_file, expected_headers=csv_expected_fields, csv_delimiter=settings_input_file_delimiter)
     print('OK')
     print("   - CSV has {} columns and {} lines (headers don't count)".format(csv_data.count_columns(), csv_data.count_lines()))
     # print(pylo.nice_json(csv_data._objects))
@@ -71,7 +87,7 @@ def __main(args, org: pylo.Organization, **kwargs):
                     sys.exit(1)
                 else:
                     csv_object['**not_created_reason**'] = 'Found duplicated name in PCE'
-                    if not ignore_if_iplist_exists:
+                    if not settings_ignore_if_iplist_exists:
                         pylo.log.error("PCE contains iplists with duplicates name from CSV: '{}' at line #{}. Please fix CSV or look for --options to ignore it".format(lower_name, csv_object['*line*']))
                         sys.exit(1)
                     print("  - WARNING: CSV has an entry for iplist name '{}' at line #{} but it exists already in the PCE. It will be ignored.".format(lower_name, csv_object['*line*']))
@@ -89,28 +105,28 @@ def __main(args, org: pylo.Organization, **kwargs):
             ignored_objects_count += 1
 
     print(' * Preparing Iplist JSON data...')
-    iplists_json_data = []
+    iplists_json_data: List[IPListObjectCreationJsonStructure] = []
     for data in csv_objects_to_create:
-        new_iplist = {}
+        new_iplist: IPListObjectCreationJsonStructure = {}
         iplists_json_data.append(new_iplist)
 
         if len(data['name']) < 1:
             raise pylo.PyloEx('Iplist at line #{} is missing a name in CSV'.format(data['*line*']))
-        else:
-            new_iplist['name'] = data['name']
+
+        new_iplist['name'] = str(data['name'])
 
         if len(data['description']) > 0:
-            new_iplist['description'] = data['description']
+            new_iplist['description'] = str(data['description'])
 
         if len(data['networks']) < 1:
             print('Iplist at line #{} has empty networks list'.format(data['*line*']))
             sys.exit(1)
 
-        network_delimiter = network_delimiter.replace("\\n", "\n")
+        settings_network_delimiter = settings_network_delimiter.replace("\\n", "\n")
         ip_ranges = []
         new_iplist['ip_ranges'] = ip_ranges
 
-        for network_string in data['networks'].rsplit(network_delimiter):
+        for network_string in data['networks'].rsplit(settings_network_delimiter):
             network_string = network_string.strip(" \r\n")  # cleanup trailing characters
 
             exclusion = False
@@ -155,31 +171,38 @@ def __main(args, org: pylo.Organization, **kwargs):
 
     print("  * DONE")
 
-    print(" * Creating {} IPLists".format(len(iplists_json_data)))
-    total_created_count = 0
-    total_failed_count = 0
+    if settings_proceed is False:
+        print(" * Dry-run mode, no changes will be made to the PCE. Use --proceed to actually create the iplists")
+
+    else:
+        if not settings_no_confirmation_required:
+            print(" * WARNING: You are about to create {} IPLists in the PCE. Are you sure you want to proceed?".format(len(iplists_json_data)))
+            click.confirm("Do you want to proceed with the creation of these labels?", abort=True)
+
+        print(" * Creating {} IPLists".format(len(iplists_json_data)))
+        total_created_count = 0
+        total_failed_count = 0
 
-    for index in range(0, len(iplists_json_data)):
-        json_blob = iplists_json_data[index]
-        print("  - Pushing new iplist '{}' to PCE (#{} of {})... ".format(json_blob['name'], index+1, len(iplists_json_data)), end='', flush=True)
-        result = org.connector.objects_iplist_create(json_blob)
-        print("OK")
+        for index in range(0, len(iplists_json_data)):
+            json_blob: IPListObjectCreationJsonStructure = iplists_json_data[index]
+            print("  - Pushing new iplist '{}' to PCE (#{} of {})... ".format(json_blob['name'], index+1, len(iplists_json_data)), end='', flush=True)
+            result = org.connector.objects_iplist_create(json_blob)
+            print("OK")
 
-        href = result.get('href')
-        if href is None:
-            raise pylo.PyloEx('API returned unexpected response which is missing a HREF:', result)
+            href = result.get('href')
+            if href is None:
+                raise pylo.PyloEx('API returned unexpected response which is missing a HREF:', result)
 
-        total_created_count += 1
-        csv_objects_to_create[index]['href'] = href
+            total_created_count += 1
+            csv_objects_to_create[index]['href'] = href
+
+            csv_data.save_to_csv(output_file_csv, csv_created_fields)
+            csv_data.save_to_excel(output_file_excel, csv_created_fields)
 
         csv_data.save_to_csv(output_file_csv, csv_created_fields)
         csv_data.save_to_excel(output_file_excel, csv_created_fields)
 
-    csv_data.save_to_csv(output_file_csv, csv_created_fields)
-    csv_data.save_to_excel(output_file_excel, csv_created_fields)
-
-    print("  * DONE - {} created with success, {} failures and {} ignored. A report was created in {} and {}".format(total_created_count, total_failed_count, ignored_objects_count, output_file_csv, output_file_excel))
+        print("  * DONE - {} created with success, {} failures and {} ignored. A report was created in {} and {}".format(total_created_count, total_failed_count, ignored_objects_count, output_file_csv, output_file_excel))
 
 
 command_object = Command(command_name, __main, fill_parser, load_specific_objects_only=objects_load_filter)
-

illumio_pylo/cli/commands/ruleset_export.py

@@ -11,23 +11,24 @@ command_name = 'rule-export'
 
 
 def fill_parser(parser: argparse.ArgumentParser):
-    parser.add_argument('--format', '-f', required=False, default='excel',choices=['csv', 'excel'], help='Output file format')
-    parser.add_argument('--output-dir', '-o', required=False, default='output', help='Directory where to save the output file')
+    parser.add_argument('--format', '-f', required=False, default='excel', choices=['csv', 'excel'],
+                        help='Output file format')
+    parser.add_argument('--output-dir', '-o', required=False, default='output',
+                        help='Directory where to save the output file')
     parser.add_argument('--prefix-objects-with-type', nargs='?', const=True, default=False,
                         help='Prefix objects with their type (e.g. "label:mylabel")')
     parser.add_argument('--object-types-as-section', action='store_true', default=False,
                         help="Consumer and providers will show objects types section headers, example:" + os.linesep +
-                        "LABELS: " + os.linesep +
-                        "R-WEB" + os.linesep +
-                        "A-FUSION" + os.linesep +
-                        "IPLISTS: " + os.linesep +
-                        "Private_Networks" + os.linesep +
-                        "Public_NATed")
+                             "LABELS: " + os.linesep +
+                             "R-WEB" + os.linesep +
+                             "A-FUSION" + os.linesep +
+                             "IPLISTS: " + os.linesep +
+                             "Private_Networks" + os.linesep +
+                             "Public_NATed")
 
 
 def __main(args: Dict, org: pylo.Organization, **kwargs):
-
-    setting_prefix_objects_with_type: bool|str = args['prefix_objects_with_type']
+    setting_prefix_objects_with_type: bool | str = args['prefix_objects_with_type']
     setting_object_types_as_section: bool = args['prefix_objects_with_type']
     settings_output_file_format = args['format']
     settings_output_dir = args['output_dir']
@@ -69,12 +70,12 @@ def __main(args: Dict, org: pylo.Organization, **kwargs):
             if scope_str[-1] == "\n":
                 scope_str = scope_str[:-1]
 
-
-            consumers_str = rule.consumers.members_to_str("\n", prefix_objects_with_type=setting_prefix_objects_with_type,
-                                                            object_types_as_section=setting_object_types_as_section)
-            providers_str = rule.providers.members_to_str("\n", prefix_objects_with_type=setting_prefix_objects_with_type,
+            consumers_str = rule.consumers.members_to_str("\n",
+                                                          prefix_objects_with_type=setting_prefix_objects_with_type,
+                                                          object_types_as_section=setting_object_types_as_section)
+            providers_str = rule.providers.members_to_str("\n",
+                                                          prefix_objects_with_type=setting_prefix_objects_with_type,
                                                           object_types_as_section=setting_object_types_as_section)
-
 
             data = {'ruleset': ruleset.name, 'scope': scope_str,
                     'consumers': consumers_str,
@@ -126,8 +127,3 @@ def prepare_csv_report_object(output_file_format: Literal['excel', 'csv'], setti
 
 
 command_object = Command(command_name, __main, fill_parser)
-
-
-
-
-

illumio_pylo/cli/commands/update_pce_objects_cache.py

@@ -41,4 +41,3 @@ def __main(args, org: pylo.Organization = None, connector: pylo.APIConnector = N
 
 
 command_object = Command(command_name, __main, fill_parser, skip_pce_config_loading=True)
-

illumio_pylo/cli/commands/utils/LabelCreation.py

@@ -30,7 +30,7 @@ def generate_list_of_labels_to_create(csv_data: Iterable[Dict[str, Union[bool, s
         real_case: str
         type: str
 
-    name_cache: Dict[str,LabelExistsRecord] = {}
+    name_cache: Dict[str, LabelExistsRecord] = {}
 
     for label in org.LabelStore.get_labels():
         if label.name is not None:
@@ -98,4 +98,4 @@ def create_labels(labels_to_be_created: List[LabelToBeCreatedRecord], org: pylo.
             "   - Pushing '{}' with type '{}' to the PCE... ".format(label_to_create['name'], label_to_create['type']),
             end='', flush=True)
         org.LabelStore.api_create_label(label_to_create['name'], label_to_create['type'])
-        print("OK")
+        print("OK")