illumio-pylo 0.3.2__tar.gz → 0.3.4__tar.gz

{illumio_pylo-0.3.2/illumio_pylo.egg-info → illumio_pylo-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: illumio_pylo
-Version: 0.3.2
+Version: 0.3.4
 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.2 → illumio_pylo-0.3.4}/dev_playground/recalculate_explorer_logs_multithreaded.py

@@ -71,7 +71,9 @@ def do_log_resolution(q: Queue, thread_num: int):
     global skip_count
     global resolution_cache
 
-    local_connector = pylo.APIConnector(connector.hostname, connector.port, connector.api_user, connector.api_key, connector.skipSSLCertCheck, connector.orgID)
+    local_connector = pylo.APIConnector(fqdn=connector.fqdn, port=connector.port,
+                                        api_user=connector.api_user, api_key=connector.api_key,
+                                        skip_ssl_cert_check= connector.skipSSLCertCheck, org_id=connector.org_id)
 
     while True:
 

{illumio_pylo-0.3.2 → illumio_pylo-0.3.4}/dev_playground/test.py

@@ -6,8 +6,8 @@ import logging
 log.setLevel(logging.DEBUG)
 
 
-con = pylo.APIConnector(fqdn="192.168.253.10", port=8443, skip_ssl_cert_check=True, apiuser='api_185c2399e24b631c2',
-                        apikey='2dbaf8fe5bb9278e26388e5d35229a6797ff5c622154b6289edfc03e7c0f9782')
+con = pylo.APIConnector(fqdn="192.168.253.10", port=8443, skip_ssl_cert_check=True, api_user='api_185c2399e24b631c2',
+                        api_key='2dbaf8fe5bb9278e26388e5d35229a6797ff5c622154b6289edfc03e7c0f9782')
 
 con.collect_pce_infos()
 

{illumio_pylo-0.3.2 → illumio_pylo-0.3.4}/illumio_pylo/API/APIConnector.py

@@ -12,7 +12,7 @@ from .JsonPayloadTypes import LabelGroupObjectJsonStructure, LabelObjectCreation
     LabelDimensionObjectStructure, AuditLogApiReplyEventJsonStructure, WorkloadsGetQueryLabelFilterJsonStructure, \
     NetworkDeviceObjectJsonStructure, NetworkDeviceEndpointObjectJsonStructure, HrefReference, \
     WorkloadObjectCreateJsonStructure, WorkloadObjectMultiCreateJsonRequestPayload, \
-    WorkloadBulkUpdateEntryJsonStructure, WorkloadBulkUpdateResponseEntry
+    WorkloadBulkUpdateEntryJsonStructure, WorkloadBulkUpdateResponseEntry, VenObjectJsonStructure
 
 try:
     import requests as requests
@@ -62,16 +62,16 @@ all_object_types: Dict[ObjectTypes, ObjectTypes] = {
 class APIConnector:
     """docstring for APIConnector."""
 
-    def __init__(self, fqdn: str, port, apiuser: str, apikey: str, skip_ssl_cert_check=False, org_id=1, name='unnamed'):
+    def __init__(self, fqdn: str, port, api_user: str, api_key: str, skip_ssl_cert_check=False, org_id=1, name='unnamed'):
         self.name = name
         self.fqdn: str = fqdn
         if type(port) is int:
             port = str(port)
         self.port: int = port
-        self._api_key: str = apikey
+        self._api_key: str = api_key
         self._decrypted_api_key: str = None
-        self.api_user: str = apiuser
-        self.orgID: int = org_id
+        self.api_user: str = api_user
+        self.org_id: int = org_id
         self.skipSSLCertCheck: bool = skip_ssl_cert_check
         self.version: Optional['pylo.SoftwareVersion'] = None
         self.version_string: str = "Not Defined"
@@ -148,7 +148,7 @@ class APIConnector:
     def _make_api_url(self, path: str = '', include_org_id=False) -> str:
         url = self._make_base_url('/api/v2')
         if include_org_id:
-            url += '/orgs/' + str(self.orgID)
+            url += '/orgs/' + str(self.org_id)
         url += path
 
         return url
@@ -624,6 +624,35 @@ class APIConnector:
 
         return None
 
+    def objects_ven_get(self,
+                             include_deleted=False,
+                             filter_by_ip: str = None,
+                             filter_by_label: Optional[WorkloadsGetQueryLabelFilterJsonStructure] = None,
+                             filter_by_name: str = None,
+                             max_results: int = None,
+                             async_mode=True) -> List[VenObjectJsonStructure]:
+        path = '/vens'
+        data = {}
+
+        if include_deleted:
+            data['include_deleted'] = 'yes'
+
+        if filter_by_ip is not None:
+            data['ip_address'] = filter_by_ip
+
+        if filter_by_label is not None:
+            # filter_by_label must be converted to json text
+            data['labels'] = json.dumps(filter_by_label)
+
+        if filter_by_name is not None:
+            data['name'] = filter_by_name
+
+        if max_results is not None:
+            data['max_results'] = max_results
+
+        return self.do_get_call(path=path, async_call=async_mode, params=data)
+
+
     def objects_workload_get(self,
                              include_deleted=False,
                              filter_by_ip: str = None,

{illumio_pylo-0.3.2 → illumio_pylo-0.3.4}/illumio_pylo/API/CredentialsManager.py

@@ -14,7 +14,6 @@ except ImportError:
     paramiko = None
 
 
-
 class CredentialFileEntry(TypedDict):
     name: str
     fqdn: str

{illumio_pylo-0.3.2 → illumio_pylo-0.3.4}/illumio_pylo/API/JsonPayloadTypes.py

@@ -121,6 +121,35 @@ class WorkloadBulkUpdateResponseEntry(TypedDict):
     message: NotRequired[str]
 
 
+class VenObjectWorkloadSummaryJsonStructure(TypedDict):
+    href: str
+    mode: str
+    online: bool
+
+
+class VenObjectJsonStructure(TypedDict):
+    created_at: str
+    created_by: Optional[HrefReferenceWithName]
+    description: Optional[str]
+    hostname: Optional[str]
+    href: str
+    labels: List[HrefReference]
+    name: Optional[str]
+    interfaces: List[WorkloadInterfaceObjectJsonStructure]
+    updated_at: str
+    updated_by: Optional[HrefReferenceWithName]
+    last_heartbeat_at: Optional[str]
+    last_goodbye_at: Optional[str]
+    ven_type: Literal['server', 'endpoint', 'containerized-ven']
+    active_pce_fqdn: Optional[str]
+    target_pce_fqdn: Optional[str]
+    workloads: List[VenObjectWorkloadSummaryJsonStructure]
+    version: Optional[str]
+    os_id: Optional[str]
+    os_version: Optional[str]
+    os_platform: Optional[str]
+    uid: Optional[str]
+
 
 class RuleServiceReferenceObjectJsonStructure(TypedDict):
     href: str

{illumio_pylo-0.3.2 → illumio_pylo-0.3.4}/illumio_pylo/Organization.py

@@ -71,7 +71,7 @@ class Organization:
         credentials = get_credentials_from_file(fqdn_or_profile_name, credential_file)
 
         connector = pylo.APIConnector(fqdn=credentials.fqdn, port=credentials.port,
-                                      apiuser=credentials.api_user, apikey=credentials.api_key,
+                                      api_user=credentials.api_user, api_key=credentials.api_key,
                                       org_id=credentials.org_id,
                                       skip_ssl_cert_check=not credentials.verify_ssl, name=fqdn_or_profile_name)
 

{illumio_pylo-0.3.2 → illumio_pylo-0.3.4}/illumio_pylo/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.2"
+__version__ = "0.3.4"
 
 import os
 import sys
@@ -43,7 +43,7 @@ def get_organization(fqdn: str, port: int, api_user: str, api_key: str,
     """
     Load an organization from the API with parameters provided as arguments.
     """
-    api = APIConnector(fqdn=fqdn, port=port, apiuser=api_user, apikey=api_key, org_id=organization_id,
+    api = APIConnector(fqdn=fqdn, port=port, api_user=api_user, api_key=api_key, org_id=organization_id,
                        skip_ssl_cert_check=not verify_ssl)
     org = Organization(1)
     org.load_from_api(api, include_deleted_workloads=include_deleted_workloads,

{illumio_pylo-0.3.2 → illumio_pylo-0.3.4/illumio_pylo.egg-info}/PKG-INFO

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