mas-cli 11.12.0__tar.gz → 12.0.0__tar.gz

{mas_cli-11.12.0 → mas_cli-12.0.0}/PKG-INFO

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

mas_cli-12.0.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__ = "12.0.0"  # Python module compatible semver

{mas_cli-11.12.0 → mas_cli-12.0.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 = "11.12.0"
+        self.version = "12.0.0"
         self.h1count = 0
         self.h2count = 0
 
@@ -184,6 +184,21 @@ class BaseApp(PrintMixin, PromptMixin):
             },
         }
 
+        self.licenses = {
+            "8.9.x": " - <u>https://ibm.biz/MAS89-License</u>",
+            "8.10.x": " - <u>https://ibm.biz/MAS810-License</u>",
+            "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",
+        }
+
+        self.upgrade_path = {
+            "9.0.x": "9.1.x-feature",
+            "8.11.x": "9.0.x",
+            "8.10.x": "8.11.x",
+            "8.9.x": "8.10.x",
+        }
+
         self.spinner = {
             "interval": 80,
             "frames": [" ⠋", " ⠙", " ⠹", " ⠸", " ⠼", " ⠴", " ⠦", " ⠧", " ⠇", " ⠏"]

{mas_cli-11.12.0 → mas_cli-12.0.0}/src/mas/cli/install/app.py

@@ -112,19 +112,11 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
 
     @logMethodCall
     def licensePrompt(self):
-        licenses = {
-            "8.9.x": " - <u>https://ibm.biz/MAS89-License</u>",
-            "8.10.x": " - <u>https://ibm.biz/MAS810-License</u>",
-            "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\n - Be aware, this channel subscription is supported for non-production use only.  It allows early access to new features for evaluation is non-production environments. This subscription is offered alongside and in parallel with our normal maintained streams.  When using this subscription, IBM Support will only accept cases for the latest available bundle deployed in a non-production environment. Severity must be either 3 or 4 and cases cannot be escalated.  Please refer to IBM documentation for more details.\n",
-        }
-
         if not self.licenseAccepted:
             self.printH1("License Terms")
             self.printDescription([
                 "To continue with the installation, you must accept the license terms:",
-                licenses[self.getParam('mas_channel')]
+                self.licenses[self.getParam('mas_channel')]
             ])
 
             if self.noConfirm:
@@ -175,62 +167,28 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         self.catalogCp4dVersion = self.chosenCatalog["cpd_product_version_default"]
         self.catalogMongoDbVersion = self.chosenCatalog["mongo_extras_version_default"]
 
-        self.catalogReleases = ["9.0.x", "8.11.x", "8.10.x"]
-
-        self.catalogTable = [
-            {
-                "": "Core",
-                "9.1.x-feature": self.chosenCatalog["mas_core_version"]["9.1.x-feature"],
-                "9.0.x": self.chosenCatalog["mas_core_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_core_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_core_version"]["8.10.x"]
-            },
-            {
-                "": "Manage",
-                "9.1.x-feature": self.chosenCatalog["mas_manage_version"]["9.1.x-feature"],
-                "9.0.x": self.chosenCatalog["mas_manage_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_manage_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_manage_version"]["8.10.x"]
-            },
-            {
-                "": "IoT",
-                "9.0.x": self.chosenCatalog["mas_iot_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_iot_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_iot_version"]["8.10.x"]
-            },
-            {
-                "": "Monitor",
-                "9.0.x": self.chosenCatalog["mas_monitor_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_monitor_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_monitor_version"]["8.10.x"]
-            },
-            {
-                "": "Assist",
-                "9.0.x": self.chosenCatalog["mas_assist_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_assist_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_assist_version"]["8.10.x"]
-            },
-            {
-                "": "Optimizer",
-                "9.1.x-feature": self.chosenCatalog["mas_optimizer_version"]["9.1.x-feature"],
-                "9.0.x": self.chosenCatalog["mas_optimizer_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_optimizer_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_optimizer_version"]["8.10.x"]
-            },
-            {
-                "": "Predict",
-                "9.0.x": self.chosenCatalog["mas_predict_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_predict_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_predict_version"]["8.10.x"]
-            },
-            {
-                "": "Inspection",
-                "9.1.x-feature": self.chosenCatalog["mas_visualinspection_version"]["9.1.x-feature"],
-                "9.0.x": self.chosenCatalog["mas_visualinspection_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_visualinspection_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_visualinspection_version"]["8.10.x"]
-            }
-        ]
+        self.catalogReleases = []
+        self.catalogTable = []
+
+        applications = {
+            "Core": "mas_core_version",
+            "Manage": "mas_manage_version",
+            "IoT": "mas_iot_version",
+            "Monitor": "mas_monitor_version",
+            "Assist": "mas_assist_version",
+            "Optimizer": "mas_optimizer_version",
+            "Predict": "mas_predict_version",
+            "Inspection": "mas_visualinspection_version",
+        }
+
+        # Dynamically fetch the channels from the chosen catalog
+        # based on mas core
+        for channel in self.chosenCatalog["mas_core_version"]:
+            self.catalogReleases.append(channel)
+
+        # Generate catalogTable
+        for application, key in applications.items():
+            self.catalogTable.append({"": application} | self.chosenCatalog[key])
 
         summary = [
             "",

{mas_cli-11.12.0 → mas_cli-12.0.0}/src/mas/cli/install/catalogs.py

@@ -9,13 +9,13 @@
 # *****************************************************************************
 supportedCatalogs = {
     "amd64": [
+        "v9-241205-amd64",
         "v9-241107-amd64",
         "v9-241003-amd64",
         "v9-240827-amd64",
-        "v9-241205-amd64"
     ],
     "s390x": [
+        "v9-241205-s390x",
         "v9-241107-s390x",
-        "v9-241205-s390x"
-    ]
+    ],
 }