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

illumio_pylo/API/APIConnector.py

@@ -2,7 +2,7 @@ import json
 import time
 import getpass
 
-from .CredentialsManager import is_api_key_encrypted, decrypt_api_key
+from .CredentialsManager import is_api_key_encrypted, decrypt_api_key, CredentialProfile
 from .JsonPayloadTypes import LabelGroupObjectJsonStructure, LabelObjectCreationJsonStructure, \
     LabelObjectJsonStructure, LabelObjectUpdateJsonStructure, PCEObjectsJsonStructure, \
     LabelGroupObjectUpdateJsonStructure, IPListObjectCreationJsonStructure, IPListObjectJsonStructure, \
@@ -108,6 +108,12 @@ class APIConnector:
     def get_all_object_types():
         return all_object_types.copy()
 
+    @staticmethod
+    def create_from_credentials_object(credentials: CredentialProfile) -> Optional['APIConnector']:
+        return APIConnector(credentials.fqdn, credentials.port, credentials.api_user,
+                            credentials.api_key, skip_ssl_cert_check=not credentials.verify_ssl,
+                            org_id=credentials.org_id, name=credentials.name)
+
     @staticmethod
     def create_from_credentials_in_file(fqdn_or_profile_name: str, request_if_missing: bool = False,
                                         credential_file: Optional[str] = None) -> Optional['APIConnector']:
@@ -115,9 +121,7 @@ class APIConnector:
         credentials = pylo.get_credentials_from_file(fqdn_or_profile_name, credential_file)
 
         if credentials is not None:
-            return APIConnector(credentials.fqdn, credentials.port, credentials.api_user,
-                                credentials.api_key, skip_ssl_cert_check=not credentials.verify_ssl,
-                                org_id=credentials.org_id, name=credentials.name)
+            return APIConnector.create_from_credentials_object(credentials)
 
         if not request_if_missing:
             return None
@@ -362,7 +366,7 @@ class APIConnector:
         else:
             raise pylo.PyloEx("Unsupported object type '{}'".format(object_type))
 
-    def get_pce_objects(self, include_deleted_workloads=False, list_of_objects_to_load: Optional[List[str]] = None):
+    def get_pce_objects(self, include_deleted_workloads=False, list_of_objects_to_load: Optional[List[str]] = None, force_async_mode=False):
 
         objects_to_load = {}
         if list_of_objects_to_load is not None:
@@ -389,7 +393,7 @@ class APIConnector:
         errors = []
         thread_queue = Queue()
 
-        def get_objects(q: Queue, thread_num: int):
+        def get_objects(q: Queue, thread_num: int, force_async_mode=False):
             while True:
                 object_type, errors = q.get()
                 try:
@@ -397,7 +401,7 @@ class APIConnector:
                         q.task_done()
                         continue
                     if object_type == 'workloads':
-                        if self.get_objects_count_by_type(object_type) > default_max_objects_for_sync_calls:
+                        if self.get_objects_count_by_type(object_type) > default_max_objects_for_sync_calls or force_async_mode:
                             data['workloads'] = self.objects_workload_get(include_deleted=include_deleted_workloads)
                         else:
                             data['workloads'] = self.objects_workload_get(include_deleted=include_deleted_workloads, async_mode=False, max_results=default_max_objects_for_sync_calls)
@@ -456,7 +460,7 @@ class APIConnector:
                 q.task_done()
 
         for i in range(threads_count):
-            worker = Thread(target=get_objects, args=(thread_queue, i))
+            worker = Thread(target=get_objects, args=(thread_queue, i, force_async_mode,))
             worker.daemon = True
             worker.start()
 

illumio_pylo/API/CredentialsManager.py

@@ -97,7 +97,7 @@ def get_all_credentials_from_file(credential_file: str ) -> List[CredentialProfi
 
 
 def get_credentials_from_file(fqdn_or_profile_name: str = None,
-                              credential_file: str = None) -> CredentialProfile:
+                              credential_file: str = None, fail_with_an_exception=True) -> Optional[CredentialProfile]:
 
     if fqdn_or_profile_name is None:
         log.debug("No fqdn_or_profile_name provided, profile_name=default will be used")
@@ -121,9 +121,12 @@ def get_credentials_from_file(fqdn_or_profile_name: str = None,
         if credential_profile.fqdn.lower() == fqdn_or_profile_name.lower():
             return credential_profile
 
-    raise PyloEx("No profile found in credential file '{}' with fqdn: {}".
+    if fail_with_an_exception:
+        raise PyloEx("No profile found in credential file '{}' with fqdn: {}".
                     format(credential_file, fqdn_or_profile_name))
 
+    return None
+
 
 def list_potential_credential_files() -> List[str]:
     """
@@ -204,9 +207,7 @@ def create_credential_in_default_file(data: CredentialFileEntry) -> str:
     return file_path
 
 
-def encrypt_api_key_with_paramiko_key(ssh_key: paramiko.AgentKey, api_key: str) -> str:
-
-
+def encrypt_api_key_with_paramiko_ssh_key_fernet(ssh_key: paramiko.AgentKey, api_key: str) -> str:
     def encrypt(raw: str, key: bytes) -> bytes:
         """
 
@@ -220,7 +221,7 @@ def encrypt_api_key_with_paramiko_key(ssh_key: paramiko.AgentKey, api_key: str)
 
 
     # generate a random 128bit key
-    session_key_to_sign = os.urandom(16)
+    session_key_to_sign = os.urandom(32)
 
     signed_message = ssh_key.sign_ssh_data(session_key_to_sign)
 
@@ -236,7 +237,7 @@ def encrypt_api_key_with_paramiko_key(ssh_key: paramiko.AgentKey, api_key: str)
     return api_key
 
 
-def decrypt_api_key_with_paramiko_key(encrypted_api_key_payload: str) -> str:
+def decrypt_api_key_with_paramiko_ssh_key_fernet(encrypted_api_key_payload: str) -> str:
     def decrypt(token_b64_encoded: str, key: bytes):
         f = Fernet(base64.urlsafe_b64encode(key))
         return f.decrypt(token_b64_encoded).decode('utf-8')
@@ -277,7 +278,7 @@ def decrypt_api_key(encrypted_api_key_payload: str) -> str:
     if not encrypted_api_key_payload.startswith("$encrypted$:"):
         raise PyloEx("Invalid encrypted API key format")
     if encrypted_api_key_payload.startswith("$encrypted$:ssh-Fernet:"):
-        return decrypt_api_key_with_paramiko_key(encrypted_api_key_payload)
+        return decrypt_api_key_with_paramiko_ssh_key_fernet(encrypted_api_key_payload)
 
     raise PyloEx("Unsupported encryption method: {}".format(encrypted_api_key_payload.split(":")[1]))
 

illumio_pylo/Helpers/exports.py

@@ -255,10 +255,9 @@ class ArraysToExcel:
                             new_line.append('=HYPERLINK("{}", "{}")'.format(item,self._headers[item_index].url_text))
                         else:
                             new_line.append(item)
-
-                    length = find_length(new_line[item_index])
-                    if length > columns_max_width[item_index]:
-                        columns_max_width[item_index] = length
+                            length = find_length(new_line[item_index])
+                            if length > columns_max_width[item_index]:
+                                columns_max_width[item_index] = length
 
 
                 xls_data.append(new_line)

illumio_pylo/IPMap.py

@@ -71,6 +71,15 @@ class IP4Map:
             self._entries.append(new_entry)
             self.sort_and_recalculate()
 
+    def add_another_map(self, another_map: 'IP4Map', skip_recalculation=False):
+        for entry in another_map._entries:
+            self._entries.append(entry)
+
+        if skip_recalculation:
+            return
+
+        self.sort_and_recalculate()
+
     def intersection(self, another_map: 'IP4Map'):
 
         inverted_map = IP4Map()

illumio_pylo/LabeledObject.py

@@ -13,7 +13,7 @@ class LabeledObject:
     def get_labels_dict(self):
         return self._labels.copy()
 
-    def get_labels(self):
+    def get_labels(self) -> Iterable['pylo.Label']:
         return self._labels.values()
 
     def set_label(self, label :'pylo.Label'):

illumio_pylo/Organization.py

@@ -135,7 +135,10 @@ class Organization:
             object_to_load = pylo.APIConnector.get_all_object_types()
 
         if self.pce_version is None:
-            raise pylo.PyloEx('Organization has no "version" specified')
+            if 'pce_version' in data:
+                self.pce_version = pylo.SoftwareVersion(data['pce_version'])
+            else:
+                raise pylo.PyloEx('Organization has no "version" specified')
 
         self.LabelStore.load_label_dimensions(data.get('label_dimensions'))
 

illumio_pylo/Rule.py

@@ -4,7 +4,7 @@ from typing import Optional, List, Union, Dict, Any, NewType
 import illumio_pylo as pylo
 from .API.JsonPayloadTypes import RuleServiceReferenceObjectJsonStructure, RuleDirectServiceReferenceObjectJsonStructure
 from illumio_pylo import Workload, Label, LabelGroup, Ruleset, Referencer, SecurityPrincipal, PyloEx, \
-    Service, nice_json, string_list_to_text, find_connector_or_die, VirtualService, IPList
+    Service, nice_json, string_list_to_text, find_connector_or_die, VirtualService, IPList, PortMap
 
 RuleActorsAcceptableTypes = NewType('RuleActorsAcceptableTypes', Union[Workload, Label, LabelGroup, IPList, VirtualService])
 
@@ -250,6 +250,7 @@ class RuleServiceContainer(pylo.Referencer):
         self.owner = owner
         self._items: Dict[Service, Service] = {}
         self._direct_services: List[DirectServiceInRule] = []
+        self._cached_port_map: Optional[PortMap] = None
 
     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
@@ -295,6 +296,8 @@ class RuleServiceContainer(pylo.Referencer):
         :param service:
         :return: True if the service was removed, False if it was not found
         """
+        self._cached_port_map = None
+
         for i in range(0, len(self._direct_services)):
             if self._direct_services[i] is service:
                 del(self._direct_services[i])
@@ -302,6 +305,8 @@ class RuleServiceContainer(pylo.Referencer):
         return False
 
     def add_direct_service(self, service: DirectServiceInRule) -> bool:
+        self._cached_port_map = None
+
         for member in self._direct_services:
             if service is member:
                 return False
@@ -352,6 +357,27 @@ class RuleServiceContainer(pylo.Referencer):
 
         self.owner.raw_json.update(data)
 
+    def get_port_map(self) -> PortMap:
+        """
+        Get a PortMap object with all ports and protocols from all services in this container
+        :return:
+        """
+        if self._cached_port_map is not None:
+            return self._cached_port_map
+
+        result = PortMap()
+        for service in self._items.values():
+            for entry in service.entries:
+                result.add(entry.protocol, entry.port, entry.to_port, skip_recalculation=True)
+        for direct in self._direct_services:
+            result.add(direct.protocol, direct.port, direct.to_port, skip_recalculation=True)
+
+        result.merge_overlapping_maps()
+
+        self._cached_port_map = result
+
+        return result
+
 
 class RuleHostContainer(pylo.Referencer):
     def __init__(self, owner: 'pylo.Rule', name: str):

illumio_pylo/Ruleset.py

@@ -101,29 +101,17 @@ class RulesetScopeEntry:
 
 
     def to_string(self, label_separator = '|', use_href=False):
-        string = 'All' + label_separator
-        if self.app_label is not None:
-            if use_href:
-                string = self.app_label.href + label_separator
-            else:
-                string = self.app_label.name + label_separator
-
-        if self.env_label is None:
-            string += 'All' + label_separator
-        else:
-            if use_href:
-                string += self.env_label.href + label_separator
-            else:
-                string += self.env_label.name + label_separator
-
-        if self.loc_label is None:
-            string += 'All'
-        else:
-            if use_href:
-                string += self.loc_label.href
+        string = ''
+        for label_type in self.owner.owner.owner.owner.LabelStore.label_types:
+            label = self._labels.get(label_type)
+            if len(string) > 0:
+                string += label_separator
+            if label is None:
+                string += 'All'
+            elif use_href:
+                string += label.href
             else:
-                string += self.loc_label.name
-
+                string += label.name
         return string
 
     def is_all_all_all(self):
@@ -156,10 +144,6 @@ class RulesetScopeEntry:
 
 class Ruleset:
 
-    name: str
-    href: Optional[str]
-    description: str
-
     def __init__(self, owner: 'pylo.RulesetStore'):
         self.owner: 'pylo.RulesetStore' = owner
         self.href: Optional[str] = None
@@ -169,6 +153,7 @@ class Ruleset:
         # must keep an ordered list of rules while the dict by href is there for quick searches
         self._rules_by_href: Dict[str, 'pylo.Rule'] = {}
         self._rules: List['pylo.Rule'] = []
+        self.disabled: bool = False
 
     @property
     def rules(self):
@@ -211,6 +196,9 @@ class Ruleset:
             raise pylo.PyloEx("Cannot find Ruleset href in JSON data: \n" + pylo.Helpers.nice_json(data))
         self.href = data['href']
 
+        if 'enabled' in data:
+            self.disabled = not data['enabled']
+
         scopes_json = data.get('scopes')
         if scopes_json is None:
             raise pylo.PyloEx("Cannot find Ruleset scope in JSON data: \n" + pylo.Helpers.nice_json(data))
@@ -287,7 +275,7 @@ class Ruleset:
         if pce_fqdn is None or pce_port is None:
             connector = pylo.find_connector_or_die(self)
             if pce_fqdn is None:
-                pce_fqdn = connector.hostname
+                pce_fqdn = connector.fqdn
             if pce_port is None:
                 pce_port = connector.port
 

illumio_pylo/Service.py

@@ -7,10 +7,20 @@ from typing import *
 
 class PortMap:
     def __init__(self):
-        self._tcp_map = []
-        self._udp_map = []
+        self._tcp_map: List[List[2]] = []  # [start, end]
+        self._udp_map: List[List[2]] = []  # [start, end]
         self._protocol_map = {}
 
+    def copy(self) -> 'PortMap':
+        new_map = PortMap()
+        new_map._tcp_map = self._tcp_map.copy()
+        new_map._udp_map = self._udp_map.copy()
+        new_map._protocol_map = self._protocol_map.copy()
+        return new_map
+
+    def count(self) -> int:
+        return len(self._tcp_map) + len(self._udp_map) + len(self._protocol_map)
+
     def add(self, protocol, start_port: int, end_port: int = None, skip_recalculation=False):
 
         proto = None
@@ -31,67 +41,54 @@ class PortMap:
             return
 
         if start_port is None:
+            start_port = end_port
+
+        if end_port is None:
             end_port = start_port
 
-        new_entry = [start_port, end_port]
+        if proto == 6:
+            self._tcp_map.append([start_port, end_port])
+        else:
+            self._udp_map.append([start_port, end_port])
 
         if not skip_recalculation:
             self.merge_overlapping_maps()
 
-    def merge_overlapping_maps(self):
-        self._sort_maps()
-
-        new_map = []
-
-        cur_entry = None
-
-        for original_entry in self._tcp_map:
-            if cur_entry is None:
-                cur_entry = original_entry
-                continue
-
-            cur_start = cur_entry[0]
-            cur_end = cur_entry[1]
-            new_start = original_entry[0]
-            new_end = original_entry[1]
+    def to_list_of_objects(self) -> List[Dict]:
+        result = []
+        for entry in self._tcp_map:
+            result.append({'proto': 6, 'port': entry[0], 'to_port': entry[1]})
 
-            if new_start > cur_end + 1:
-                new_map.append(cur_entry)
-                continue
+        for entry in self._udp_map:
+            result.append({'proto': 17, 'port': entry[0], 'to_port': entry[1]})
 
-            if new_end > cur_end:
-                cur_entry[1] = new_end
+        for proto in self._protocol_map:
+            result.append({'proto': proto})
 
-        if cur_entry is not None:
-            self._tcp_map = []
-        else:
-            new_map.append(cur_entry)
-            self._tcp_map = new_map
-
-        new_map = []
-
-        for original_entry in self._udp_map:
-            if cur_entry is None:
-                cur_entry = original_entry
-                continue
-
-            cur_start = cur_entry[0]
-            cur_end = cur_entry[1]
-            new_start = original_entry[0]
-            new_end = original_entry[1]
-
-            if new_start > cur_end + 1:
-                new_map.append(cur_entry)
-                continue
+        return result
 
-            if new_end > cur_end:
-                cur_entry[1] = new_end
+    def merge_overlapping_maps(self):
+        self._sort_maps()
 
-        if cur_entry is not None:
-            self._udp_map = []
-        else:
-            new_map.append(cur_entry)
-            self._udp_map = new_map
+        def merge_maps(map_list):
+            new_list = []
+            current = None
+            for entry in map_list:
+                if current is None:
+                    current = entry
+                    continue
+
+                if entry[0] <= current[1] + 1:
+                    current[1] = entry[1]
+                else:
+                    new_list.append(current)
+                    current = entry
+            if current is not None:
+                new_list.append(current)
+            return new_list
+
+        self._tcp_map = merge_maps(self._tcp_map)
+        self._udp_map = merge_maps(self._udp_map)
 
     def _sort_maps(self):
         def first_entry(my_list):

illumio_pylo/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 
 import os
 import sys

illumio_pylo/cli/__init__.py

@@ -1,6 +1,7 @@
 import os
 from typing import Optional, Dict
-
+import time
+import datetime
 import sys
 import argparse
 from .NativeParsers import BaseParser
@@ -15,6 +16,8 @@ from illumio_pylo.cli import commands
 
 def run(forced_command_name: Optional[str] = None):
 
+    cli_start_time = datetime.datetime.now()
+
     def add_native_parser_to_argparse(parser: argparse.ArgumentParser, native_parsers: object):
         # each property of the native parser is an extension of BaseParser, we need to iterate over them and add them to the argparse parser
         for attr_name in dir(native_parsers):
@@ -33,9 +36,11 @@ def run(forced_command_name: Optional[str] = None):
                     print(" * Native CLI arguments parsing...")
                 attr.execute(args[attr.get_arg_name()], org, padding='    ')
 
-    parser = argparse.ArgumentParser(description='TODO LATER')
+    parser = argparse.ArgumentParser(description='PYLO-CLI: Illumio API&More Command Line Interface')
     parser.add_argument('--pce', type=str, required=False,
                         help='hostname of the PCE')
+    parser.add_argument('--force-async-mode', action='store_true',
+                        help='Forces the command to run async API queries when required (large PCEs which timeout on specific queries)')
     parser.add_argument('--debug', action='store_true',
                         help='Enables extra debugging output in Pylo framework')
     parser.add_argument('--use-cache', action='store_true',
@@ -89,14 +94,16 @@ 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
         if credential_profile_name is None:
             raise pylo.PyloEx("The --pce argument is required for this command")
         if settings_use_cache:
             print(" * Loading objects from cached PCE '{}' data... ".format(credential_profile_name), end="", flush=True)
             org = pylo.Organization.get_from_cache_file(credential_profile_name)
-            print("OK!")
+            print("OK! (execution time: {:.2f} seconds)".format(time.perf_counter() - timer_start))
             connector = pylo.APIConnector.create_from_credentials_in_file(credential_profile_name, request_if_missing=False)
             if connector is not None:
                 org.connector = connector
@@ -106,8 +113,9 @@ def run(forced_command_name: Optional[str] = None):
             print("OK!")
 
             print(" * Downloading PCE objects from API... ".format(credential_profile_name), end="", flush=True)
-            config_data = connector.get_pce_objects(list_of_objects_to_load=selected_command.load_specific_objects_only)
-            print("OK!")
+            config_data = connector.get_pce_objects(list_of_objects_to_load=selected_command.load_specific_objects_only, force_async_mode=args['force_async_mode'])
+            timer_download_finished = time.perf_counter()
+            print("OK! (execution time: {:.2f} seconds)".format(timer_download_finished - timer_start))
 
             org = pylo.Organization(1)
             org.connector = connector
@@ -116,7 +124,7 @@ def run(forced_command_name: Optional[str] = None):
                 print(" * Loading objects from PCE '{}' via API... ".format(credential_profile_name), end="", flush=True)
                 org.pce_version = connector.get_software_version()
                 org.load_from_json(config_data, list_of_objects_to_load=selected_command.load_specific_objects_only)
-                print("OK!")
+                print("OK! (execution time: {:.2f} seconds)".format(time.perf_counter() - timer_download_finished))
 
         print()
         if not selected_command.skip_pce_config_loading:
@@ -126,6 +134,7 @@ def run(forced_command_name: Optional[str] = None):
             print(flush=True)
 
     print("**** {} UTILITY ****".format(selected_command.name.upper()), flush=True)
+    command_execution_time_start = time.perf_counter()
     if selected_command.native_parsers is None:
         native_parsers = None
     else:
@@ -138,7 +147,11 @@ def run(forced_command_name: Optional[str] = None):
         commands.available_commands[selected_command.name].main(args, org=org, config_data=config_data, connector=connector, pce_cache_was_used=settings_use_cache)
 
     print()
+    cli_end_time = datetime.datetime.now()
     print("**** END OF {} UTILITY ****".format(selected_command.name.upper()))
+    print("Command Specific Execution time: {:.2f} seconds".format(time.perf_counter() - command_execution_time_start))
+    print("CLI started at {} and finished at {}".format(cli_start_time, cli_end_time))
+    print("CLI Total Execution time: {}".format(cli_end_time - cli_start_time))
     print()
 
 

illumio_pylo/cli/commands/credential_manager.py

@@ -1,3 +1,5 @@
+import sys
+
 from prettytable import PrettyTable
 import argparse
 import os
@@ -7,7 +9,8 @@ import paramiko
 import illumio_pylo as pylo
 import click
 from illumio_pylo.API.CredentialsManager import get_all_credentials, create_credential_in_file, CredentialFileEntry, \
-    create_credential_in_default_file, encrypt_api_key_with_paramiko_key, decrypt_api_key_with_paramiko_key
+    create_credential_in_default_file, encrypt_api_key_with_paramiko_ssh_key_fernet, decrypt_api_key_with_paramiko_ssh_key_fernet, \
+    get_credentials_from_file
 
 from illumio_pylo import log
 from . import Command
@@ -20,19 +23,24 @@ objects_load_filter = None
 def fill_parser(parser: argparse.ArgumentParser):
     sub_parser = parser.add_subparsers(dest='sub_command', required=True)
     list_parser = sub_parser.add_parser('list', help='List all credentials')
-    create_parser = sub_parser.add_parser('create', help='Create a new credential')
 
-    create_parser.add_argument('--name', required=True, type=str,
-                               help='Name of the credential')
-    create_parser.add_argument('--fqdn', required=True, type=str,
+    test_parser = sub_parser.add_parser('test', help='Test a credential')
+    test_parser.add_argument('--name', required=False, type=str, default=None,
+                             help='Name of the credential profile to test')
+
+
+    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')
+    create_parser.add_argument('--fqdn', required=False, type=str, default=None,
                                  help='FQDN of the PCE')
-    create_parser.add_argument('--port', required=True, type=int,
+    create_parser.add_argument('--port', required=False, type=int, default=None,
                                  help='Port of the PCE')
-    create_parser.add_argument('--org', required=True, type=int,
+    create_parser.add_argument('--org', required=False, type=int, default=None,
                                  help='Organization ID')
-    create_parser.add_argument('--api-user', required=True, type=str,
+    create_parser.add_argument('--api-user', required=False, type=str, default=None,
                                     help='API user')
-    create_parser.add_argument('--verify-ssl', required=True, type=bool,
+    create_parser.add_argument('--verify-ssl', required=False, type=bool, default=None,
                                  help='Verify SSL')
 
 
@@ -54,14 +62,10 @@ def __main(args, **kwargs):
                   )
 
     elif args['sub_command'] == 'create':
-        print("Recap:")
-        print("Name: {}".format(args['name']))
-        print("FQDN: {}".format(args['fqdn']))
-        print("Port: {}".format(args['port']))
-        print("Org ID: {}".format(args['org']))
-        print("API User: {}".format(args['api_user']))
-        print("Verify SSL: {}".format(args['verify_ssl']))
-        print()
+
+        wanted_name = args['name']
+        if wanted_name is None:
+            wanted_name = click.prompt('> Input a Profile Name (ie: prod-pce)', type=str)
 
         print("* Checking if a credential with the same name already exists...", flush=True, end="")
         credentials = get_all_credentials()
@@ -70,20 +74,52 @@ def __main(args, **kwargs):
                 raise pylo.PyloEx("A credential named '{}' already exists".format(args['name']))
         print("OK!")
 
+        wanted_fqdn = args['fqdn']
+        if wanted_fqdn is None:
+            wanted_fqdn = click.prompt('> PCE FQDN (ie: pce1.mycompany.com)', type=str)
+
+        wanted_port = args['port']
+        if wanted_port is None:
+            wanted_port = click.prompt('> PCE Port (ie: 8443)', type=int)
+
+        wanted_org = args['org']
+        if wanted_org is None:
+            wanted_org = click.prompt('> Organization ID', type=int)
+
+        wanted_api_user = args['api_user']
+        if wanted_api_user is None:
+            wanted_api_user = click.prompt('> API User', type=str)
+
+        wanted_verify_ssl = args['verify_ssl']
+        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))
+        print("FQDN: {}".format(wanted_fqdn))
+        print("Port: {}".format(wanted_port))
+        print("Org ID: {}".format(wanted_org))
+        print("API User: {}".format(wanted_api_user))
+        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)
 
         credentials_data: CredentialFileEntry = {
-            "name": args['name'],
-            "fqdn": args['fqdn'],
-            "port": args['port'],
-            "org_id": args['org'],
-            "api_user": args['api_user'],
-            "verify_ssl": args['verify_ssl'],
+            "name": wanted_name,
+            "fqdn": wanted_fqdn,
+            "port": wanted_port,
+            "org_id": wanted_org,
+            "api_user": wanted_api_user,
+            "verify_ssl": wanted_verify_ssl,
             "api_key": api_key
         }
 
-        encrypt_api_key = click.prompt('> Encrypt API? Y/N', type=bool)
+        encrypt_api_key = click.prompt('> Encrypt API (requires an SSH agent running and an RSA or Ed25519 key) ? Y/N', type=bool)
         if encrypt_api_key:
             print("Available keys (ECDSA NISTPXXX keys and a few others are not supported and will be filtered out):")
             ssh_keys = paramiko.Agent().get_keys()
@@ -100,10 +136,10 @@ def __main(args, **kwargs):
                                                       selected_ssh_key.get_fingerprint().hex(),
                                                       selected_ssh_key.comment))
             print(" * encrypting API key with selected key (you may be prompted by your SSH agent for confirmation or PIN code) ...", flush=True, end="")
-            encrypted_api_key = encrypt_api_key_with_paramiko_key(ssh_key=selected_ssh_key, api_key=api_key)
+            encrypted_api_key = encrypt_api_key_with_paramiko_ssh_key_fernet(ssh_key=selected_ssh_key, api_key=api_key)
             print("OK!")
             print(" * trying to decrypt the encrypted API key...", flush=True, end="")
-            decrypted_api_key = decrypt_api_key_with_paramiko_key(encrypted_api_key_payload=encrypted_api_key)
+            decrypted_api_key = decrypt_api_key_with_paramiko_ssh_key_fernet(encrypted_api_key_payload=encrypted_api_key)
             if decrypted_api_key != api_key:
                 raise pylo.PyloEx("Decrypted API key does not match original API key")
             print("OK!")
@@ -122,6 +158,35 @@ def __main(args, **kwargs):
 
         print("OK! ({})".format(file_path))
 
+    elif args['sub_command'] == 'test':
+        print("* Profile Tester command")
+        wanted_name = args['name']
+        if wanted_name is None:
+            wanted_name = click.prompt('> Input a Profile Name to test (ie: prod-pce)', type=str)
+        found_profile = get_credentials_from_file(wanted_name, fail_with_an_exception=False)
+        if found_profile is None:
+            print("Cannot find a profile named '{}'".format(wanted_name))
+            print("Available profiles:")
+            credentials = get_all_credentials()
+            for credential in credentials:
+                print(" - {}".format(credential.name))
+            sys.exit(1)
+
+        print("Selected profile:")
+        print(" - Name: {}".format(found_profile.name))
+        print(" - FQDN: {}".format(found_profile.fqdn))
+        print(" - Port: {}".format(found_profile.port))
+        print(" - Org ID: {}".format(found_profile.org_id))
+        print(" - API User: {}".format(found_profile.api_user))
+        print(" - Verify SSL: {}".format(found_profile.verify_ssl))
+
+        print("* Testing credential...", flush=True, end="")
+        connector = pylo.APIConnector.create_from_credentials_object(found_profile)
+        connector.objects_label_dimension_get()
+        print("OK!")
+
+    else:
+        raise pylo.PyloEx("Unknown sub-command '{}'".format(args['sub_command']))
 
 command_object = Command(command_name, __main, fill_parser, credentials_manager_mode=True)
 

illumio_pylo/cli/commands/ruleset_export.py

@@ -1,6 +1,6 @@
 import argparse
 import os
-from typing import Dict, List
+from typing import Dict, List, Literal
 
 import illumio_pylo as pylo
 from illumio_pylo import ArraysToExcel, ExcelHeader
@@ -12,7 +12,7 @@ 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', '-o', required=False, default='.', help='Directory where to save the output file')
+    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,
@@ -26,44 +26,26 @@ def fill_parser(parser: argparse.ArgumentParser):
 
 
 
-def __main(options: Dict, org: pylo.Organization, **kwargs):
-    csv_report_headers = pylo.ExcelHeaderSet(
-        [   ExcelHeader(name = 'ruleset', max_width = 40),
-            ExcelHeader(name = 'scope', max_width = 50),
-            ExcelHeader(name = 'type', max_width = 10),
-            ExcelHeader(name = 'consumers', max_width = 80),
-            ExcelHeader(name = 'providers', max_width = 80),
-            ExcelHeader(name = 'services', max_width = 30),
-            ExcelHeader(name = 'options', max_width = 40),
-            ExcelHeader(name = 'ruleset_url', max_width = 40, wrap_text = False),
-            ExcelHeader(name = 'ruleset_href', max_width = 30, wrap_text = False)
-            ])
-
-    setting_prefix_objects_with_type: bool|str = options['prefix_objects_with_type']
+def __main(args: Dict, org: pylo.Organization, **kwargs):
+
+    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']
+
+
     if setting_prefix_objects_with_type is False:
         print(" * Prefix for object types are disabled")
     else:
         print(" * Prefix for object types are enabled")
 
-    setting_object_types_as_section: bool = options['prefix_objects_with_type']
+
     if setting_object_types_as_section is False:
         print(" * Object types as section are disabled")
     else:
         print(" * Object types as section are enabled")
 
-    output_file_format = options.get('format')
-    if output_file_format == "excel":
-        output_file_extension = ".xlsx"
-    elif output_file_format == "csv":
-        output_file_extension = ".csv"
-    else:
-        raise Exception("Unknown output file format: %s" % output_file_format)
-
-    output_file_name = options.get('output') + os.sep + make_filename_with_timestamp('rule_export_') + output_file_extension
-    output_file_name = os.path.abspath(output_file_name)
-
-    csv_report = pylo.ArraysToExcel()
-    sheet = csv_report.create_sheet('rulesets', csv_report_headers, force_all_wrap_text=True, multivalues_cell_delimiter=',')
+    csv_report, output_file_name, sheet = prepare_csv_report_object(settings_output_file_format, settings_output_dir)
 
     for ruleset in org.RulesetStore.rulesets:
         for rule in ruleset.rules_ordered_by_type:
@@ -103,23 +85,47 @@ def __main(options: Dict, org: pylo.Organization, **kwargs):
                     'services': rule.services.members_to_str("\n"),
                     'options': pylo.string_list_to_text(rule_options, "\n"),
                     'ruleset_href': ruleset.href,
-                    'ruleset_url': ruleset.get_ruleset_url()}
-            if rule.is_extra_scope():
-                data['type'] = 'extra'
-            else:
-                data['type'] = 'intra'
+                    'ruleset_url': ruleset.get_ruleset_url(),
+                    'type': 'intra' if rule.is_intra_scope() else 'extra'
+                    }
+
             sheet.add_line_from_object(data)
 
-    if output_file_format == "csv":
+    if settings_output_file_format == "csv":
         print(" * Writing export file '{}' ... ".format(output_file_name), end='', flush=True)
         sheet.write_to_csv(output_file_name)
         print("DONE")
-    elif output_file_format == "excel":
+    elif settings_output_file_format == "excel":
         print(" * Writing export file '{}' ... ".format(output_file_name), end='', flush=True)
         csv_report.write_to_excel(output_file_name)
         print("DONE")
     else:
-        raise pylo.PyloEx("Unknown format: '{}'".format(options['format']))
+        raise pylo.PyloEx("Unknown format: '{}'".format(args['format']))
+
+
+def prepare_csv_report_object(output_file_format: Literal['excel', 'csv'], settings_output_dir: str):
+    if output_file_format == "excel":
+        output_file_extension = ".xlsx"
+    elif output_file_format == "csv":
+        output_file_extension = ".csv"
+    else:
+        raise Exception("Unknown output file format: %s" % output_file_format)
+    csv_report_headers = pylo.ExcelHeaderSet(
+        [ExcelHeader(name='ruleset', max_width=40),
+         ExcelHeader(name='scope', max_width=50),
+         ExcelHeader(name='type', max_width=10),
+         ExcelHeader(name='consumers', max_width=80),
+         ExcelHeader(name='providers', max_width=80),
+         ExcelHeader(name='services', max_width=30),
+         ExcelHeader(name='options', max_width=40),
+         ExcelHeader(name='ruleset_url', max_width=40, wrap_text=False),
+         ExcelHeader(name='ruleset_href', max_width=30, wrap_text=False)
+         ])
+    csv_report = ArraysToExcel()
+    sheet = csv_report.create_sheet('rulesets', csv_report_headers, force_all_wrap_text=True,
+                                    multivalues_cell_delimiter=',')
+    output_file_name = make_filename_with_timestamp('rule_export_', settings_output_dir) + output_file_extension
+    return csv_report, output_file_name, sheet
 
 
 command_object = Command(command_name, __main, fill_parser)

illumio_pylo/cli/commands/utils/misc.py

@@ -8,5 +8,9 @@ def make_filename_with_timestamp(prefix: str, output_directory: str = './') -> s
     if output_directory.startswith('.') or not output_directory.startswith('/') or not output_directory.startswith('\\'):
         output_directory = os.path.realpath(os.getcwd() + os.path.sep + output_directory)
 
+    # if the directory does not exist, we will create it and its parents if needed
+    if not os.path.exists(output_directory):
+        os.makedirs(output_directory)
+
     now = datetime.now()
     return output_directory + os.path.sep + prefix + now.strftime("%Y%m%d-%H%M%S")

illumio_pylo/cli/commands/ven_upgrader.py

@@ -11,14 +11,8 @@ objects_load_filter = ['workloads', 'labels']
 
 
 def fill_parser(parser: argparse.ArgumentParser):
-    parser.add_argument('--filter-env-label', type=str, required=False, default=None,
-                        help='Filter agents by environment labels (separated by commas)')
-    parser.add_argument('--filter-loc-label', type=str, required=False, default=None,
-                        help='Filter agents by location labels (separated by commas)')
-    parser.add_argument('--filter-app-label', type=str, required=False, default=None,
-                        help='Filter agents by application labels (separated by commas)')
-    parser.add_argument('--filter-role-label', type=str, required=False, default=None,
-                        help='Filter agents by role labels (separated by commas)')
+    parser.add_argument('--filter-label', '-fl', action='append',
+                        help='Only look at workloads matching specified labels')
 
     parser.add_argument('--filter-ven-versions', nargs='+', type=str, required=False, default=None,
                         help='Filter agents by versions (separated by spaces)')
@@ -67,58 +61,13 @@ def __main(args, org: pylo.Organization, **kwargs):
     target_version = pylo.SoftwareVersion(target_version_string)
 
     print(" * Parsing filters")
-
-    env_label_list = {}
-    if args['filter_env_label'] is not None:
-        print("   * Environment Labels specified")
-        for raw_label_name in args['filter_env_label'].split(','):
-            print("     - label named '{}'".format(raw_label_name), end='', flush=True)
-            label = org.LabelStore.find_label_by_name_and_type(raw_label_name, pylo.label_type_env)
-            if label is None:
-                print("NOT FOUND!")
-                raise pylo.PyloEx("Cannot find label named '{}'".format(raw_label_name))
-            else:
-                print("found")
-                env_label_list[label] = label
-
-    loc_label_list = {}
-    if args['filter_loc_label'] is not None:
-        print("   * Location Labels specified")
-        for raw_label_name in args['filter_loc_label'].split(','):
-            print("     - label named '{}' ".format(raw_label_name), end='', flush=True)
-            label = org.LabelStore.find_label_by_name_and_type(raw_label_name, pylo.label_type_loc)
-            if label is None:
-                print("NOT FOUND!")
-                raise pylo.PyloEx("Cannot find label named '{}'".format(raw_label_name))
-            else:
-                print("found")
-                loc_label_list[label] = label
-
-    app_label_list = {}
-    if args['filter_app_label'] is not None:
-        print("   * Application Labels specified")
-        for raw_label_name in args['filter_app_label'].split(','):
-            print("     - label named '{}' ".format(raw_label_name), end='', flush=True)
-            label = org.LabelStore.find_label_by_name_and_type(raw_label_name, pylo.label_type_app)
-            if label is None:
-                print("NOT FOUND!")
-                raise pylo.PyloEx("Cannot find label named '{}'".format(raw_label_name))
-            else:
-                print("found")
-                app_label_list[label] = label
-
-    role_label_list = {}
-    if args['filter_role_label'] is not None:
-        print("   * Role Labels specified")
-        for raw_label_name in args['filter_role_label']:
-            print("     - label named '{}' ".format(raw_label_name), end='', flush=True)
-            label = org.LabelStore.find_label_by_name_and_type(raw_label_name, pylo.label_type_role)
+    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']:
+            label = org.LabelStore.find_label_by_name(label_name)
             if label is None:
-                print("NOT FOUND!")
-                raise pylo.PyloEx("Cannot find label named '{}'".format(raw_label_name))
-            else:
-                print("found")
-                role_label_list[label] = label
+                raise pylo.PyloEx("Cannot find label '{}' in the PCE".format(label_name))
+            filter_labels.append(label)
 
     filter_versions = {}
     if args['filter_ven_versions'] is not None:
@@ -149,25 +98,8 @@ def __main(args, org: pylo.Organization, **kwargs):
                 del agents[agent_href]
                 continue
 
-        if len(env_label_list) > 0 and (workload.env_label is None or workload.env_label not in env_label_list):
-            pylo.log.debug(" - workload '{}' does not match env_label filters, it's out!".format(workload.get_name()))
-            del agents[agent_href]
-            continue
-        if len(loc_label_list) > 0 and (workload.loc_label is None or workload.loc_label not in loc_label_list):
-            pylo.log.debug(" - workload '{}' does not match loc_label filters, it's out!".format(workload.get_name()))
-            del agents[agent_href]
-            continue
-        if len(app_label_list) > 0 and (workload.app_label is None or workload.app_label not in app_label_list):
-            pylo.log.debug(" - workload '{}' does not match app_label filters, it's out!".format(workload.get_name()))
-            del agents[agent_href]
-            continue
-        if len(role_label_list) > 0 and (workload.role_label is None or workload.role_label not in role_label_list):
-            pylo.log.debug(" - workload '{}' does not match role_label filters, it's out!".format(workload.get_name()))
-            del agents[agent_href]
-            continue
-
-        if agent.software_version.version_string not in filter_versions:
-            pylo.log.debug(" - workload '{}' does not match the version filter, it's out!".format(workload.get_name()))
+        if workload.uses_all_labels(filter_labels) is False:
+            pylo.log.debug(" - workload '{}' is not matching the labels filter".format(workload.get_name()))
             del agents[agent_href]
             continue
 

illumio_pylo/cli/commands/workload_export.py

@@ -80,9 +80,11 @@ def __main(args, org: pylo.Organization, **kwargs):
     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)
@@ -110,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()
@@ -132,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,6 +3,8 @@ 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
@@ -43,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):
@@ -54,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']
@@ -113,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>
 
@@ -134,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/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.1.dist-info → illumio_pylo-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: illumio_pylo
-Version: 0.3.1
+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.1.dist-info → illumio_pylo-0.3.2.dist-info}/RECORD

@@ -1,60 +1,60 @@
 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=T4OgouskDV99jeXA-lZU43r0rN7fc3bQ4Lf1t7cvWEY,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=LJHtec-xbifHsJWF18exijSh3YLjkYW0f8s4hfn-a-0,21867
+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=Sf1nlQHq28i8OYbf8osEDO8ndOlXPhsqHkb8I3241To,5700
+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=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=9jhvMby9RVwYYbiUB0PCu2YHPRrUIyJTLWxp_Bu0OLY,11323
-illumio_pylo/cli/commands/workload_import.py,sha256=PxviMVmjfe3t0aW05aX_k45YKnFxg1AhgiPRXF-Igaw,16969
+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=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
@@ -65,8 +65,8 @@ illumio_pylo/utilities/resources/iplists-import-example.xlsx,sha256=VW-7CRr8NA2V
 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.1.dist-info/LICENSE,sha256=WYmcYJG1QFgu1hfo7qrEkZ3Jhcz8NUWe6XUraZvlIFs,10172
-illumio_pylo-0.3.1.dist-info/METADATA,sha256=W31HBVec-NOUgqCD0SH3HvUs4Dp81L6vayukDDKv_aM,12224
-illumio_pylo-0.3.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-illumio_pylo-0.3.1.dist-info/top_level.txt,sha256=c5cu_ZMuSuxjq48ih58Kc0Tr8-JdQtV8GrKJicvWNFE,13
-illumio_pylo-0.3.1.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,,