mas-cli 13.16.0__py3-none-any.whl → 13.17.2__py3-none-any.whl

mas/cli/install/app.py

@@ -40,11 +40,16 @@ from mas.cli.validators import (
     WorkspaceNameFormatValidator,
     TimeoutFormatValidator,
     StorageClassValidator,
+    JsonValidator,
     OptimizerInstallPlanValidator
 )
 
 from mas.devops.ocp import createNamespace, getStorageClasses
-from mas.devops.mas import getCurrentCatalog, getDefaultStorageClasses
+from mas.devops.mas import (
+    getCurrentCatalog,
+    getDefaultStorageClasses,
+    isVersionEqualOrAfter
+)
 from mas.devops.sls import findSLSByNamespace
 from mas.devops.data import getCatalog
 from mas.devops.tekton import (
@@ -163,7 +168,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
     def processCatalogChoice(self) -> list:
         self.catalogDigest = self.chosenCatalog["catalog_digest"]
         self.catalogMongoDbVersion = self.chosenCatalog["mongo_extras_version_default"]
-        if self.architecture != "s390x":
+        if self.architecture != "s390x" and self.architecture != "ppc64le":
             self.catalogCp4dVersion = self.chosenCatalog["cpd_product_version_default"]
 
             applications = {
@@ -175,6 +180,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 "Optimizer": "mas_optimizer_version",
                 "Predict": "mas_predict_version",
                 "Inspection": "mas_visualinspection_version",
+                "Facilities": "mas_facilities_version",
             }
         else:
             applications = {
@@ -194,13 +200,14 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         # Generate catalogTable
         for application, key in applications.items():
             # Add 9.1-feature channel based off 9.0 to those apps that have not onboarded yet
-            tempChosenCatalog = self.chosenCatalog[key].copy()
-            if '9.1.x-feature' not in tempChosenCatalog:
-                tempChosenCatalog.update({"9.1.x-feature": tempChosenCatalog["9.0.x"]})
+            if key in self.chosenCatalog:
+                tempChosenCatalog = self.chosenCatalog[key].copy()
+                if '9.1.x-feature' not in tempChosenCatalog:
+                    tempChosenCatalog.update({"9.1.x-feature": tempChosenCatalog["9.0.x"]})
 
-            self.catalogTable.append({"": application} | {key.replace(".x", ""): value for key, value in sorted(tempChosenCatalog.items(), reverse=True)})
+                self.catalogTable.append({"": application} | {key.replace(".x", ""): value for key, value in sorted(tempChosenCatalog.items(), reverse=True)})
 
-        if self.architecture == "s390x":
+        if self.architecture == "s390x" or self.architecture == "ppc64le":
             summary = [
                 "",
                 "<u>Catalog Details</u>",
@@ -326,8 +333,8 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
 
     @logMethodCall
     def configGrafana(self) -> None:
-        if self.architecture == "s390x":
-            # We are not supporting Grafana on s390x at the moment
+        if self.architecture == "s390x" or self.architecture == "ppc64le":
+            # We are not supporting Grafana on s390x /ppc64le at the moment
             self.setParam("grafana_action", "none")
         else:
             try:
@@ -369,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')}")
@@ -626,6 +633,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 self.installManage = True
                 self.isManageFoundation = True
                 self.setParam("is_full_manage", "false")
+                self.setParam("mas_app_settings_aio_flag", "false")
                 self.manageAppName = "Manage foundation"
                 self.printDescription([f"{self.manageAppName} installs the following capabilities: User, Security groups, Application configurator and Mobile configurator."])
         else:
@@ -634,8 +642,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         if self.installManage:
             self.configAppChannel("manage")
 
-        # Predict for MAS 8.10 is effectively unsupported now, because it has not shipped support for Cloud Pak for Data 4.8 as of June 2023 catalog update
-        if self.installIoT and self.installManage and self.getParam("mas_channel") != "8.10.x":
+        if self.installIoT and self.installManage:
             self.installPredict = self.yesOrNo("Install Predict")
         else:
             self.installPredict = False
@@ -644,7 +651,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             self.configAppChannel("predict")
 
         # Assist is only installable on MAS 9.0.x due to withdrawal of support for Watson Discovery in our managed dependency stack and the inability of Assist 8.x to support this
-        if not self.getParam("mas_channel").startswith("8."):
+        if isVersionEqualOrAfter('9.0.0', self.getParam("mas_channel")):
             self.installAssist = self.yesOrNo("Install Assist")
             if self.installAssist:
                 self.configAppChannel("assist")
@@ -659,9 +666,12 @@ 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:
+                self.configAppChannel("facilities")
+        else:
+            self.installFacilities = False
 
     @logMethodCall
     def configAppChannel(self, appId):
@@ -756,6 +766,81 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 self.promptForString("IBM Cloud API Key", "cos_apikey", isPassword=True)
                 self.promptForString("IBM Cloud Resource Group", "cos_resourcegroup")
 
+    @logMethodCall
+    def facilitiesSettings(self) -> None:
+        if self.installFacilities:
+            self.printH1("Configure Maximo Real Estate and Facilities")
+            self.printDescription([
+                "Real Estate and Facilities custom configurations"
+            ])
+            self.printDescription([
+                "Maximo Real Estate and Facilities Size:",
+                "  1. Small",
+                "  2. Medium",
+                "  3. Large"
+            ])
+            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:", "mas_ws_facilities_db_maxconnpoolsize", default=200)
+
+                self.printDescription(["Real Estate and Facilities Persistent Volume Storage Configuration"])
+                defaultStorageClasses = getDefaultStorageClasses(self.dynamicClient)
+                notUseAutodetectedStorageClasses = False
+                if defaultStorageClasses.provider is not None:
+                    self.storageClassProvider = defaultStorageClasses.provider
+                    print_formatted_text(HTML(f"<MediumSeaGreen>Storage provider auto-detected: {defaultStorageClasses.providerName}</MediumSeaGreen>"))
+                    print_formatted_text(HTML(f"<LightSlateGrey>  - Storage class (ReadWriteMany): {defaultStorageClasses.rwx}</LightSlateGrey>"))
+                    print_formatted_text(HTML(f"<LightSlateGrey>  - Storage class (ReadWriteOnce): {defaultStorageClasses.rwo}</LightSlateGrey>"))
+                    if self.yesOrNo("Use the auto-detected storage classes"):
+                        self.printDescription([
+                            "Storage Mode for Userfiles PVC:",
+                            "  1. ReadWriteMany",
+                            "  2. ReadWriteOnce"
+                        ])
+                        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)
+                        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)
+                    else:
+                        notUseAutodetectedStorageClasses = True
+                if defaultStorageClasses.provider is None or notUseAutodetectedStorageClasses:
+                    for storageClass in getStorageClasses(self.dynamicClient):
+                        print_formatted_text(HTML(f"<LightSlateGrey>  - {storageClass.metadata.name}</LightSlateGrey>"))
+                    self.promptForString("Select storage class for user files PVC:", "mas_ws_facilities_storage_userfiles_class")
+                    self.promptForString("Select storage class for log PVC:", "mas_ws_facilities_storage_log_class")
+                    self.printDescription([
+                        "Storage Mode for Userfiles PVC:",
+                        "  1. ReadWriteMany",
+                        "  2. ReadWriteOnce"
+                    ])
+                    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)
+
+                if self.yesOrNo("Supply configuration for dedicated workflow agents"):
+                    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:
         self.printH1("Choose Install Mode")
@@ -773,6 +858,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             " - Enable optional Maximo Manage integration Cognos Analytics and Watson Studio Local",
             " - Enable optional Maximo Predict integration with SPSS",
             " - Enable optional IBM Turbonomic integration",
+            " - Enable optional Real Estate and Facilities configurations",
             " - Customize Db2 node affinity and tolerations, memory, cpu, and storage settings (when using the IBM Db2 Universal Operator)",
             " - Choose alternative Apache Kafka providers (default to Strimzi)",
             " - Customize Grafana storage settings"
@@ -818,7 +904,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         self.optimizerSettings()
         self.predictSettings()
         self.assistSettings()
-        self.aibrokerSettings()
+        self.facilitiesSettings()
 
         # Dependencies
         self.configMongoDb()
@@ -848,7 +934,7 @@ 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
         self.db2SetTolerations = False
@@ -862,7 +948,8 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             "approval_monitor": {"id": "app-cfg-monitor"},  # After Monitor workspace has been configured
             "approval_optimizer": {"id": "app-cfg-optimizer"},  # After Optimizer workspace has been configured
             "approval_predict": {"id": "app-cfg-predict"},  # After Predict workspace has been configured
-            "approval_visualinspection": {"id": "app-cfg-visualinspection"}  # After Visual Inspection workspace has been configured
+            "approval_visualinspection": {"id": "app-cfg-visualinspection"},  # After Visual Inspection workspace has been configured
+            "approval_facilities": {"id": "app-cfg-facilities"},  # After Facilities workspace has been configured 
         }
 
         self.configGrafana()
@@ -945,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)
@@ -956,6 +1039,10 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             elif key == "optimizer_plan":
                 if value is not None and value != "":
                     self.setParam("mas_app_plan_optimizer", value)
+            elif key == "facilities_channel":
+                if value is not None and value != "":
+                    self.setParam("mas_app_channel_facilities", value)
+                    self.installFacilities = True
 
             # Manage advanced settings that need extra processing
             elif key == "mas_app_settings_server_bundle_size":
@@ -1017,6 +1104,9 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                     self.setParam("mas_manual_cert_mgmt", False)
                     self.manualCertsDir = None
 
+            elif key == "enable_ipv6":
+                self.setParam("enable_ipv6", True)
+
             # Fail if there's any arguments we don't know how to handle
             else:
                 print(f"Unknown option: {key} {value}")
@@ -1030,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"))
 
@@ -1120,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([
@@ -1147,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")
@@ -1164,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

@@ -113,6 +113,9 @@ class installArgBuilderMixin():
         if self.getParam('mas_enable_walkme') == "false":
             command += f"  --disable-walkme{newline}"
 
+        if self.getParam('enable_ipv6') is True:
+            command += f"  --enable-ipv6{newline}"
+
         # Storage
         # -----------------------------------------------------------------------------
         command += f"  --storage-class-rwo \"{self.getParam('storage_class_rwo')}\""
@@ -168,6 +171,8 @@ class installArgBuilderMixin():
             command += f"  --predict-channel \"{self.getParam('mas_app_channel_predict')}\"{newline}"
         if self.installInspection:
             command += f"  --visualinspection-channel \"{self.getParam('mas_app_channel_visualinspection')}\"{newline}"
+        if self.installFacilities:
+            command += f"  --facilities-channel \"{self.getParam('mas_app_channel_facilities')}\"{newline}"
 
         # Arcgis
         # -----------------------------------------------------------------------------
@@ -232,29 +237,70 @@ class installArgBuilderMixin():
             if self.getParam('mas_appws_bindings_health_wsl_flag') == "true":
                 command += f"  --manage-health-wsl{newline}"
 
+        # Facilities Advanced Settings
+        # -----------------------------------------------------------------------------
+        # TODO: Fix type for storage sizes and max conn pool size
+        if self.installFacilities:
+            if self.getParam('mas_ws_facilities_size') != "":
+                command += f"  --facilities-size \"{self.getParam('mas_ws_facilities_size')}\"{newline}"
+
+            if self.getParam('mas_ws_facilities_pull_policy') != "":
+                command += f"  --facilities-pull-policy \"{self.getParam('mas_ws_facilities_pull_policy')}\"{newline}"
+
+            if self.getParam('mas_ws_facilities_routes_timeout') != "":
+                command += f"  --facilities-routes-timeout \"{self.getParam('mas_ws_facilities_routes_timeout')}\"{newline}"
+
+            if self.getParam('mas_ws_facilities_liberty_extension_XML') != "":
+                command += f"  --facilities-xml-extension \"{self.getParam('mas_ws_facilities_liberty_extension_XML')}\"{newline}"
+
+            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_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_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}"
+
         # 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
 
         # IBM Db2 Universal Operator
         # -----------------------------------------------------------------------------
-        if self.getParam('db2_action_system') == "install" or self.getParam('db2_action_manage') == "install":
+        if self.getParam('db2_action_system') == "install" or self.getParam('db2_action_manage') == "install" or self.getParam('db2_action_facilities') == "install":
             if self.getParam('db2_action_system') == "install":
                 command += f"  --db2-system{newline}"
             if self.getParam('db2_action_manage') == "install":
                 command += f"  --db2-manage{newline}"
+            if self.getParam('db2_action_facilities') == "install":
+                command += f"  --db2-facilities{newline}"
 
             if self.getParam('db2_channel') != "":
                 command += f"  --db2-channel \"{self.getParam('db2_channel')}\"{newline}"
@@ -333,9 +379,9 @@ class installArgBuilderMixin():
             # Kafka - Event Streams
             # -----------------------------------------------------------------------------
             if self.getParam('eventstreams_instance_name') != "":
-                command += f"  --eventstreams-resource-group \"{self.getParam('eventstreams_resource_group')}\""
-                command += f" --eventstreams-instance-name \"{self.getParam('eventstreams_instance_name')}\""
-                command += f" --eventstreams-instance-location \"{self.getParam('eventstreams_instance_location')}\"{newline}"
+                command += f"  --eventstreams-resource-group \"{self.getParam('eventstreams_resourcegroup')}\""
+                command += f" --eventstreams-instance-name \"{self.getParam('eventstreams_name')}\""
+                command += f" --eventstreams-instance-location \"{self.getParam('eventstreams_location')}\"{newline}"
 
         # COS
         # -----------------------------------------------------------------------------
@@ -395,6 +441,8 @@ class installArgBuilderMixin():
             command += f"  --approval-predict \"{self.getParam('approval_predict')}\"{newline}"
         if self.getParam('approval_visualinspection') != "":
             command += f"  --approval-visualinspection \"{self.getParam('approval_visualinspection')}\"{newline}"
+        if self.getParam('approval_facilities') != "":
+            command += f"  --approval-facilities \"{self.getParam('approval_facilities')}\"{newline}"
 
         # More Options
         # -----------------------------------------------------------------------------