mas-cli 15.4.0__py3-none-any.whl → 15.5.0__py3-none-any.whl

mas/cli/update/app.py

@@ -11,6 +11,7 @@
 
 import logging
 import logging.handlers
+from typing import Callable
 from halo import Halo
 from prompt_toolkit import print_formatted_text, HTML
 
@@ -21,7 +22,7 @@ from ..validators import StorageClassValidator
 from .argParser import updateArgParser
 
 from mas.devops.ocp import createNamespace, getStorageClasses, getConsoleURL
-from mas.devops.mas import listMasInstances, getCurrentCatalog
+from mas.devops.mas import listMasInstances, listAiServiceInstances, getCurrentCatalog
 from mas.devops.tekton import preparePipelinesNamespace, installOpenShiftPipelines, updateTektonDefinitions, launchUpdatePipeline
 
 
@@ -94,7 +95,10 @@ class UpdateApp(BaseApp):
         # deprecated MaximoApplicationSuite ImageContentSourcePolicy instead of the new ImageDigestMirrorSet
         self.isAirgap()
         self.reviewCurrentCatalog()
-        self.reviewMASInstance()
+        isMasInstalled = self.reviewMASInstance()
+        isAiServiceInstalled = self.reviewAiServiceInstance()
+        if not isMasInstalled and not isAiServiceInstalled:
+            self.fatalError(["No MAS or AI Service instances were detected on the cluster => nothing to update! See log file for details"])
 
         if self.args.mas_catalog_version is None:
             # Interactive mode
@@ -228,15 +232,23 @@ class UpdateApp(BaseApp):
                 f" <u>{catalogInfo['image']}</u>"
             ])
 
-    def reviewMASInstance(self) -> None:
-        self.printH1("Review MAS Instances")
-        self.printDescription(["The following MAS intances are installed on the target cluster and will be affected by the catalog update:"])
+    def reviewMASInstance(self) -> bool:
+        return self.reviewInstances(listMasInstances, 'MAS', 'Suite.core.mas.ibm.com/v1')
+
+    def reviewAiServiceInstance(self) -> bool:
+        return self.reviewInstances(listAiServiceInstances, 'AI Service', 'AIServiceApp.aiservice.ibm.com/v1')
+
+    def reviewInstances(self, getInstances: Callable, name: str, kind: str) -> bool:
+        self.printH1(f"Review {name} Instances")
         try:
-            suites = listMasInstances(self.dynamicClient)
-            for suite in suites:
-                self.printDescription([f"- <u>{suite['metadata']['name']}</u> v{suite['status']['versions']['reconciled']}"])
+            instances = getInstances(self.dynamicClient)
+            self.printDescription([f"The following {name} instances are installed on the target cluster and will be affected by the catalog update:"])
+            for instance in instances:
+                self.printDescription([f"- <u>{instance['metadata']['name']}</u> v{instance['status']['versions']['reconciled']}"])
+            return True
         except ResourceNotFoundError:
-            self.fatalError("No MAS instances were detected on the cluster (Suite.core.mas.ibm.com/v1 API is not available).  See log file for details")
+            self.printDescription([f"No {name} instances were detected on the cluster ({kind} API is not available)"])
+            return False
 
     def chooseCatalog(self) -> None:
         self.printH1("Select IBM Maximo Operator Catalog Version")

{mas_cli-15.4.0.dist-info → mas_cli-15.5.0.dist-info}/METADATA

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

{mas_cli-15.4.0.dist-info → mas_cli-15.5.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-mas/cli/__init__.py,sha256=j5gTptbFChwynOmhMQP6gl7ZZl9c6aCl8bS0iHbY8Zw,526
-mas/cli/cli.py,sha256=TvAP_69oZVoTuUIW1vMtaH9GFmLqC9GP-XaJHlLgOzU,18932
+mas/cli/__init__.py,sha256=y8o8bkmTCBmPQkRGRoZX7w2hYxXB6lXr_4c9U5smkgw,526
+mas/cli/cli.py,sha256=qs5ug_r6CoFXF5iZ20mfzHrr0PlfiDBbZrRkQDr71ZY,18932
 mas/cli/displayMixins.py,sha256=e3lAx1DIOwsriDcNI0M2JyP1jeLOZKvId6sPrvWLyqs,5984
 mas/cli/gencfg.py,sha256=kgbYihOcqGADK8XnrfcEoBawaY1qSGKuVNW1unACOnU,4433
 mas/cli/validators.py,sha256=YBxkKOHO0d-EK61nUflVOd0-Mxmjuq_nbPYWyKD0VKc,5844
@@ -24,7 +24,7 @@ mas/cli/install/settings/manageSettings.py,sha256=796r5Gyub07cPn8q65kh_h-KjFRVCH
 mas/cli/install/settings/mongodbSettings.py,sha256=aZdQHpeMwLVznrJWAkJsZu2Ok9t4Dkra2RGa_uKJHaY,2604
 mas/cli/install/settings/turbonomicSettings.py,sha256=ul4eWf53b1NCzJTFsEPX6DWM23YUlWILYBygplqXYlU,1631
 mas/cli/templates/facilities-configs.yml.j2,sha256=Er4UwxUl1Y3rtjIPMExVM8EXNcbesMusgLcRV050B1s,774
-mas/cli/templates/ibm-mas-tekton.yaml,sha256=1R8k16JhOMsRNAXrfGKVgQ-zsJ4W5IT1EyQmyj56hkM,1563093
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=jypOeaLxOIy-jlGqgmhn9BChTgKEVZs4JT71Hezl7l8,1563095
 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
@@ -101,14 +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=wEJx7eyHlhM70uoa8iccKAF7T2MHQ33laxQ40Y-vziE,39559
+mas/cli/update/app.py,sha256=xRodxuqcd840w952MDseoIptnbNoXV_9nK957AnEYAs,40264
 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=ZaT8tGrFfIsZM2dkvoYBy89EiqQ0ZKgEfhbMYdf0UEc,8873
 mas/cli/upgrade/argParser.py,sha256=5JxAcbwKjFKCKnbucCxg7Xacdhjphb9nRORfsgB1h_0,2196
 mas/cli/upgrade/settings/__init__.py,sha256=QI2CUsj-NXBU1qrPOsOk4MbeWnfNq0UOF3rYYc_1l2A,775
-mas_cli-15.4.0.data/scripts/mas-cli,sha256=ijL4Ecg_2fRtdrQ8Mk28qsi6o3O6KRIAUM8BUry5cPs,3621
-mas_cli-15.4.0.dist-info/METADATA,sha256=TxxsdJ4tBElD35MxIB5th-TXp2dPOlrG00M7Jn-P6_I,2258
-mas_cli-15.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mas_cli-15.4.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-15.4.0.dist-info/RECORD,,
+mas_cli-15.5.0.data/scripts/mas-cli,sha256=ijL4Ecg_2fRtdrQ8Mk28qsi6o3O6KRIAUM8BUry5cPs,3621
+mas_cli-15.5.0.dist-info/METADATA,sha256=Cz1o-cdG885XeA5ZQcZuaZrrclN6UDP0nRqZHtP47c0,2258
+mas_cli-15.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mas_cli-15.5.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-15.5.0.dist-info/RECORD,,