mas-cli 13.20.0__py3-none-any.whl → 13.22.0__py3-none-any.whl

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,30 @@ 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.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 +134,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 +155,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-13.20.0.dist-info → mas_cli-13.22.0.dist-info}/METADATA

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

{mas_cli-13.20.0.dist-info → mas_cli-13.22.0.dist-info}/RECORD

@@ -1,23 +1,23 @@
-mas/cli/__init__.py,sha256=nU650ipf5GNjfooInfPrbPFBZXYyfQqhAl3Du6m0Fb0,527
-mas/cli/cli.py,sha256=xNEMKBw0wV9aeC9ZgPwmzwVMIBRFSJVnowv0zgEoUQ0,18175
+mas/cli/__init__.py,sha256=sMsj85AGAJfWcbR3NTTBiivVUqDC_yKZA643Nml5Tk4,527
+mas/cli/cli.py,sha256=oWsMIaR8_wiKLvZY9a2MCPxpUqBDbnCjigZH3AXKKBM,18175
 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/install/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,508
-mas/cli/install/app.py,sha256=dje7_VUpX08t-MEvkmTSa-YB1-0ZWKHse1DRxReASkY,61406
-mas/cli/install/argBuilder.py,sha256=a_D8vvqBj7jH83iCKTb1kj4Py_OJpGIDEgdQ13wpHJw,25078
-mas/cli/install/argParser.py,sha256=Of8zxZ7iIkSEusvTRXteR34kWM-P9QnqOUrVPtaqHGQ,36004
+mas/cli/install/app.py,sha256=VXNMR7PVbQqT21sbtpsASN5jLzhI5ypFEFoRYxTRuHo,61273
+mas/cli/install/argBuilder.py,sha256=G_aNIjWQPMILm-SntgvFyKd4Ywmgfi51ouE075v2fqY,25059
+mas/cli/install/argParser.py,sha256=awQRyiin70wYh1UX6U9PoNN9MWmZ55Z-iZSZq_81PBs,36107
 mas/cli/install/catalogs.py,sha256=jAYpqTuMwhJcsjv-ez7BZY0Y0T-w782G6h2s8x3g2tY,751
-mas/cli/install/params.py,sha256=JB0yqyv4FRb0ZJN56sGQv0TGGgCMCTzdEzY-E_xrnUE,5080
+mas/cli/install/params.py,sha256=YsgMLtToqiMI2g5SeX-q_IIil2uQB5TVpN8_ad4op8s,5061
 mas/cli/install/summarizer.py,sha256=zlMMx7raa_2MCGr6_S5OsEw9skeA1GTDo9Hh4cCEq84,21874
 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/db2Settings.py,sha256=YaCu1mLyRIk_bkkKPlBRv7x4gsh8YTrJ_NDelaIL8HQ,14513
 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/turbonomicSettings.py,sha256=ul4eWf53b1NCzJTFsEPX6DWM23YUlWILYBygplqXYlU,1631
-mas/cli/templates/ibm-mas-tekton.yaml,sha256=Qmq1j7vR1ugcDUUUC2oMi00vma5Fs-fmpeAbHMPeIgw,879516
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=ynZ8Ks15E05Tb4Bq7EWQvjmj5mlmwTvgAjkoy1KgBIo,939884
 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
@@ -97,10 +97,11 @@ mas/cli/update/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,50
 mas/cli/update/app.py,sha256=QeG-hH-QudpeoD7MEFx1e2NATyudnQSgNMLmRJbt480,39096
 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.20.0.data/scripts/mas-cli,sha256=BbibIX0psLEOZdcNaFcO4mJvStD0pKLAe-p-NwVTrBs,3439
-mas_cli-13.20.0.dist-info/METADATA,sha256=RV4jATzdsPIiw54dK6_asRvM422UJcyVUCRRRTmHR1I,2259
-mas_cli-13.20.0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-mas_cli-13.20.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-13.20.0.dist-info/RECORD,,
+mas/cli/upgrade/app.py,sha256=9P6Jy42JwUiErsOk8uIDQXpITuC7JR-1gn7W8w_SWwQ,8883
+mas/cli/upgrade/argParser.py,sha256=5JxAcbwKjFKCKnbucCxg7Xacdhjphb9nRORfsgB1h_0,2196
+mas/cli/upgrade/settings/__init__.py,sha256=QI2CUsj-NXBU1qrPOsOk4MbeWnfNq0UOF3rYYc_1l2A,775
+mas_cli-13.22.0.data/scripts/mas-cli,sha256=BbibIX0psLEOZdcNaFcO4mJvStD0pKLAe-p-NwVTrBs,3439
+mas_cli-13.22.0.dist-info/METADATA,sha256=J-0kA89Gtu1NSNm-hmgmkrSG3A31Q55sULEipbENGuI,2259
+mas_cli-13.22.0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+mas_cli-13.22.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-13.22.0.dist-info/RECORD,,

{mas_cli-13.20.0.dist-info → mas_cli-13.22.0.dist-info}/WHEEL

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