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

mas/cli/install/settings/additionalConfigs.py

@@ -16,6 +16,7 @@ from prompt_toolkit import print_formatted_text
 import logging
 logger = logging.getLogger(__name__)
 
+
 class AdditionalConfigsMixin():
     def additionalConfigs(self) -> None:
         if self.interactiveMode:
@@ -136,40 +137,40 @@ class AdditionalConfigsMixin():
 
             apps = {
                 "mas_app_channel_assist": {
-                        "dir": self.getParam("mas_manual_cert_dir") + "/assist/",
-                        "keyPrefix": "assist."
-                    },
+                    "dir": self.manualCertsDir + "/assist/",
+                    "keyPrefix": "assist."
+                },
                 "mas_app_channel_manage": {
-                        "dir": self.getParam("mas_manual_cert_dir") + "/manage/",
-                        "keyPrefix": "manage."
-                    },
+                    "dir": self.manualCertsDir + "/manage/",
+                    "keyPrefix": "manage."
+                },
                 "mas_app_channel_iot": {
-                        "dir": self.getParam("mas_manual_cert_dir") + "/iot/",
-                        "keyPrefix": "iot."
-                    },
+                    "dir": self.manualCertsDir + "/iot/",
+                    "keyPrefix": "iot."
+                },
                 "mas_app_channel_monitor": {
-                        "dir": self.getParam("mas_manual_cert_dir") + "/monitor/",
-                        "keyPrefix": "monitor."
-                    },
+                    "dir": self.manualCertsDir + "/monitor/",
+                    "keyPrefix": "monitor."
+                },
                 "mas_app_channel_predict": {
-                        "dir": self.getParam("mas_manual_cert_dir") + "/predict/",
-                        "keyPrefix": "predict."
-                    },
+                    "dir": self.manualCertsDir + "/predict/",
+                    "keyPrefix": "predict."
+                },
                 "mas_app_channel_visualinspection": {
-                        "dir": self.getParam("mas_manual_cert_dir") + "/visualinspection/",
-                        "keyPrefix": "visualinspection."
-                    },
+                    "dir": self.manualCertsDir + "/visualinspection/",
+                    "keyPrefix": "visualinspection."
+                },
                 "mas_app_channel_optimizer": {
-                        "dir": self.getParam("mas_manual_cert_dir") + "/optimizer/",
-                        "keyPrefix": "optimizer."
-                    }
+                    "dir": self.manualCertsDir + "/optimizer/",
+                    "keyPrefix": "optimizer."
                 }
+            }
 
             for file in ["ca.crt", "tls.crt", "tls.key"]:
-                if file not in map(path.basename, glob(f'{self.getParam("mas_manual_cert_dir")}/core/*')):
-                    self.fatalError(f'{file} is not present in {self.getParam("mas_manual_cert_dir")}/core/')
+                if file not in map(path.basename, glob(f'{self.manualCertsDir}/core/*')):
+                    self.fatalError(f'{file} is not present in {self.manualCertsDir}/core/')
             for ext in extensions:
-                certsSecret = self.addFilesToSecret(certsSecret, self.getParam("mas_manual_cert_dir")+'/core/', ext, "core.")
+                certsSecret = self.addFilesToSecret(certsSecret, self.manualCertsDir + '/core/', ext, "core.")
 
             for app in apps:
                 if self.getParam(app) != "":
@@ -181,7 +182,7 @@ class AdditionalConfigsMixin():
 
             self.certsSecret = certsSecret
 
-    def addFilesToSecret(self, secretDict: dict, configPath: str, extension: str, keyPrefix: str='') -> dict:
+    def addFilesToSecret(self, secretDict: dict, configPath: str, extension: str, keyPrefix: str = '') -> dict:
         """
         Add file (or files) to pipeline-additional-configs
         """
@@ -206,4 +207,4 @@ class AdditionalConfigsMixin():
                 secretDict["data"] = {}
             secretDict["data"][keyPrefix + fileName] = b64encode(data.encode('ascii')).decode("ascii")
 
-        return secretDict
+        return secretDict

mas/cli/install/settings/db2Settings.py

@@ -11,6 +11,7 @@
 from os import path
 from prompt_toolkit import print_formatted_text
 
+
 class Db2SettingsMixin():
     def configDb2(self) -> None:
         self.printH1("Configure Databases")
@@ -123,9 +124,8 @@ class Db2SettingsMixin():
         else:
             self.setParam("db2_action_manage", "none")
 
-
         # Do we need to configure Db2u?
-        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":
             self.printH2("Installation Namespace")
             self.promptForString("Install namespace", "db2_namespace", default="db2u")
 

mas/cli/install/settings/kafkaSettings.py

@@ -11,6 +11,7 @@
 from os import path
 from prompt_toolkit import print_formatted_text
 
+
 class KafkaSettingsMixin():
     def configKafka(self) -> None:
         if self.installIoT:

mas/cli/install/settings/manageSettings.py

@@ -11,6 +11,7 @@
 import logging
 logger = logging.getLogger(__name__)
 
+
 class ManageSettingsMixin():
 
     def arcgisSettings(self) -> None:
@@ -75,24 +76,42 @@ class ManageSettingsMixin():
         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"] += ",acm=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"
+            if self.yesOrNo(" - Asset Configuration Manager"):
+                self.params["mas_appws_components"] += ",acm=latest"
+            if self.yesOrNo(" - Aviation"):
+                self.params["mas_appws_components"] += ",acm=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"]:
@@ -154,7 +173,7 @@ class ManageSettingsMixin():
         else:
             self.fatalError("Invalid selection")
 
-    def manageSettingsJMS (self) -> None:
+    def manageSettingsJMS(self) -> None:
         if self.getParam("mas_app_settings_server_bundles_size") in ["jms", "snojms"]:
             self.printDescription([
                 "Only Manage JMS sequential queues (sqin and sqout) are enabled by default.",
@@ -227,3 +246,27 @@ class ManageSettingsMixin():
             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/install/settings/turbonomicSettings.py

@@ -10,6 +10,7 @@
 
 from mas.devops.mas import isAirgapInstall
 
+
 class TurbonomicSettingsMixin():
 
     def configTurbonomic(self) -> None:

mas/cli/install/summarizer.py

@@ -16,6 +16,7 @@ from mas.devops.ocp import getConsoleURL
 
 logger = logging.getLogger(__name__)
 
+
 class InstallSummarizerMixin():
     def ocpSummary(self) -> None:
         self.printH2("OpenShift Container Platform")
@@ -42,7 +43,7 @@ class InstallSummarizerMixin():
             self.printSummary("Artifactory Token", f"{self.params['artifactory_token'][0:8]}<snip>")
 
     def masSummary(self) -> None:
-        operationalModeNames=["", "Production", "Non-Production"]
+        operationalModeNames = ["", "Production", "Non-Production"]
 
         self.printH2("IBM Maximo Application Suite")
         self.printParamSummary("Instance ID", "mas_instance_id")
@@ -50,7 +51,7 @@ class InstallSummarizerMixin():
         self.printParamSummary("Workspace Name", "mas_workspace_name")
 
         print()
-        self.printSummary(f"Operational Mode", operationalModeNames[self.operationalMode])
+        self.printSummary("Operational Mode", operationalModeNames[self.operationalMode])
         if isAirgapInstall(self.dynamicClient):
             self.printSummary("Install Mode", "Disconnected Install")
         else:
@@ -76,7 +77,7 @@ class InstallSummarizerMixin():
 
         if self.getParam("mas_manual_cert_mgmt") != "":
             print()
-            self.printParamSummary("Manual Certificates", "mas_manual_cert_dir")
+            self.printSummary("Manual Certificates", self.manualCertsDir)
         else:
             print()
             self.printSummary("Manual Certificates", "Not Configured")
@@ -128,7 +129,6 @@ class InstallSummarizerMixin():
         else:
             self.printSummary("Loc Srv Esri (arcgis)", "Do Not Install")
 
-
     def predictSummary(self) -> None:
         if self.installPredict:
             self.printSummary("Predict", self.params["mas_app_channel_predict"])
@@ -155,10 +155,36 @@ class InstallSummarizerMixin():
         else:
             self.printSummary("Visual Inspection", "Do Not Install")
 
+    def aibrokerSummary(self) -> None:
+        if self.installAiBroker:
+            self.printSummary("AI Broker", self.params["mas_app_channel_aibroker"])
+            print_formatted_text(HTML("  <SkyBlue>+ Maximo AI Broker Settings</SkyBlue>"))
+            self.printParamSummary("  + Storage provider", "mas_aibroker_storage_provider")
+            self.printParamSummary("  + Storage access key", "mas_aibroker_storage_accesskey")
+            self.printParamSummary("  + Storage secret key", "mas_aibroker_storage_secretkey")
+            self.printParamSummary("  + Storage host", "mas_aibroker_storage_host")
+            self.printParamSummary("  + Storage port", "mas_aibroker_storage_port")
+            self.printParamSummary("  + Storage ssl", "mas_aibroker_storage_ssl")
+            self.printParamSummary("  + Storage region", "mas_aibroker_storage_region")
+            self.printParamSummary("  + Storage pipelines bucket", "mas_aibroker_storage_pipelines_bucket")
+            self.printParamSummary("  + Storage tenants bucket", "mas_aibroker_storage_tenants_bucket")
+            self.printParamSummary("  + Storage templates bucket", "mas_aibroker_storage_templates_bucket")
+            self.printParamSummary("  + Watsonxai api key", "mas_aibroker_watsonxai_apikey")
+            self.printParamSummary("  + Watsonxai machine learning url", "mas_aibroker_watsonxai_url")
+            self.printParamSummary("  + Watsonxai project id", "mas_aibroker_watsonxai_project_id")
+            self.printParamSummary("  + Database host", "mas_aibroker_db_host")
+            self.printParamSummary("  + Database port", "mas_aibroker_db_port")
+            self.printParamSummary("  + Database user", "mas_aibroker_db_user")
+            self.printParamSummary("  + Database name", "mas_aibroker_db_database")
+            self.printParamSummary("  + Database Secretname", "mas_aibroker_db_secret_name")
+            self.printParamSummary("  + Database password", "mas_aibroker_db_secret_value")
+        else:
+            self.printSummary("AI Broker", "Do Not Install")
+
     def manageSummary(self) -> None:
         if self.installManage:
             self.printSummary("Manage", self.params["mas_app_channel_manage"])
-            print_formatted_text(HTML(f"  <SkyBlue>+ Components</SkyBlue>"))
+            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 "acm=" in self.getParam("mas_appws_components") else "Disabled")
@@ -184,7 +210,7 @@ class InstallSummarizerMixin():
             self.printParamSummary("+ Base Language", "mas_app_settings_base_lang")
             self.printParamSummary("+ Additional Languages", "mas_app_settings_secondary_langs")
 
-            print_formatted_text(HTML(f"  <SkyBlue>+ Database Settings</SkyBlue>"))
+            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")
@@ -253,8 +279,8 @@ class InstallSummarizerMixin():
         self.printH2("Cloud Object Storage")
         if self.getParam("cos_type") != "":
             self.printParamSummary("Type", "cos_type")
-            if self.getParam("cos_resourcegroup") != "":
-                self.printParamSummary("Resource Group", "cos_resourcegroup")
+            if self.getParam("ibmcos_resourcegroup") != "":
+                self.printParamSummary("Resource Group", "ibmcos_resourcegroup")
         else:
             self.printSummary("Type", "None")
 
@@ -323,7 +349,7 @@ class InstallSummarizerMixin():
         ])
 
         logger.debug("PipelineRun parameters:")
-        logger.debug(yaml.dump(self.params, default_flow_style = False))
+        logger.debug(yaml.dump(self.params, default_flow_style=False))
 
         # Cluster Config & Dependencies
         self.ocpSummary()
@@ -341,6 +367,7 @@ class InstallSummarizerMixin():
         self.optimizerSummary()
         self.assistSummary()
         self.inspectionSummary()
+        self.aibrokerSummary()
 
         # Application Dependencies
         self.mongoSummary()