mas-cli 15.1.12__tar.gz → 15.2.0__tar.gz

{mas_cli-15.1.12 → mas_cli-15.2.0}/PKG-INFO

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

mas_cli-15.2.0/src/mas/cli/__init__.py

@@ -0,0 +1,11 @@
+# *****************************************************************************
+# 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
+#
+# *****************************************************************************
+
+__version__ = "15.2.0"  # Python module compatible semver

{mas_cli-15.1.12 → mas_cli-15.2.0}/src/mas/cli/aiservice/install/app.py

@@ -10,18 +10,17 @@
 # *****************************************************************************
 
 import logging
-from sys import exit
-from os import path, getenv
 import re
 import calendar
 
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+from sys import exit
+from os import path, getenv
 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
-
 from halo import Halo
 
 from ...cli import BaseApp
@@ -43,7 +42,8 @@ from ...install.settings.additionalConfigs import AdditionalConfigsMixin
 
 from mas.cli.validators import (
     InstanceIDFormatValidator,
-    StorageClassValidator
+    StorageClassValidator,
+    BucketPrefixValidator
 )
 
 from mas.devops.ocp import createNamespace, getStorageClasses
@@ -80,42 +80,29 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         self.catalogDigest = self.chosenCatalog["catalog_digest"]
         self.catalogMongoDbVersion = self.chosenCatalog["mongo_extras_version_default"]
         applications = {
-            "Aibroker": "aiservice_version",
+            "AI Service": "aiservice_version",
         }
 
         self.catalogReleases = {}
         self.catalogTable = []
 
         # Dynamically fetch the channels from the chosen catalog
-        # based on mas core
-        for channel in self.chosenCatalog["mas_core_version"]:
-            # {"9.1-feature": "9.1.x-feature"}
+        for channel in self.chosenCatalog["aiservice_version"]:
             self.catalogReleases.update({channel.replace('.x', ''): channel})
 
         # Generate catalogTable
         for application, key in applications.items():
-            # Add 9.1-feature channel based off 9.0 to those apps that have not onboarded yet
             tempChosenCatalog = self.chosenCatalog[key].copy()
             self.catalogTable.append({"": application} | {key.replace(".x", ""): value for key, value in sorted(tempChosenCatalog.items(), reverse=True)})
 
-        if self.architecture == "s390x":
-            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(sorted(self.catalogReleases, reverse=True))}",
-                f"MongoDb:               {self.catalogMongoDbVersion}",
-            ]
-        else:
-            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(sorted(self.catalogReleases, reverse=True))}",
-                f"MongoDb:               {self.catalogMongoDbVersion}",
-            ]
+        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"AI Service Releases:   {', '.join(sorted(self.catalogReleases, reverse=True))}",
+            f"MongoDb:               {self.catalogMongoDbVersion}",
+        ]
 
         return summary
 
@@ -204,19 +191,13 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
 
             elif key == "install_minio_aiservice":
                 incompatibleWithMinioInstall = [
-                    # "aiservice_s3_provider",
                     "aiservice_s3_accesskey",
                     "aiservice_s3_secretkey",
                     "aiservice_s3_host",
                     "aiservice_s3_port",
                     "aiservice_s3_ssl",
                     "aiservice_s3_bucket_prefix",
-                    # "aiservice_s3_endpoint_url",
-                    "aiservice_s3_region",
-                    # "aiservice_tenant_s3_access_key",
-                    # "aiservice_tenant_s3_secret_key",
-                    # "aiservice_tenant_s3_endpoint_url",
-                    # "aiservice_tenant_s3_region"
+                    "aiservice_s3_region"
                 ]
                 if value is None:
                     for uKey in incompatibleWithMinioInstall:
@@ -241,25 +222,25 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
                     self.setParam("aiservice_s3_host", "minio-service.minio.svc.cluster.local")
                     self.setParam("aiservice_s3_port", "9000")
                     self.setParam("aiservice_s3_ssl", "false")
-                    # self.setParam("aiservice_s3_endpoint_url", "http://minio-service.minio.svc.cluster.local:9000")
                     self.setParam("aiservice_s3_region", "none")
-                    self.setParam("aiservice_s3_bucket_prefix", "aiservice")
-
-                    # self.setParam("aiservice_tenant_s3_access_key", self.args.minio_root_user)
-                    # self.setParam("aiservice_tenant_s3_secret_key", self.args.minio_root_password)
-                    # self.setParam("aiservice_tenant_s3_endpoint_url", "http://minio-service.minio.svc.cluster.local:9000")
-                    # self.setParam("aiservice_tenant_s3_region", "none")
+                    self.setParam("aiservice_s3_bucket_prefix", "s3-")
                 else:
                     self.fatalError(f"Unsupported value for --install-minio: {value}")
 
+            elif key == "aiservice_s3_bucket_prefix":
+                if len(value) == 0 or len(value) > 4:
+                    self.fatalError(f"Unsupported value for --s3-bucket-prefix(Must be 1-4 characters long): {value}")
+
             elif key == "non_prod":
                 if not value:
                     self.operationalMode = 1
                     self.setParam("environment_type", "production")
+                    self.setParam("aiservice_odh_model_deployment_type", "raw")
                 else:
                     self.operationalMode = 2
                     self.setParam("mas_annotations", "mas.ibm.com/operationalMode=nonproduction")
                     self.setParam("environment_type", "non-production")
+                    self.setParam("aiservice_odh_model_deployment_type", "serverless")
 
             elif key == "additional_configs":
                 self.localConfigDir = value
@@ -383,14 +364,6 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
             "Note: Maximo AI Service 9.1 includes a limited-use license to watsonx.ai and incurs an additional AppPoint cost"
         ])
 
-        if not self.devMode:
-            self.printDescription([
-                "",
-                "<ForestGreen>Coming Soon!  We are busy putting the finishing touches on Maximo AI Service 9.1 ahead of a re-launch planned for the 28 August 2025 catalog update</ForestGreen>",
-                ""
-            ])
-            exit(1)
-
         # Set image_pull_policy of the CLI in interactive mode
         if args.image_pull_policy and args.image_pull_policy != "":
             self.setParam("image_pull_policy", args.image_pull_policy)
@@ -421,7 +394,14 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         self.isAirgap()
 
         # Configure the installOptions for the appropriate architecture
-        self.catalogOptions = supportedCatalogs[self.architecture]
+        # self.catalogOptions = supportedCatalogs[self.architecture]
+
+        # Once AI Service is supported by all supported catalogs we can remove this
+        # In the meantime we will need to update this as we go
+        self.catalogOptions = []
+        for option in supportedCatalogs[self.architecture]:
+            if option >= "v9-250828-amd64":
+                self.catalogOptions.append(option)
 
         # Basic settings before the user provides any input
         self.configICR()
@@ -546,69 +526,32 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         else:
             # Ask for external storage configuration
             self.printDescription(["Configure your external object storage (S3-compatible) connection details:"])
-            # s3_completer = WordCompleter(["aws", "minio"])
-            # s3_provider = self.promptForString("Storage provider", completer=s3_completer)
-            # self.setParam("aiservice_s3_provider", s3_provider)
             self.promptForString("Storage access key", "aiservice_s3_accesskey")
             self.promptForString("Storage secret key", "aiservice_s3_secretkey", isPassword=True)
             self.promptForString("Storage host", "aiservice_s3_host")
             self.promptForString("Storage port", "aiservice_s3_port")
             self.promptForString("Storage ssl", "aiservice_s3_ssl")
             self.promptForString("Storage region", "aiservice_s3_region")
-            self.promptForString("Storage bucket prefix", "aiservice_s3_bucket_prefix")
+            self.printDescription([
+                "",
+                "Storage bucket prefix restrictions:",
+                " - Must be 1-4 characters long"
+            ])
+            self.promptForString("Storage bucket prefix", "aiservice_s3_bucket_prefix", validator=BucketPrefixValidator())
             self.promptForString("Storage tenants bucket", "aiservice_s3_tenants_bucket")
             self.promptForString("Storage templates bucket", "aiservice_s3_templates_bucket")
 
-        # S3 parameters are now auto-derived from storage configuration
-        # self._deriveS3ParametersFromStorage()
-
     def aiServiceTenantSettings(self) -> None:
         self.printH1("AI Service Tenant Settings")
-        self.promptForString("Tenant entitlement type", "tenant_entitlement_type")
-        self.promptForString("Tenant start date", "tenant_entitlement_start_date")
-        self.promptForString("Tenant end date", "tenant_entitlement_end_date")
-
-    # def _deriveS3ParametersFromStorage(self) -> None:
-    #     """
-    #     Auto-derive S3 and tenant S3 parameters from the aiservice_s3_* parameters.
-    #     This reuses the values provided for kmodel object storage to avoid redundant prompts.
-    #     """
-    #     storage_provider = self.getParam("aiservice_s3_provider")
-    #     storage_host = self.getParam("aiservice_s3_host")
-    #     storage_port = self.getParam("aiservice_s3_port")
-    #     storage_ssl = self.getParam("aiservice_s3_ssl")
-    #     storage_region = self.getParam("aiservice_s3_region")
-    #     storage_bucket_prefix = self.getParam("aiservice_s3_bucket_prefix")
-    #     storage_accesskey = self.getParam("aiservice_s3_accesskey")
-    #     storage_secretkey = self.getParam("aiservice_s3_secretkey")
-
-    #     # Build endpoint URL from storage configuration
-    #     protocol = "https" if storage_ssl == "true" else "http"
-
-    #     if storage_provider == "minio":
-    #         endpoint_url = f"{protocol}://{storage_host}:{storage_port}"
-    #     elif storage_provider == "aws":
-    #         # For AWS S3, construct proper endpoint
-    #         if storage_region and storage_region != "none":
-    #             endpoint_url = f"{protocol}://s3.{storage_region}.amazonaws.com"
-    #         else:
-    #             endpoint_url = f"{protocol}://s3.amazonaws.com"
-    #     else:
-    #         # For other providers, construct basic endpoint
-    #         endpoint_url = f"{protocol}://{storage_host}:{storage_port}" if storage_port else f"{protocol}://{storage_host}"
-
-    #     # Set S3 parameters (reusing storage configuration)
-    #     if endpoint_url:
-    #         self.setParam("aiservice_s3_endpoint_url", endpoint_url)
-    #     self.setParam("aiservice_s3_region", storage_region if storage_region else "none")
-
-    #     # Set tenant S3 parameters (reusing same storage configuration)
-    #     self.setParam("aiservice_tenant_s3_bucket_prefix", "tenant")  # Default tenant prefix
-    #     self.setParam("aiservice_tenant_s3_access_key", storage_accesskey)
-    #     self.setParam("aiservice_tenant_s3_secret_key", storage_secretkey)
-    #     if endpoint_url:
-    #         self.setParam("aiservice_tenant_s3_endpoint_url", endpoint_url)
-    #     self.setParam("aiservice_tenant_s3_region", storage_region if storage_region else "none")
+        self.printDescription([
+            "AI Service will reserve AppPoints for a fixed period of time based on the values you enter:"
+        ])
+
+        today = datetime.today()
+        oneyear = datetime.today() + relativedelta(years=1)
+        self.setParam("tenant_entitlement_type", "standard")
+        self.setParam("tenant_entitlement_start_date", today.strftime('%Y-%m-%d'))
+        self.promptForString("Entitlement end date (YYYY-MM-DD)", "tenant_entitlement_end_date", default=oneyear.strftime('%Y-%m-%d'))
 
     def _setMinioStorageDefaults(self) -> None:
         """
@@ -622,7 +565,7 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         self.setParam("aiservice_s3_port", "9000")
         self.setParam("aiservice_s3_ssl", "false")
         self.setParam("aiservice_s3_region", "none")
-        self.setParam("aiservice_s3_bucket_prefix", "aiservice")
+        self.setParam("aiservice_s3_bucket_prefix", "s3-")
 
         # Set default bucket names
         self.setParam("aiservice_s3_tenants_bucket", "km-tenants")
@@ -662,7 +605,10 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         ])
         self.promptForString("RSL url", "rsl_url")
         self.promptForString("ORG Id of RSL", "rsl_org_id")
-        self.promptForString("Token for RSL", "rsl_token", isPassword=True)
+        rslToken = self.promptForString("Token for RSL", isPassword=True)
+        if not rslToken.startswith("Bearer "):
+            rslToken = "Bearer " + rslToken
+        self.setParam("rsl_token", rslToken)
         if self.yesOrNo("Does the RSL API use a self-signed certificate?"):
             self.promptForString("RSL CA certificate (PEM format)", "rsl_ca_crt")
 
@@ -734,20 +680,13 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
             self.chosenCatalog = getCatalog(self.getParam("mas_catalog_version"))
             catalogSummary = self.processCatalogChoice()
             self.printDescription(catalogSummary)
-            self.printDescription([
-                "",
-                "Two types of release are available:",
-                " - GA releases of Maximo Application Suite are supported under IBM's standard 3+1+3 support lifecycle policy.",
-                " - 'Feature' releases allow early access to new features for evaluation in non-production environments and are only supported through to the next GA release.",
-                ""
-            ])
-
             print(tabulate(self.catalogTable, headers="keys", tablefmt="simple_grid"))
 
-            releaseCompleter = WordCompleter(sorted(self.catalogReleases, reverse=True))
-            releaseSelection = self.promptForString("Select release", completer=releaseCompleter)
-
-            self.setParam("aiservice_channel", self.catalogReleases[releaseSelection])
+            # There's only one release channel, the user doesn't need to be prompted!!
+            # releaseCompleter = WordCompleter(sorted(self.catalogReleases, reverse=True))
+            # releaseSelection = self.promptForString("Select release", completer=releaseCompleter)
+            # self.setParam("aiservice_channel", self.catalogReleases[releaseSelection])
+            self.setParam("aiservice_channel", "9.1.x")
 
     @logMethodCall
     def validateCatalogSource(self):
@@ -837,7 +776,7 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         self.printH1("Configure AppPoint Licensing")
         self.printDescription(
             [
-                "By default the MAS instance will be configured to use a cluster-shared License, this provides a shared pool of AppPoints available to all MAS instances on the cluster.",
+                "By default the AI Service instance will be configured to use a cluster-shared License, this provides a shared pool of AppPoints available to all MAS &amp; AI Service instances on the cluster.",
                 "",
             ]
         )
@@ -848,9 +787,9 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         if self.showAdvancedOptions:
             self.printDescription(
                 [
-                    "Alternatively you may choose to install using a dedicated license only available to this MAS instance.",
-                    "  1. Install MAS with Cluster-Shared License (AppPoints)",
-                    "  2. Install MAS with Dedicated License (AppPoints)",
+                    "Alternatively you may choose to install using a dedicated license only available to this AI Service instance.",
+                    "  1. Install AI Service with Cluster-Shared License (AppPoints)",
+                    "  2. Install AI Service with Dedicated License (AppPoints)",
                 ]
             )
             self.slsMode = self.promptForInt("SLS Mode", default=1)
@@ -897,5 +836,7 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         self.operationalMode = self.promptForInt("Operational Mode", default=1)
         if self.operationalMode == 1:
             self.setParam("environment_type", "production")
+            self.setParam("aiservice_odh_model_deployment_type", "raw")
         else:
             self.setParam("environment_type", "non-production")
+            self.setParam("aiservice_odh_model_deployment_type", "serverless")

{mas_cli-15.1.12 → mas_cli-15.2.0}/src/mas/cli/aiservice/install/argBuilder.py

@@ -105,8 +105,6 @@ class aiServiceInstallArgBuilderMixin():
 
         # AI Service Advanced Settings
         # -----------------------------------------------------------------------------
-        # if self.getParam('aiservice_s3_provider') != "":
-        #     command += f"  --s3-provider \"{self.getParam('aiservice_s3_provider')}\"{newline}"
         if self.getParam('aiservice_s3_accesskey') != "":
             command += f"  --s3-accesskey \"{self.getParam('aiservice_s3_accesskey')}\"{newline}"
         if self.getParam('aiservice_s3_secretkey') != "":
@@ -126,6 +124,9 @@ class aiServiceInstallArgBuilderMixin():
         if self.getParam('aiservice_s3_templates_bucket') != "":
             command += f"  --s3-templates-bucket \"{self.getParam('aiservice_s3_templates_bucket')}\"{newline}"
 
+        if self.getParam('aiservice_odh_model_deployment_type') != "":
+            command += f"  --odh-model-deployment-type \"{self.getParam('aiservice_odh_model_deployment_type')}\"{newline}"
+
         if self.getParam('aiservice_watsonxai_apikey') != "":
             command += f"  --watsonxai-apikey \"{self.getParam('aiservice_watsonxai_apikey')}\"{newline}"
         if self.getParam('aiservice_watsonxai_url') != "":

{mas_cli-15.1.12 → mas_cli-15.2.0}/src/mas/cli/aiservice/install/argParser.py

@@ -54,13 +54,13 @@ catArgGroup.add_argument(
     help="IBM entitlement key"
 )
 
-# Aibroker Basic Configuration
+# AI Service Basic Configuration
 # -----------------------------------------------------------------------------
-masArgGroup = aiServiceinstallArgParser.add_argument_group("Aibroker Basic Configuration")
+masArgGroup = aiServiceinstallArgParser.add_argument_group("AI Service Basic Configuration")
 masArgGroup.add_argument(
     "-i", "--aiservice-instance-id",
     required=False,
-    help="Aibroker Instance ID"
+    help="AI Service Instance ID"
 )
 
 # MAS Advanced Configuration
@@ -171,21 +171,22 @@ masAppsArgGroup.add_argument(
     help="Subscription channel for Maximo AI Service"
 )
 
-# AI Service
+# ODH
 # -----------------------------------------------------------------------------
-aiServiceArgGroup = aiServiceinstallArgParser.add_argument_group("Maximo AI Service")
+odhArgGroup = aiServiceinstallArgParser.add_argument_group("Opendatahub")
+
+odhArgGroup.add_argument(
+    "--odh-model-deployment-type",
+    dest="aiservice_odh_model_deployment_type",
+    required=False,
+    default="raw",
+    help="Model deployment type for ODH"
+)
 
 # S3 - General
 # -----------------------------------------------------------------------------
 s3ArgGroup = aiServiceinstallArgParser.add_argument_group("S3 Storage")
 
-# s3ArgGroup.add_argument(
-#     "--s3-provider",
-#     dest="aiservice_s3_provider",
-#     required=False,
-#     help="S3 storage provider type (e.g., minio, aws)"
-# )
-
 # S3 - Minio
 # -----------------------------------------------------------------------------
 s3ArgGroup.add_argument(
@@ -304,23 +305,26 @@ watsonxArgGroup.add_argument(
 
 # AI Service
 # -----------------------------------------------------------------------------
+aiServiceArgGroup = aiServiceinstallArgParser.add_argument_group("Maximo AI Service")
+
 aiServiceArgGroup.add_argument(
     "--tenant-entitlement-type",
     dest="tenant_entitlement_type",
     required=False,
-    help="Type of aibroker tenant"
+    default="standard",
+    help="Entitlement type for AI Service tenant"
 )
 aiServiceArgGroup.add_argument(
     "--tenant-entitlement-start-date",
     dest="tenant_entitlement_start_date",
     required=False,
-    help="Start date for Aibroker tenant"
+    help="Start date for AI Service tenant"
 )
 aiServiceArgGroup.add_argument(
     "--tenant-entitlement-end-date",
     dest="tenant_entitlement_end_date",
     required=False,
-    help="End date for Aibroker tenant"
+    help="End date for AI Service tenant"
 )
 aiServiceArgGroup.add_argument(
     "--rsl-url",

{mas_cli-15.1.12 → mas_cli-15.2.0}/src/mas/cli/aiservice/install/params.py

@@ -57,8 +57,9 @@ optionalParams = [
     # Dev Mode
     "artifactory_username",
     "artifactory_token",
+    # ODH
+    "aiservice_odh_model_deployment_type",
     # AI Service
-    # "aiservice_s3_provider",
     "aiservice_s3_accesskey",
     "aiservice_s3_secretkey",
     "aiservice_s3_host",

{mas_cli-15.1.12 → mas_cli-15.2.0}/src/mas/cli/aiservice/install/summarizer.py

@@ -45,36 +45,33 @@ class aiServiceInstallSummarizerMixin():
         self.printH2("AI Service")
         self.printParamSummary("Release", "aiservice_channel")
         self.printParamSummary("Instance ID", "aiservice_instance_id")
-        self.printParamSummary("Environment type", "environment_type")
+        self.printParamSummary("Environment Type", "environment_type")
+
+        self.printH2("AI Service Tenant Entitlement")
+        self.printParamSummary("Entitlement Type", "tenant_entitlement_type")
+        self.printParamSummary("Start Date", "tenant_entitlement_start_date")
+        self.printParamSummary("End Date", "tenant_entitlement_end_date")
 
         self.printH2("S3 Configuration")
         # self.printParamSummary("Storage provider", "aiservice_s3_provider")
         if self.getParam("minio_root_user") is not None and self.getParam("minio_root_user") != "":
-            self.printParamSummary("minio root username", "minio_root_user")
-        print()
-        self.printParamSummary("Storage access key", "aiservice_s3_accesskey")
-        self.printParamSummary("Storage host", "aiservice_s3_host")
-        self.printParamSummary("Storage port", "aiservice_s3_port")
-        self.printParamSummary("Storage ssl", "aiservice_s3_ssl")
-        self.printParamSummary("Storage region", "aiservice_s3_region")
-        self.printParamSummary("S3 bucket prefix", "aiservice_s3_bucket_prefix")
-        self.printParamSummary("Storage tenants bucket", "aiservice_s3_tenants_bucket")
-        self.printParamSummary("Storage templates bucket", "aiservice_s3_templates_bucket")
+            self.printParamSummary("Minio Root Username", "minio_root_user")
         print()
+        self.printParamSummary("Host", "aiservice_s3_host")
+        self.printParamSummary("Port", "aiservice_s3_port")
+        self.printParamSummary("SSL Enabled", "aiservice_s3_ssl")
+        self.printParamSummary("Region", "aiservice_s3_region")
+        self.printParamSummary("Bucket Prefix", "aiservice_s3_bucket_prefix")
+        self.printParamSummary("Templates Bucket Name", "aiservice_s3_templates_bucket")
+        self.printParamSummary("Tenants Bucket Name", "aiservice_s3_tenants_bucket")
 
         self.printH2("IBM WatsonX")
-        self.printParamSummary("Watsonxai machine learning url", "aiservice_watsonxai_url")
-        self.printParamSummary("Watsonxai project id", "aiservice_watsonxai_project_id")
-
-        self.printH2("AI Service Tenant")
-        self.printParamSummary("Tenant entitlement type", "tenant_entitlement_type")
-        self.printParamSummary("Tenant start date", "tenant_entitlement_start_date")
-        self.printParamSummary("Tenant end date", "tenant_entitlement_end_date")
+        self.printParamSummary("URL", "aiservice_watsonxai_url")
+        self.printParamSummary("Project ID", "aiservice_watsonxai_project_id")
 
         self.printH2("RSL")
-        self.printParamSummary("RSL url", "rsl_url")
-        self.printParamSummary("ORG Id of RSL", "rsl_org_id")
-        self.printParamSummary("Token for RSL", "rsl_token")
+        self.printParamSummary("URL", "rsl_url")
+        self.printParamSummary("Organization ID", "rsl_org_id")
 
     def db2Summary(self) -> None:
         self.printH2("IBM Db2 Univeral Operator Configuration")

{mas_cli-15.1.12 → mas_cli-15.2.0}/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 = "15.1.12"
+        self.version = "15.2.0"
         self.h1count = 0
         self.h2count = 0
 

{mas_cli-15.1.12 → mas_cli-15.2.0}/src/mas/cli/install/catalogs.py

@@ -9,18 +9,19 @@
 # *****************************************************************************
 supportedCatalogs = {
     "amd64": [
+        "v9-250828-amd64",
         "v9-250731-amd64",
         "v9-250624-amd64",
         "v9-250501-amd64",
-        "v9-250403-amd64",
     ],
     "s390x": [
+        "v9-250828-s390x",
         "v9-250731-s390x",
         "v9-250624-s390x",
         "v9-250501-s390x",
-        "v9-250403-s390x",
     ],
     "ppc64le": [
+        "v9-250828-ppc64le",
         "v9-250731-ppc64le",
         "v9-250624-ppc64le",
     ],