mas-cli 13.25.1__py3-none-any.whl → 13.27.0__py3-none-any.whl

mas/cli/aiservice/install/params.py

@@ -0,0 +1,120 @@
+# *****************************************************************************
+# Copyright (c) 2024, 2025 IBM Corporation and other Contributors.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# *****************************************************************************
+
+requiredParams = [
+    # MAS
+    "mas_catalog_version",
+    # Storage classes
+    "storage_class_rwo",
+    "storage_class_rwx",
+    # Entitlement
+    "ibm_entitlement_key",
+    # DRO
+    "uds_contact_email",
+    "uds_contact_firstname",
+    "uds_contact_lastname"
+]
+
+optionalParams = [
+    # Pipeline
+    "image_pull_policy",
+    "service_account_name",
+    # Catalogue
+    "mas_catalog_digest",
+    # SLS
+    "sls_namespace",
+    # DRO
+    "dro_namespace",
+    # Db2
+    "db2_action_system",
+    "db2_action_manage",
+    "db2_action_facilities",
+    "db2_type",
+    "db2_timezone",
+    "db2_namespace",
+    "db2_channel",
+    "db2_affinity_key",
+    "db2_affinity_value",
+    "db2_tolerate_key",
+    "db2_tolerate_value",
+    "db2_tolerate_effect",
+    "db2_cpu_requests",
+    "db2_cpu_limits",
+    "db2_memory_requests",
+    "db2_memory_limits",
+    "db2_backup_storage_size",
+    "db2_data_storage_size",
+    "db2_logs_storage_size",
+    "db2_meta_storage_size",
+    "db2_temp_storage_size",
+    # Dev Mode
+    "artifactory_username",
+    "artifactory_token",
+    # Aibroker
+    "mas_aibroker_storage_provider",
+    "mas_aibroker_storage_accesskey",
+    "mas_aibroker_storage_secretkey",
+    "mas_aibroker_storage_host",
+    "mas_aibroker_storage_port",
+    "mas_aibroker_storage_ssl",
+    "mas_aibroker_storage_region",
+    "mas_aibroker_storage_pipelines_bucket",
+    "mas_aibroker_storage_tenants_bucket",
+    "mas_aibroker_storage_templates_bucket",
+    "mas_aibroker_tenant_name",
+    "mas_aibroker_watsonxai_apikey",
+    "mas_aibroker_watsonxai_url",
+    "mas_aibroker_watsonxai_project_id",
+    "mas_aibroker_watsonx_action",
+    "mas_aibroker_db_host",
+    "mas_aibroker_db_port",
+    "mas_aibroker_db_user",
+    "mas_aibroker_db_database",
+    "mas_aibroker_db_secret_name",
+    "mas_aibroker_db_secret_key",
+    "mas_aibroker_db_secret_value",
+    "aibroker_instance_id",
+    "mariadb_user",
+    "mariadb_password",
+    "minio_root_user",
+    "minio_root_password",
+    "tenant_entitlement_type",
+    "tenant_entitlement_start_date",
+    "tenant_entitlement_end_date",
+    "mas_aibroker_s3_bucket_prefix",
+    "mas_aibroker_s3_region",
+    "mas_aibroker_s3_endpoint_url",
+    "mas_aibroker_tenant_s3_bucket_prefix",
+    "mas_aibroker_tenant_s3_region",
+    "mas_aibroker_tenant_s3_endpoint_url",
+    "mas_aibroker_tenant_s3_access_key",
+    "mas_aibroker_tenant_s3_secret_key",
+    "rsl_url",
+    "rsl_org_id",
+    "rsl_token",
+    "install_minio_aiservice",
+    "install_sls_aiservice",
+    "install_dro_aiservice",
+    "install_db2_aiservice",
+    "mas_aibroker_dro_secret_name",
+    "mas_aibroker_dro_api_key",
+    "mas_aibroker_dro_url",
+    "mas_aibroker_dro_ca_cert",
+    "mas_aibroker_db2_username",
+    "mas_aibroker_db2_password",
+    "mas_aibroker_db2_jdbc_url",
+    "mas_aibroker_db2_ssl_enabled",
+    "mas_aibroker_db2_ca_cert",
+    "mas_aibroker_sls_secret_name",
+    "mas_aibroker_sls_registration_key",
+    "mas_aibroker_sls_url",
+    "mas_aibroker_sls_ca_cert",
+    "environment_type",
+]

mas/cli/aiservice/install/summarizer.py

@@ -0,0 +1,193 @@
+# *****************************************************************************
+# Copyright (c) 2024, 2025 IBM Corporation and other Contributors.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# *****************************************************************************
+
+import logging
+import yaml
+from prompt_toolkit import print_formatted_text, HTML
+from mas.devops.ocp import getConsoleURL
+
+logger = logging.getLogger(__name__)
+
+
+class aiServiceInstallSummarizerMixin():
+    def ocpSummary(self) -> None:
+        self.printH2("Pipeline Configuration")
+        self.printParamSummary("Service Account", "service_account_name")
+        self.printParamSummary("Image Pull Policy", "image_pull_policy")
+        self.printSummary("Skip Pre-Install Healthcheck", "Yes" if self.getParam('skip_pre_check') == "true" else "No")
+
+        self.printH2("OpenShift Container Platform")
+        self.printSummary("Worker Node Architecture", self.architecture)
+        self.printSummary("Storage Class Provider", self.storageClassProvider)
+        self.printParamSummary("ReadWriteOnce Storage Class", "storage_class_rwo")
+        self.printParamSummary("ReadWriteMany Storage Class", "storage_class_rwx")
+
+        self.printParamSummary("Certificate Manager", "cert_manager_provider")
+        self.printParamSummary("Cluster Ingress Certificate Secret", "ocp_ingress_tls_secret_name")
+
+    def masSummary(self) -> None:
+
+        self.printH2("IBM Maximo Application Suite")
+
+        print()
+        self.printParamSummary("Catalog Version", "mas_catalog_version")
+        # We only list the digest if it's specified (primary use case is when running development builds in airgap environments)
+        if self.getParam("mas_catalog_digest" != ""):
+            self.printParamSummary("Catalog Digest", "mas_catalog_digest")
+        self.printParamSummary("Subscription Channel", "mas_channel")
+
+        print()
+        self.printParamSummary("IBM Entitled Registry", "mas_icr_cp")
+        self.printParamSummary("IBM Open Registry", "mas_icr_cpopen")
+
+        print()
+        if self.localConfigDir is not None:
+            self.printSummary("Additional Config", self.localConfigDir)
+        else:
+            self.printSummary("Additional Config", "Not Configured")
+
+    def aibrokerSummary(self) -> None:
+        if self.installAiBroker:
+            self.printSummary("AI Broker", self.params["mas_app_channel_aibroker"])
+            print_formatted_text(HTML("  <SkyBlue>+ Maximo AI Broker Settings</SkyBlue>"))
+            self.printParamSummary("  + Aibroker Instance Id", "aibroker_instance_id")
+            self.printParamSummary("  + Storage provider", "mas_aibroker_storage_provider")
+            if self.getParam("mas_aibroker_storage_provider") == "minio":
+                self.printParamSummary("  + minio root username", "minio_root_user")
+            if self.getParam("mas_app_channel_aibroker") != "9.0.x":
+                self.printParamSummary("  + Mariadb username", "mariadb_user")
+                self.printParamSummary("  + Mariadb password", "mariadb_password")
+            self.printParamSummary("  + Storage access key", "mas_aibroker_storage_accesskey")
+            self.printParamSummary("  + Storage host", "mas_aibroker_storage_host")
+            self.printParamSummary("  + Storage port", "mas_aibroker_storage_port")
+            self.printParamSummary("  + Storage ssl", "mas_aibroker_storage_ssl")
+            self.printParamSummary("  + Storage region", "mas_aibroker_storage_region")
+            self.printParamSummary("  + Storage pipelines bucket", "mas_aibroker_storage_pipelines_bucket")
+            self.printParamSummary("  + Storage tenants bucket", "mas_aibroker_storage_tenants_bucket")
+            self.printParamSummary("  + Storage templates bucket", "mas_aibroker_storage_templates_bucket")
+            self.printParamSummary("  + Watsonxai machine learning url", "mas_aibroker_watsonxai_url")
+            self.printParamSummary("  + Watsonxai project id", "mas_aibroker_watsonxai_project_id")
+            self.printParamSummary("  + Database host", "mas_aibroker_db_host")
+            self.printParamSummary("  + Database port", "mas_aibroker_db_port")
+            self.printParamSummary("  + Database user", "mas_aibroker_db_user")
+            self.printParamSummary("  + Database name", "mas_aibroker_db_database")
+            if self.getParam("mas_app_channel_aibroker") != "9.0.x":
+                self.printParamSummary("  + Tenant entitlement type", "tenant_entitlement_type")
+                self.printParamSummary("  + Tenant start date", "tenant_entitlement_start_date")
+                self.printParamSummary("  + Tenant end date", "tenant_entitlement_end_date")
+                self.printParamSummary("  + Tenant end date", "tenant_entitlement_end_date")
+                self.printParamSummary("  + S3 bucket prefix", "mas_aibroker_s3_bucket_prefix")
+                self.printParamSummary("  + S3 endpoint url", "mas_aibroker_s3_endpoint_url")
+                self.printParamSummary("  + S3 bucket prefix (tenant level)", "mas_aibroker_tenant_s3_bucket_prefix")
+                self.printParamSummary("  + S3 region (tenant level)", "mas_aibroker_tenant_s3_region")
+                self.printParamSummary("  + S3 endpoint url (tenant level)", "mas_aibroker_tenant_s3_endpoint_url")
+                self.printParamSummary("  + RSL url", "rsl_url")
+                self.printParamSummary("  + ORG Id of RSL", "rsl_org_id")
+                self.printParamSummary("  + Token for RSL", "rsl_token")
+                self.printParamSummary("  + Install minio", "install_minio_aiservice")
+                self.printParamSummary("  + Install SLS", "install_sls_aiservice")
+                if self.getParam("install_sls_aiservice") != "true":
+                    self.printParamSummary("  + SLS secret name", "mas_aibroker_sls_secret_name")
+                    self.printParamSummary("  + SLS registration key", "mas_aibroker_sls_registration_key")
+                    self.printParamSummary("  + SLS URL", "mas_aibroker_sls_url")
+                self.printParamSummary("  + Install DRO", "install_dro_aiservice")
+                if self.getParam("install_dro_aiservice") != "true":
+                    self.printParamSummary("  + DRO secret name", "mas_aibroker_dro_secret_name")
+                    self.printParamSummary("  + DRO API key", "mas_aibroker_dro_api_key")
+                    self.printParamSummary("  + DRO URL", "mas_aibroker_dro_url")
+                self.printParamSummary("  + Install DB2", "install_db2_aiservice")
+                if self.getParam("install_db2_aiservice") != "true":
+                    self.printParamSummary("  + DB2 username", "mas_aibroker_db2_username")
+                    self.printParamSummary("  + DB2 JDBC URL", "mas_aibroker_db2_jdbc_url")
+                    self.printParamSummary("  + DB2 SSL enabled", "mas_aibroker_db2_ssl_enabled")
+                self.printParamSummary("  + Environment type", "environment_type")
+
+        else:
+            self.printSummary("AI Broker", "Do Not Install")
+
+    def db2Summary(self) -> None:
+        if self.getParam("db2_action_system") == "install" or self.getParam("db2_action_manage") == "install":
+            self.printH2("IBM Db2 Univeral Operator Configuration")
+            self.printSummary("System Instance", "Install" if self.getParam("db2_action_system") == "install" else "Do Not Install")
+            self.printSummary("Dedicated Manage Instance", "Install" if self.getParam("db2_action_manage") == "install" else "Do Not Install")
+            self.printParamSummary(" - Type", "db2_type")
+            self.printParamSummary(" - Timezone", "db2_timezone")
+            print()
+            self.printParamSummary("Install Namespace", "db2_namespace")
+            self.printParamSummary("Subscription Channel", "db2_channel")
+            print()
+            self.printParamSummary("CPU Request", "db2_cpu_requests")
+            self.printParamSummary("CPU Limit", "db2_cpu_limits")
+            self.printParamSummary("Memory Request", "db2_memory_requests")
+            self.printParamSummary("Memory Limit ", "db2_memory_limits")
+            print()
+            self.printParamSummary("Meta Storage", "db2_meta_storage_size")
+            self.printParamSummary("Data Storage", "db2_data_storage_size")
+            self.printParamSummary("Backup Storage", "db2_backup_storage_size")
+            self.printParamSummary("Temp Storage", "db2_temp_storage_size")
+            self.printParamSummary("Transaction Logs Storage", "db2_logs_storage_size")
+            print()
+            if self.getParam('db2_affinity_key') != "":
+                self.printSummary("Node Affinity", f"{self.getParam('db2_affinity_key')}={self.getParam('db2_affinity_value')}")
+            else:
+                self.printSummary("Node Affinity", "None")
+
+            if self.getParam('db2_tolerate_key') != "":
+                self.printSummary("Node Tolerations", f"{self.getParam('db2_tolerate_key')}={self.getParam('db2_tolerate_value')} @ {self.getParam('db2_tolerate_effect')}")
+            else:
+                self.printSummary("Node Tolerations", "None")
+
+    def droSummary(self) -> None:
+        self.printH2("IBM Data Reporter Operator (DRO) Configuration")
+        self.printParamSummary("Contact e-mail", "uds_contact_email")
+        self.printParamSummary("First name", "uds_contact_firstname")
+        self.printParamSummary("Last name", "uds_contact_lastname")
+        self.printParamSummary("Install Namespace", "dro_namespace")
+
+    def slsSummary(self) -> None:
+        self.printH2("IBM Suite License Service")
+        self.printParamSummary("Namespace", "sls_namespace")
+        if self.getParam("sls_action") == "install":
+            self.printSummary("Subscription Channel", "3.x")
+            self.printParamSummary("IBM Open Registry", "sls_icr_cpopen")
+            if self.slsLicenseFileLocal:
+                self.printSummary("License File", self.slsLicenseFileLocal)
+
+    def mongoSummary(self) -> None:
+        self.printH2("MongoDb")
+        if self.getParam("mongodb_action") == "install":
+            self.printSummary("Type", "MongoCE Operator")
+            self.printParamSummary("Install Namespace", "mongodb_namespace")
+        elif self.getParam("mongodb_action") == "byo":
+            self.printSummary("Type", "BYO (mongodb-system.yaml)")
+        else:
+            self.fatalError(f"Unexpected value for mongodb_action parameter: {self.getParam('mongodb_action')}")
+
+    def displayInstallSummary(self) -> None:
+        self.printH1("Review Settings")
+        self.printDescription([
+            "Connected to:",
+            f" - <u>{getConsoleURL(self.dynamicClient)}</u>"
+        ])
+
+        logger.debug("PipelineRun parameters:")
+        logger.debug(yaml.dump(self.params, default_flow_style=False))
+
+        # Cluster Config & Dependencies
+        self.ocpSummary()
+        self.droSummary()
+        self.slsSummary()
+        self.masSummary()
+        self.printH2("IBM Maximo Application Suite Application - Aiservice")
+        self.aibrokerSummary()
+
+        # Application Dependencies
+        self.mongoSummary()
+        self.db2Summary()

mas/cli/cli.py

@@ -117,7 +117,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version = "13.25.1"
+        self.version = "13.27.0"
         self.h1count = 0
         self.h2count = 0
 
@@ -146,7 +146,16 @@ class BaseApp(PrintMixin, PromptMixin):
 
         self.compatibilityMatrix = {
             "9.1.x": {
-                "facilities": ["9.1.x"]
+                "facilities": ["9.1.x"],
+                "assist": ["9.1.x", "9.0.x"],
+                "iot": ["9.1.x", "9.0.x"],
+                "manage": ["9.1.x", "9.0.x"],
+                "monitor": ["9.1.x", "9.0.x"],
+                "optimizer": ["9.1.x", "9.0.x"],
+                "predict": ["9.1.x", "9.0.x"],
+                "visualinspection": ["9.1.x", "9.0.x"],
+                "aibroker": ["9.1.x", "9.0.x"],
+
             },
             "9.1.x-feature": {
                 "assist": ["9.0.x"],
@@ -195,10 +204,14 @@ class BaseApp(PrintMixin, PromptMixin):
             "8.11.x": " - <u>https://ibm.biz/MAS811-License</u>\n - <u>https://ibm.biz/MAXIT81-License</u>",
             "9.0.x": " - <u>https://ibm.biz/MAS90-License</u>\n - <u>https://ibm.biz/MaximoIT90-License</u>\n - <u>https://ibm.biz/MAXArcGIS90-License</u>",
             "9.1.x-feature": " - <u>https://ibm.biz/MAS90-License</u>\n - <u>https://ibm.biz/MaximoIT90-License</u>\n - <u>https://ibm.biz/MAXArcGIS90-License</u>\n\nBe aware, this channel subscription is supported for non-production use only.   \nIt allows early access to new features for evaluation in non-production environments.   \nThis subscription is offered alongside and in parallel with our normal maintained streams.   \nWhen using this subscription, IBM Support will only accept cases for the latest available bundle deployed in a non-production environment.   \nSeverity must be either 3 or 4 and cases cannot be escalated.   \nPlease refer to IBM documentation for more details.\n",
+            "9.1.x": " - <u>https://ibm.biz/MAS91-License</u>\n - <u>https://ibm.biz/MAXIT91-License</u>\n - <u>https://ibm.biz/MAXESRI91-License</u>",
+            "aibroker-9.1.x": " - <u>https://ibm.biz/MAS91-License</u>",
         }
 
         self.upgrade_path = {
-            "9.0.x": "9.1.x-feature",
+            "9.1.x": "9.1.x",
+            "9.1.x-feature": "9.1.x",
+            "9.0.x": "9.1.x",
             "8.11.x": "9.0.x",
             "8.10.x": "8.11.x",
             "8.9.x": "8.10.x",

mas/cli/gencfg.py

@@ -11,6 +11,7 @@
 from os import path
 from jinja2 import Template
 from base64 import b64encode
+from json import loads
 
 
 class ConfigGeneratorMixin():
@@ -88,3 +89,25 @@ class ConfigGeneratorMixin():
         with open(destination, 'w') as f:
             f.write(cfg)
             f.write('\n')
+
+    def generateFacilitiesCfg(self, destination: str) -> None:
+        templateFile = path.join(self.templatesDir, "facilities-configs.yml.j2")
+
+        with open(templateFile) as tFile:
+            template = Template(tFile.read())
+
+        dwfagents = self.getParam("mas_ws_facilities_dwfagents")
+        maxconnpoolsize = self.getParam("mas_ws_facilities_db_maxconnpoolsize")
+        userfiles_size = self.getParam("mas_ws_facilities_storage_userfiles_size")
+        log_size = self.getParam("mas_ws_facilities_storage_log_size")
+        cfg = template.render(
+            mas_instance_id=self.getParam("mas_instance_id"),
+            mas_ws_facilities_storage_log_size=log_size if log_size != "" else 30,
+            mas_ws_facilities_storage_userfiles_size=userfiles_size if userfiles_size != "" else 50,
+            mas_ws_facilities_db_maxconnpoolsize=maxconnpoolsize if maxconnpoolsize != "" else 200,
+            mas_ws_facilities_dwfagents=loads(dwfagents) if dwfagents != '' else ''
+        )
+
+        with open(destination, 'w') as f:
+            f.write(cfg)
+            f.write('\n')

mas/cli/install/app.py

@@ -40,6 +40,7 @@ from mas.cli.validators import (
     WorkspaceNameFormatValidator,
     TimeoutFormatValidator,
     StorageClassValidator,
+    JsonValidator,
     OptimizerInstallPlanValidator
 )
 
@@ -375,7 +376,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             self.printDescription([
                 f"Unknown catalog {self.getParam('mas_catalog_version')}, please manually select the version of Cloud Pak for Data to use"
             ])
-            self.promptForString("Cloud Pak for Data product version", "cpd_product_version", default="4.8.0")
+            self.promptForString("Cloud Pak for Data product version", "cpd_product_version", default="5.1.3")
             logger.debug(f"Using user-provided (prompt) CP4D product version: {self.getParam('cpd_product_version')}")
         else:
             logger.debug(f"Using user-provided (flags) CP4D product version: {self.getParam('cpd_product_version')}")
@@ -665,10 +666,6 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         if self.installInspection:
             self.configAppChannel("visualinspection")
 
-        self.installAiBroker = self.yesOrNo("Install AI Broker")
-        if self.installAiBroker:
-            self.configAppChannel("aibroker")
-
         if isVersionEqualOrAfter('9.1.0', self.getParam("mas_channel")) and self.getParam("mas_channel") != '9.1.x-feature':
             self.installFacilities = self.yesOrNo("Install Real Estate and Facilities")
             if self.installFacilities:
@@ -770,7 +767,6 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 self.promptForString("IBM Cloud Resource Group", "cos_resourcegroup")
 
     @logMethodCall
-    # TODO: Fix type for storage sizes and max conn pool size
     def facilitiesSettings(self) -> None:
         if self.installFacilities:
             self.printH1("Configure Maximo Real Estate and Facilities")
@@ -786,13 +782,17 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             self.promptForListSelect("Select the size:", ["small", "medium", "large"], "mas_ws_facilities_size")
 
             if self.showAdvancedOptions:
+                self.printH2("Maximo Real Estate and Facilities Settings - Advanced")
+                self.printDescription([
+                    "Advanced configurations for Real Estate and Facilities are added through an additional file called facilities-configs.yaml"
+                ])
                 if self.yesOrNo("Supply extra XML tags for Real Estate and Facilities server.xml"):
                     self.promptForString("Real Estate and Facilities Liberty Extension Secret Name", "mas_ws_facilities_liberty_extension_XML")
                 if self.yesOrNo("Supply custom AES Encryption Password"):
                     self.promptForString("Real Estate and Facilities AES Vault Secret Name", "mas_ws_facilities_vault_secret")
 
                 self.promptForString("Set Real Estate and Facilities Routes Timeout:", "mas_ws_facilities_routes_timeout", default="600s")
-                # self.promptForInt("Set Facilities maximum connection poll size:", default=200)
+                self.promptForInt("Set Facilities maximum connection poll size:", "mas_ws_facilities_db_maxconnpoolsize", default=200)
 
                 self.printDescription(["Real Estate and Facilities Persistent Volume Storage Configuration"])
                 defaultStorageClasses = getDefaultStorageClasses(self.dynamicClient)
@@ -810,10 +810,10 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                         ])
                         storageMode = self.promptForListSelect("Select the storage mode for user files PVC:", ["ReadWriteMany", "ReadWriteOnce"], "mas_ws_facilities_storage_userfiles_mode", default=1)
                         _ = self.setParam("mas_ws_facilities_storage_userfiles_class", defaultStorageClasses.rwx) if storageMode == "ReadWriteMany" else self.setParam("mas_ws_facilities_storage_userfiles_class", defaultStorageClasses.rwo)
-                        # self.promptForInt("User file PVC size (Gb):", "mas_ws_facilities_storage_userfiles_size", default=50)
+                        self.promptForInt("User file PVC size (Gb):", "mas_ws_facilities_storage_userfiles_size", default=50)
                         storageMode = self.promptForListSelect("Select the storage mode for log PVC:", ["ReadWriteMany", "ReadWriteOnce"], "mas_ws_facilities_storage_log_mode", default=1)
                         _ = self.setParam("mas_ws_facilities_storage_log_class", defaultStorageClasses.rwx) if storageMode == "ReadWriteMany" else self.setParam("mas_ws_facilities_storage_log_class", defaultStorageClasses.rwo)
-                        # self.promptForInt("Log PVC size (Gb):", "mas_ws_facilities_storage_log_size", default=30)
+                        self.promptForInt("Log PVC size (Gb):", "mas_ws_facilities_storage_log_size", default=30)
                     else:
                         notUseAutodetectedStorageClasses = True
                 if defaultStorageClasses.provider is None or notUseAutodetectedStorageClasses:
@@ -828,11 +828,18 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                     ])
                     self.promptForListSelect("Select the storage mode for user files PVC:", ["ReadWriteMany", "ReadWriteOnce"], "mas_ws_facilities_storage_userfiles_mode", default=1)
                     self.promptForListSelect("Select the storage mode for log PVC:", ["ReadWriteMany", "ReadWriteOnce"], "mas_ws_facilities_storage_log_mode", default=1)
-                    # self.promptForInt("User file PVC size (Gb):", "mas_ws_facilities_storage_userfiles_size", default=50)
-                    # self.promptForInt("Log PVC size (Gb):", "mas_ws_facilities_storage_log_size", default=30)
+                    self.promptForInt("User file PVC size (Gb):", "mas_ws_facilities_storage_userfiles_size", default=50)
+                    self.promptForInt("Log PVC size (Gb):", "mas_ws_facilities_storage_log_size", default=30)
 
                 if self.yesOrNo("Supply configuration for dedicated workflow agents"):
-                    self.promptForString("Dedicated Workflow Agent JSON:")
+                    print_formatted_text(HTML("<LightSlateGrey> Example: '[{\"name\":\"dwfa1\",\"members\":[{\"name\": \"u1\", \"class\": \"user\"}]}, {\"name\":\"dwfa2\",\"members\":[{\"name\": \"u2\", \"class\": \"user\"},{\"name\":\"g1\", \"class\":\"group\"}]}]' </LightSlateGrey>"))
+                    self.promptForString("Dedicated Workflow Agent JSON:", "mas_ws_facilities_dwfagents", validator=JsonValidator())
+
+                # If advanced options is selected, we need to create a file to add props not supported by Tekton
+                self.selectLocalConfigDir()
+                facilitiesConfigsPath = path.join(self.localConfigDir, "facilities-configs.yaml")
+                self.generateFacilitiesCfg(destination=facilitiesConfigsPath)
+                self.setParam("mas_ws_facilities_config_file", "/workspace/configs/facilities-configs.yaml")
 
     @logMethodCall
     def chooseInstallFlavour(self) -> None:
@@ -897,7 +904,6 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         self.optimizerSettings()
         self.predictSettings()
         self.assistSettings()
-        self.aibrokerSettings()
         self.facilitiesSettings()
 
         # Dependencies
@@ -928,7 +934,6 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         self.installPredict = False
         self.installInspection = False
         self.installOptimizer = False
-        self.installAiBroker = False
         self.installFacilities = False
         self.deployCP4D = False
         self.db2SetAffinity = False
@@ -1027,10 +1032,6 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 if value is not None and value != "":
                     self.setParam("mas_app_channel_visualinspection", value)
                     self.installInspection = True
-            elif key == "aibroker_channel":
-                if value is not None and value != "":
-                    self.setParam("mas_app_channel_aibroker", value)
-                    self.installAiBroker = True
             elif key == "optimizer_channel":
                 if value is not None and value != "":
                     self.setParam("mas_app_channel_optimizer", value)
@@ -1119,6 +1120,14 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             # Configure Storage and Access mode
             self.manageStorageAndAccessMode()
 
+        if self.installFacilities:
+            # Verifiy if any of the props that needs to be in a file are given
+            if self.getParam("mas_ws_facilities_storage_log_size") != "" or self.getParam("mas_ws_facilities_storage_userfiles_size") != "" or self.getParam("mas_ws_facilities_db_maxconnpoolsize") or self.getParam("mas_ws_facilities_dwfagents"):
+                self.selectLocalConfigDir()
+                facilitiesConfigsPath = path.join(self.localConfigDir, "facilities-configs.yaml")
+                self.generateFacilitiesCfg(destination=facilitiesConfigsPath)
+                self.setParam("mas_ws_facilities_config_map_name", "facilities-config")
+
         # Load the catalog information
         self.chosenCatalog = getCatalog(self.getParam("mas_catalog_version"))
 
@@ -1209,6 +1218,13 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         self.slsLicenseFile()
         self.manualCertificates()
 
+        if not self.noConfirm and not self.waitForPVC:
+            self.printDescription(["If you are using storage classes that utilize 'WaitForFirstConsumer' binding mode choose 'No' at the prompt below"])
+            self.waitForPVC = self.yesOrNo("Wait for PVCs to bind")
+
+        if not self.waitForPVC:
+            self.setParam("no_wait_for_pvc", True)
+
         # Show a summary of the installation configuration
         self.printH1("Non-Interactive Install Command")
         self.printDescription([
@@ -1236,12 +1252,6 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             self.printH1("Launch Install")
             pipelinesNamespace = f"mas-{self.getParam('mas_instance_id')}-pipelines"
 
-            if not self.noConfirm:
-                self.printDescription(["If you are using storage classes that utilize 'WaitForFirstConsumer' binding mode choose 'No' at the prompt below"])
-                wait = self.yesOrNo("Wait for PVCs to bind")
-            else:
-                wait = False
-
             with Halo(text='Validating OpenShift Pipelines installation', spinner=self.spinner) as h:
                 installOpenShiftPipelines(self.dynamicClient)
                 h.stop_and_persist(symbol=self.successIcon, text="OpenShift Pipelines Operator is installed and ready to use")
@@ -1253,7 +1263,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                     instanceId=self.getParam("mas_instance_id"),
                     storageClass=self.pipelineStorageClass,
                     accessMode=self.pipelineStorageAccessMode,
-                    waitForBind=wait,
+                    waitForBind=self.waitForPVC,
                     configureRBAC=(self.getParam("service_account_name") == "")
                 )
                 prepareInstallSecrets(

mas/cli/install/argBuilder.py

@@ -256,39 +256,39 @@ class installArgBuilderMixin():
             if self.getParam('mas_ws_facilities_vault_secret') != "":
                 command += f"  --facilities-vault-secret \"{self.getParam('mas_ws_facilities_vault_secret')}\"{newline}"
 
-            # if self.getParam('mas_ws_facilities_dwfagents') != "":
-            #     command += f"  --facilities-dwfagent \"{self.getParam('mas_ws_facilities_dwfagents')}\"{newline}"
+            if self.getParam('mas_ws_facilities_dwfagents') != "":
+                command += f"  --facilities-dwfagent \'{self.getParam('mas_ws_facilities_dwfagents')}\'{newline}"
 
-            # if self.getParam('mas_ws_facilities_db_maxconnpoolsize') != "":
-            #     command += f"  --facilities-maxconnpoolsize \"{self.getParam('mas_ws_facilities_db_maxconnpoolsize')}\"{newline}"
+            if self.getParam('mas_ws_facilities_db_maxconnpoolsize') != "":
+                command += f"  --facilities-maxconnpoolsize \"{self.getParam('mas_ws_facilities_db_maxconnpoolsize')}\"{newline}"
 
             if self.getParam('mas_ws_facilities_storage_log_class') != "":
                 command += f"  --facilities-log-storage-class \"{self.getParam('mas_ws_facilities_storage_log_class')}\"{newline}"
             if self.getParam('mas_ws_facilities_storage_log_mode') != "":
                 command += f"  --facilities-log-storage-mode \"{self.getParam('mas_ws_facilities_storage_log_mode')}\"{newline}"
-            # if self.getParam('mas_ws_facilities_storage_log_size') != "":
-            #     command += f"  --facilities-log-storage-size \"{self.getParam('mas_ws_facilities_storage_log_size')}\"{newline}"
+            if self.getParam('mas_ws_facilities_storage_log_size') != "":
+                command += f"  --facilities-log-storage-size \"{self.getParam('mas_ws_facilities_storage_log_size')}\"{newline}"
 
             if self.getParam('mas_ws_facilities_storage_userfiles_class') != "":
                 command += f"  --facilities-userfiles-storage-class \"{self.getParam('mas_ws_facilities_storage_userfiles_class')}\"{newline}"
             if self.getParam('mas_ws_facilities_storage_userfiles_mode') != "":
                 command += f"  --facilities-userfiles-storage-mode \"{self.getParam('mas_ws_facilities_storage_userfiles_mode')}\"{newline}"
-            # if self.getParam('mas_ws_facilities_storage_userfiles_size') != "":
-            #     command += f"  --facilities-userfiles-storage-size \"{self.getParam('mas_ws_facilities_storage_userfiles_size')}\"{newline}"
+            if self.getParam('mas_ws_facilities_storage_userfiles_size') != "":
+                command += f"  --facilities-userfiles-storage-size \"{self.getParam('mas_ws_facilities_storage_userfiles_size')}\"{newline}"
 
         # IBM Cloud Pak for Data
         # -----------------------------------------------------------------------------
         if self.getParam('cpd_product_version') != "":
             command += f"  --cp4d-version \"{self.getParam('cpd_product_version')}\""
-            if self.getParam('cpd_install_spss') == "install":
+            if self.getParam('cpd_install_spss') == "true":
                 command += " --cp4d-install-spss"
-            if self.getParam('cpd_install_cognos') == "install":
+            if self.getParam('cpd_install_cognos') == "true":
                 command += " --cp4d-install-cognos"
-            if self.getParam('cpd_install_ws') == "install":
+            if self.getParam('cpd_install_ws') == "true":
                 command += " --cp4d-install-ws"
-            if self.getParam('cpd_install_wml') == "install":
+            if self.getParam('cpd_install_wml') == "true":
                 command += " --cp4d-install-wml"
-            if self.getParam('cpd_install_ae') == "install":
+            if self.getParam('cpd_install_ae') == "true":
                 command += " --cp4d-install-ae"
             command += newline