mas-cli 13.16.0__py3-none-any.whl → 13.17.2__py3-none-any.whl

mas/cli/update/app.py

@@ -242,13 +242,13 @@ class UpdateApp(BaseApp):
         self.printH1("Select IBM Maximo Operator Catalog Version")
         self.printDescription([
             "Select MAS Catalog",
-            "  1) Apr 03 2025 Update (MAS 9.0.10, 8.11.21, & 8.10.24)",
-            "  2) Mar 06 2025 Update (MAS 9.0.9, 8.11.20, & 8.10.23)",
-            "  3) Feb 06 2025 Update (MAS 9.0.8, 8.11.19, & 8.10.22)",
+            "  1) Jun 05 2025 Update (MAS 9.1.0, 9.0.12, 8.11.21, & 8.10.26)",
+            "  2) May 01 2025 Update (MAS 9.0.11, 8.11.22, & 8.10.25)",
+            "  3) Apr 03 2025 Update (MAS 9.0.10, 8.11.21, & 8.10.24)",
         ])
 
         catalogOptions = [
-            "v9-250403-amd64", "v9-250306-amd64", "v9-250206-amd64",
+            "v9-250624-amd64", "v9-250501-amd64", "v9-250403-amd64",
         ]
         self.promptForListSelect("Select catalog version", catalogOptions, "mas_catalog_version", default=1)
 
@@ -362,6 +362,8 @@ class UpdateApp(BaseApp):
                         "v9-250206-amd64": "7.0.12",
                         "v9-250306-amd64": "7.0.12",
                         "v9-250403-amd64": "7.0.12",
+                        "v9-250501-amd64": "7.0.12",
+                        "v9-250624-amd64": "7.0.12",
                     }
                     catalogVersion = self.getParam('mas_catalog_version')
                     if catalogVersion in mongoVersions:
@@ -375,6 +377,7 @@ class UpdateApp(BaseApp):
                     currentMongoVersionMajor = currentMongoVersion.split(".")[0]
 
                     if targetMongoVersionMajor > currentMongoVersionMajor:
+                        self.setParam("mongodb_action", "install")
                         # Let users know that Mongo will be upgraded if existing MongoDb major.minor version
                         # is lower than the target major version
                         # We don't show this message for normal updates, e.g. 5.0.1 to 5.0.2
@@ -399,7 +402,7 @@ class UpdateApp(BaseApp):
                         self.showMongoDependencyUpdateNotice(currentMongoVersion, targetMongoVersion)
                         self.fatalError(f"Existing MongoDB Community Edition installation at version {currentMongoVersion} cannot be downgraded to version {targetMongoVersion}")
                     else:
-                        h.stop_and_persist(symbol=self.successIcon, text=f"MongoDb CE is aleady installed at version {targetMongoVersion}")
+                        h.stop_and_persist(symbol=self.successIcon, text=f"MongoDb CE is already installed at version {targetMongoVersion}")
                 else:
                     # There's no MongoDb instance installed in the cluster, so nothing to do
                     h.stop_and_persist(symbol=self.successIcon, text="No MongoDb CE instances found")
@@ -494,7 +497,9 @@ class UpdateApp(BaseApp):
             "v9-250109-amd64": "5.0.0",
             "v9-250206-amd64": "5.0.0",
             "v9-250306-amd64": "5.0.0",
-            "v9-250403-amd64": "5.0.0"
+            "v9-250403-amd64": "5.0.0",
+            "v9-250501-amd64": "5.0.0",
+            "v9-250624-amd64": "5.1.3",
         }
 
         with Halo(text='Checking for IBM Cloud Pak for Data', spinner=self.spinner) as h:

mas/cli/upgrade/app.py

@@ -20,15 +20,16 @@ from halo import Halo
 from ..cli import BaseApp
 from ..validators import InstanceIDValidator
 from .argParser import upgradeArgParser
+from .settings import UpgradeSettingsMixin
 
 from mas.devops.ocp import createNamespace
-from mas.devops.mas import listMasInstances, getMasChannel
+from mas.devops.mas import listMasInstances, getMasChannel, getWorkspaceId, verifyAppInstance
 from mas.devops.tekton import installOpenShiftPipelines, updateTektonDefinitions, launchUpgradePipeline
 
 logger = logging.getLogger(__name__)
 
 
-class UpgradeApp(BaseApp):
+class UpgradeApp(BaseApp, UpgradeSettingsMixin):
     def upgrade(self, argv):
         """
         Upgrade MAS instance
@@ -38,6 +39,7 @@ class UpgradeApp(BaseApp):
         self.noConfirm = args.no_confirm
         self.skipPreCheck = args.skip_pre_check
         self.licenseAccepted = args.accept_license
+        self.devMode = args.dev_mode
 
         if instanceId is None:
             self.printH1("Set Target OpenShift Cluster")
@@ -45,6 +47,8 @@ class UpgradeApp(BaseApp):
             self.connect()
         else:
             logger.debug("MAS instance ID is set, so we assume already connected to the desired OCP")
+            # Need to lookup target architecture because configDb2 will try to access self.architecture
+            self.lookupTargetArchitecture()
 
         if self.dynamicClient is None:
             print_formatted_text(HTML("<Red>Error: The Kubernetes dynamic Client is not available.  See log file for details</Red>"))
@@ -71,16 +75,21 @@ class UpgradeApp(BaseApp):
 
         currentChannel = getMasChannel(self.dynamicClient, instanceId)
         if currentChannel is not None:
-            if currentChannel not in self.upgrade_path:
-                self.fatalError(f"No upgrade available, {instanceId} is are already on the latest release {currentChannel}")
-            nextChannel = self.upgrade_path[currentChannel]
+            if self.devMode:
+                # This is mainly used for the scenario where Manage Foundation would be installed, because core-upgrade does not use the value of nextChannel,
+                # it uses a compatibility_matrix object in ansible-devops to determine the next channel, so nextChannel is only informative for core upgrade purposes
+                nextChannel = prompt(HTML('<Yellow>Custom channel</Yellow> '))
+            else:
+                if currentChannel not in self.upgrade_path:
+                    self.fatalError(f"No upgrade available, {instanceId} is are already on the latest release {currentChannel}")
+                nextChannel = self.upgrade_path[currentChannel]
         else:
             # We still allow the upgrade to proceed even though we can't detect the MAS instance.  The upgrade may be being
             # queued up to run after install for instance
             currentChannel = "Unknown"
             nextChannel = "Unknown"
 
-        if not self.licenseAccepted:
+        if not self.licenseAccepted and not self.devMode:
             self.printH1("License Terms")
             self.printDescription([
                 "To continue with the upgrade, you must accept the license terms:",
@@ -93,6 +102,31 @@ class UpgradeApp(BaseApp):
                 if not self.yesOrNo("Do you accept the license terms"):
                     exit(1)
 
+        # The only scenario where Manage Foundation needs to be installed during an upgrade is from 9.0.x to 9.1.x (if Manage was not already installed in 9.0.x).
+        self.setParam("should_install_manage_foundation", "false")
+        if nextChannel.startswith("9.1") and not verifyAppInstance(self.dynamicClient, instanceId, "manage"):
+            self.manageAppName = "Manage foundation"
+            self.showAdvancedOptions = False
+            self.installIoT = False
+            self.installFacilities = False
+            self.installManage = True
+            self.isManageFoundation = True
+            self.printDescription([f"{self.manageAppName} installs the following capabilities: User, Security groups, Application configurator and Mobile configurator."])
+            self.printH1("Configure IBM Container Registry")
+            self.promptForString("IBM entitlement key", "ibm_entitlement_key", isPassword=True)
+            if self.devMode:
+                self.promptForString("Artifactory username", "artifactory_username")
+                self.promptForString("Artifactory token", "artifactory_token", isPassword=True)
+            self.setParam("should_install_manage_foundation", "true")
+            self.setParam("is_full_manage", "false")
+            self.setParam("mas_appws_components", "")
+            self.setParam("mas_app_settings_aio_flag", "false")
+            self.setParam("mas_app_channel_manage", nextChannel)
+            self.setParam("mas_workspace_id", getWorkspaceId(self.dynamicClient, instanceId))
+            # It has been decided that we don't need to ask for any specific Manage Settings
+            # self.manageSettings()
+            self.configDb2(silentMode=True)
+
         self.printH1("Review Settings")
         print_formatted_text(HTML(f"<LightSlateGrey>Instance ID ..................... {instanceId}</LightSlateGrey>"))
         print_formatted_text(HTML(f"<LightSlateGrey>Current MAS Channel ............. {currentChannel}</LightSlateGrey>"))
@@ -101,7 +135,7 @@ class UpgradeApp(BaseApp):
 
         if not self.noConfirm:
             print()
-            continueWithUpgrade = self.yesOrNo("Proceed with these settings?")
+            continueWithUpgrade = self.yesOrNo("Proceed with these settings")
 
         if self.noConfirm or continueWithUpgrade:
             self.createTektonFileWithDigest()
@@ -122,7 +156,7 @@ class UpgradeApp(BaseApp):
                 h.stop_and_persist(symbol=self.successIcon, text=f"Latest Tekton definitions are installed (v{self.version})")
 
             with Halo(text='Submitting PipelineRun for {instanceId} upgrade', spinner=self.spinner) as h:
-                pipelineURL = launchUpgradePipeline(self.dynamicClient, instanceId, self.skipPreCheck)
+                pipelineURL = launchUpgradePipeline(self.dynamicClient, instanceId, self.skipPreCheck, params=self.params)
                 if pipelineURL is not None:
                     h.stop_and_persist(symbol=self.successIcon, text=f"PipelineRun for {instanceId} upgrade submitted")
                     print_formatted_text(HTML(f"\nView progress:\n  <Cyan><u>{pipelineURL}</u></Cyan>\n"))

mas/cli/upgrade/argParser.py

@@ -53,6 +53,13 @@ otherArgGroup.add_argument(
     default=False,
     help="Accept all license terms without prompting"
 )
+otherArgGroup.add_argument(
+    "--dev-mode",
+    required=False,
+    action="store_true",
+    default=False,
+    help="Configure upgrade for development mode",
+)
 otherArgGroup.add_argument(
     '-h', "--help",
     action='help',

mas/cli/upgrade/settings/__init__.py

@@ -0,0 +1,19 @@
+# *****************************************************************************
+# Copyright (c) 2025 IBM Corporation and other Contributors.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# *****************************************************************************
+
+from ...install.settings.db2Settings import Db2SettingsMixin
+from ...install.settings.manageSettings import ManageSettingsMixin
+
+
+class UpgradeSettingsMixin(Db2SettingsMixin, ManageSettingsMixin):
+    """
+    This class collects all the Mixins providing interactive prompts for mas-upgrade
+    """
+    pass

mas/cli/validators.py

@@ -10,6 +10,7 @@
 
 from re import match
 from os import path
+from json import loads, JSONDecodeError
 
 # Use of the openshift client rather than the kubernetes client allows us access to "apply"
 from openshift import dynamic
@@ -136,3 +137,15 @@ class OptimizerInstallPlanValidator(Validator):
         response = document.text
         if response not in ["full", "limited"]:
             raise ValidationError(message='Enter a valid response: full, limited', cursor_position=len(response))
+
+
+class JsonValidator(Validator):
+    def validate(self, document):
+        """
+        Validate that a response is a valid JSON
+        """
+        inputJson = document.text
+        try:
+            loads(inputJson)
+        except JSONDecodeError:
+            raise (ValidationError(message='Enter a valid JSON', cursor_position=len(inputJson)))

{mas_cli-13.16.0.data → mas_cli-13.17.2.data}/scripts/mas-cli

@@ -15,6 +15,7 @@ from sys import argv
 
 from mas.cli import __version__ as VERSION
 from mas.cli.install.app import InstallApp
+from mas.cli.aiservice.install.app import AiServiceInstallApp
 from mas.cli.update.app import UpdateApp
 from mas.cli.upgrade.app import UpgradeApp
 from mas.cli.uninstall.app import UninstallApp
@@ -54,6 +55,9 @@ if __name__ == '__main__':
         if function == "install":
             app = InstallApp()
             app.install(argv[2:])
+        elif function == "aiservice-install":
+            app = AiServiceInstallApp()
+            app.install(argv[2:])
         elif function == "uninstall":
             app = UninstallApp()
             app.uninstall(argv[2:])

{mas_cli-13.16.0.dist-info → mas_cli-13.17.2.dist-info}/METADATA

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

{mas_cli-13.16.0.dist-info → mas_cli-13.17.2.dist-info}/RECORD

@@ -1,23 +1,30 @@
-mas/cli/__init__.py,sha256=9g6s4A7Nu9c-_4qU7kt_Zs7VAWqO8w9LPcwKijOesqE,527
-mas/cli/cli.py,sha256=wc6ZAADsbDLwt24lOjeKW-2wzRTWx_4yZag92ohZmfQ,18175
+mas/cli/__init__.py,sha256=MwCsrvfWOPI1baw1rAEjYTFTvENdUJeQKDaU_mjBra8,527
+mas/cli/cli.py,sha256=3EjnBhknIrxEdlxw9wRnte_bGLKPkjQKhn8oAhYdYgg,18933
 mas/cli/displayMixins.py,sha256=e3lAx1DIOwsriDcNI0M2JyP1jeLOZKvId6sPrvWLyqs,5984
-mas/cli/gencfg.py,sha256=p38Ss_ooiNHOZTJT8l0YxDaEaPwD4ZXgxEbW-S9YLNY,3311
-mas/cli/validators.py,sha256=vi1pFA8QtqMhqtGk1NlkkNDUrlFCi53kS5wJqFGDgOU,5108
+mas/cli/gencfg.py,sha256=kgbYihOcqGADK8XnrfcEoBawaY1qSGKuVNW1unACOnU,4433
+mas/cli/validators.py,sha256=2mLqBfoFU4D3A84ma9namjpnPKR3a0XySSGXa_b7pWg,5495
+mas/cli/aiservice/install/__init__.py,sha256=Af-TjB2oIy3bM-Rt3YNeJ_2ndsZZU7azqFkT5um7XQY,515
+mas/cli/aiservice/install/app.py,sha256=zK9K4wx4kADrCQMeIVaDWDZ46_8h3o1-_hbEDH6rZt0,41423
+mas/cli/aiservice/install/argBuilder.py,sha256=gavbxaLPfYVXwjjTs6o-dpP-_0YrL1Kg8XIxAjWT5oU,15584
+mas/cli/aiservice/install/argParser.py,sha256=ilwn58CoZxUs54guscEiFD-loTB2iUgL4w18kz3MqA4,21441
+mas/cli/aiservice/install/params.py,sha256=923Q-T-3VJqr7QZCvFUVu8syKVnMfy604al7xk9UtNY,3491
+mas/cli/aiservice/install/summarizer.py,sha256=E7bxTnOz6wSgce_KBq2AmQSLpWeMwSjWhED-2gEtTnY,11405
 mas/cli/install/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,508
-mas/cli/install/app.py,sha256=cKS1AbzOB-d1yDAsv_ypMaQDOMTE81TaCTCgjWEyRYo,61315
-mas/cli/install/argBuilder.py,sha256=NKVk7ADbN7SRzJVvLlRKUiJQfDc0xWbhFIwOfAdYRSs,24977
-mas/cli/install/argParser.py,sha256=59Wa3ch2IsuwcJiibgkttCX_0WTtFOl30l0nznbL9dQ,35632
-mas/cli/install/catalogs.py,sha256=4Mgv_nUHuT5lwoPbiJdkn58_k1RvGxmlueJLMrnJNak,751
-mas/cli/install/params.py,sha256=i4btI6qDQ9QBjojsZcJj4A5k1qsguMvdfDBerj52YWc,5050
-mas/cli/install/summarizer.py,sha256=XUrhivOBNNb_rqbdhIofTaBznKgfkH--7i-GPQlx-fU,21777
+mas/cli/install/app.py,sha256=Op2reTxi9okJF0xUM04InADWtEg-d20mhc3sNY7zHtI,69019
+mas/cli/install/argBuilder.py,sha256=v_rnUYnmY4q4xw8HQJ2L07NtA84ZZcJLpL9jVvR-Kb4,28380
+mas/cli/install/argParser.py,sha256=PjqadJxQKaIryld3YuwmN_VuSoHJBILwLRWbnCfOtlM,35161
+mas/cli/install/catalogs.py,sha256=p9WFQSA6vcQNiOrlAGCmr5e5IwHJTL0D9QU-e1wco6E,804
+mas/cli/install/params.py,sha256=vzaqivQ7odTxI45wZmrelA73cnaPu4fomBpDNwhYp40,5650
+mas/cli/install/summarizer.py,sha256=7uBwOWWT9Zxhwbl3chZvC8a3n_qt8IVUU-6ZkGfIJAc,22045
 mas/cli/install/settings/__init__.py,sha256=RdyBSh-rM0wkuvILVzJ1gxjOtLuQ1mF6QbEL0MyiKIY,1034
-mas/cli/install/settings/additionalConfigs.py,sha256=u9DTwGZkPLIGfbNrz6yXsBi39EZgk2bwJuDUrNm_Nio,10008
-mas/cli/install/settings/db2Settings.py,sha256=-RTejDTgvnA-bbEnPWXO4imjy0IMfAlW6J71UyNUsZc,13278
+mas/cli/install/settings/additionalConfigs.py,sha256=hFN7OIiPmmAoo8h_5JiMLtW9r30zK1mMKuPqPpFf1mc,10187
+mas/cli/install/settings/db2Settings.py,sha256=zFw1wiZTGFLdUsQUKY0l5dWne4ZXQhKuksSO0Q_86AM,16825
 mas/cli/install/settings/kafkaSettings.py,sha256=r1uK-IApqB9IQiSNt_8sP0wa4FPJcXU_qnadhElEOuI,7241
-mas/cli/install/settings/manageSettings.py,sha256=whoAT3B-qQjLD6SaS_9OEmmIvbSXbcI9m-wCDyu4alI,17853
-mas/cli/install/settings/mongodbSettings.py,sha256=UVt8vMLNpgyewlcymSystIhICnHsd0uoM9qpgezVjGg,2567
+mas/cli/install/settings/manageSettings.py,sha256=TZIdAY_xUc751i-Vs6cXhVI3ul4MCnLdtpP9khLZpeI,16109
+mas/cli/install/settings/mongodbSettings.py,sha256=aZdQHpeMwLVznrJWAkJsZu2Ok9t4Dkra2RGa_uKJHaY,2604
 mas/cli/install/settings/turbonomicSettings.py,sha256=ul4eWf53b1NCzJTFsEPX6DWM23YUlWILYBygplqXYlU,1631
-mas/cli/templates/ibm-mas-tekton.yaml,sha256=qVMypPiF2hH9ygpZZcRWcrU5wRE7kpZ8Qb3tXC9qZSg,877610
+mas/cli/templates/facilities-configs.yml.j2,sha256=Er4UwxUl1Y3rtjIPMExVM8EXNcbesMusgLcRV050B1s,774
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=Gs_ckPyzMFY1ezX7vKb_klbsk4V_p1yZCmOCLJVG9ug,1108213
 mas/cli/templates/jdbccfg.yml.j2,sha256=cANbwkUkKEPQp-P3_BB_Llbt94457Ciagah2hOdySIM,1644
 mas/cli/templates/suite_mongocfg.yml.j2,sha256=WrgJUfGyvfaRIHjY5VR_zLZ5irTpV5khKNq76ejIxKU,1606
 mas/cli/templates/pod-templates/best-effort/ibm-data-dictionary-assetdatadictionary.yml,sha256=8VG_FDFcEjWNaAOZTcS58Pe0tWOXC10SJLloNqzEMC8,757
@@ -94,13 +101,14 @@ mas/cli/uninstall/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc
 mas/cli/uninstall/app.py,sha256=uPJy3z-1Yt66MSFdZz1Qh8MjA97ZrQmjSgTx-Gqua9I,10047
 mas/cli/uninstall/argParser.py,sha256=VVG4myUvFOtg98L6HAzpgGg7s5c-vub_UMZPGuNQko4,3452
 mas/cli/update/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,508
-mas/cli/update/app.py,sha256=ts6VLgDXz8pB17LbdoEl4y9i19IcBfb2ndYp7X9SIE0,39001
+mas/cli/update/app.py,sha256=tp8bGy-vJMch1HOFgGNlntqKkYD1Tyozjq2Kx_FH7Z8,39265
 mas/cli/update/argParser.py,sha256=oOIXzB_rsI2p3og_5X5SFt_g7LURyEdLxZeiGCKq1nU,4711
 mas/cli/upgrade/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,508
-mas/cli/upgrade/app.py,sha256=EuEZayc0nw9kA6Hz8M9Mv7uk0hgmspJSZCYhNEfCECk,6428
-mas/cli/upgrade/argParser.py,sha256=pqzNDSHy6l13JunHWQLyOI-NFnDGDoVJ_HM07FLYJSc,2033
-mas_cli-13.16.0.data/scripts/mas-cli,sha256=BbibIX0psLEOZdcNaFcO4mJvStD0pKLAe-p-NwVTrBs,3439
-mas_cli-13.16.0.dist-info/METADATA,sha256=yBgVDvDeOg7EoJqFmvKkQ-3pcv9Y4LSHxK2Xxm0C0lc,2259
-mas_cli-13.16.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-mas_cli-13.16.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-13.16.0.dist-info/RECORD,,
+mas/cli/upgrade/app.py,sha256=3Z7oVrQGJPrV5dZjXZuBGT78vODPDLXnHnfD27pxNDs,8926
+mas/cli/upgrade/argParser.py,sha256=5JxAcbwKjFKCKnbucCxg7Xacdhjphb9nRORfsgB1h_0,2196
+mas/cli/upgrade/settings/__init__.py,sha256=QI2CUsj-NXBU1qrPOsOk4MbeWnfNq0UOF3rYYc_1l2A,775
+mas_cli-13.17.2.data/scripts/mas-cli,sha256=ijL4Ecg_2fRtdrQ8Mk28qsi6o3O6KRIAUM8BUry5cPs,3621
+mas_cli-13.17.2.dist-info/METADATA,sha256=qhUNCOb87Mg5BNAfVoX2SRXIziMWSToPeNyj_G3CSsE,2259
+mas_cli-13.17.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mas_cli-13.17.2.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-13.17.2.dist-info/RECORD,,

{mas_cli-13.16.0.dist-info → mas_cli-13.17.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any