illumio-pylo 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

illumio_pylo/cli/commands/workload_export.py

@@ -1,9 +1,10 @@
 from typing import List, Dict
-
-import illumio_pylo as pylo
 import argparse
 import sys
 from datetime import datetime
+
+import illumio_pylo as pylo
+from illumio_pylo import ArraysToExcel, ExcelHeader, ExcelHeaderSet
 from .utils.misc import make_filename_with_timestamp
 from . import Command
 
@@ -36,7 +37,7 @@ extra_columns: List[ExtraColumn] = []
 
 
 def fill_parser(parser: argparse.ArgumentParser):
-    parser.add_argument('--output', required=False, default='.')
+    parser.add_argument('--output-dir', required=False, default='output')
 
     parser.add_argument('--verbose', '-v', action='store_true',
                         help='')
@@ -65,23 +66,25 @@ def __main(args, org: pylo.Organization, **kwargs):
     filter_file_delimiter = args['filter_file_delimiter']
     filter_fields = args['filter_fields']
     filter_keep_in_report = args['keep_filters_in_report']
-    save_location = args['save_location']
+    settings_output_dir = args['output_dir']
     verbose = args['verbose']
     csv_output_only = args['csv_output_only']
     excel_output_only = args['excel_output_only']
     # print(args['filter_fields'])
 
-    output_file_prefix = make_filename_with_timestamp('workload_export_')
-    output_file_csv = save_location + '/' + output_file_prefix + '.csv'
-    output_file_excel = save_location + '/' + output_file_prefix + '.xlsx'
+    output_file_prefix = make_filename_with_timestamp('workload_export_', output_directory=settings_output_dir)
+    output_file_csv = output_file_prefix + '.csv'
+    output_file_excel = output_file_prefix + '.xlsx'
 
-    csv_report_headers = ['name', 'hostname']
+    csv_report_headers = ExcelHeaderSet(['name', 'hostname'])
     for label_type in org.LabelStore.label_types:
         csv_report_headers.append(f'label_{label_type}')
 
-    csv_report_headers.extend(['online', 'managed', 'status', 'agent.last_heartbeat',
-                               'agent.sec_policy_sync_state', 'agent.sec_policy_applied_at',
-                          'href', 'agent.href'])
+    csv_report_headers.extend([
+        'online', 'managed', 'status', 'agent.last_heartbeat',
+        'agent.sec_policy_sync_state', 'agent.sec_policy_applied_at',
+        ExcelHeader(name='link_to_pce', wrap_text=False, url_text='See in PCE', is_url=True),
+        'href', 'agent.href'])
 
     for extra_column in extra_columns:
         csv_report_headers.append(extra_column.column_description().name)
@@ -109,7 +112,7 @@ def __main(args, org: pylo.Organization, **kwargs):
         for field in filter_data._detected_headers:
             csv_report_headers.append('_' + field)
 
-    csv_report = pylo.ArraysToExcel()
+    csv_report = ArraysToExcel()
     csv_sheet = csv_report.create_sheet('workloads', csv_report_headers, force_all_wrap_text=True)
 
     all_workloads = org.WorkloadStore.itemsByHRef.copy()
@@ -131,6 +134,7 @@ def __main(args, org: pylo.Organization, **kwargs):
                 'online': wkl.online,
                 'managed': not wkl.unmanaged,
                 'status': wkl.get_status_string(),
+                'link_to_pce': wkl.href,
             }
             for label_type in org.LabelStore.label_types:
                 new_row[f'label_{label_type}'] = wkl.get_label_name(label_type)

illumio_pylo/cli/commands/workload_import.py

@@ -3,7 +3,10 @@ from dataclasses import dataclass
 import sys
 import argparse
 
+import click
+
 import illumio_pylo as pylo
+from illumio_pylo import ArraysToExcel, ExcelHeaderSet, ExcelHeader
 from .utils.LabelCreation import generate_list_of_labels_to_create, create_labels
 from .utils.misc import make_filename_with_timestamp
 from . import Command
@@ -42,6 +45,12 @@ def fill_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--batch-size', type=int, required=False, default=500,
                         help='Number of Workloads to create per API call')
 
+    parser.add_argument('--proceed-with-creation', '-p', action='store_true',
+                        help='If set, the script will proceed with the creation of the workloads')
+
+    parser.add_argument('--no-confirmation-required', '-n', action='store_true',
+                        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):
@@ -53,6 +62,8 @@ def __main(args, org: pylo.Organization, **kwargs):
     settings_header_label_prefix: str = args['label_type_header_prefix']
     settings_ignore_all_sorts_collisions: bool = args['ignore_all_sorts_collisions']
     settings_ignore_empty_ip_entries: bool = args['ignore_empty_ip_entries']
+    settings_proceed_with_creation: bool = args['proceed_with_creation']
+    settings_no_confirmation_required: bool = args['no_confirmation_required']
     settings_output_dir: str = args['output_dir']
 
     batch_size = args['batch_size']
@@ -76,13 +87,14 @@ def __main(args, org: pylo.Organization, **kwargs):
         csv_expected_fields.append({'name': f"{settings_header_label_prefix}{label_type}"  , 'optional': True})
 
 
-    csv_report_headers = ['name', 'hostname', 'ip', 'description']
+    csv_report_headers = ExcelHeaderSet(['name', 'hostname', 'ip', 'description'])
     for label_type in org.LabelStore.label_types:
         csv_report_headers.append(f'label_{label_type}')
-    csv_report_headers.append({'name': '**not_created_reason**'})
-    csv_report_headers.append({'name': 'href', 'max_width': 15})
 
-    csv_report = pylo.ArraysToExcel()
+    csv_report_headers.append(ExcelHeader(name='**not_created_reason**'))
+    csv_report_headers.append(ExcelHeader(name='href', max_width=15))
+
+    csv_report = ArraysToExcel()
     csv_sheet = csv_report.create_sheet('Workloads', csv_report_headers)
 
 
@@ -111,6 +123,11 @@ def __main(args, org: pylo.Organization, **kwargs):
     # <editor-fold desc="Missing Labels creation">
     if len(labels_to_be_created) > 0:
         print(" * {} Labels need to created before Workloads can be imported, listing:".format(len(labels_to_be_created)))
+        for label in labels_to_be_created:
+            print("   - Label: {} (type={})".format(label.name, label.type))
+        if not settings_no_confirmation_required:
+            click.confirm("Do you want to proceed with the creation of these labels?", abort=True)
+
         create_labels(labels_to_be_created, org)
     # </editor-fold>
 
@@ -132,21 +149,37 @@ 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:
-        print(" * Creating {} Unmanaged Workloads in batches of {}".format(umw_creator_manager.count_drafts(), batch_size))
-        total_created_count = 0
-        total_failed_count = 0
-
-        results = umw_creator_manager.create_all_in_pce(amount_created_per_batch=batch_size, retrieve_workloads_after_creation=False)
-        for result in results:
-            if result.success:
-                total_created_count += 1
-                result.external_tracker_id['href'] = result.workload_href
+        if not settings_proceed_with_creation is 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:
+                    object_to_create['**not_created_reason**'] = '--proceed-with-creation/-p flag was not set'
+        else:
+            confirmed = settings_no_confirmation_required
+            print(" * Creating {} Unmanaged Workloads in batches of {}".format(umw_creator_manager.count_drafts(), batch_size))
+            if not settings_no_confirmation_required:
+                confirmed = click.confirm("Do you want to proceed with the creation of these workloads?")
+
+            if not confirmed:
+                print(" * No Workloads will be created, user aborted the operation")
+                for object_to_create in csv_objects_to_create:
+                    if '**not_created_reason**' not in object_to_create:
+                        object_to_create['**not_created_reason**'] = 'user aborted the operation'
             else:
-                total_failed_count += 1
-                result.external_tracker_id['**not_created_reason**'] = result.message
+                total_created_count = 0
+                total_failed_count = 0
+
+                results = umw_creator_manager.create_all_in_pce(amount_created_per_batch=batch_size, retrieve_workloads_after_creation=False)
+                for result in results:
+                    if result.success:
+                        total_created_count += 1
+                        result.external_tracker_id['href'] = result.workload_href
+                    else:
+                        total_failed_count += 1
+                        result.external_tracker_id['**not_created_reason**'] = result.message
 
-        print("  * DONE - {} created with success, {} failures and {} ignored.".format(
-            total_created_count, total_failed_count, ignored_objects_count))
+                print("  * DONE - {} created with success, {} failures and {} ignored.".format(
+                    total_created_count, total_failed_count, ignored_objects_count))
     # </editor-fold>
 
     print()

illumio_pylo/cli/commands/workload_update.py

@@ -4,6 +4,7 @@ import argparse
 import sys
 
 import illumio_pylo as pylo
+from illumio_pylo import ArraysToExcel, ExcelHeader, ExcelHeaderSet
 from .utils.LabelCreation import generate_list_of_labels_to_create, create_labels
 from .utils.misc import make_filename_with_timestamp
 from . import Command
@@ -97,14 +98,14 @@ def __main(args, org: pylo.Organization, **kwargs):
     context.ignored_workloads_count = 0
 
 
-    csv_report_headers: List[Union[str, pylo.ExcelHeader]] = ['name', 'hostname']
+    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}')
     for label_type in org.LabelStore.label_types:
         csv_report_headers.append(f'new_{label_type}')
     csv_report_headers.extend(['**updated**', '**reason**', 'href'])
 
-    context.csv_report = csv_report = pylo.ArraysToExcel()
+    context.csv_report = 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">

illumio_pylo/tmp.py

@@ -3,12 +3,11 @@ from datetime import datetime
 
 import illumio_pylo as pylo
 
-log = logging.getLogger('Pylo')
-
+log = logging.getLogger('PYLO')
 
 def init_logger():
     console_logger = logging.StreamHandler()
-    formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+    formatter = logging.Formatter('%(asctime)s %(levelname)s %(name)s/%(filename)s:%(lineno)d - %(message)s')
     console_logger.setFormatter(formatter)
     log.addHandler(console_logger)
 
@@ -32,7 +31,12 @@ def get_logger():
     return log
 
 
-def find_connector_or_die(obj):
+def find_connector_or_die(obj) -> 'pylo.APIConnector':
+    """
+    Find the APIConnector object in the object or its owner recursively. Will raise an exception if not found
+    :param obj:
+    :return:
+    """
     connector = obj.__dict__.get('connector')  # type: pylo.APIConnector
     if connector is None:
         owner = obj.__dict__.get('owner')

{illumio_pylo-0.3.0.dist-info → illumio_pylo-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: illumio_pylo
-Version: 0.3.0
+Version: 0.3.2
 Summary: A set of tools and library for working with Illumio PCE
 Home-page: https://github.com/cpainchaud/pylo
 Author: Christophe Painchaud

{illumio_pylo-0.3.0.dist-info → illumio_pylo-0.3.2.dist-info}/RECORD

@@ -1,76 +1,72 @@
 illumio_pylo/AgentStore.py,sha256=O4dz9m0KM0TQPZvvEMoD_5pCkMvQ70YVDaWqbqqhR4k,5091
 illumio_pylo/Exception.py,sha256=3lxS-ANBaEvHAKhDb8UzNLj5IpQBmRHNs4YkHONmQjs,1033
 illumio_pylo/IPList.py,sha256=XljZM4AHjM59PoR0bPLoJDVjLFJGVjewF91GwXV29UY,4501
-illumio_pylo/IPMap.py,sha256=Jh7qpsp2G8faHU6hX6ahvpoJGJkmuLYyCEn1YVUl_2k,9980
+illumio_pylo/IPMap.py,sha256=2xCU0BD6Zc5yWgemn6Q0jNgs0owzp7TCyh6sVRLMf5U,10232
 illumio_pylo/Label.py,sha256=sn6qNFo8Etdl0lUYRoSp_VC0mJymuFJpQ99x9vAwKSY,835
 illumio_pylo/LabelCommon.py,sha256=2HzljD2xJSBjf4Ywxk8JpBQQfbiZILCMV_Mj_EATIGk,1500
 illumio_pylo/LabelGroup.py,sha256=bVXvONHwR44GkF-9S19Fs2cnc4g8IW42VjyKi7QXmvQ,2624
 illumio_pylo/LabelStore.py,sha256=_feA5HdrfnOgcWStBToesu1S2ymHQKEKEG2Ygcadh9g,19809
-illumio_pylo/LabeledObject.py,sha256=R5FlDzmGzFpePCaEKMvBYuXcD6ejH9Hc985U2XVAfpU,1965
-illumio_pylo/Organization.py,sha256=Cz9bTBQKuMkjGDV21G4NdPm18SwMnpuzO8Z3UjKAY4U,12242
+illumio_pylo/LabeledObject.py,sha256=zXIFcHtuvgxhu93htxiWtHoJ_mMWfSSdOBRNlEiXej0,1991
+illumio_pylo/Organization.py,sha256=MeESA6HuU0HzzkIKbj1NW_wzkarq30ptsCiffD1lm2M,12379
 illumio_pylo/Query.py,sha256=lgLjst41ma3HMVkngvTjL7zSLjh80RoXYL5vS3PWO7Q,13330
 illumio_pylo/ReferenceTracker.py,sha256=HyY0NwZwOdAzSXJrs6i6dhB_kgn1tidZL5LFLLkPuSM,1070
-illumio_pylo/Rule.py,sha256=pHTe-7eLgJ-ucXHvv6XQWihQ8WPhNoxCzTJ9NvJHj44,25496
-illumio_pylo/Ruleset.py,sha256=f8HIS2LIQ-LRBYWooLur_AR0OwMOTVpMquYAjwQZdcM,11987
+illumio_pylo/Rule.py,sha256=jPU0hj8BDv2t-keL3NCK6NEd-kYSRkjwtzdo1xWiC5E,26352
+illumio_pylo/Ruleset.py,sha256=G-YrxHRovECDV0TVOLOJyRbMtlgSNmqiq4jMwR3175A,11711
 illumio_pylo/RulesetStore.py,sha256=wJLAKi32y-YiI8NLWWa_Ykrn54AQDcLz3rRlvTGUToI,3379
 illumio_pylo/SecurityPrincipal.py,sha256=8c7VYirJvByjW4r8Vz4NYHXlGYawOVE6YHDpizSIIO4,2280
-illumio_pylo/Service.py,sha256=AIvBd_2p_ZSwakZLW__i8uwBnT0LPSXSSI0NzRIQGlI,8012
+illumio_pylo/Service.py,sha256=CKj5VHjkvy7YL18afHqgJl-Qole7s1NWoah3rWHm6Zw,8280
 illumio_pylo/SoftwareVersion.py,sha256=Wg8Mi7vcoL9JgFSRo3i5aiX_OkUIU3ahmgLUrzJ9JYw,4348
 illumio_pylo/VirtualService.py,sha256=KAKE4iWuNmOumGradR2vwZxZ_3iiZg4pBST5ixCZSng,561
 illumio_pylo/VirtualServiceStore.py,sha256=b6bcMixq0Vfv7WjQTQnFHGCv_Mld7sOfvGi4NtFAMQ4,3057
 illumio_pylo/Workload.py,sha256=OIrP2TVFpCjQdjMYPdHkZHcKRszZ2hPnj4uRhI6d8EI,19677
 illumio_pylo/WorkloadStore.py,sha256=08FKIk9fubsaHy_-m2a0Io5sO_V9jmTa40-L3vyemRc,10947
 illumio_pylo/WorkloadStoreSubClasses.py,sha256=tK7s-7s5wRf9SHv3T00EOzgv4gX8gPIM77KBubCzBuo,6092
-illumio_pylo/__init__.py,sha256=bF8M2oAaA0IzKYq6FFM9dhnwNKlk2RCixcxqN_1x3cM,4192
-illumio_pylo/tmp.py,sha256=zC3QAFfjMsthnbdjDKhXTG13q5G197oU-i45sMSDOhU,2926
-illumio_pylo/API/APIConnector.py,sha256=ufuZ0cNx-hpjgDGvWOAuGm91d3ykoEE5FC_CCv4UCZI,59144
+illumio_pylo/__init__.py,sha256=0cUO16-EHeOd6bZL4Aap5BngagWLcGsCZAnvhoVSxdg,4192
+illumio_pylo/tmp.py,sha256=7PIn11aYfoxed7tjG_I1iZmiacn4TxZPihs7qD7f4DI,3123
+illumio_pylo/API/APIConnector.py,sha256=PM-7sNPmBaZ8fLM5KGcLd7nXBha4Il6fFGAHntToSdk,59433
 illumio_pylo/API/AuditLog.py,sha256=p0mfjrE5S8qoJgA5LIP_XGFBP3iL86Nl6BQEmhMVrPA,1533
 illumio_pylo/API/ClusterHealth.py,sha256=GdMpVQrHUW4zLM-409GcPHM8H8b3LAppO37ZcUZyT_Q,5122
-illumio_pylo/API/CredentialsManager.py,sha256=8Z_R3AuVJk3Nhq1cwxHDBXp-z3GfIGOaNQeZBFpAw3c,10909
+illumio_pylo/API/CredentialsManager.py,sha256=vPqekauA0twbcpbWx8GcGFX4DQlh0y0SWAE9M4HKBsE,11031
 illumio_pylo/API/Explorer.py,sha256=fFAIF-67_uuKgJOP0eZPPJrOGuYmFl33GK75AyMjgJU,47590
 illumio_pylo/API/JsonPayloadTypes.py,sha256=eUsK1ba8PLoV-VReRE6A3qar-N3xckXRZbY2ckSkmMk,7113
 illumio_pylo/API/RuleSearchQuery.py,sha256=O0-MsUXhwmywoO0G-GXnLq6kkVC9LgmxMZwqVKc_oJE,5325
 illumio_pylo/API/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 illumio_pylo/Helpers/__init__.py,sha256=6E2eTZe-4qfPKGjRRQNtYsPrBhJSAjbdvv_DpniV_rY,49
-illumio_pylo/Helpers/exports.py,sha256=aI5JbmWNIdOpO2K1a3zXBoIgdryc71ZcMdMsTmm2rpE,21309
+illumio_pylo/Helpers/exports.py,sha256=mW8zGDqSyAsAC7WjC-WX1DDhDS-DCJ37cF3raZ_C6xg,21890
 illumio_pylo/Helpers/functions.py,sha256=TjI_NmD3cm1Escp3h51SFEDgS1vT9dUa8PX9-e0siao,4680
 illumio_pylo/cli/NativeParsers.py,sha256=nzDL54EV0J-Iz0P9EkeiPl6DWQBSbCu-MpEPRad3j6c,4055
-illumio_pylo/cli/__init__.py,sha256=wa0GHWNyRin-HfmJI4b9RMbKv-vwF-9Dra6ZgCSCWcU,6651
+illumio_pylo/cli/__init__.py,sha256=UuZ2KamgIpvfYE1FXilm_THHAvXimdUcvGb3Jrbjfhc,7737
 illumio_pylo/cli/__main__.py,sha256=ll1gK8k1YL_kPsImI7WVlw2sCyNyhocnuCqko6mGaYI,223
 illumio_pylo/cli/commands/__init__.py,sha256=yoVkXy-qBGiAAziWiayJdjcclx1WTayShXSPqHelcWA,1489
-illumio_pylo/cli/commands/credential_manager.py,sha256=oS7fM7HMmkaLoQZHOctpSZNeCgIqZpl9-y2C3OBt0Tk,6868
+illumio_pylo/cli/commands/credential_manager.py,sha256=nChEuE7jewCzVNH2dXn3VspsfPmplZO-TjXLt07h7MA,9613
 illumio_pylo/cli/commands/iplist_analyzer.py,sha256=vOl6fNd0HrUKnKXtY1sj7jeyx2GtuDZENV7mF79O7yU,3714
 illumio_pylo/cli/commands/iplist_import_from_file.py,sha256=XvC-GlJyjA4dDPzfvGoBFtwelI9g_rQqGzgKgqMYcsI,8284
-illumio_pylo/cli/commands/ruleset_export.py,sha256=a7kG1KIaYgkjzfgc2xq-3N7JR4KbEkKHJrpvIs1MU9A,5543
+illumio_pylo/cli/commands/ruleset_export.py,sha256=E64oYgGKI1Ry382DqV1gT4IlsLdd55QTqdInXlL9EPU,5896
 illumio_pylo/cli/commands/update_pce_objects_cache.py,sha256=kNBAmPIbJyw97FRcNREy059A5FLOGm_poKJYGdTWqr4,1256
-illumio_pylo/cli/commands/ven_compatibility_report_export.py,sha256=DwDOkHIJwibw1k5dMfNKh-Cqb1eBruM8gOJmYCASZP0,7959
-illumio_pylo/cli/commands/ven_duplicate_remover.py,sha256=32yefradL4E0Zg0sFHqy4X8Nj6mgUHBb8SHKj7XY7Dc,19497
+illumio_pylo/cli/commands/ven_compatibility_report_export.py,sha256=8ZpgGQfn5zmOslgeE1imwx4-gDHfukdgoXJGZUh9q3o,8120
+illumio_pylo/cli/commands/ven_duplicate_remover.py,sha256=sPq1E9LqJ0lku8c23zwfeJbCOblkG_3umve5-zV3DXU,19579
 illumio_pylo/cli/commands/ven_idle_to_visibility.py,sha256=OMcQSB82Pn50TS7OL1_TPOvvN9XFR3jUxVYYizUQinI,13387
-illumio_pylo/cli/commands/ven_upgrader.py,sha256=B07JbrEc8Gd5qgsu8JuYKMUagVEKBSuEXEDyFpO5n7c,11032
-illumio_pylo/cli/commands/workload_export.py,sha256=-khPwwtiZUyGHQHAdAE1G8X7seNLztEhmXHjn5ihoCc,11233
-illumio_pylo/cli/commands/workload_import.py,sha256=YOD9PIU5HX3a17hj0l3eYukDnJ-DHurDmvPvmEMZRLI,16876
+illumio_pylo/cli/commands/ven_upgrader.py,sha256=4cLUA7HSpskJpPOtEkQh41lE4gMGJJiQiKGCd0CKYJk,7222
+illumio_pylo/cli/commands/workload_export.py,sha256=EcQR8AacJVe7rOqYH-HFxyTchwHHQ9ZTc-ALSMt9gDY,11421
+illumio_pylo/cli/commands/workload_import.py,sha256=EJPjue9jnPR4UyLrh67LlXovvpmfa9Lb4DAfy6exAFA,18939
 illumio_pylo/cli/commands/workload_reset_names_to_null.py,sha256=GaO2Th1rx8i7_7yqb9WkGpDz3sdbYNod5fABQnhogig,3383
-illumio_pylo/cli/commands/workload_update.py,sha256=Yf_b3x-qU8KcCZxaE0K6edyHIOojUrRTvsZ89kro7dk,28441
+illumio_pylo/cli/commands/workload_update.py,sha256=hDiYEeOwGaSUkoG4NK7EvKbMnChoYJAGDmqRWDtLD9A,28484
 illumio_pylo/cli/commands/workload_used_in_rule_finder.py,sha256=2MO9jjYh-mkY6rkfvDyW0Ok6El_AqDWGXiFDYq5YgTk,3361
 illumio_pylo/cli/commands/utils/LabelCreation.py,sha256=qaU7BeP4et2GJxHwgbDNRoQLCA-xWp_y1nJ-m8ANUwA,4883
 illumio_pylo/cli/commands/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-illumio_pylo/cli/commands/utils/misc.py,sha256=BUnRLo_RVtVc79e_AmVlReU1aY_Z4cYQIVUYtAW9HVY,594
+illumio_pylo/cli/commands/utils/misc.py,sha256=iV5CEEccfQ08eO0wSpTOxS9-32_GXSekShic6auuGPE,761
 illumio_pylo/docs/Doxygen,sha256=AVvSIRYLHFWJ15YLGahhzhsW0ZUUFO5lVxd2-F3iWz8,74257
 illumio_pylo/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 illumio_pylo/utilities/cli.py,sha256=7Wv7qhdc91-vsaxiu4j8k7LY7V9dcwWHnHV7PLpOBAI,320
 illumio_pylo/utilities/credentials.example.json,sha256=CZcp3aAbdVljfyQzFbgxIZCU9Ln2eWZKfWcmN9VAeVc,439
-illumio_pylo/utilities/explorer_report_exporter.py,sha256=23wUjqc20eHgvwxyVYuoFfNozah2491XFaTUFBYHw7w,2693
 illumio_pylo/utilities/health_monitoring.py,sha256=sqe9gArMZm3s8y6Jg6F9SO_Rm2dj1aM99xpPi8WSFZc,3700
-illumio_pylo/utilities/iplists_stats_duplicates_unused_finder.py,sha256=cmxf_PUG5h3apmLLzIeAhKujUfm9QDOEF-TNK0ZEu8I,2547
-illumio_pylo/utilities/ven_idle_to_illumination.py,sha256=GKfpKHN4KdtYcmm-tepFaQhCtk-vLg5dH-NdnR2FJeU,14824
-illumio_pylo/utilities/ven_reassign_pce.py,sha256=eKMfVMgkESBI-fXB-sBHMOsW24ooN-ng4mP9LOLpkW8,7700
 illumio_pylo/utilities/resources/iplists-import-example.csv,sha256=beM9OBWJQNiYXlGh1KYiHxCN8LpZk4uPpoiO14-CgOE,200
 illumio_pylo/utilities/resources/iplists-import-example.xlsx,sha256=VW-7CRr8NA2Vultv9jLGd8-_jzVp5ZtL3KgswjOUHeQ,16893
 illumio_pylo/utilities/resources/workload-exporter-filter-example.csv,sha256=cn5IA8AGEPjvS-EsPXA_GJ-LFsdF9t_44rSzFTCmAzE,36
 illumio_pylo/utilities/resources/workloads-import-example.csv,sha256=DEOGVikFjxQpMFFI0l0jb3hrxEEeZCpTGkmWkz6GUcY,91
 illumio_pylo/utilities/resources/workloads-import-example.xlsx,sha256=U8Ac2BZidA6NlvBFAVPHqeY5zmg3rjmIAXp5b3b1P5w,17101
-illumio_pylo-0.3.0.dist-info/LICENSE,sha256=WYmcYJG1QFgu1hfo7qrEkZ3Jhcz8NUWe6XUraZvlIFs,10172
-illumio_pylo-0.3.0.dist-info/METADATA,sha256=Bc9yiJZnKYOiuLSRGlKBJHkU8A0KHLTmen1mXuih5K8,12224
-illumio_pylo-0.3.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-illumio_pylo-0.3.0.dist-info/top_level.txt,sha256=c5cu_ZMuSuxjq48ih58Kc0Tr8-JdQtV8GrKJicvWNFE,13
-illumio_pylo-0.3.0.dist-info/RECORD,,
+illumio_pylo-0.3.2.dist-info/LICENSE,sha256=WYmcYJG1QFgu1hfo7qrEkZ3Jhcz8NUWe6XUraZvlIFs,10172
+illumio_pylo-0.3.2.dist-info/METADATA,sha256=TQ6C78x4N8G9pvl48e9MKRErO1CIjV17ETRUM1tN824,12224
+illumio_pylo-0.3.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+illumio_pylo-0.3.2.dist-info/top_level.txt,sha256=c5cu_ZMuSuxjq48ih58Kc0Tr8-JdQtV8GrKJicvWNFE,13
+illumio_pylo-0.3.2.dist-info/RECORD,,

illumio_pylo/utilities/explorer_report_exporter.py

@@ -1,86 +0,0 @@
-import os
-import sys
-import argparse
-import math
-from datetime import datetime
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))))
-import illumio_pylo as pylo
-
-
-# <editor-fold desc="Argparse stuff">
-parser = argparse.ArgumentParser(description='TODO LATER', formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-parser.add_argument('--pce', type=str, required=True,
-                    help='hostname of the PCE')
-parser.add_argument('--debug', '-d', action='store_true',
-                    help='extra debugging messages for developers')
-
-parser.add_argument('--consumer-labels', '-cl', type=str, nargs='+', required=False, default=False,
-                    help='extra debugging messages for developers')
-# </editor-fold>
-
-
-args = vars(parser.parse_args())
-
-if args['debug']:
-    pylo.log_set_debug()
-
-
-hostname = args['pce']
-
-
-now = datetime.now()
-report_file = 'explorer-results_{}.csv'.format(now.strftime("%Y%m%d-%H%M%S"))
-report_file_excel = 'explorer-results_{}.xlsx'.format(now.strftime("%Y%m%d-%H%M%S"))
-
-
-csv_report_headers = ['name', 'hostname', 'role', 'app', 'env', 'loc', 'href']
-csv_report = pylo.ArrayToExport(csv_report_headers)
-
-
-# <editor-fold desc="PCE Configuration Download and Parsing">
-org = pylo.Organization(1)
-fake_config = pylo.Organization.create_fake_empty_config()
-
-print(" * Looking for credentials for PCE '{}'... ".format(hostname), end="", flush=True)
-connector = pylo.APIConnector.create_from_credentials_in_file(hostname, request_if_missing=True)
-print("OK!")
-
-print(" * Downloading Labels listing from the PCE... ", end="", flush=True)
-fake_config['labels'] = connector.objects_label_get()
-print("OK!")
-
-print(" * Parsing PCE data ... ", end="", flush=True)
-org.pce_version = connector.version
-org.connector = connector
-org.load_from_json(fake_config)
-print("OK!")
-
-# </editor-fold>
-
-
-print(" - Now building query parameters:")
-if args['consumer_labels'] is not False:
-    print("   - Consumer labels were provided:")
-else:
-    print("   - No Consumer label provided")
-
-explorer_filters = connector.ExplorerFilterSetV1(max_results=2)
-
-print(" - Querying PCE...", end='', flush=True)
-search_results = connector.explorer_search(explorer_filters)
-print(" OK!")
-print(pylo.nice_json(search_results))
-
-
-print()
-print(" * Writing report file '{}' ... ".format(report_file), end='', flush=True)
-csv_report.write_to_csv(report_file)
-print("DONE")
-print(" * Writing report file '{}' ... ".format(report_file_excel), end='', flush=True)
-csv_report.write_to_excel(report_file_excel)
-print("DONE")
-
-if csv_report.lines_count() < 1:
-    print("\n** WARNING: no entry matched your filters so reports are empty !\n")
-

illumio_pylo/utilities/iplists_stats_duplicates_unused_finder.py

@@ -1,75 +0,0 @@
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))))
-import illumio_pylo as pylo
-import argparse
-
-
-parser = argparse.ArgumentParser(description='TODO LATER')
-parser.add_argument('--pce', type=str, required=True,
-                    help='hostname of the PCE')
-
-args = vars(parser.parse_args())
-
-hostname = args['pce']
-
-
-org = pylo.Organization(1)
-
-print("Loading PCE configuration from '{}' or cached file... ".format(hostname), end="", flush=True)
-org.load_from_cache_or_saved_credentials(hostname, prompt_for_api_key_if_missing=True)
-print("OK!\n")
-
-unique_hashes = {}
-unique_ipranges = {}
-total_ipranges = 0
-unused_iplists = []
-
-for iplist in org.IPListStore.items_by_href.values():
-    #print("- handling of iplist '{}' with {} members".format(iplist.name, iplist.count_entries()))
-    entries_hash = ""
-    for entry in sorted(iplist.raw_entries):
-        total_ipranges += 1
-
-        entries_hash += entry + ' '
-        if entry not in unique_ipranges:
-            unique_ipranges[entry] = [iplist]
-        else:
-            unique_ipranges[entry].append(iplist)
-
-    #print("  - hash: {}".format(entries_hash))
-
-    if entries_hash in unique_hashes:
-        unique_hashes[entries_hash].append(iplist)
-    else:
-        unique_hashes[entries_hash] = [iplist]
-
-    if iplist.count_references() == 0:
-        unused_iplists.append(iplist)
-
-    #print(pylo.nice_json(iplist.raw_json))
-
-
-print("*** Listing Unused IPLists ***")
-for iplist in unused_iplists:
-    print(" - '{}' HREF:{}".format(iplist.name, iplist.href))
-
-
-print("*** Listing Duplicate IPLists ***")
-for hash in unique_hashes:
-    if len(unique_hashes[hash]) <= 1:
-        continue
-    print(" - hash {}'".format(hash))
-    for iplist in unique_hashes[hash]:
-        print("    - {} HREF:{}".format(iplist.name, iplist.href))
-
-
-print("\nIPlist count: {}\nUnique iplists: {}\nIPRanges count: {}\nUnique IPRanges: {}".format(org.IPListStore.count(),
-                                                                                               len(unique_hashes),
-                                                                                               total_ipranges,
-                                                                                               len(unique_ipranges)
-                                                                                               ))
-print("Unused IPlists: {}".format(len(unused_iplists)))
-
-print("\nGeneric Config statistics:\n{}".format(org.stats_to_str()))