mas-cli 11.9.3__py3-none-any.whl → 11.10.1__py3-none-any.whl

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "11.9.3"  # Python module compatible semver
+__version__ = "11.10.1"  # Python module compatible semver

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 = "11.9.3"
+        self.version = "11.10.1"
         self.h1count = 0
         self.h2count = 0
 
@@ -184,9 +184,9 @@ class BaseApp(PrintMixin, PromptMixin):
         self._dynClient = None
 
         self.printTitle(f"\nIBM Maximo Application Suite Admin CLI v{self.version}")
-        print_formatted_text(HTML("Powered by <DarkGoldenRod><u>https://github.com/ibm-mas/ansible-devops/</u></DarkGoldenRod> and <DarkGoldenRod><u>https://tekton.dev/</u></DarkGoldenRod>\n"))
+        print_formatted_text(HTML("Powered by <Orange><u>https://github.com/ibm-mas/ansible-devops/</u></Orange> and <Orange><u>https://tekton.dev/</u></Orange>\n"))
         if which("kubectl") is None:
-            self.fatalError("Could not find kubectl on the path, see <DarkGoldenRod><u>https://kubernetes.io/docs/tasks/tools/#kubectl</u></DarkGoldenRod> for installation instructions")
+            self.fatalError("Could not find kubectl on the path, see <Orange><u>https://kubernetes.io/docs/tasks/tools/#kubectl</u></Orange> for installation instructions")
 
     @logMethodCall
     def createTektonFileWithDigest(self) -> None:

mas/cli/displayMixins.py

@@ -9,7 +9,7 @@
 # *****************************************************************************
 
 from os import getenv
-from prompt_toolkit import prompt, print_formatted_text, HTML
+from prompt_toolkit import prompt, print_formatted_text, HTML, PromptSession
 from prompt_toolkit.completion import WordCompleter
 from prompt_toolkit.validation import Validator
 
@@ -90,7 +90,12 @@ class PromptMixin():
         if param is not None and default == "":
             default = getenv(param.upper(), default="")
 
-        response = prompt(masPromptValue(message), is_password=isPassword, default=default, completer=completer, validator=validator, validate_while_typing=False)
+        if completer is not None:
+            promptSession = PromptSession()
+            response = promptSession.prompt(masPromptValue(message), is_password=isPassword, default=default, completer=completer, validator=validator, validate_while_typing=False, pre_run=promptSession.default_buffer.start_completion)
+        else:
+            response = prompt(masPromptValue(message), is_password=isPassword, default=default, completer=completer, validator=validator, validate_while_typing=False)
+
         if param is not None:
             self.params[param] = response
         return response

mas/cli/install/app.py

@@ -14,10 +14,12 @@ import logging.handlers
 from sys import exit
 from os import path, getenv
 import re
+import calendar
 
 from openshift.dynamic.exceptions import NotFoundError
 
 from prompt_toolkit import prompt, print_formatted_text, HTML
+from prompt_toolkit.completion import WordCompleter
 
 from tabulate import tabulate
 
@@ -30,7 +32,7 @@ from .argParser import installArgParser
 from .settings import InstallSettingsMixin
 from .summarizer import InstallSummarizerMixin
 from .params import requiredParams, optionalParams
-from .catalogs import catalogChoices
+from .catalogs import supportedCatalogs
 
 from mas.cli.validators import (
     InstanceIDFormatValidator,
@@ -41,7 +43,9 @@ from mas.cli.validators import (
     OptimizerInstallPlanValidator
 )
 
-from mas.devops.ocp import createNamespace, getStorageClass, getStorageClasses
+from mas.devops.ocp import createNamespace, getStorageClasses
+from mas.devops.mas import getCurrentCatalog, getDefaultStorageClasses
+from mas.devops.data import getCatalog
 from mas.devops.tekton import (
     installOpenShiftPipelines,
     updateTektonDefinitions,
@@ -102,17 +106,17 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             self.fatalError(
                 "\n".join([
                     "Unable to proceed with installation of Maximo Manage.  Could not detect the required \"image-registry\" service in the openshift-image-registry namespace",
-                    "For more information refer to <u>https://www.ibm.com/docs/en/masv-and-l/continuous-delivery?topic=installing-enabling-openshift-internal-image-registry</u>"
+                    "For more information refer to <Orange><u>https://www.ibm.com/docs/en/masv-and-l/continuous-delivery?topic=installing-enabling-openshift-internal-image-registry</u></Orange>"
                 ])
             )
 
     @logMethodCall
     def licensePrompt(self):
         licenses = {
-            "8.9.x": " - <u>https://ibm.biz/MAS89-License</u>",
-            "8.10.x": " - <u>https://ibm.biz/MAS810-License</u>",
-            "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>"
+            "8.9.x": " - <Orange><u>https://ibm.biz/MAS89-License</u></Orange>",
+            "8.10.x": " - <Orange><u>https://ibm.biz/MAS810-License</u></Orange>",
+            "8.11.x": " - <Orange><u>https://ibm.biz/MAS811-License</u></Orange>\n - <Orange><u>https://ibm.biz/MAXIT81-License</u></Orange>",
+            "9.0.x": " - <Orange><u>https://ibm.biz/MAS90-License</u></Orange>\n - <Orange><u>https://ibm.biz/MaximoIT90-License</u></Orange>\n - <Orange><u>https://ibm.biz/MAXArcGIS90-License</u></Orange>"
         }
 
         if not self.licenseAccepted:
@@ -153,6 +157,87 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         self.setParam("cert_manager_provider", "redhat")
         self.setParam("cert_manager_action", "install")
 
+    def formatCatalog(self, name: str) -> str:
+        # Convert "v9-241107-amd64" into "November 2024 Update (v9-241107-amd64)"
+        date = name.split("-")[1]
+        month = int(date[2:4])
+        monthName = calendar.month_name[month]
+        year = date[:2]
+        return f" - {monthName} 20{year} Update\n   <Orange><u>https://ibm-mas.github.io/cli/catalogs/{name}</u></Orange>"
+
+    def formatRelease(self, release: str) -> str:
+        return f"{release} ... {self.catalogReleases[release]['core']}"
+
+    @logMethodCall
+    def processCatalogChoice(self) -> list:
+        self.catalogDigest = self.chosenCatalog["catalog_digest"]
+        self.catalogCp4dVersion = self.chosenCatalog["cpd_product_version_default"]
+        self.catalogMongoDbVersion = self.chosenCatalog["mongo_extras_version_default"]
+
+        self.catalogReleases = ["9.0.x", "8.11.x", "8.10.x"]
+
+        self.catalogTable = [
+            {
+                "": "Core",
+                "9.0.x": self.chosenCatalog["mas_core_version"]["9.0.x"],
+                "8.11.x": self.chosenCatalog["mas_core_version"]["8.11.x"],
+                "8.10.x": self.chosenCatalog["mas_core_version"]["8.10.x"]
+            },
+            {
+                "": "Manage",
+                "9.0.x": self.chosenCatalog["mas_manage_version"]["9.0.x"],
+                "8.11.x": self.chosenCatalog["mas_manage_version"]["8.11.x"],
+                "8.10.x": self.chosenCatalog["mas_manage_version"]["8.10.x"]
+            },
+            {
+                "": "IoT",
+                "9.0.x": self.chosenCatalog["mas_iot_version"]["9.0.x"],
+                "8.11.x": self.chosenCatalog["mas_iot_version"]["8.11.x"],
+                "8.10.x": self.chosenCatalog["mas_iot_version"]["8.10.x"]
+            },
+            {
+                "": "Monitor",
+                "9.0.x": self.chosenCatalog["mas_monitor_version"]["9.0.x"],
+                "8.11.x": self.chosenCatalog["mas_monitor_version"]["8.11.x"],
+                "8.10.x": self.chosenCatalog["mas_monitor_version"]["8.10.x"]
+            },
+            {
+                "": "Assist",
+                "9.0.x": self.chosenCatalog["mas_assist_version"]["9.0.x"],
+                "8.11.x": self.chosenCatalog["mas_assist_version"]["8.11.x"],
+                "8.10.x": self.chosenCatalog["mas_assist_version"]["8.10.x"]
+            },
+            {
+                "": "Optimizer",
+                "9.0.x": self.chosenCatalog["mas_optimizer_version"]["9.0.x"],
+                "8.11.x": self.chosenCatalog["mas_optimizer_version"]["8.11.x"],
+                "8.10.x": self.chosenCatalog["mas_optimizer_version"]["8.10.x"]
+            },
+            {
+                "": "Predict",
+                "9.0.x": self.chosenCatalog["mas_predict_version"]["9.0.x"],
+                "8.11.x": self.chosenCatalog["mas_predict_version"]["8.11.x"],
+                "8.10.x": self.chosenCatalog["mas_predict_version"]["8.10.x"]
+            },
+            {
+                "": "Inspection",
+                "9.0.x": self.chosenCatalog["mas_visualinspection_version"]["9.0.x"],
+                "8.11.x": self.chosenCatalog["mas_visualinspection_version"]["8.11.x"],
+                "8.10.x": self.chosenCatalog["mas_visualinspection_version"]["8.10.x"]
+            }
+        ]
+
+        summary = [
+            "",
+            "<u>Catalog Details</u>",
+            f"Catalog Image:         icr.io/cpopen/ibm-maximo-operator-catalog:{self.getParam('mas_catalog_version')}",
+            f"Catalog Digest:        {self.catalogDigest}",
+            f"MAS Releases:          {', '.join(self.catalogReleases)}",
+            f"Cloud Pak for Data:    {self.catalogCp4dVersion}",
+            f"MongoDb:               {self.catalogMongoDbVersion}",
+        ]
+        return summary
+
     @logMethodCall
     def configCatalog(self):
         self.printH1("IBM Maximo Operator Catalog Selection")
@@ -160,11 +245,46 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             self.promptForString("Select catalog source", "mas_catalog_version", default="v9-master-amd64")
             self.promptForString("Select channel", "mas_channel", default="9.1.x-dev")
         else:
-            print(tabulate(self.installOptions, headers="keys", tablefmt="simple_grid"))
-            catalogSelection = self.promptForInt("Select catalog and release", default=1)
+            catalogInfo = getCurrentCatalog(self.dynamicClient)
+
+            if catalogInfo is None:
+                self.printDescription([
+                    "The catalog you choose dictates the version of everything that is installed, with Maximo Application Suite this is the only version you need to remember; all other versions are determined by this choice.",
+                    "Older catalogs can still be used, but we recommend using an older version of the CLI that aligns with the release date of the catalog.",
+                    " - Learn more: <Orange><u>https://ibm-mas.github.io/cli/catalogs/</u></Orange>",
+                    ""
+                ])
+                print("Supported Catalogs:")
+                for catalog in self.catalogOptions:
+                    catalogString = self.formatCatalog(catalog)
+                    print_formatted_text(HTML(f"{catalogString}"))
+                print()
+
+                catalogCompleter = WordCompleter(self.catalogOptions)
+                catalogSelection = self.promptForString("Select catalog", completer=catalogCompleter)
+                self.setParam("mas_catalog_version", catalogSelection)
+            else:
+                self.printDescription([
+                    f"The IBM Maximo Operator Catalog is already installed in this cluster ({catalogInfo['catalogId']}).  If you wish to install MAS using a newer version of the catalog please first update the catalog using mas update."
+                ])
+                self.setParam("mas_catalog_version", catalogInfo["catalogId"])
+
+            self.chosenCatalog = getCatalog(self.getParam("mas_catalog_version"))
+            catalogSummary = self.processCatalogChoice()
+            self.printDescription(catalogSummary)
+            self.printDescription([
+                "",
+                "Multiple releases of Maximo Application Suite are available, each is supported under IBM's standard 3+1+3 support model.",
+                "Choose the release of IBM Maximo Application Suite that you want to use for this installation from the table below:",
+                ""
+            ])
+
+            print(tabulate(self.catalogTable, headers="keys", tablefmt="simple_grid"))
 
-            self.setParam("mas_catalog_version", self.installOptions[catalogSelection - 1]["catalog"])
-            self.setParam("mas_channel", self.installOptions[catalogSelection - 1]["release"])
+            releaseCompleter = WordCompleter(self.catalogReleases)
+            releaseSelection = self.promptForString("Select release", completer=releaseCompleter)
+
+            self.setParam("mas_channel", releaseSelection)
 
     @logMethodCall
     def configSLS(self) -> None:
@@ -219,12 +339,13 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
 
     @logMethodCall
     def configCP4D(self):
-        if self.getParam("mas_catalog_version") in ["v9-240625-amd64", "v9-240730-amd64", "v9-240827-amd64", "v9-241003-amd64", "v9-241107-amd64"]:
+        if self.getParam("mas_catalog_version") in self.catalogOptions:
+            # Note: this will override any version provided by the user (which is intentional!)
             logger.debug(f"Using automatic CP4D product version: {self.getParam('cpd_product_version')}")
-            self.setParam("cpd_product_version", "4.8.0")
+            self.setParam("cpd_product_version", self.chosenCatalog["cpd_product_version_default"])
         elif self.getParam("cpd_product_version") == "":
             if self.noConfirm:
-                self.fatalError("Cloud Pak for Data version must be set manually, but --no-confirm flag has been set")
+                self.fatalError("Cloud Pak for Data version must be set manually, but --no-confirm has been set without setting --cp4d-version")
             self.printDescription([
                 f"Unknown catalog {self.getParam('mas_catalog_version')}, please manually select the version of Cloud Pak for Data to use"
             ])
@@ -522,46 +643,14 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             "  - ReadWriteMany volumes can be mounted as read-write by multiple pods across many nodes.",
             ""
         ])
-        # 1. ROKS
-        if getStorageClass(self.dynamicClient, "ibmc-file-gold-gid") is not None:
-            print_formatted_text(HTML("<MediumSeaGreen>Storage provider auto-detected: IBMCloud ROKS</MediumSeaGreen>"))
-            print_formatted_text(HTML("<LightSlateGrey>  - Storage class (ReadWriteOnce): ibmc-block-gold</LightSlateGrey>"))
-            print_formatted_text(HTML("<LightSlateGrey>  - Storage class (ReadWriteMany): ibmc-file-gold-gid</LightSlateGrey>"))
-            self.storageClassProvider = "ibmc"
-            self.params["storage_class_rwo"] = "ibmc-block-gold"
-            self.params["storage_class_rwx"] = "ibmc-file-gold-gid"
-        # 2. OCS
-        elif getStorageClass(self.dynamicClient, "ocs-storagecluster-cephfs") is not None:
-            print_formatted_text(HTML("<MediumSeaGreen>Storage provider auto-detected: OpenShift Container Storage</MediumSeaGreen>"))
-            print_formatted_text(HTML("<LightSlateGrey>  - Storage class (ReadWriteOnce): ocs-storagecluster-ceph-rbd</LightSlateGrey>"))
-            print_formatted_text(HTML("<LightSlateGrey>  - Storage class (ReadWriteMany): ocs-storagecluster-cephfs</LightSlateGrey>"))
-            self.storageClassProvider = "ocs"
-            self.params["storage_class_rwo"] = "ocs-storagecluster-ceph-rbd"
-            self.params["storage_class_rwx"] = "ocs-storagecluster-cephfs"
-        # 3. NFS Client
-        elif getStorageClass(self.dynamicClient, "nfs-client") is not None:
-            print_formatted_text(HTML("<MediumSeaGreen>Storage provider auto-detected: NFS Client</MediumSeaGreen>"))
-            print_formatted_text(HTML("<LightSlateGrey>  - Storage class (ReadWriteOnce): nfs-client</LightSlateGrey>"))
-            print_formatted_text(HTML("<LightSlateGrey>  - Storage class (ReadWriteMany): nfs-client</LightSlateGrey>"))
-            self.storageClassProvider = "nfs"
-            self.params["storage_class_rwo"] = "nfs-client"
-            self.params["storage_class_rwx"] = "nfs-client"
-        # 4. Azure
-        elif getStorageClass(self.dynamicClient, "managed-premium") is not None:
-            print_formatted_text(HTML("<MediumSeaGreen>Storage provider auto-detected: Azure Managed</MediumSeaGreen>"))
-            print_formatted_text(HTML("<LightSlateGrey>  - Storage class (ReadWriteOnce): managed-premium</LightSlateGrey>"))
-            print_formatted_text(HTML("<LightSlateGrey>  - Storage class (ReadWriteMany): azurefiles-premium</LightSlateGrey>"))
-            self.storageClassProvider = "azure"
-            self.params["storage_class_rwo"] = "managed-premium"
-            self.params["storage_class_rwx"] = "azurefiles-premium"
-        # 5. AWS
-        elif getStorageClass(self.dynamicClient, "gp2") is not None:
-            print_formatted_text(HTML("<MediumSeaGreen>Storage provider auto-detected: AWS gp2</MediumSeaGreen>"))
-            print_formatted_text(HTML("<LightSlateGrey>  - Storage class (ReadWriteOnce): gp2</LightSlateGrey>"))
-            print_formatted_text(HTML("<LightSlateGrey>  - Storage class (ReadWriteMany): efs</LightSlateGrey>"))
-            self.storageClassProvider = "aws"
-            self.params["storage_class_rwo"] = "gp2"
-            self.params["storage_class_rwx"] = "efs"
+        defaultStorageClasses = getDefaultStorageClasses(self.dynamicClient)
+        if defaultStorageClasses.provider is not None:
+            print_formatted_text(HTML(f"<MediumSeaGreen>Storage provider auto-detected: {defaultStorageClasses.providerName}</MediumSeaGreen>"))
+            print_formatted_text(HTML(f"<LightSlateGrey>  - Storage class (ReadWriteOnce): {defaultStorageClasses.rwo}</LightSlateGrey>"))
+            print_formatted_text(HTML(f"<LightSlateGrey>  - Storage class (ReadWriteMany): {defaultStorageClasses.rwx}</LightSlateGrey>"))
+            self.storageClassProvider = defaultStorageClasses.provider
+            self.params["storage_class_rwo"] = defaultStorageClasses.rwo
+            self.params["storage_class_rwx"] = defaultStorageClasses.rwx
 
         overrideStorageClasses = False
         if "storage_class_rwx" in self.params and self.params["storage_class_rwx"] != "":
@@ -880,6 +969,9 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 print(f"Unknown option: {key} {value}")
                 self.fatalError(f"Unknown option: {key} {value}")
 
+        # Load the catalog information
+        self.chosenCatalog = getCatalog(self.getParam("mas_catalog_version"))
+
         # Once we've processed the inputs, we should validate the catalog source & prompt to accept the license terms
         if not self.devMode:
             self.validateCatalogSource()
@@ -925,7 +1017,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             exit(1)
 
         # Configure the installOptions for the appropriate architecture
-        self.installOptions = catalogChoices[self.architecture]
+        self.catalogOptions = supportedCatalogs[self.architecture]
 
         # Basic settings before the user provides any input
         self.configICR()

mas/cli/install/catalogs.py

@@ -7,135 +7,13 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # *****************************************************************************
-
-catalogChoices = {
+supportedCatalogs = {
     "amd64": [
-        {
-            "#": 1,
-            "catalog": "v9-241107-amd64",
-            "release": "9.0.x",
-            "core": "9.0.5",
-            "assist": "9.0.2",
-            "iot": "9.0.4",
-            "manage": "9.0.5",
-            "monitor": "9.0.4",
-            "optimizer": "9.0.4",
-            "predict": "9.0.2",
-            "inspection": "9.0.4",
-            "aibroker": "9.0.3"
-        },
-        {
-            "#": 2,
-            "catalog": "v9-241107-amd64",
-            "release": "8.11.x",
-            "core": "8.11.16",
-            "assist": "8.8.6",
-            "iot": "8.8.14",
-            "manage": "8.7.13",
-            "monitor": "8.11.12",
-            "optimizer": "8.5.10",
-            "predict": "8.9.5",
-            "inspection": "8.9.7"
-        },
-        {
-            "#": 3,
-            "catalog": "v9-241107-amd64",
-            "release": "8.10.x",
-            "core": "8.10.19",
-            "assist": "8.7.7",
-            "iot": "8.7.18",
-            "manage": "8.6.19",
-            "monitor": "8.10.14",
-            "optimizer": "8.4.11",
-            "predict": "8.8.4",
-            "inspection": "8.8.4"
-        },
-        {
-            "#": 4,
-            "catalog": "v9-241003-amd64",
-            "release": "9.0.x",
-            "core": "9.0.3",
-            "assist": "9.0.2",
-            "iot": "9.0.3",
-            "manage": "9.0.3",
-            "monitor": "9.0.3",
-            "optimizer": "9.0.3",
-            "predict": "9.0.2",
-            "inspection": "9.0.3"
-        },
-        {
-            "#": 5,
-            "catalog": "v9-241003-amd64",
-            "release": "8.11.x",
-            "core": "8.11.15",
-            "assist": "8.8.6",
-            "iot": "8.8.13",
-            "manage": "8.7.12",
-            "monitor": "8.11.11",
-            "optimizer": "8.5.9",
-            "predict": "8.9.5",
-            "inspection": "8.9.6"
-        },
-        {
-            "#": 6,
-            "catalog": "v9-241003-amd64",
-            "release": "8.10.x",
-            "core": "8.10.18",
-            "assist": "8.7.7",
-            "iot": "8.7.17",
-            "manage": "8.6.18",
-            "monitor": "8.10.14",
-            "optimizer": "8.4.10",
-            "predict": "8.8.3",
-            "inspection": "8.8.4"
-        },
-        {
-            "#": 7,
-            "catalog": "v9-240827-amd64",
-            "release": "9.0.x",
-            "core": "9.0.2",
-            "assist": "9.0.2",
-            "iot": "9.0.2",
-            "manage": "9.0.2",
-            "monitor": "9.0.2",
-            "optimizer": "9.0.2",
-            "predict": "9.0.1",
-            "inspection": "9.0.2"
-        },
-        {
-            "#": 8,
-            "catalog": "v9-240827-amd64",
-            "release": "8.11.x",
-            "core": "8.11.14",
-            "assist": "8.8.6",
-            "iot": "8.8.12",
-            "manage": "8.7.11",
-            "monitor": "8.11.10",
-            "optimizer": "8.5.8",
-            "predict": "8.9.3",
-            "inspection": "8.9.5"
-        },
-        {
-            "#": 9,
-            "catalog": "v9-240827-amd64",
-            "release": "8.10.x",
-            "core": "8.10.17",
-            "assist": "8.7.7",
-            "iot": "8.7.16",
-            "manage": "8.6.17",
-            "monitor": "8.10.13",
-            "optimizer": "8.4.9",
-            "predict": "8.8.3",
-            "inspection": "8.8.4"
-        }
+        "v9-241107-amd64",
+        "v9-241003-amd64",
+        "v9-240827-amd64"
     ],
     "s390x": [
-        {
-            "#": 1,
-            "catalog": "v9-241107-s390x",
-            "release": "9.0.x",
-            "core": "9.0.5",
-            "manage": "9.0.5"
-        }
+        "v9-241107-s390x"
     ]
 }

mas/cli/install/settings/additionalConfigs.py

@@ -67,7 +67,7 @@ class AdditionalConfigsMixin():
             self.printH1("Configure Pod Templates")
             self.printDescription([
                 "The CLI supports two pod template profiles out of the box that allow you to reconfigure MAS for either a guaranteed or best effort QoS level",
-                "For more information about the Kubernetes quality of service (QoS) levels, see https://kubernetes.io/docs/concepts/workloads/pods/pod-qos/",
+                "For more information about the Kubernetes quality of service (QoS) levels, see <Orange><u>https://kubernetes.io/docs/concepts/workloads/pods/pod-qos/</u></Orange>",
                 "You may also choose to use your own customized pod template definitions"
             ])
 

mas/cli/install/settings/db2Settings.py

@@ -164,8 +164,8 @@ class Db2SettingsMixin():
                     "Note that the same settings are applied to both the IoT and Manage 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:",
-                    " - <u>https://docs.openshift.com/container-platform/4.12/nodes/scheduling/nodes-scheduler-node-affinity.html</u>",
-                    " - <u>https://docs.openshift.com/container-platform/4.12/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u>"
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.12/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.12/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u></Orange>"
                 ])
 
                 if self.yesOrNo("Configure node affinity"):

mas/cli/install/settings/kafkaSettings.py

@@ -73,7 +73,7 @@ class KafkaSettingsMixin():
                         "While provisioning the AWS MSK instance, you will be required to provide the AWS Virtual Private Cloud ID and subnet details",
                         "where your instance will be deployed to properly configure inbound and outbound connectivity.",
                         "You should be able to find these information inside your VPC and subnet configurations in the target AWS account.",
-                        "For more details about AWS subnet/CIDR configuration, refer: https://docs.aws.amazon.com/vpc/latest/userguide/subnet-sizing.html"
+                        "For more details about AWS subnet/CIDR configuration, refer: <Orange><u>https://docs.aws.amazon.com/vpc/latest/userguide/subnet-sizing.html</u></Orange>"
                     ])
                     self.promptForString("AWS Access Key ID", "aws_access_key_id", isPassword=True)
                     self.promptForString("AWS Secret Access Key" "aws_secret_access_key", isPassword=True)

mas/cli/install/settings/manageSettings.py

@@ -32,7 +32,7 @@ class ManageSettingsMixin():
                     "",
                     "IBM Maximo Location Services for Esri License Terms",
                     "For information about your IBM Maximo Location Services for Esri License visit: ",
-                    " <u>https://ibm.biz/MAXArcGIS90-License</u>",
+                    " - <Orange><u>https://ibm.biz/MAXArcGIS90-License</u></Orange>",
                     "To continue with the installation, you must accept these additional license terms"
                 ])
 
@@ -117,7 +117,7 @@ class ManageSettingsMixin():
             if ",icd=" in self.params["mas_appws_components"]:
                 self.printH2("Maximo IT License Terms")
                 self.printDescription([
-                    "For information about your Maximo IT License, see https://ibm.biz/MAXIT81-License",
+                    "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"
                 ])
 
@@ -217,7 +217,7 @@ class ManageSettingsMixin():
         self.printDescription([
             "Define the additional languages to be configured in Maximo Manage. provide a comma-separated list of supported languages codes, for example: 'JA,DE,AR'",
             "A complete list of available language codes is available online:",
-            "    <u>https://www.ibm.com/docs/en/mas-cd/mhmpmh-and-p-u/continuous-delivery?topic=deploy-language-support</u>"
+            "    <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")
@@ -226,7 +226,7 @@ class ManageSettingsMixin():
         if self.getParam("mas_app_channel_manage") in ["8.7.x", "9.0.x"] and self.showAdvancedOptions:
             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>"
+                " - <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")

mas/cli/install/settings/turbonomicSettings.py

@@ -18,7 +18,7 @@ class TurbonomicSettingsMixin():
             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>"
+                " - Learn more: <Orange><u>https://www.ibm.com/products/turbonomic</u></Orange>"
             ])
 
             if isAirgapInstall(self.dynamicClient):