mas-cli 13.25.1__py3-none-any.whl → 13.26.0__py3-none-any.whl

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "13.25.1"  # Python module compatible semver
+__version__ = "13.26.0"  # 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 = "13.25.1"
+        self.version = "13.26.0"
         self.h1count = 0
         self.h2count = 0
 
@@ -146,7 +146,16 @@ class BaseApp(PrintMixin, PromptMixin):
 
         self.compatibilityMatrix = {
             "9.1.x": {
-                "facilities": ["9.1.x"]
+                "facilities": ["9.1.x"],
+                "assist": ["9.1.x", "9.0.x"],
+                "iot": ["9.1.x", "9.0.x"],
+                "manage": ["9.1.x", "9.0.x"],
+                "monitor": ["9.1.x", "9.0.x"],
+                "optimizer": ["9.1.x", "9.0.x"],
+                "predict": ["9.1.x", "9.0.x"],
+                "visualinspection": ["9.1.x", "9.0.x"],
+                "aibroker": ["9.1.x", "9.0.x"],
+
             },
             "9.1.x-feature": {
                 "assist": ["9.0.x"],
@@ -195,10 +204,13 @@ class BaseApp(PrintMixin, PromptMixin):
             "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>",
             "9.1.x-feature": " - <u>https://ibm.biz/MAS90-License</u>\n - <u>https://ibm.biz/MaximoIT90-License</u>\n - <u>https://ibm.biz/MAXArcGIS90-License</u>\n\nBe aware, this channel subscription is supported for non-production use only.   \nIt allows early access to new features for evaluation in non-production environments.   \nThis subscription is offered alongside and in parallel with our normal maintained streams.   \nWhen using this subscription, IBM Support will only accept cases for the latest available bundle deployed in a non-production environment.   \nSeverity must be either 3 or 4 and cases cannot be escalated.   \nPlease refer to IBM documentation for more details.\n",
+            "9.1.x": " - <u>https://ibm.biz/MAS91-License</u>\n - <u>https://ibm.biz/MAXIT91-License</u>\n - <u>https://ibm.biz/MAXESRI91-License</u>",
         }
 
         self.upgrade_path = {
-            "9.0.x": "9.1.x-feature",
+            "9.1.x": "9.1.x",
+            "9.1.x-feature": "9.1.x",
+            "9.0.x": "9.1.x",
             "8.11.x": "9.0.x",
             "8.10.x": "8.11.x",
             "8.9.x": "8.10.x",

mas/cli/gencfg.py

@@ -11,6 +11,7 @@
 from os import path
 from jinja2 import Template
 from base64 import b64encode
+from json import loads
 
 
 class ConfigGeneratorMixin():
@@ -88,3 +89,25 @@ class ConfigGeneratorMixin():
         with open(destination, 'w') as f:
             f.write(cfg)
             f.write('\n')
+
+    def generateFacilitiesCfg(self, destination: str) -> None:
+        templateFile = path.join(self.templatesDir, "facilities-configs.yml.j2")
+
+        with open(templateFile) as tFile:
+            template = Template(tFile.read())
+
+        dwfagents = self.getParam("mas_ws_facilities_dwfagents")
+        maxconnpoolsize = self.getParam("mas_ws_facilities_db_maxconnpoolsize")
+        userfiles_size = self.getParam("mas_ws_facilities_storage_userfiles_size")
+        log_size = self.getParam("mas_ws_facilities_storage_log_size")
+        cfg = template.render(
+            mas_instance_id=self.getParam("mas_instance_id"),
+            mas_ws_facilities_storage_log_size=log_size if log_size != "" else 30,
+            mas_ws_facilities_storage_userfiles_size=userfiles_size if userfiles_size != "" else 50,
+            mas_ws_facilities_db_maxconnpoolsize=maxconnpoolsize if maxconnpoolsize != "" else 200,
+            mas_ws_facilities_dwfagents=loads(dwfagents) if dwfagents != '' else ''
+        )
+
+        with open(destination, 'w') as f:
+            f.write(cfg)
+            f.write('\n')

mas/cli/install/app.py

@@ -40,6 +40,7 @@ from mas.cli.validators import (
     WorkspaceNameFormatValidator,
     TimeoutFormatValidator,
     StorageClassValidator,
+    JsonValidator,
     OptimizerInstallPlanValidator
 )
 
@@ -375,7 +376,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             self.printDescription([
                 f"Unknown catalog {self.getParam('mas_catalog_version')}, please manually select the version of Cloud Pak for Data to use"
             ])
-            self.promptForString("Cloud Pak for Data product version", "cpd_product_version", default="4.8.0")
+            self.promptForString("Cloud Pak for Data product version", "cpd_product_version", default="5.1.3")
             logger.debug(f"Using user-provided (prompt) CP4D product version: {self.getParam('cpd_product_version')}")
         else:
             logger.debug(f"Using user-provided (flags) CP4D product version: {self.getParam('cpd_product_version')}")
@@ -770,7 +771,6 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 self.promptForString("IBM Cloud Resource Group", "cos_resourcegroup")
 
     @logMethodCall
-    # TODO: Fix type for storage sizes and max conn pool size
     def facilitiesSettings(self) -> None:
         if self.installFacilities:
             self.printH1("Configure Maximo Real Estate and Facilities")
@@ -786,13 +786,17 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             self.promptForListSelect("Select the size:", ["small", "medium", "large"], "mas_ws_facilities_size")
 
             if self.showAdvancedOptions:
+                self.printH2("Maximo Real Estate and Facilities Settings - Advanced")
+                self.printDescription([
+                    "Advanced configurations for Real Estate and Facilities are added through an additional file called facilities-configs.yaml"
+                ])
                 if self.yesOrNo("Supply extra XML tags for Real Estate and Facilities server.xml"):
                     self.promptForString("Real Estate and Facilities Liberty Extension Secret Name", "mas_ws_facilities_liberty_extension_XML")
                 if self.yesOrNo("Supply custom AES Encryption Password"):
                     self.promptForString("Real Estate and Facilities AES Vault Secret Name", "mas_ws_facilities_vault_secret")
 
                 self.promptForString("Set Real Estate and Facilities Routes Timeout:", "mas_ws_facilities_routes_timeout", default="600s")
-                # self.promptForInt("Set Facilities maximum connection poll size:", default=200)
+                self.promptForInt("Set Facilities maximum connection poll size:", "mas_ws_facilities_db_maxconnpoolsize", default=200)
 
                 self.printDescription(["Real Estate and Facilities Persistent Volume Storage Configuration"])
                 defaultStorageClasses = getDefaultStorageClasses(self.dynamicClient)
@@ -810,10 +814,10 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                         ])
                         storageMode = self.promptForListSelect("Select the storage mode for user files PVC:", ["ReadWriteMany", "ReadWriteOnce"], "mas_ws_facilities_storage_userfiles_mode", default=1)
                         _ = self.setParam("mas_ws_facilities_storage_userfiles_class", defaultStorageClasses.rwx) if storageMode == "ReadWriteMany" else self.setParam("mas_ws_facilities_storage_userfiles_class", defaultStorageClasses.rwo)
-                        # self.promptForInt("User file PVC size (Gb):", "mas_ws_facilities_storage_userfiles_size", default=50)
+                        self.promptForInt("User file PVC size (Gb):", "mas_ws_facilities_storage_userfiles_size", default=50)
                         storageMode = self.promptForListSelect("Select the storage mode for log PVC:", ["ReadWriteMany", "ReadWriteOnce"], "mas_ws_facilities_storage_log_mode", default=1)
                         _ = self.setParam("mas_ws_facilities_storage_log_class", defaultStorageClasses.rwx) if storageMode == "ReadWriteMany" else self.setParam("mas_ws_facilities_storage_log_class", defaultStorageClasses.rwo)
-                        # self.promptForInt("Log PVC size (Gb):", "mas_ws_facilities_storage_log_size", default=30)
+                        self.promptForInt("Log PVC size (Gb):", "mas_ws_facilities_storage_log_size", default=30)
                     else:
                         notUseAutodetectedStorageClasses = True
                 if defaultStorageClasses.provider is None or notUseAutodetectedStorageClasses:
@@ -828,11 +832,18 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                     ])
                     self.promptForListSelect("Select the storage mode for user files PVC:", ["ReadWriteMany", "ReadWriteOnce"], "mas_ws_facilities_storage_userfiles_mode", default=1)
                     self.promptForListSelect("Select the storage mode for log PVC:", ["ReadWriteMany", "ReadWriteOnce"], "mas_ws_facilities_storage_log_mode", default=1)
-                    # self.promptForInt("User file PVC size (Gb):", "mas_ws_facilities_storage_userfiles_size", default=50)
-                    # self.promptForInt("Log PVC size (Gb):", "mas_ws_facilities_storage_log_size", default=30)
+                    self.promptForInt("User file PVC size (Gb):", "mas_ws_facilities_storage_userfiles_size", default=50)
+                    self.promptForInt("Log PVC size (Gb):", "mas_ws_facilities_storage_log_size", default=30)
 
                 if self.yesOrNo("Supply configuration for dedicated workflow agents"):
-                    self.promptForString("Dedicated Workflow Agent JSON:")
+                    print_formatted_text(HTML("<LightSlateGrey> Example: '[{\"name\":\"dwfa1\",\"members\":[{\"name\": \"u1\", \"class\": \"user\"}]}, {\"name\":\"dwfa2\",\"members\":[{\"name\": \"u2\", \"class\": \"user\"},{\"name\":\"g1\", \"class\":\"group\"}]}]' </LightSlateGrey>"))
+                    self.promptForString("Dedicated Workflow Agent JSON:", "mas_ws_facilities_dwfagents", validator=JsonValidator())
+
+                # If advanced options is selected, we need to create a file to add props not supported by Tekton
+                self.selectLocalConfigDir()
+                facilitiesConfigsPath = path.join(self.localConfigDir, "facilities-configs.yaml")
+                self.generateFacilitiesCfg(destination=facilitiesConfigsPath)
+                self.setParam("mas_ws_facilities_config_file", "/workspace/configs/facilities-configs.yaml")
 
     @logMethodCall
     def chooseInstallFlavour(self) -> None:
@@ -1119,6 +1130,14 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             # Configure Storage and Access mode
             self.manageStorageAndAccessMode()
 
+        if self.installFacilities:
+            # Verifiy if any of the props that needs to be in a file are given
+            if self.getParam("mas_ws_facilities_storage_log_size") != "" or self.getParam("mas_ws_facilities_storage_userfiles_size") != "" or self.getParam("mas_ws_facilities_db_maxconnpoolsize") or self.getParam("mas_ws_facilities_dwfagents"):
+                self.selectLocalConfigDir()
+                facilitiesConfigsPath = path.join(self.localConfigDir, "facilities-configs.yaml")
+                self.generateFacilitiesCfg(destination=facilitiesConfigsPath)
+                self.setParam("mas_ws_facilities_config_map_name", "facilities-config")
+
         # Load the catalog information
         self.chosenCatalog = getCatalog(self.getParam("mas_catalog_version"))
 

mas/cli/install/argBuilder.py

@@ -256,25 +256,25 @@ class installArgBuilderMixin():
             if self.getParam('mas_ws_facilities_vault_secret') != "":
                 command += f"  --facilities-vault-secret \"{self.getParam('mas_ws_facilities_vault_secret')}\"{newline}"
 
-            # if self.getParam('mas_ws_facilities_dwfagents') != "":
-            #     command += f"  --facilities-dwfagent \"{self.getParam('mas_ws_facilities_dwfagents')}\"{newline}"
+            if self.getParam('mas_ws_facilities_dwfagents') != "":
+                command += f"  --facilities-dwfagent \'{self.getParam('mas_ws_facilities_dwfagents')}\'{newline}"
 
-            # if self.getParam('mas_ws_facilities_db_maxconnpoolsize') != "":
-            #     command += f"  --facilities-maxconnpoolsize \"{self.getParam('mas_ws_facilities_db_maxconnpoolsize')}\"{newline}"
+            if self.getParam('mas_ws_facilities_db_maxconnpoolsize') != "":
+                command += f"  --facilities-maxconnpoolsize \"{self.getParam('mas_ws_facilities_db_maxconnpoolsize')}\"{newline}"
 
             if self.getParam('mas_ws_facilities_storage_log_class') != "":
                 command += f"  --facilities-log-storage-class \"{self.getParam('mas_ws_facilities_storage_log_class')}\"{newline}"
             if self.getParam('mas_ws_facilities_storage_log_mode') != "":
                 command += f"  --facilities-log-storage-mode \"{self.getParam('mas_ws_facilities_storage_log_mode')}\"{newline}"
-            # if self.getParam('mas_ws_facilities_storage_log_size') != "":
-            #     command += f"  --facilities-log-storage-size \"{self.getParam('mas_ws_facilities_storage_log_size')}\"{newline}"
+            if self.getParam('mas_ws_facilities_storage_log_size') != "":
+                command += f"  --facilities-log-storage-size \"{self.getParam('mas_ws_facilities_storage_log_size')}\"{newline}"
 
             if self.getParam('mas_ws_facilities_storage_userfiles_class') != "":
                 command += f"  --facilities-userfiles-storage-class \"{self.getParam('mas_ws_facilities_storage_userfiles_class')}\"{newline}"
             if self.getParam('mas_ws_facilities_storage_userfiles_mode') != "":
                 command += f"  --facilities-userfiles-storage-mode \"{self.getParam('mas_ws_facilities_storage_userfiles_mode')}\"{newline}"
-            # if self.getParam('mas_ws_facilities_storage_userfiles_size') != "":
-            #     command += f"  --facilities-userfiles-storage-size \"{self.getParam('mas_ws_facilities_storage_userfiles_size')}\"{newline}"
+            if self.getParam('mas_ws_facilities_storage_userfiles_size') != "":
+                command += f"  --facilities-userfiles-storage-size \"{self.getParam('mas_ws_facilities_storage_userfiles_size')}\"{newline}"
 
         # IBM Cloud Pak for Data
         # -----------------------------------------------------------------------------

mas/cli/install/argParser.py

@@ -745,19 +745,20 @@ facilitiesArgGroup.add_argument(
     required=False,
     help="Defines the name of the secret that holds the AES Encryption password",
 )
-# facilitiesArgGroup.add_argument(
-#     "--facilities-dwfagent",
-#     dest="mas_ws_facilities_dwfagents",
-#     required=False,
-#     help="Defines the list of dedicates workflow agents",
-# )
-# facilitiesArgGroup.add_argument(
-#     "--facilities-maxconnpoolsize",
-#     dest="mas_ws_facilities_db_maxconnpoolsize",
-#     required=False,
-#     help="Defines the maximum connection pool size",
-#     default=200,
-# )
+facilitiesArgGroup.add_argument(
+    "--facilities-dwfagent",
+    dest="mas_ws_facilities_dwfagents",
+    required=False,
+    help="Defines the list of dedicates workflow agents",
+    type=str
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-maxconnpoolsize",
+    dest="mas_ws_facilities_db_maxconnpoolsize",
+    required=False,
+    help="Defines the maximum connection pool size",
+    default=200,
+)
 facilitiesArgGroup.add_argument(
     "--facilities-log-storage-class",
     dest="mas_ws_facilities_storage_log_class",
@@ -770,12 +771,12 @@ facilitiesArgGroup.add_argument(
     required=False,
     help="Defines the log storage mode",
 )
-# facilitiesArgGroup.add_argument(
-#     "--facilities-log-storage-size",
-#     dest="mas_ws_facilities_storage_log_size",
-#     required=False,
-#     help="Defines the logs storage size",
-# )
+facilitiesArgGroup.add_argument(
+    "--facilities-log-storage-size",
+    dest="mas_ws_facilities_storage_log_size",
+    required=False,
+    help="Defines the logs storage size",
+)
 facilitiesArgGroup.add_argument(
     "--facilities-userfiles-storage-class",
     dest="mas_ws_facilities_storage_userfiles_class",
@@ -788,12 +789,12 @@ facilitiesArgGroup.add_argument(
     required=False,
     help="Defines the user files storage mode",
 )
-# facilitiesArgGroup.add_argument(
-#     "--facilities-userfiles-storage-size",
-#     dest="mas_ws_facilities_storage_userfiles_size",
-#     required=False,
-#     help="Defines the user files storage size",
-# )
+facilitiesArgGroup.add_argument(
+    "--facilities-userfiles-storage-size",
+    dest="mas_ws_facilities_storage_userfiles_size",
+    required=False,
+    help="Defines the user files storage size",
+)
 
 # IBM Cloud Pak for Data
 # -----------------------------------------------------------------------------

mas/cli/install/catalogs.py

@@ -9,17 +9,18 @@
 # *****************************************************************************
 supportedCatalogs = {
     "amd64": [
+        "v9-250624-amd64",
         "v9-250501-amd64",
         "v9-250403-amd64",
         "v9-250306-amd64",
-        "v9-250206-amd64",
     ],
     "s390x": [
+        "v9-250624-s390x",
         "v9-250501-s390x",
         "v9-250403-s390x",
         "v9-250306-s390x",
-        "v9-250206-s390x",
     ],
     "ppc64le": [
+        "v9-250624-ppc64le",
     ],
 }

mas/cli/install/params.py

@@ -184,12 +184,12 @@ optionalParams = [
     "mas_ws_facilities_pull_policy",
     "mas_ws_facilities_storage_log_class",
     "mas_ws_facilities_storage_log_mode",
-    # "mas_ws_facilities_storage_log_size",
+    "mas_ws_facilities_storage_log_size",
     "mas_ws_facilities_storage_userfiles_class",
     "mas_ws_facilities_storage_userfiles_mode",
-    # "mas_ws_facilities_storage_userfiles_size",
-    # "mas_ws_facilities_dwfagents",
-    # "mas_ws_facilities_db_maxconnpoolsize",
+    "mas_ws_facilities_storage_userfiles_size",
+    "mas_ws_facilities_dwfagents",
+    "mas_ws_facilities_db_maxconnpoolsize",
     # Special chars
     "mas_special_characters"
 ]

mas/cli/install/settings/db2Settings.py

@@ -182,8 +182,10 @@ class Db2SettingsMixin():
                     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>",
-                    " - <Orange><u>https://docs.openshift.com/container-platform/4.16/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u></Orange>"
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.18/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.18/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u></Orange>",
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.17/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.17/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u></Orange>"
                 ])
 
                 if self.yesOrNo("Configure node affinity"):

mas/cli/install/settings/manageSettings.py

@@ -119,6 +119,8 @@ class ManageSettingsMixin():
                     self.params["mas_appws_components"] += ",utilities=latest"
                 if self.yesOrNo(" - Workday Applications"):
                     self.params["mas_appws_components"] += ",workday=latest"
+                if self.yesOrNo(" - AIP"):
+                    self.params["mas_appws_components"] += ",aip=latest"
                 logger.debug(f"Generated mas_appws_components = {self.params['mas_appws_components']}")
 
                 if ",icd=" in self.params["mas_appws_components"]:
@@ -207,7 +209,7 @@ class ManageSettingsMixin():
                 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)
+                    self.promptForString("Password", "mas_app_settings_customization_archive_password", isPassword=True)  # pragma: allowlist secret
 
     def manageSettingsDemodata(self) -> None:
         self.yesOrNo("Create demo data", "mas_app_settings_demodata")

mas/cli/install/summarizer.py

@@ -202,6 +202,7 @@ class InstallSummarizerMixin():
                 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.printSummary("  + AIP", "Enabled" if "aip=" 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")

mas/cli/templates/facilities-configs.yml.j2

@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: facilities-config
+  namespace: mas-{{ mas_instance_id }}-pipelines
+data:
+  mas_ws_facilities_storage_log_size: |
+    {{ mas_ws_facilities_storage_log_size }}
+  mas_ws_facilities_storage_userfiles_size: |
+    {{ mas_ws_facilities_storage_userfiles_size }}
+  mas_ws_facilities_db_maxconnpoolsize: |
+    {{ mas_ws_facilities_db_maxconnpoolsize }}
+  mas_ws_facilities_dwfagents: |
+{%- if mas_ws_facilities_dwfagents is defined and mas_ws_facilities_dwfagents != '' %}
+{%- for agent in mas_ws_facilities_dwfagents %}
+    - name: "{{ agent.name }}"
+      members:
+{%- for member in agent.members %}
+        - name: "{{ member.name }}"
+          class: "{{ member.class }}"
+{%- endfor %}
+{%- endfor %}
+{%- else %}
+    []
+{% endif %}