pyxecm 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

pyxecm/customizer/customizer.py

@@ -138,8 +138,8 @@ class Customizer:
             self.settings.m365.client_id,
         )
         self.logger.debug(
-            "Microsoft 365 Client Secret         = %s",
-            self.settings.m365.client_secret,
+            "Microsoft 365 Client Secret         = <sensitive>",
+            #            self.settings.m365.client_secret,
         )
         self.logger.info(
             "Microsoft 365 Domain                = %s",
@@ -166,8 +166,8 @@ class Customizer:
             self.settings.m365.sharepoint_app_client_id,
         )
         self.logger.debug(
-            "Microsoft 365 SharePoint App Client Secret = %s",
-            self.settings.m365.sharepoint_app_client_secret,
+            "Microsoft 365 SharePoint App Client Secret = <sensitive>",
+            #            self.settings.m365.sharepoint_app_client_secret,
         )
 
         m365_object = M365(
@@ -397,37 +397,37 @@ class Customizer:
         """
 
         self.logger.info(
-            "Aviator Search Base URL             = %s",
+            "Aviator Search Base URL      = %s",
             self.settings.avts.base_url,
         )
         self.logger.info(
-            "Aviator Search OTDS URL             = %s",
-            self.settings.avts.otds_url,
+            "Aviator Search OTDS URL      = %s",
+            str(self.settings.otds.url),
         )
         self.logger.info(
-            "Aviator Search Client ID            = %s",
+            "Aviator Search Client ID     = %s",
             self.settings.avts.client_id,
         )
         self.logger.debug(
-            "Aviator Search Client Secret        = %s",
+            "Aviator Search Client Secret = %s",
             self.settings.avts.client_secret,
         )
         self.logger.info(
-            "Aviator Search User ID              = %s",
+            "Aviator Search User ID       = %s",
             self.settings.avts.username,
         )
         self.logger.debug(
-            "Aviator Search User Password        = %s",
+            "Aviator Search User Password = %s",
             self.settings.avts.password,
         )
 
         return AVTS(
-            otds_url=str(self.settings.avts.otds_url),
             base_url=str(self.settings.avts.base_url),
             client_id=self.settings.avts.client_id,
             client_secret=self.settings.avts.client_secret,
             username=self.settings.avts.username,
             password=self.settings.avts.password,
+            otds_url=str(self.settings.otds.url),
             logger=self.logger,
         )
 
@@ -606,6 +606,7 @@ class Customizer:
             password=self.settings.otds.password.get_secret_value(),
             otds_ticket=self.settings.otds.ticket,
             bind_password=self.settings.otds.bind_password.get_secret_value(),
+            admin_partition=self.settings.otds.admin_partition,
             logger=self.logger,
         )
 
@@ -651,12 +652,12 @@ class Customizer:
         """
 
         self.logger.info("Connection parameters OTAC:")
-        self.logger.info("OTAC URL          = %s", str(self.settings.otac.url))
-        self.logger.info("OTAC URL internal = %s", str(self.settings.otac.url_internal))
-        self.logger.info("OTAC Admin User        = %s", self.settings.otac.username)
-        self.logger.debug("OTAC Admin Password   = %s", self.settings.otac.password)
+        self.logger.info("OTAC URL            = %s", str(self.settings.otac.url))
+        self.logger.info("OTAC URL internal   = %s", str(self.settings.otac.url_internal))
+        self.logger.info("OTAC Admin User     = %s", self.settings.otac.username)
+        self.logger.debug("OTAC Admin Password = %s", self.settings.otac.password)
         self.logger.info(
-            "OTAC Known Server      = %s",
+            "OTAC Known Server   = %s",
             (self.settings.otac.known_server if self.settings.otac.known_server != "" else "<not configured>"),
         )
 
@@ -686,9 +687,9 @@ class Customizer:
             cert_type="ARC",
         )
         if not response:
-            self.logger.error("Failed to enable OTAC certificate for Extended ECM!")
+            self.logger.error("Failed to enable OTAC certificate for OTCS!")
         else:
-            self.logger.info("Successfully enabled OTAC certificate for Extended ECM!")
+            self.logger.info("Successfully enabled OTAC certificate for OTCS!")
 
         # is there a known server configured for Archive Center (to sync content with)
         if otac_object and self.settings.otac.known_server != "":
@@ -778,18 +779,16 @@ class Customizer:
             self.settings.otcs.feme_uri,
         )
 
-        self.logger.debug("Checking if OTCS object has already been initialized")
-
         otds_ticket = self.otds_object.cookie()["OTDSTicket"] if self.otds_object else None
         otcs_object = OTCS(
-            url.scheme,
-            url.host,
-            url.port,
-            self.settings.otcs.url.scheme + "://" + self.settings.otcs.url.host,
-            self.settings.otcs.username,
-            self.settings.otcs.password.get_secret_value(),
-            self.settings.otcs.partition,
-            self.settings.otcs.resource_name,
+            protocol=url.scheme,
+            hostname=url.host,
+            port=url.port,
+            public_url=self.settings.otcs.url.scheme + "://" + self.settings.otcs.url.host,
+            username=self.settings.otcs.username,
+            password=self.settings.otcs.password.get_secret_value(),
+            user_partition=self.settings.otcs.partition,
+            resource_name=self.settings.otcs.resource_name,
             otds_ticket=otds_ticket,
             base_path=self.settings.otcs.base_path,
             feme_uri=self.settings.otcs.feme_uri,
@@ -814,21 +813,31 @@ class Customizer:
             otcs_cookie = otcs_object.authenticate()
         self.logger.info("OTCS is ready now.")
 
+        # Now we should be able to get the OTCS resource ID from OTDS:
+        otcs_resource = self.otds_object.get_resource(
+            self.settings.otcs.resource_name,
+        )
+        if not otcs_resource or "resourceID" not in otcs_resource:
+            self.logger.error(
+                "Cannot get OTCS resource ID from OTDS for resource name -> '%s'!", self.settings.otcs.resource_name
+            )
+            return otcs_object
+        otcs_resource_id = otcs_resource["resourceID"]
+        otcs_object.set_resource_id(resource_id=otcs_resource_id)
+        self.logger.info(
+            "OTCS has resource ID -> '%s' for resource name -> '%s'", otcs_resource_id, self.settings.otcs.resource_name
+        )
+
         if "OTCS_RESSOURCE_ID" not in self.settings.placeholder_values:
-            self.settings.placeholder_values["OTCS_RESSOURCE_ID"] = self.otds_object.get_resource(
-                self.settings.otcs.resource_name,
-            )["resourceID"]
+            self.settings.placeholder_values["OTCS_RESSOURCE_ID"] = otcs_resource_id
             self.logger.debug(
                 "Placeholder values after OTCS init -> %s",
                 self.settings.placeholder_values,
             )
 
         if self.settings.otawp.enabled:
-            otcs_resource = self.otds_object.get_resource(
-                self.settings.otcs.resource_name,
-            )
-            otcs_resource["logoutURL"] = (
-                f"{self.settings.otawp.public_protocol}://{self.settings.otawp.public_url}/home/system/wcp/sso/sso_logout.htm"
+            otcs_resource["logoutURL"] = "{}://{}/home/system/wcp/sso/sso_logout.htm".format(
+                self.settings.otawp.public_protocol, self.settings.otawp.public_url
             )
             otcs_resource["logoutMethod"] = "GET"
 
@@ -896,14 +905,14 @@ class Customizer:
             )
 
         otiv_license = self.otds_object.add_license_to_resource(
-            self.settings.otiv.license_file,
-            self.settings.otiv.product_name,
-            self.settings.otiv.product_description,
-            otiv_resource["resourceID"],
+            path_to_license_file=self.settings.otiv.license_file,
+            product_name=self.settings.otiv.product_name,
+            product_description=self.settings.otiv.product_description,
+            resource_id=otiv_resource["resourceID"],
         )
         if not otiv_license:
             self.logger.info(
-                "Couldn't apply license -> %s for product -> %s. Intelligent Viewing may not be deployed!",
+                "Couldn't apply license -> %s for product -> '%s'. Intelligent Viewing may not be deployed!",
                 self.settings.otiv.license_file,
                 self.settings.otiv.product_name,
             )
@@ -1007,6 +1016,7 @@ class Customizer:
             "OTAWP Enabled          = %s",
             str(self.settings.otawp.enabled),
         )
+        self.logger.info("OTAWP URL              = %s", self.settings.otawp.public_url)
         self.logger.info(
             "OTAWP Resource         = %s",
             self.settings.otawp.resource_name,
@@ -1016,7 +1026,8 @@ class Customizer:
             self.settings.otawp.access_role_name,
         )
         self.logger.info("OTAWP Admin User       = %s", self.settings.otawp.username)
-        self.logger.debug("OTAWP Password        = %s", self.settings.otawp.password)
+        self.logger.debug("OTAWP Password         = %s", self.settings.otawp.password)
+        self.logger.info("OTAWP Organization     = %s", self.settings.otawp.organization)
         self.logger.info("OTAWP K8s Stateful Set = %s", self.settings.k8s.sts_otawp)
         self.logger.info("OTAWP K8s Config Map   = %s", self.settings.k8s.cm_otawp)
 
@@ -1025,6 +1036,8 @@ class Customizer:
             self.settings.otcs.resource_name,
         )
 
+        organization = "system"
+
         # Loop to wait for OTCS to create its OTDS resource
         # (we need it to update the AppWorks K8s Config Map):
         otcs_resource = self.otds_object.get_resource(self.settings.otcs.resource_name)
@@ -1049,223 +1062,15 @@ class Customizer:
                 "OTDS resource -> '%s' for AppWorks Platform does not yet exist. Creating...",
                 self.settings.otawp.resource_name,
             )
-            # Create a Python dict with the special payload we need for AppWorks:
-            additional_payload = {}
-            additional_payload["connectorid"] = "rest"
-            additional_payload["resourceType"] = "rest"
-            user_attribute_mapping = [
-                {
-                    "sourceAttr": ["oTExternalID1"],
-                    "destAttr": "__NAME__",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["displayname"],
-                    "destAttr": "DisplayName",
-                    "mappingFormat": "%s",
-                },
-                {"sourceAttr": ["mail"], "destAttr": "Email", "mappingFormat": "%s"},
-                {
-                    "sourceAttr": ["oTTelephoneNumber"],
-                    "destAttr": "Telephone",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["oTMobile"],
-                    "destAttr": "Mobile",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["oTFacsimileTelephoneNumber"],
-                    "destAttr": "Fax",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["oTStreetAddress,l,st,postalCode,c"],
-                    "destAttr": "Address",
-                    "mappingFormat": "%s%n%s %s %s%n%s",
-                },
-                {
-                    "sourceAttr": ["oTCompany"],
-                    "destAttr": "Company",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["ds-pwp-account-disabled"],
-                    "destAttr": "AccountDisabled",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["oTExtraAttr9"],
-                    "destAttr": "IsServiceAccount",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["custom:proxyConfiguration"],
-                    "destAttr": "ProxyConfiguration",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["c"],
-                    "destAttr": "Identity-CountryOrRegion",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["gender"],
-                    "destAttr": "Identity-Gender",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["displayName"],
-                    "destAttr": "Identity-DisplayName",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["oTStreetAddress"],
-                    "destAttr": "Identity-Address",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["l"],
-                    "destAttr": "Identity-City",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["mail"],
-                    "destAttr": "Identity-Email",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["givenName"],
-                    "destAttr": "Identity-FirstName",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["sn"],
-                    "destAttr": "Identity-LastName",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["initials"],
-                    "destAttr": "Identity-MiddleNames",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["oTMobile"],
-                    "destAttr": "Identity-Mobile",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["postalCode"],
-                    "destAttr": "Identity-PostalCode",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["st"],
-                    "destAttr": "Identity-StateOrProvince",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["title"],
-                    "destAttr": "Identity-title",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["physicalDeliveryOfficeName"],
-                    "destAttr": "Identity-physicalDeliveryOfficeName",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["oTFacsimileTelephoneNumber"],
-                    "destAttr": "Identity-oTFacsimileTelephoneNumber",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["notes"],
-                    "destAttr": "Identity-notes",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["oTCompany"],
-                    "destAttr": "Identity-oTCompany",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["oTDepartment"],
-                    "destAttr": "Identity-oTDepartment",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["birthDate"],
-                    "destAttr": "Identity-Birthday",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["cn"],
-                    "destAttr": "Identity-UserName",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["Description"],
-                    "destAttr": "Identity-UserDescription",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["oTTelephoneNumber"],
-                    "destAttr": "Identity-Phone",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["displayName"],
-                    "destAttr": "Identity-IdentityDisplayName",
-                    "mappingFormat": "%s",
-                },
-            ]
-            additional_payload["userAttributeMapping"] = user_attribute_mapping
-            group_attribute_mapping = [
-                {
-                    "sourceAttr": ["cn"],
-                    "destAttr": "__NAME__",
-                    "mappingFormat": '%js:function format(name) { return name.replace(/&/g,"-and-"); }',
-                },
-                {
-                    "sourceAttr": ["description"],
-                    "destAttr": "Description",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["description"],
-                    "destAttr": "Identity-Description",
-                    "mappingFormat": "%s",
-                },
-                {
-                    "sourceAttr": ["displayName"],
-                    "destAttr": "Identity-DisplayName",
-                    "mappingFormat": "%s",
-                },
-            ]
-            additional_payload["groupAttributeMapping"] = group_attribute_mapping
-            additional_payload["connectorName"] = "REST (Generic)"
-            additional_payload["pcCreatePermissionAllowed"] = "true"
-            additional_payload["pcModifyPermissionAllowed"] = "true"
-            additional_payload["pcDeletePermissionAllowed"] = "false"
-            additional_payload["connectionParamInfo"] = [
-                {
-                    "name": "fBaseURL",
-                    "value": "http://appworks:8080/home/system/app/otdspush",
-                },
-                {"name": "fUsername", "value": self.settings.otawp.username},
-                {
-                    "name": "fPassword",
-                    "value": self.settings.otawp.password.get_secret_value(),
-                },
-            ]
-
             awp_resource = self.otds_object.add_resource(
                 name=self.settings.otawp.resource_name,
                 description="AppWorks Platform",
                 display_name="AppWorks Platform",
-                additional_payload=additional_payload,
+                additional_payload=OTAWP.resource_payload(
+                    org_name=organization,
+                    username=self.settings.otawp.username,
+                    password=self.settings.otawp.password.get_secret_value(),
+                ),
             )
         else:
             self.logger.info(
@@ -1287,60 +1092,74 @@ class Customizer:
             self.settings.placeholder_values,
         )
 
-        self.logger.info(
-            "Update AppWorks Kubernetes Config Map with OTDS resource IDs...",
-        )
-
-        config_map = self.k8s_object.get_config_map(self.settings.k8s.cm_otawp)
-        if not config_map:
-            self.logger.error(
-                "Failed to retrieve AppWorks Kubernetes Config Map -> %s",
-                self.settings.k8s.cm_otawp,
+        # Check if Kubernetes is available. Actually that should always be the case...
+        if self.k8s_object:
+            self.logger.info(
+                "Update AppWorks Kubernetes Config Map with OTDS resource IDs...",
             )
-        else:
-            solution = yaml.safe_load(config_map.data["solution.yaml"])
 
-            # Change values as required
-            solution["platform"]["organizations"]["system"]["otds"]["resourceId"] = awp_resource_id
-            solution["platform"]["content"]["ContentServer"]["contentServerUrl"] = (
-                f"{self.settings.otcs.url!s}{self.settings.otcs.base_path}"
-            )
-            solution["platform"]["content"]["ContentServer"]["contentServerSupportDirectoryUrl"] = (
-                f"{self.settings.otcs.url!s}/cssupport"
-            )
-            solution["platform"]["content"]["ContentServer"]["otdsResourceId"] = otcs_resource_id
-            solution["platform"]["authenticators"]["OTDS_auth"]["publicLoginUrl"] = (
-                str(self.settings.otds.url) + "/otdsws/login"
-            )
-            solution["platform"]["security"]["contentSecurityPolicy"] = "frame-ancestors 'self' " + str(
-                self.settings.otcs.url,
-            )
-            config_map.data["solution.yaml"] = yaml.dump(solution)
-            result = self.k8s_object.replace_config_map(
-                self.settings.k8s.cm_otawp,
-                config_map.data,
-            )
-            if result:
-                self.logger.info("Successfully updated AppWorks solution YAML.")
+            config_map = self.k8s_object.get_config_map(config_map_name=self.settings.k8s.cm_otawp)
+            if not config_map:
+                self.logger.error(
+                    "Failed to retrieve AppWorks Kubernetes config map -> '%s'",
+                    self.settings.k8s.cm_otawp,
+                )
             else:
-                self.logger.error("Failed to update AppWorks Solution YAML.")
-            self.logger.debug("Solution YAML for AppWorks -> %s", solution)
+                self.logger.info(
+                    "Update Kubernetes config map for AppWorks organization -> '%s' with OTDS resource IDs...",
+                    organization,
+                )
+                solution = yaml.safe_load(config_map.data["solution.yaml"])
 
-        self.logger.info("Scale AppWorks Kubernetes Stateful Set to 1...")
-        self.k8s_object.scale_stateful_set(
-            sts_name=self.settings.k8s.sts_otawp,
-            scale=1,
-        )
+                # Change values as required
+                solution["platform"]["organizations"][organization]["otds"]["resourceId"] = awp_resource_id
+                solution["platform"]["content"]["ContentServer"]["contentServerUrl"] = (
+                    f"{self.settings.otcs.url!s}{self.settings.otcs.base_path}"
+                )
+                solution["platform"]["content"]["ContentServer"]["contentServerSupportDirectoryUrl"] = (
+                    f"{self.settings.otcs.url!s}/cssupport"
+                )
+                solution["platform"]["content"]["ContentServer"]["otdsResourceId"] = otcs_resource_id
+                solution["platform"]["authenticators"]["OTDS_auth"]["publicLoginUrl"] = (
+                    str(self.settings.otds.url) + "/otdsws/login"
+                )
+                solution["platform"]["security"]["contentSecurityPolicy"] = "frame-ancestors 'self' " + str(
+                    self.settings.otcs.url,
+                )
+                config_map.data["solution.yaml"] = yaml.dump(solution)
+                result = self.k8s_object.replace_config_map(
+                    config_map_name=self.settings.k8s.cm_otawp,
+                    config_map_data=config_map.data,
+                )
+                if result:
+                    self.logger.info(
+                        "Successfully updated AppWorks solution YAML for organization -> '%s'.",
+                        organization,
+                    )
+                else:
+                    self.logger.error(
+                        "Failed to update AppWorks solution YAML for organization -> '%s'!",
+                        organization,
+                    )
+                self.logger.debug("Solution YAML for AppWorks organization -> '%s': %s", organization, solution)
+
+            self.logger.info("Scale AppWorks Kubernetes stateful set -> '%s' to 1...", self.settings.k8s.sts_otawp)
+            self.k8s_object.scale_stateful_set(
+                sts_name=self.settings.k8s.sts_otawp,
+                scale=1,
+            )
+        else:
+            self.logger.warning("Kubernetes not initialized. Cannot configure AppWorks Kubernetes Config Map!")
 
         # Add the OTCS Admin user to the AppWorks Access Role in OTDS
         self.otds_object.add_user_to_access_role(
-            "Access to " + self.settings.otawp.resource_name,
-            "otadmin@otds.admin",
+            access_role="Access to " + self.settings.otawp.resource_name,
+            user_id="otadmin@otds.admin",
         )
 
         # Loop to wait for OTCS to create its OTDS user partition:
         otcs_partition = self.otds_object.get_partition(
-            self.settings.otcs.partition,
+            name=self.settings.otcs.partition,
             show_error=False,
         )
         while otcs_partition is None:
@@ -1351,27 +1170,27 @@ class Customizer:
 
             time.sleep(30)
             otcs_partition = self.otds_object.get_partition(
-                self.settings.otcs.partition,
+                name=self.settings.otcs.partition,
                 show_error=False,
             )
 
         # Add the OTDS user partition for OTCS to the AppWorks Platform Access Role in OTDS.
         # This will effectvely sync all OTCS users with AppWorks Platform:
         self.otds_object.add_partition_to_access_role(
-            self.settings.otawp.access_role_name,
-            self.settings.otcs.partition,
+            access_role=self.settings.otawp.access_role_name,
+            partition=self.settings.otcs.partition,
         )
 
         # Add the OTDS admin partition to the AppWorks Platform Access Role in OTDS.
         self.otds_object.add_partition_to_access_role(
-            self.settings.otawp.access_role_name,
-            self.settings.otds.admin_partition,
+            access_role=self.settings.otawp.access_role_name,
+            partition=self.settings.otds.admin_partition,
         )
 
         # Set Group inclusion for Access Role for OTAWP to "True":
         self.otds_object.update_access_role_attributes(
-            self.settings.otawp.access_role_name,
-            [{"name": "pushAllGroups", "values": ["True"]}],
+            name=self.settings.otawp.access_role_name,
+            attribute_list=[{"name": "pushAllGroups", "values": ["True"]}],
         )
 
         # Add ResourceID User to OTDSAdmin to allow push
@@ -1381,92 +1200,23 @@ class Customizer:
         )
 
         # Allow impersonation for all users:
-        self.otds_object.impersonate_resource(self.settings.otawp.resource_name)
-
-        # Add SPS license for OTAWP
-        # check if the license file exists, otherwise skip for versions pre 24.1
-        if os.path.isfile(self.settings.otawp.license_file):
-            self.logger.info(
-                "Found OTAWP license file -> '%s', assiging it to ressource '%s'...",
-                self.settings.otawp.license_file,
-                self.settings.otawp.resource_name,
-            )
-
-            otawp_license = self.otds_object.add_license_to_resource(
-                self.settings.otawp.license_file,
-                self.settings.otawp.product_name,
-                self.settings.otawp.product_description,
-                awp_resource["resourceID"],
-            )
-            if not otawp_license:
-                self.logger.error(
-                    "Couldn't apply license -> '%s' for product -> '%s' to OTDS resource -> '%s'",
-                    self.settings.otawp.license_file,
-                    self.settings.otawp.product_name,
-                    awp_resource["resourceID"],
-                )
-            else:
-                self.logger.info(
-                    "Successfully applied license -> '%s' for product -> '%s' to OTDS resource -> '%s'",
-                    self.settings.otawp.license_file,
-                    self.settings.otawp.product_name,
-                    awp_resource["resourceID"],
-                )
+        self.otds_object.impersonate_resource(resource_name=self.settings.otawp.resource_name)
 
-            # Assign AppWorks license to Content Server Members Partiton and otds.admin:
-            for partition_name in ["otds.admin", self.settings.otcs.partition]:
-                if self.otds_object.is_partition_licensed(
-                    partition_name=partition_name,
-                    resource_id=awp_resource["resourceID"],
-                    license_feature="USERS",
-                    license_name=self.settings.otawp.product_name,
-                ):
-                    self.logger.info(
-                        "Partition -> '%s' is already licensed for -> '%s' (%s)",
-                        partition_name,
-                        self.settings.otawp.product_name,
-                        "USERS",
-                    )
-                else:
-                    assigned_license = self.otds_object.assign_partition_to_license(
-                        partition_name,
-                        awp_resource["resourceID"],
-                        "USERS",
-                        self.settings.otawp.product_name,
-                    )
-                    if not assigned_license:
-                        self.logger.error(
-                            "Partition -> '%s' could not be assigned to license -> '%s' (%s)",
-                            partition_name,
-                            self.settings.otawp.product_name,
-                            "USERS",
-                        )
-                    else:
-                        self.logger.info(
-                            "Partition -> '%s' successfully assigned to license -> '%s' (%s)",
-                            partition_name,
-                            self.settings.otawp.product_name,
-                            "USERS",
-                        )
         otawp_object = OTAWP(
-            self.settings.otawp.protocol,
-            self.settings.k8s.sts_otawp,
-            str(self.settings.otawp.port),
-            "sysadmin",
-            self.settings.otawp.password.get_secret_value(),
-            "",
-            self.settings.otcs.partition,
-            self.settings.otds.admin_partition,
-            self.settings.k8s.cm_otawp,
-            otcs_resource_id,
-            self.settings.otds.url,
-            self.settings.otcs.url,
-            self.settings.otcs.base_path,
-            self.settings.otawp.license_file,
-            self.settings.otawp.product_name,
-            self.settings.otawp.product_description,
+            protocol=self.settings.otawp.protocol,
+            hostname=self.settings.k8s.sts_otawp,
+            port=str(self.settings.otawp.port),
+            username="sysadmin",
+            password=self.settings.otawp.password.get_secret_value(),
+            organization=self.settings.otawp.organization,
+            otawp_ticket="",
+            config_map_name=self.settings.k8s.cm_otawp,
+            license_file=self.settings.otawp.license_file,
+            product_name=self.settings.otawp.product_name,
+            product_description=self.settings.otawp.product_description,
             logger=self.logger,
         )
+
         return otawp_object
 
     # end method definition
@@ -1484,8 +1234,9 @@ class Customizer:
                 OTCS object of the backend.
             frontend:
                 OTCS object of the frontend.
-            extra_wait_time (int):
+            extra_wait_time (int, optional):
                 Extra wait time after the restart to make sure pods are responsive again.
+                Default is 60.
 
         Returns:
             None
@@ -1500,6 +1251,18 @@ class Customizer:
 
         self.logger.info("Restart OTCS frontend and backend pods...")
 
+        # Get number of replicas or update it for frontends as it might change with dynamic scaling:
+        otcs_frontend_scale = self.k8s_object.get_stateful_set_scale(
+            sts_name=self.settings.k8s.sts_otcs_frontend,
+        )
+        if not otcs_frontend_scale:
+            self.logger.error(
+                "Cannot find Kubernetes Stateful Set -> '%s' for OTCS Frontends!",
+                self.settings.k8s.sts_otcs_frontend,
+            )
+
+        self.settings.k8s.sts_otcs_frontend_replicas = otcs_frontend_scale.spec.replicas
+
         # Restart all frontends:
         for x in range(self.settings.k8s.sts_otcs_frontend_replicas):
             pod_name = self.settings.k8s.sts_otcs_frontend + "-" + str(x)
@@ -1510,7 +1273,7 @@ class Customizer:
                 ["/bin/sh", "-c", "touch /tmp/keepalive"],
                 container="otcs-frontend-container",
             )
-            self.logger.info("Restarting pod -> '%s'", pod_name)
+            self.logger.info("Restarting OTCS in pod -> '%s'", pod_name)
             self.k8s_object.exec_pod_command(
                 pod_name,
                 ["/bin/sh", "-c", "/opt/opentext/cs/stop_csserver"],
@@ -1532,7 +1295,7 @@ class Customizer:
                 ["/bin/sh", "-c", "touch /tmp/keepalive"],
                 container="otcs-admin-container",
             )
-            self.logger.info("Restarting pod -> '%s'", pod_name)
+            self.logger.info("Restarting OTCS in pod -> '%s'", pod_name)
             self.k8s_object.exec_pod_command(
                 pod_name,
                 ["/bin/sh", "-c", "/opt/opentext/cs/stop_csserver"],
@@ -1763,8 +1526,8 @@ class Customizer:
             return False
 
         # Establish in-cluster Kubernetes connection
-        self.log_header("Initialize Kubernetes")
         if self.settings.k8s.enabled:
+            self.log_header("Initialize Kubernetes")
             try:
                 self.k8s_object = self.init_k8s()
 
@@ -1810,6 +1573,7 @@ class Customizer:
                 self.logger.error("Failed to initialize OTAC - exiting...")
                 return False
         else:
+            self.logger.info("Archive Center is disabled.")
             self.otac_object = None
 
         if self.settings.otiv.enabled:  # is Intelligent Viewing deployed?
@@ -1817,16 +1581,18 @@ class Customizer:
 
             self.otiv_object = self.init_otiv()
         else:
+            self.logger.info("Intelligent Viewing is disabled.")
             self.otiv_object = None
 
         if self.settings.otpd.enabled:  # is PowerDocs deployed?
-            self.log_header("Initialize OTPD")
+            self.log_header("Initialize PowerDocs")
 
             self.otpd_object = self.init_otpd()
             if not self.otpd_object:
                 self.logger.error("Failed to initialize OTPD - exiting...")
                 return False
         else:
+            self.logger.info("PowerDocs is disabled.")
             self.otpd_object = None
 
         if self.settings.coreshare.enabled:  # is Core Share enabled?
@@ -1837,10 +1603,11 @@ class Customizer:
                 self.logger.error("Failed to initialize Core Share - exiting...")
                 return False
         else:
+            self.logger.info("Core Share is disabled.")
             self.core_share_object = None
 
         if (
-            self.settings.m365.enabled and self.settings.m365.username != "" and self.settings.m365.password != ""
+            self.settings.m365.enabled and self.settings.m365.client_id != "" and self.settings.m365.client_secret != ""
         ):  # is M365 enabled?
             self.log_header("Initialize Microsoft 365")
 
@@ -1849,6 +1616,9 @@ class Customizer:
             if not self.m365_object:
                 self.logger.error("Failed to initialize Microsoft 365!")
                 return False
+        else:
+            self.logger.info("Microsoft 365 is disabled or credentials are missing.")
+            self.m365_object = None
 
         if self.settings.avts.enabled:
             self.log_header("Initialize Aviator Search")
@@ -1857,6 +1627,7 @@ class Customizer:
                 self.logger.error("Failed to initialize Aviator Search")
                 return False
         else:
+            self.logger.info("Aviator Search is disabled.")
             self.avts_object = None
 
         return True
@@ -1938,6 +1709,7 @@ class Customizer:
                 m365_object=self.m365_object,
                 core_share_object=self.core_share_object,
                 browser_automation_object=self.browser_automation_object,
+                browser_headless=self.settings.headless_browser,
                 placeholder_values=self.settings.placeholder_values,  # this dict includes placeholder replacements for the Ressource IDs of OTAWP and OTCS
                 log_header_callback=self.log_header,
                 stop_on_error=self.settings.stop_on_error,
@@ -2031,42 +1803,44 @@ class Customizer:
         if self.settings.otcs.maintenance_mode:
             self.set_maintenance_mode(enable=False)
 
-        # Restart AppWorksPlatform pod if it is deployed (to make settings effective):
-        if self.settings.otawp.enabled:  # is AppWorks Platform deployed?
-            otawp_resource = self.otds_object.get_resource(
-                name=self.settings.otawp.resource_name,
-            )
-            if "allowImpersonation" not in otawp_resource or not otawp_resource["allowImpersonation"]:
-                # Allow impersonation for all users:
-                self.logger.warning(
-                    "OTAWP impersonation is not correct in OTDS before OTAWP pod restart!",
-                )
-            else:
-                self.logger.info(
-                    "OTAWP impersonation is correct in OTDS before OTAWP pod restart!",
-                )
-            self.logger.info("Restart OTAWP pod...")
-            self.restart_otawp_pod()
-            # For some reason we need to double-check that the impersonation
-            # for OTAWP has been set correctly and if not set it again:
-            otawp_resource = self.otds_object.get_resource(
-                name=self.settings.otawp.resource_name,
-            )
-            if "allowImpersonation" not in otawp_resource or not otawp_resource["allowImpersonation"]:
-                # Allow impersonation for all users:
-                self.logger.warning(
-                    "OTAWP impersonation is not correct in OTDS - set it once more...",
-                )
-                self.otds_object.impersonate_resource(
-                    resource_name=self.settings.otawp.resource_name,
-                )
-
-        # Restart Aviator Search (Omnigroup) to ensure group synchronisation is working
-        if self.settings.avts.enabled:  # is Aviator Search deployed?
-            self.logger.info(
-                "Restarting Aviator Search Omnigroup server after creation of OTDS ClientID/ClientSecret...",
-            )
-            self.k8s_object.restart_stateful_set(sts_name="idol-omnigroupserver")
+        # Code below disbaled -> not needed anymore, will be done via "kubernetes" payload section
+        #
+        # # Restart AppWorksPlatform pod if it is deployed (to make settings effective):
+        # if self.settings.otawp.enabled:  # is AppWorks Platform deployed?
+        #     otawp_resource = self.otds_object.get_resource(
+        #         name=self.settings.otawp.resource_name,
+        #     )
+        #     if "allowImpersonation" not in otawp_resource or not otawp_resource["allowImpersonation"]:
+        #         # Allow impersonation for all users:
+        #         self.logger.warning(
+        #             "OTAWP impersonation is not correct in OTDS before OTAWP pod restart!",
+        #         )
+        #     else:
+        #         self.logger.info(
+        #             "OTAWP impersonation is correct in OTDS before OTAWP pod restart!",
+        #         )
+        #     self.logger.info("Restart OTAWP pod...")
+        #     self.restart_otawp_pod()
+        #     # For some reason we need to double-check that the impersonation
+        #     # for OTAWP has been set correctly and if not set it again:
+        #     otawp_resource = self.otds_object.get_resource(
+        #         name=self.settings.otawp.resource_name,
+        #     )
+        #     if "allowImpersonation" not in otawp_resource or not otawp_resource["allowImpersonation"]:
+        #         # Allow impersonation for all users:
+        #         self.logger.warning(
+        #             "OTAWP impersonation is not correct in OTDS - set it once more...",
+        #         )
+        #         self.otds_object.impersonate_resource(
+        #             resource_name=self.settings.otawp.resource_name,
+        #         )
+
+        # # Restart Aviator Search (Omnigroup) to ensure group synchronisation is working
+        # if self.settings.avts.enabled:  # is Aviator Search deployed?
+        #     self.logger.info(
+        #         "Restarting Aviator Search Omnigroup server after creation of OTDS client ID and client secret...",
+        #     )
+        #     self.k8s_object.restart_stateful_set(sts_name="idol-omnigroupserver")
 
         # Upload log file for later review to "Deployment" folder
         # in "Administration" folder in OTCS Enterprise volume: