mas-cli 13.11.0__tar.gz → 13.12.1__tar.gz

{mas_cli-13.11.0 → mas_cli-13.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mas-cli
-Version: 13.11.0
+Version: 13.12.1
 Summary: Python Admin CLI for Maximo Application Suite
 Home-page: https://github.com/ibm-mas/cli
 Author: David Parker

{mas_cli-13.11.0 → mas_cli-13.12.1}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "13.11.0"  # Python module compatible semver
+__version__ = "13.12.1"  # Python module compatible semver

{mas_cli-13.11.0 → mas_cli-13.12.1}/src/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.11.0"
+        self.version = "13.12.1"
         self.h1count = 0
         self.h2count = 0
 

{mas_cli-13.11.0 → mas_cli-13.12.1}/src/mas/cli/install/app.py

@@ -615,7 +615,21 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         if self.installMonitor:
             self.configAppChannel("monitor")
 
-        self.installManage = self.yesOrNo("Install Manage")
+        self.manageAppName = "Manage"
+        self.isManageFoundation = False
+        self.installManage = self.yesOrNo(f"Install {self.manageAppName}")
+
+        # If the selection was to not install manage but we are in mas_channel 9.1 or later, we need to set self.isManageFoundation to True
+        # Also, we need to force self.installManage to be True because Manage must always be installed in MAS 9.1 or later
+        if not self.installManage:
+            if not self.getParam("mas_channel").startswith("8.") and not self.getParam("mas_channel").startswith("9.0"):
+                self.installManage = True
+                self.isManageFoundation = True
+                self.setParam("is_full_manage", "false")
+                self.manageAppName = "Manage foundation"
+                self.printDescription([f"{self.manageAppName} installs the following capabilities: User, Security groups, Application configurator and Mobile configurator."])
+        else:
+            self.setParam("is_full_manage", "true")
 
         if self.installManage:
             self.configAppChannel("manage")
@@ -1006,6 +1020,11 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 print(f"Unknown option: {key} {value}")
                 self.fatalError(f"Unknown option: {key} {value}")
 
+        if self.installManage:
+            # If Manage is being installed and --is-full-manage was set to something different than "false", assume it is "true"
+            if self.getParam("is_full_manage") != "false":
+                self.setParam("is_full_manage", "true")
+
         # Load the catalog information
         self.chosenCatalog = getCatalog(self.getParam("mas_catalog_version"))
 

{mas_cli-13.11.0 → mas_cli-13.12.1}/src/mas/cli/install/argBuilder.py

@@ -160,6 +160,7 @@ class installArgBuilderMixin():
             command += f"  --monitor-channel \"{self.getParam('mas_app_channel_monitor')}\"{newline}"
         if self.installManage:
             command += f"  --manage-channel \"{self.getParam('mas_app_channel_manage')}\"{newline}"
+            command += f"  --is-full-manage \"{self.getParam('is_full_manage')}\"{newline}"
         if self.installOptimizer:
             command += f"  --optimizer-channel \"{self.getParam('mas_app_channel_optimizer')}\""
             command += f" --optimizer-plan \"{self.getParam('mas_app_plan_optimizer')}\"{newline}"

{mas_cli-13.11.0 → mas_cli-13.12.1}/src/mas/cli/install/argParser.py

@@ -338,6 +338,11 @@ masAppsArgGroup.add_argument(
     required=False,
     help="Subscription channel for Maximo Manage"
 )
+masAppsArgGroup.add_argument(
+    "--is-full-manage",
+    required=False,
+    help="Full Manage instead of Manage Foundation"
+)
 masAppsArgGroup.add_argument(
     "--predict-channel",
     required=False,

{mas_cli-13.11.0 → mas_cli-13.12.1}/src/mas/cli/install/params.py

@@ -38,6 +38,7 @@ optionalParams = [
     "mas_superuser_password",
     "mas_trust_default_cas",
     "mas_app_settings_server_bundles_size",
+    "is_full_manage",
     "mas_app_settings_default_jms",
     "mas_app_settings_persistent_volumes_flag",
     "mas_app_settings_demodata",

{mas_cli-13.11.0 → mas_cli-13.12.1}/src/mas/cli/install/settings/db2Settings.py

@@ -40,19 +40,19 @@ class Db2SettingsMixin():
 
             # Check if a configuration already exists before creating a new one
             jdbcCfgFile = path.join(self.localConfigDir, f"jdbc-{instanceId}-manage.yaml")
-            print_formatted_text(f"Searching for Manage database configuration file in {jdbcCfgFile} ...")
+            print_formatted_text(f"Searching for {self.manageAppName} database configuration file in {jdbcCfgFile} ...")
             if path.exists(jdbcCfgFile):
-                if self.yesOrNo(f"Manage database configuration file 'jdbc-{instanceId}-manage.yaml' already exists.  Do you want to generate a new one"):
+                if self.yesOrNo(f"{self.manageAppName} database configuration file 'jdbc-{instanceId}-manage.yaml' already exists.  Do you want to generate a new one"):
                     self.generateJDBCCfg(instanceId=instanceId, scope="workspace-application", workspaceId=workspaceId, appId="manage", destination=jdbcCfgFile)
             else:
-                print_formatted_text(f"Expected file ({jdbcCfgFile}) was not found, generating a valid Manage database configuration file now ...")
+                print_formatted_text(f"Expected file ({jdbcCfgFile}) was not found, generating a valid {self.manageAppName} database configuration file now ...")
                 self.generateJDBCCfg(instanceId=instanceId, scope="workspace-application", workspaceId=workspaceId, appId="manage", destination=jdbcCfgFile)
             return
 
         # Proceed as normal
         # We know we are installing either IoT or Manage, and on amd64 target architecture
         self.printDescription([
-            "The installer can setup one or more IBM Db2 instances in your OpenShift cluster for the use of applications that require a JDBC datasource (IoT, Manage, Monitor, & Predict) or you may choose to configure MAS to use an existing database"
+            f"The installer can setup one or more IBM Db2 instances in your OpenShift cluster for the use of applications that require a JDBC datasource (IoT, {self.manageAppName}, Monitor, & Predict) or you may choose to configure MAS to use an existing database"
         ])
 
         self.setParam("db2_cpu_requests", "4000m")
@@ -111,28 +111,28 @@ class Db2SettingsMixin():
             self.setParam("db2_action_system", "none")
 
         if self.installManage:
-            self.printH2("Database Configuration for Maximo Manage")
+            self.printH2(f"Database Configuration for Maximo {self.manageAppName}")
             self.printDescription([
-                "Maximo Manage can be configured to share the system Db2 instance or use it's own dedicated database:",
+                f"Maximo {self.manageAppName} can be configured to share the system Db2 instance or use it's own dedicated database:",
                 " - Use of a shared instance has a significant footprint reduction but is only recommended for development/test/demo installs",
                 " - In most production systems you will want to use a dedicated database",
                 " - IBM Db2, Oracle Database, & Microsoft SQL Server are all supported database options"
             ])
             # Determine whether to use the system or a dedicated database
-            if self.installIoT and self.yesOrNo("Re-use System Db2 instance for Manage application"):
+            if self.installIoT and self.yesOrNo(f"Re-use System Db2 instance for {self.manageAppName} application"):
                 # We are going to bind Manage to the system database, which has already been set up in the previous step
                 self.setParam("mas_appws_bindings_jdbc_manage", "system")
                 self.setParam("db2_action_manage", "none")
             else:
                 self.setParam("mas_appws_bindings_jdbc_manage", "workspace-application")
-                if self.yesOrNo("Create manage dedicated Db2 instance using the IBM Db2 Universal Operator"):
+                if self.yesOrNo(f"Create {self.manageAppName} dedicated Db2 instance using the IBM Db2 Universal Operator"):
                     self.setParam("db2_action_manage", "install")
                     self.printDescription([
-                        "Available Db2 instance types for Manage:",
+                        f"Available Db2 instance types for {self.manageAppName}:",
                         "  1. DB2 Warehouse (Default option)",
                         "  2. DB2 Online Transactional Processing (OLTP)"
                     ])
-                    self.promptForListSelect(message="Select the Manage dedicated DB2 instance type", options=["db2wh", "db2oltp"], param="db2_type", default="1")
+                    self.promptForListSelect(message=f"Select the {self.manageAppName} dedicated DB2 instance type", options=["db2wh", "db2oltp"], param="db2_type", default="1")
                 else:
                     workspaceId = self.getParam("mas_workspace_id")
                     self.setParam("db2_action_manage", "byo")
@@ -141,12 +141,12 @@ class Db2SettingsMixin():
 
                     # Check if a configuration already exists before creating a new one
                     jdbcCfgFile = path.join(self.localConfigDir, f"jdbc-{instanceId}-manage.yaml")
-                    print_formatted_text(f"Searching for Manage database configuration file in {jdbcCfgFile} ...")
+                    print_formatted_text(f"Searching for {self.manageAppName} database configuration file in {jdbcCfgFile} ...")
                     if path.exists(jdbcCfgFile):
-                        if self.yesOrNo(f"Manage database configuration file 'jdbc-{instanceId}-manage.yaml' already exists.  Do you want to generate a new one"):
+                        if self.yesOrNo(f"{self.manageAppName} database configuration file 'jdbc-{instanceId}-manage.yaml' already exists.  Do you want to generate a new one"):
                             self.generateJDBCCfg(instanceId=instanceId, scope="workspace-application", workspaceId=workspaceId, appId="manage", destination=jdbcCfgFile)
                     else:
-                        print_formatted_text(f"Expected file ({jdbcCfgFile}) was not found, generating a valid Manage database configuration file now ...")
+                        print_formatted_text(f"Expected file ({jdbcCfgFile}) was not found, generating a valid {self.manageAppName} database configuration file now ...")
                         self.generateJDBCCfg(instanceId=instanceId, scope="workspace-application", workspaceId=workspaceId, appId="manage", destination=jdbcCfgFile)
         else:
             self.setParam("db2_action_manage", "none")
@@ -161,7 +161,7 @@ class Db2SettingsMixin():
                 # -------------------------------------------------------------------------
                 self.printH2("Node Affinity and Tolerations")
                 self.printDescription([
-                    "Note that the same settings are applied to both the IoT and Manage Db2 instances",
+                    f"Note that the same settings are applied to both the IoT and {self.manageAppName} Db2 instances",
                     "Use existing node labels and taints to control scheduling of the Db2 workload in your cluster",
                     "For more information refer to the Red Hat documentation:",
                     " - <Orange><u>https://docs.openshift.com/container-platform/4.16/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
@@ -179,7 +179,7 @@ class Db2SettingsMixin():
 
                 self.printH2("Database CPU & Memory")
                 self.printDescription([
-                    "Note that the same settings are applied to both the IoT and Manage Db2 instances"
+                    f"Note that the same settings are applied to both the IoT and {self.manageAppName} Db2 instances"
                 ])
 
                 if self.yesOrNo("Customize CPU and memory request/limit"):
@@ -190,7 +190,7 @@ class Db2SettingsMixin():
 
                 self.printH2("Database Storage Capacity")
                 self.printDescription([
-                    "Note that the same settings are applied to both the IoT and Manage Db2 instances"
+                    f"Note that the same settings are applied to both the IoT and {self.manageAppName} Db2 instances"
                 ])
 
                 if self.yesOrNo("Customize storage capacity"):

mas_cli-13.12.1/src/mas/cli/install/settings/manageSettings.py

@@ -0,0 +1,295 @@
+# *****************************************************************************
+# Copyright (c) 2024 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
+logger = logging.getLogger(__name__)
+
+
+class ManageSettingsMixin():
+
+    def arcgisSettings(self) -> None:
+        # If Spatial is selected, then prompt to choose to add IBM Maximo Location Services for Esri, and prompt license
+        if "spatial=" in self.getParam("mas_appws_components") and self.getParam("mas_app_channel_manage").startswith("9."):
+            self.printDescription([
+                "",
+                "Maximo Spatial requires a map server provider in order to enable geospatial capabilities",
+                "You may choose your preferred map provider later or you can enable IBM Maximo Location Services for Esri now",
+                f"This includes ArcGIS Enterprise as part of the {self.manageAppName} and Maximo Spatial bundle (Additional AppPoints required)."
+            ])
+
+            if self.yesOrNo("Include IBM Maximo Location Services for Esri"):
+                self.setParam("install_arcgis", "true")
+                self.setParam("mas_arcgis_channel", self.getParam("mas_app_channel_manage"))
+
+                self.printDescription([
+                    "",
+                    "IBM Maximo Location Services for Esri License Terms",
+                    "For information about your IBM Maximo Location Services for Esri License visit: ",
+                    " - <Orange><u>https://ibm.biz/MAXArcGIS90-License</u></Orange>",
+                    "To continue with the installation, you must accept these additional license terms"
+                ])
+
+                if not self.yesOrNo("Do you accept the license terms"):
+                    exit(1)
+
+    def manageSettings(self) -> None:
+        if self.installManage:
+            self.printH1(f"Configure Maximo {self.manageAppName}")
+            self.printDescription([f"Customize your {self.manageAppName} installation, refer to the product documentation for more information"])
+
+            self.manageSettingsComponents()
+            self.arcgisSettings()
+
+            self.manageSettingsServerBundleConfig()
+            self.manageSettingsJMS()
+            self.manageSettingsDatabase()
+            self.manageSettingsCustomizationArchive()
+            self.manageSettingsOther()
+
+            # Default to RWX storage classes, but fall back to RWO in SNO or when user
+            # has chosen not to provide a RWX storage class
+            storageClass = self.getParam("storage_class_rwx")
+            accessMode = "ReadWriteMany"
+            if self.isSNO() or self.getParam("storage_class_rwx") == "none":
+                storageClass = self.getParam("storage_class_rwo")
+                accessMode = "ReadWriteOnce"
+
+            self.setParam("mas_app_settings_doclinks_pvc_storage_class", storageClass)
+            self.setParam("mas_app_settings_bim_pvc_storage_class", storageClass)
+            self.setParam("mas_app_settings_jms_queue_pvc_storage_class", storageClass)
+
+            self.setParam("mas_app_settings_doclinks_pvc_accessmode", accessMode)
+            self.setParam("mas_app_settings_bim_pvc_accessmode", accessMode)
+            self.setParam("mas_app_settings_jms_queue_pvc_accessmode", accessMode)
+
+    def manageSettingsComponents(self) -> None:
+        # Only ask to install Manage components if this is a full Manage installation
+        # If this is a Manage Foundation installation, leave mas_appws_components blank
+        if self.isManageFoundation:
+            self.params["mas_appws_components"] = ""
+        else:
+            self.printH2(f"Maximo {self.manageAppName} Components")
+            self.printDescription([f"The default configuration will install {self.manageAppName} with Health enabled, alternatively choose exactly what industry solutions and add-ons will be configured"])
+
+            self.params["mas_appws_components"] = "base=latest,health=latest"
+            if self.yesOrNo("Select components to enable"):
+                self.params["mas_appws_components"] = "base=latest"
+                if self.yesOrNo(" - Asset Configuration Manager"):
+                    self.params["mas_appws_components"] += ",acm=latest"
+                if self.yesOrNo(" - Aviation"):
+                    self.params["mas_appws_components"] += ",aviation=latest"
+                if self.yesOrNo(" - Civil Infrastructure"):
+                    self.params["mas_appws_components"] += ",civil=latest"
+                if self.yesOrNo(" - Envizi"):
+                    self.params["mas_appws_components"] += ",envizi=latest"
+                if self.yesOrNo(" - Health"):
+                    self.params["mas_appws_components"] += ",health=latest"
+                if self.yesOrNo(" - Health, Safety and Environment"):
+                    self.params["mas_appws_components"] += ",hse=latest"
+                if self.yesOrNo(" - Maximo IT"):
+                    self.params["mas_appws_components"] += ",icd=latest"
+                if self.yesOrNo(" - Nuclear"):
+                    self.params["mas_appws_components"] += ",nuclear=latest"
+                if self.yesOrNo(" - Oil & Gas"):
+                    self.params["mas_appws_components"] += ",oilandgas=latest"
+                if self.yesOrNo(" - Connector for Oracle Applications"):
+                    self.params["mas_appws_components"] += ",oracleadapter=latest"
+                if self.yesOrNo(" - Connector for SAP Application"):
+                    self.params["mas_appws_components"] += ",sapadapter=latest"
+                if self.yesOrNo(" - Service Provider"):
+                    self.params["mas_appws_components"] += ",serviceprovider=latest"
+                if self.yesOrNo(" - Spatial"):
+                    self.params["mas_appws_components"] += ",spatial=latest"
+                if self.yesOrNo(" - Strategize"):
+                    self.params["mas_appws_components"] += ",strategize=latest"
+                if self.yesOrNo(" - Transportation"):
+                    self.params["mas_appws_components"] += ",transportation=latest"
+                if self.yesOrNo(" - Tririga"):
+                    self.params["mas_appws_components"] += ",tririga=latest"
+                if self.yesOrNo(" - Utilities"):
+                    self.params["mas_appws_components"] += ",utilities=latest"
+                if self.yesOrNo(" - Workday Applications"):
+                    self.params["mas_appws_components"] += ",workday=latest"
+                logger.debug(f"Generated mas_appws_components = {self.params['mas_appws_components']}")
+
+                if ",icd=" in self.params["mas_appws_components"]:
+                    self.printH2("Maximo IT License Terms")
+                    self.printDescription([
+                        "For information about your Maximo IT License, see <Orange><u>https://ibm.biz/MAXIT81-License</u></Orange>",
+                        "To continue with the installation, you must accept these additional license terms"
+                    ])
+
+                    if not self.yesOrNo("Do you accept the license terms"):
+                        exit(1)
+
+    def manageSettingsDatabase(self) -> None:
+        if self.showAdvancedOptions:
+            self.printH2(f"Maximo {self.manageAppName} Settings - Database")
+            self.printDescription([f"Customise the schema, tablespace, indexspace, and encryption settings used by {self.manageAppName}"])
+
+            if self.yesOrNo("Customize database settings"):
+                self.promptForString("Schema", "mas_app_settings_db2_schema", default="maximo")
+                self.promptForString("Tablespace", "mas_app_settings_tablespace", default="MAXDATA")
+                self.promptForString("Indexspace", "mas_app_settings_indexspace", default="MAXINDEX")
+
+                if self.yesOrNo("Customize database encryption settings"):
+                    self.promptForString("MXE_SECURITY_CRYPTO_KEY", "mas_app_settings_crypto_key")
+                    self.promptForString("MXE_SECURITY_CRYPTOX_KEY", "mas_app_settings_cryptox_key")
+                    self.promptForString("MXE_SECURITY_OLD_CRYPTO_KEY", "mas_app_settings_old_crypto_key")
+                    self.promptForString("MXE_SECURITY_OLD_CRYPTOX_KEY", "mas_app_settings_old_cryptox_key")
+                    self.yesOrNo("Override database encryption secrets with provided keys", "mas_app_settings_override_encryption_secrets_flag")
+
+    def manageSettingsServerBundleConfig(self) -> None:
+        if not self.isManageFoundation:
+            if self.showAdvancedOptions:
+                self.printH2(f"Maximo {self.manageAppName} Settings - Server Bundles")
+                self.printDescription([
+                    f"Define how you want to configure {self.manageAppName} servers:",
+                    f" - You can have one or multiple {self.manageAppName} servers distributing workload",
+                    " - Additionally, you can choose to include JMS server for messaging queues",
+                    "",
+                    "Configurations:",
+                    "  1. Deploy the 'all' server pod only (workload is concentrated in just one server pod but consumes less resource)",
+                    "  2. Deploy the 'all' and 'jms' bundle pods (workload is concentrated in just one server pod and includes jms server)"
+                ])
+
+                if not self.isSNO():
+                    self.printDescription([
+                        "  3. Deploy the 'mea', 'report', 'ui' and 'cron' bundle pods (workload is distributed across multiple server pods)",
+                        "  4. Deploy the 'mea', 'report', 'ui', 'cron' and 'jms' bundle pods (workload is distributed across multiple server pods and includes jms server)"
+                    ])
+
+                manageServerBundleSelection = self.promptForString("Select a server bundle configuration")
+
+                if manageServerBundleSelection == "1":
+                    self.setParam("mas_app_settings_server_bundles_size", "dev")
+                elif manageServerBundleSelection == "2":
+                    self.setParam("mas_app_settings_server_bundles_size", "snojms")
+                    self.setParam("mas_app_settings_persistent_volumes_flag", "true")
+                elif manageServerBundleSelection == "3":
+                    self.setParam("mas_app_settings_server_bundles_size", "small")
+                elif manageServerBundleSelection == "4":
+                    self.setParam("mas_app_settings_server_bundles_size", "jms")
+                    self.setParam("mas_app_settings_persistent_volumes_flag", "true")
+                else:
+                    self.fatalError("Invalid selection")
+            else:
+                self.setParam("mas_app_settings_server_bundles_size", "dev")
+
+    def manageSettingsJMS(self) -> None:
+        if self.getParam("mas_app_settings_server_bundles_size") in ["jms", "snojms"]:
+            self.printDescription([
+                f"Only {self.manageAppName} JMS sequential queues (sqin and sqout) are enabled by default.",
+                "However, you can enable both sequential (sqin and sqout) and continuous queues (cqin and cqout)"
+            ])
+
+            self.yesOrNo(f"Enable both {self.manageAppName} JMS sequential and continuous queues", "mas_app_settings_default_jms")
+
+    def manageSettingsCustomizationArchive(self) -> None:
+        # Only ask about customization archive in full Manage installation
+        if not self.isManageFoundation:
+            self.printH2(f"Maximo {self.manageAppName} Settings - Customization")
+            self.printDescription([
+                f"Provide a customization archive to be used in the {self.manageAppName} build process"
+            ])
+
+            if self.yesOrNo("Include customization archive"):
+                self.promptForString("Customization archive name", "mas_app_settings_customization_archive_name")
+                self.promptForString("Customization archive path/url", "mas_app_settings_customization_archive_url")
+                if self.yesOrNo("Provide authentication to access customization archive URL"):
+                    self.promptForString("Username", "mas_app_settings_customization_archive_username")
+                    self.promptForString("Password", "mas_app_settings_customization_archive_password", isPassword=True)
+
+    def manageSettingsDemodata(self) -> None:
+        self.yesOrNo("Create demo data", "mas_app_settings_demodata")
+
+    def manageSettingsTimezone(self) -> None:
+        self.promptForString(f"{self.manageAppName} server timezone", "mas_app_settings_server_timezone", default="GMT")
+        # Set Manage dedicated Db2 instance timezone to be same as Manage server timezone
+        self.setParam("db2_timezone", self.getParam("mas_app_settings_server_timezone"))
+
+    def manageSettingsLanguages(self) -> None:
+        self.printH2(f"Maximo {self.manageAppName} Settings - Languages")
+        self.printDescription([
+            f"Define the base language for Maximo {self.manageAppName}"
+        ])
+        self.promptForString("Base language", "mas_app_settings_base_lang", default="EN")
+
+        self.printDescription([
+            f"Define the additional languages to be configured in Maximo {self.manageAppName}. provide a comma-separated list of supported languages codes, for example: 'JA,DE,AR'",
+            "A complete list of available language codes is available online:",
+            "    <Orange><u>https://www.ibm.com/docs/en/mas-cd/mhmpmh-and-p-u/continuous-delivery?topic=deploy-language-support</u></Orange>"
+        ])
+
+        self.promptForString("Secondary languages", "mas_app_settings_secondary_langs")
+
+    def manageSettingsCP4D(self) -> None:
+        if self.getParam("mas_app_channel_manage") in ["8.7.x", "9.0.x"] and self.showAdvancedOptions:
+            self.printDescription([
+                f"Integration with Cognos Analytics provides additional support for reporting features in Maximo {self.manageAppName}, for more information refer to the documentation online: ",
+                " - <Orange><u>https://ibm.biz/BdMuxs</u></Orange>"
+            ])
+            self.yesOrNo("Enable integration with Cognos Analytics", "cpd_install_cognos")
+            self.yesOrNo("Enable integration with Watson Studio Local", "mas_appws_bindings_health_flag")
+
+            if self.getParam("cpd_install_cognos") == "true" or self.getParam("mas_appws_bindings_health_flag") == "true":
+                self.configCP4D()
+
+    def manageSettingsOther(self) -> None:
+        self.printH2(f"Maximo {self.manageAppName} Settings - Other")
+        if self.isManageFoundation:
+            self.printDescription([
+                "Configure additional settings:",
+                "  - Base and additional languages",
+                "  - Server timezone"
+            ])
+            if self.yesOrNo("Configure Additional Settings"):
+                self.manageSettingsTimezone()
+                self.manageSettingsLanguages()
+        else:
+            self.printDescription([
+                "Configure additional settings:",
+                "  - Demo data",
+                "  - Base and additional languages",
+                "  - Server timezone",
+                "  - Cognos integration (install Cloud Pak for Data)",
+                "  - Watson Studio Local integration (install Cloud Pak for Data)"
+            ])
+            if self.yesOrNo("Configure Additional Settings"):
+                self.manageSettingsDemodata()
+                self.manageSettingsTimezone()
+                self.manageSettingsLanguages()
+                self.manageSettingsCP4D()
+
+    def aibrokerSettings(self) -> None:
+        if self.installAiBroker:
+            self.printH2("Maximo AI Broker Settings - Storage, WatsonX, MariaDB details")
+            self.printDescription(["Customise AI Broker details"])
+            self.promptForString("Storage provider", "mas_aibroker_storage_provider")
+            self.promptForString("Storage access key", "mas_aibroker_storage_accesskey")
+            self.promptForString("Storage secret key", "mas_aibroker_storage_secretkey")
+            self.promptForString("Storage host", "mas_aibroker_storage_host")
+            self.promptForString("Storage port", "mas_aibroker_storage_port")
+            self.promptForString("Storage ssl", "mas_aibroker_storage_ssl")
+            self.promptForString("Storage region", "mas_aibroker_storage_region")
+            self.promptForString("Storage pipelines bucket", "mas_aibroker_storage_pipelines_bucket")
+            self.promptForString("Storage tenants bucket", "mas_aibroker_storage_tenants_bucket")
+            self.promptForString("Storage templates bucket", "mas_aibroker_storage_templates_bucket")
+
+            self.promptForString("Watsonxai api key", "mas_aibroker_watsonxai_apikey")
+            self.promptForString("Watsonxai machine learning url", "mas_aibroker_watsonxai_url")
+            self.promptForString("Watsonxai project id", "mas_aibroker_watsonxai_project_id")
+
+            self.promptForString("Database host", "mas_aibroker_db_host")
+            self.promptForString("Database port", "mas_aibroker_db_port")
+            self.promptForString("Database user", "mas_aibroker_db_user")
+            self.promptForString("Database name", "mas_aibroker_db_database")
+            self.promptForString("Database Secretname", "mas_aibroker_db_secret_name")
+            self.promptForString("Database password", "mas_aibroker_db_secret_value")

{mas_cli-13.11.0 → mas_cli-13.12.1}/src/mas/cli/install/summarizer.py

@@ -178,39 +178,39 @@ class InstallSummarizerMixin():
 
     def manageSummary(self) -> None:
         if self.installManage:
-            self.printSummary("Manage", self.params["mas_app_channel_manage"])
-            print_formatted_text(HTML("  <SkyBlue>+ Components</SkyBlue>"))
-            self.printSummary("  + ACM", "Enabled" if "acm=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Aviation", "Enabled" if "aviation=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Civil Infrastructure", "Enabled" if "civil=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Envizi", "Enabled" if "envizi=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Health", "Enabled" if "health=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + HSE", "Enabled" if "hse=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Maximo IT", "Enabled" if "icd=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Nuclear", "Enabled" if "nuclear=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Oil & Gas", "Enabled" if "oilandgas=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Connector for Oracle", "Enabled" if "oracleadapter=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Connector for SAP", "Enabled" if "sapadapter=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Service Provider", "Enabled" if "serviceprovider=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Spatial", "Enabled" if "spatial=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Strategize", "Enabled" if "strategize=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Transportation", "Enabled" if "transportation=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Tririga", "Enabled" if "tririga=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Utilities", "Enabled" if "utilities=" in self.getParam("mas_appws_components") else "Disabled")
-            self.printSummary("  + Workday Applications", "Enabled" if "workday=" in self.getParam("mas_appws_components") else "Disabled")
-
-            self.printParamSummary("+ Server bundle size", "mas_app_settings_server_bundles_size")
-            self.printParamSummary("+ Enable JMS queues", "mas_app_settings_default_jms")
-            self.printParamSummary("+ Server Timezone", "mas_app_settings_server_timezone")
-            self.printParamSummary("+ Base Language", "mas_app_settings_base_lang")
-            self.printParamSummary("+ Additional Languages", "mas_app_settings_secondary_langs")
-
-            print_formatted_text(HTML("  <SkyBlue>+ Database Settings</SkyBlue>"))
-            self.printParamSummary("  + Schema", "mas_app_settings_indexspace")
-            self.printParamSummary("  + Username", "mas_app_settings_db2_schema")
-            self.printParamSummary("  + Tablespace", "mas_app_settings_tablespace")
-            self.printParamSummary("  + Indexspace", "mas_app_settings_indexspace")
-
+            self.printSummary(f"{'Manage foundation' if self.getParam('is_full_manage') == 'false' else 'Manage'}", self.params["mas_app_channel_manage"])
+            if self.getParam("is_full_manage") != "false":
+                print_formatted_text(HTML("  <SkyBlue>+ Components</SkyBlue>"))
+                self.printSummary("  + ACM", "Enabled" if "acm=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Aviation", "Enabled" if "aviation=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Civil Infrastructure", "Enabled" if "civil=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Envizi", "Enabled" if "envizi=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Health", "Enabled" if "health=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + HSE", "Enabled" if "hse=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Maximo IT", "Enabled" if "icd=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Nuclear", "Enabled" if "nuclear=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Oil & Gas", "Enabled" if "oilandgas=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Connector for Oracle", "Enabled" if "oracleadapter=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Connector for SAP", "Enabled" if "sapadapter=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Service Provider", "Enabled" if "serviceprovider=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Spatial", "Enabled" if "spatial=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Strategize", "Enabled" if "strategize=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Transportation", "Enabled" if "transportation=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Tririga", "Enabled" if "tririga=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Utilities", "Enabled" if "utilities=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Workday Applications", "Enabled" if "workday=" in self.getParam("mas_appws_components") else "Disabled")
+
+                self.printParamSummary("+ Server bundle size", "mas_app_settings_server_bundles_size")
+                self.printParamSummary("+ Enable JMS queues", "mas_app_settings_default_jms")
+                self.printParamSummary("+ Server Timezone", "mas_app_settings_server_timezone")
+                self.printParamSummary("+ Base Language", "mas_app_settings_base_lang")
+                self.printParamSummary("+ Additional Languages", "mas_app_settings_secondary_langs")
+
+                print_formatted_text(HTML("  <SkyBlue>+ Database Settings</SkyBlue>"))
+                self.printParamSummary("  + Schema", "mas_app_settings_indexspace")
+                self.printParamSummary("  + Username", "mas_app_settings_db2_schema")
+                self.printParamSummary("  + Tablespace", "mas_app_settings_tablespace")
+                self.printParamSummary("  + Indexspace", "mas_app_settings_indexspace")
         else:
             self.printSummary("Manage", "Do Not Install")