mas-cli 11.6.0__py3-none-any.whl → 11.7.0__py3-none-any.whl

mas/cli/install/settings/manageSettings.py

@@ -125,53 +125,57 @@ class ManageSettingsMixin():
                     exit(1)
 
     def manageSettingsDatabase(self) -> None:
-        self.printH2("Maximo Manage Settings - Database")
-        self.printDescription(["Customise the schema, tablespace, indexspace, and encryption settings used by Manage"])
-
-        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")
+        if self.showAdvancedOptions:
+            self.printH2("Maximo Manage Settings - Database")
+            self.printDescription(["Customise the schema, tablespace, indexspace, and encryption settings used by Manage"])
+
+            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:
-        self.printH2("Maximo Manage Settings - Server Bundles")
-        self.printDescription([
-            "Define how you want to configure Manage servers:",
-            " - You can have one or multiple Manage 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():
+        if self.showAdvancedOptions:
+            self.printH2("Maximo Manage Settings - Server Bundles")
             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)"
+                "Define how you want to configure Manage servers:",
+                " - You can have one or multiple Manage 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)"
             ])
 
-        manageServerBundleSelection = self.promptForString("Select a server bundle configuration")
+            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)"
+                ])
 
-        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")
+            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.fatalError("Invalid selection")
+            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"]:
@@ -219,7 +223,7 @@ class ManageSettingsMixin():
         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"]:
+        if self.getParam("mas_app_channel_manage") in ["8.7.x", "9.0.x"] and self.showAdvancedOptionsshowAdvancedOptions:
             self.printDescription([
                 "Integration with Cognos Analytics provides additional support for reporting features in Maximo Manage, for more information refer to the documentation online: ",
                 "    <u>https://ibm.biz/BdMuxs</u>"
@@ -261,9 +265,11 @@ class ManageSettingsMixin():
             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")

mas/cli/install/settings/mongodbSettings.py

@@ -0,0 +1,42 @@
+# *****************************************************************************
+# 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
+#
+# *****************************************************************************
+
+from os import path
+from prompt_toolkit import print_formatted_text
+
+
+class MongoDbSettingsMixin():
+    def configMongoDb(self) -> None:
+        self.printH1("Configure MongoDb")
+        self.printDescription([
+            "The installer can setup mongoce in your OpenShift cluster (available only for amd64) or you may choose to configure MAS to use an existing mongodb"
+        ])
+
+        if self.architecture != "s390x" and self.yesOrNo("Create MongoDb cluster using MongoDb Community Edition Operator"):
+            if self.showAdvancedOptions:
+                self.promptForString("MongoDb namespace", "mongodb_namespace", default="mongoce")
+            self.setParam("mongodb_action", "install")
+            self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{self.getParam('mongodb_namespace')}.yml")
+        else:
+            self.setParam("mongodb_action", "byo")
+            self.setParam("sls_mongodb_cfg_file", "/workspace/additional-configs/mongodb-system.yaml")
+            self.selectLocalConfigDir()
+
+            instanceId = self.getParam('mas_instance_id')
+            # Check if a configuration already exists before creating a new one
+            mongoCfgFile = path.join(self.localConfigDir, "mongodb-system.yaml")
+
+            print_formatted_text(f"Searching for system mongodb configuration file in {mongoCfgFile} ...")
+            if path.exists(mongoCfgFile):
+                if self.yesOrNo("System mongodb configuration file 'mongodb-system.yaml' already exists.  Do you want to generate a new one"):
+                    self.generateMongoCfg(instanceId=instanceId, destination=mongoCfgFile)
+            else:
+                print_formatted_text(f"Expected file ({mongoCfgFile}) was not found, generating a valid system mongodb configuration file now ...")
+                self.generateMongoCfg(instanceId=instanceId, destination=mongoCfgFile)

mas/cli/install/settings/turbonomicSettings.py

@@ -14,17 +14,18 @@ from mas.devops.mas import isAirgapInstall
 class TurbonomicSettingsMixin():
 
     def configTurbonomic(self) -> None:
-        self.printH1("Configure Turbonomic")
-        self.printDescription([
-            "The IBM Turbonomic hybrid cloud cost optimization platform allows you to eliminate this guesswork with solutions that save time and optimize costs",
-            " - Learn more: <u>https://www.ibm.com/products/turbonomic</u>"
-        ])
+        if self.showAdvancedOptions:
+            self.printH1("Configure Turbonomic")
+            self.printDescription([
+                "The IBM Turbonomic hybrid cloud cost optimization platform allows you to eliminate this guesswork with solutions that save time and optimize costs",
+                " - Learn more: <u>https://www.ibm.com/products/turbonomic</u>"
+            ])
 
-        if isAirgapInstall(self.dynamicClient):
-            self.printHighlight("The Turbonomic Kubernetes Operator does not support disconnected installation at this time")
-        elif self.yesOrNo("Configure IBM Turbonomic integration"):
-            self.promptForString("Turbonomic Target Name", "turbonomic_target_name")
-            self.promptForString("Turbonomic Server URL", "turbonomic_server_url")
-            self.promptForString("Turbonomic Server Version", "turbonomic_server_version")
-            self.promptForString("Turbonomic Username", "turbonomic_username")
-            self.promptForString("Turbonomic Password", "turbonomic_password", isPassword=True)
+            if isAirgapInstall(self.dynamicClient):
+                self.printHighlight("The Turbonomic Kubernetes Operator does not support disconnected installation at this time")
+            elif self.yesOrNo("Configure IBM Turbonomic integration"):
+                self.promptForString("Turbonomic Target Name", "turbonomic_target_name")
+                self.promptForString("Turbonomic Server URL", "turbonomic_server_url")
+                self.promptForString("Turbonomic Server Version", "turbonomic_server_version")
+                self.promptForString("Turbonomic Username", "turbonomic_username")
+                self.promptForString("Turbonomic Password", "turbonomic_password", isPassword=True)

mas/cli/install/summarizer.py

@@ -20,6 +20,7 @@ logger = logging.getLogger(__name__)
 class InstallSummarizerMixin():
     def ocpSummary(self) -> None:
         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")
@@ -35,13 +36,6 @@ class InstallSummarizerMixin():
         self.printSummary("Skip Pre-Install Healthcheck", "Yes" if self.getParam('skip_pre_check') == "true" else "No")
         self.printSummary("Skip Grafana-Install", "Yes" if self.getParam('grafana_action') == "none" else "No")
 
-    def icrSummary(self) -> None:
-        self.printH2("IBM Container Registry Credentials")
-        self.printSummary("IBM Entitlement Key", f"{self.params['ibm_entitlement_key'][0:8]}<snip>")
-        if self.devMode:
-            self.printSummary("Artifactory Username", self.params['artifactory_username'])
-            self.printSummary("Artifactory Token", f"{self.params['artifactory_token'][0:8]}<snip>")
-
     def masSummary(self) -> None:
         operationalModeNames = ["", "Production", "Non-Production"]
 
@@ -274,6 +268,7 @@ class InstallSummarizerMixin():
         self.printH2("IBM Suite License Service")
         self.printSummary("License File", self.slsLicenseFileLocal)
         self.printParamSummary("IBM Open Registry", "sls_icr_cpopen")
+        self.printParamSummary("Namespace", "sls_namespace")
 
     def cosSummary(self) -> None:
         self.printH2("Cloud Object Storage")
@@ -308,7 +303,13 @@ class InstallSummarizerMixin():
 
     def mongoSummary(self) -> None:
         self.printH2("MongoDb")
-        self.printParamSummary("Install Namespace", "mongodb_namespace")
+        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 kafkaSummary(self) -> None:
         if self.getParam("kafka_action_system") != "":
@@ -353,7 +354,6 @@ class InstallSummarizerMixin():
 
         # Cluster Config & Dependencies
         self.ocpSummary()
-        self.icrSummary()
         self.droSummary()
         self.slsSummary()
         self.masSummary()