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

{illumio_pylo-0.3.0 → illumio_pylo-0.3.2}/.github/workflows/doxygen-publish.yml

@@ -12,7 +12,7 @@ jobs:
   deploy:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true  # Fetch Hugo themes (true OR recursive)
           fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod

{illumio_pylo-0.3.0 → illumio_pylo-0.3.2}/.github/workflows/make-binaries.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Change Pylo Version if this is a DEV build
         if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
@@ -39,18 +39,6 @@ jobs:
         run: |
           mv dist/windows/cli.exe dist/windows/pylo-cli.exe
 
-      - name: Publish executables for Master branch with 'latest' tag
-        # only if this is a TAG type
-        if: github.ref == 'refs/heads/master' && github.event_name == 'push'
-
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "latest"
-          prerelease: true
-          title: "Latest Binaries"
-          files: |
-            dist/windows/*
 
       - name: Publish executables along with the tag for a release
         # only if this is a TAG type
@@ -64,14 +52,27 @@ jobs:
           draft: false
           prerelease: false
 
+
+      - name: Publish executables for Master branch with 'latest' tag
+        # only if this is a TAG type
+        if: github.ref == 'refs/heads/master' && github.event_name == 'push'
+        uses: "crowbarmaster/GH-Automatic-Releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "latest"
+          prerelease: true
+          title: "Latest Binaries"
+          files: |
+            dist/windows/*
+
+
       - name: Publish executables for Dev branch
         if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
-        uses: softprops/action-gh-release@975c1b265e11dd76618af1c374e7981f9a6ff44a  # v0.1.16
+        uses: "crowbarmaster/GH-Automatic-Releases@latest"
         with:
-          files: dist/windows/*
-          token: ${{ secrets.GITHUB_TOKEN }}
-          draft: false
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "dev-latest"
           prerelease: false
-          tag_name: "dev-build"
-          name: "Latest DEV/Unstable Binaries"
-
+          title: "Latest Binaries for DEV/Unstable branch"
+          files: |
+            dist/windows/*

{illumio_pylo-0.3.0 → illumio_pylo-0.3.2}/.github/workflows/python-publish.yml

@@ -19,7 +19,7 @@ jobs:
       id-token: write
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v2
       with:

{illumio_pylo-0.3.0 → illumio_pylo-0.3.2}/PKG-INFO

@@ -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 → illumio_pylo-0.3.2}/examples/explorer_query.py

@@ -60,7 +60,7 @@ explorer_query.filters.set_time_from_x_days_ago(5)
 # Query the PCE for traffic logs matching the filter
 print("Querying PCE for traffic logs matching the filter... ", end='', flush=True)
 traffic_logs = explorer_query.execute()
-print("OK! found {} traffic logs".format(traffic_logs.count_results()))
+print("OK! found {} traffic logs".format(traffic_logs.count_records()))
 
 # Print the results
 records = traffic_logs.get_all_records()

{illumio_pylo-0.3.0 → illumio_pylo-0.3.2}/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-0.3.0 → illumio_pylo-0.3.2}/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-0.3.0 → illumio_pylo-0.3.2}/illumio_pylo/Helpers/exports.py

@@ -1,29 +1,56 @@
-from typing import Dict, Any, List, Optional, TypedDict, NotRequired, Union
-
-try:
-    import xlsxwriter
-except ImportError:
-    import xlsxwriter
-
-try:
-    import openpyxl
-except ImportError:
-    import openpyxl
+from typing import Dict, Any, List, Optional, TypedDict, NotRequired, Union, Iterable
 
+import xlsxwriter
+import openpyxl
 import csv
-import illumio_pylo as pylo
 import os
 
+import illumio_pylo as pylo
+
+
+class ExcelHeader:
+    def __init__(self, name: str, nice_name: Optional[str] = None, max_width: Optional[int] = None, wrap_text: Optional[bool] = None, is_url: [bool] = False, url_text: str = 'Link'):
+        self.name = name
+        self.nice_name:str = nice_name if nice_name is not None else name
+        self.max_width = max_width
+        self.wrap_text = wrap_text
+        self.url_text = url_text
+        self.is_url = is_url
+
+
+class ExcelHeaderSet(list[ExcelHeader]):
+    def __init__(self, headers: Optional[Iterable[str|ExcelHeader]]):
+        super(ExcelHeaderSet, self).__init__()
+        if headers is not None:
+            for header in headers:
+                self.append(header)
+
+    def append(self, value: str|ExcelHeader):
+        if type(value) is str:
+            super(ExcelHeaderSet, self).append(ExcelHeader(name=value))
+        elif type(value) is ExcelHeader:
+            super(ExcelHeaderSet, self).append(value)
+        else:
+            raise pylo.PyloEx("ExcelHeaderSet.append() must be a string or a dict (ExcelHeader)")
+
+    def _check_unique(self, new_header_name: str):
+        if new_header_name in self:
+            raise pylo.PyloEx("Header '{}' is already in the set".format(new_header_name))
 
-class ExcelHeader(TypedDict):
-    name: str
-    nice_name: NotRequired[str]
-    max_width: NotRequired[int]
-    wrap_text: NotRequired[bool]
+    def extend(self, iterable):
+        for item in iterable:
+            self.append(item)
+
+    def get_header(self, header_name: str) -> Optional[ExcelHeader]:
+        for header in self:
+            if header.name == header_name:
+                return header
+        return None
 
 
 class ArrayToExport:
-    def __init__(self, headers):
+
+    def __init__(self, headers: List[str]):
         self._headers = headers
         self._columns_count = len(headers)
         self._lines = []
@@ -106,8 +133,8 @@ class ArraysToExcel:
     _sheets: Dict[str, 'ArraysToExcel.Sheet']
 
     class Sheet:
-        def __init__(self, headers: List[str|ExcelHeader], force_all_wrap_text=True, sheet_color: Optional[str] = None, order_by: Optional[List[str]] = None, multivalues_cell_delimiter=' '):
-            self._headers: List[str|ExcelHeader] = headers
+        def __init__(self, headers: ExcelHeaderSet, force_all_wrap_text=True, sheet_color: Optional[str] = None, order_by: Optional[List[str]] = None, multivalues_cell_delimiter=' '):
+            self._headers: ExcelHeaderSet = headers
             self._columns_count = len(headers)
             self._lines = []
             self._columns_wrap = []
@@ -121,20 +148,18 @@ class ArraysToExcel:
             self._headers_index_to_name = []
             index = 0
 
-            for header_name in headers:
+            for header in headers:
                 self._columns_wrap.append(force_all_wrap_text)
 
-                if type(header_name) is str:
-                    self._headers_index_to_name.append(header_name)
-                    self._headers_name_to_index[header_name] = index
-                else:
-                    header_name['nice_name'] = header_name.get('nice_name', header_name['name'])
-                    self._headers_index_to_name.append(header_name['name'])
-                    self._headers_name_to_index[header_name['name']] = index
+                if header.nice_name is not None:
+                    header.nice_name = header.name
+
+                self._headers_index_to_name.append(header.name)
+                self._headers_name_to_index[header.name] = index
 
-                    wrap = header_name.get('wrap_text')
-                    if wrap is not None and not wrap:
-                        self._columns_wrap[len(self._columns_wrap)-1] = False
+                wrap = header.wrap_text
+                if wrap is not None and not wrap:
+                    self._columns_wrap[len(self._columns_wrap)-1] = False
 
                 index += 1
 
@@ -142,20 +167,11 @@ class ArraysToExcel:
         ):
             headers: List[str] = []
             for header in self._headers:
-                if type(header) is str:
-                    headers.append(header)
-                    continue
-                if 'nice_name' in header:
-                    headers.append(header['nice_name'])
-                    continue
-                headers.append(header['name'])
+                headers.append(header.name)
 
             headers_id: List[str] = []
             for header in self._headers:
-                if type(header) is str:
-                    headers_id.append(header)
-                    continue
-                headers_id.append(header['name'])
+                headers_id.append(header.name)
 
 
             exporter = ArrayToExport(headers)
@@ -180,10 +196,7 @@ class ArraysToExcel:
         def add_line_from_object(self, record):
             new_line = []
             for header in self._headers:
-                if type(header) is str:
-                    new_line.append(record.get(header))
-                else:
-                    new_line.append(record.get(header['name']))
+                new_line.append(record.get(header.name))
 
             self._lines.append(new_line)
 
@@ -226,21 +239,26 @@ class ArraysToExcel:
 
             columns_max_width = []
             for header in self._headers:
-                    columns_max_width.append(0)
+                columns_max_width.append(0)
 
+
+
+            # for each line, find the max length of string for each column and also add it to the data array
             for line in self._lines:
                 new_line = []
-                item_index = 0
-                for item in line:
+
+                for item_index, item in enumerate(line):
                     if type(item) is list:
                         new_line.append(pylo.string_list_to_text(item, self._multivalues_cell_delimiter))
                     else:
-                        new_line.append(item)
+                        if self._headers[item_index].is_url:
+                            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
-                    item_index += 1
 
                 xls_data.append(new_line)
 
@@ -252,14 +270,10 @@ class ArraysToExcel:
 
                 header_max_width_setting = None
 
-                if type(header) is str:
-                    xls_headers.append({'header': header, 'format': cell_format})
-                    column_name_length = len(header) + 2 # add 2 for dropdown menus
-                else:
-                    column_name = header.get('nice_name') or header.get('name')
-                    xls_headers.append({'header': column_name, 'format': cell_format})
-                    column_name_length = len(column_name) + 2 # add 2 for dropdown menus
-                    header_max_width_setting = header.get('max_width')
+                column_name = header.nice_name
+                xls_headers.append({'header': column_name, 'format': cell_format})
+                column_name_length = len(column_name) + 2 # add 2 for dropdown menus
+                header_max_width_setting = header.max_width
 
                 # default is to use width=longest string
                 column_width = columns_max_width[header_index]+1
@@ -296,7 +310,7 @@ class ArraysToExcel:
     def __init__(self):
         self._sheets = {}
 
-    def create_sheet(self, name: str, headers, force_all_wrap_text: bool = True, sheet_color: Optional[str] = None,
+    def create_sheet(self, name: str, headers: ExcelHeaderSet, force_all_wrap_text: bool = True, sheet_color: Optional[str] = None,
                      order_by: Optional[List[str]] = None, multivalues_cell_delimiter: str = ' ') -> Sheet:
         if name in self._sheets:
             pylo.PyloEx("A sheet named '{}' already exists".format(name))

{illumio_pylo-0.3.0 → illumio_pylo-0.3.2}/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-0.3.0 → illumio_pylo-0.3.2}/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-0.3.0 → illumio_pylo-0.3.2}/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-0.3.0 → illumio_pylo-0.3.2}/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-0.3.0 → illumio_pylo-0.3.2}/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