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

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

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

{mas_cli-11.11.2 → mas_cli-11.12.0}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "11.11.2"  # Python module compatible semver
+__version__ = "11.12.0"  # Python module compatible semver

{mas_cli-11.11.2 → mas_cli-11.12.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.11.2"
+        self.version = "11.12.0"
         self.h1count = 0
         self.h2count = 0
 
@@ -143,6 +143,16 @@ class BaseApp(PrintMixin, PromptMixin):
         self.architecture = None
 
         self.compatibilityMatrix = {
+            "9.1.x-feature": {
+                "assist": ["9.0.x"],
+                "iot": ["9.0.x"],
+                "manage": ["9.1.x-feature", "9.0.x"],
+                "monitor": ["9.0.x"],
+                "optimizer": ["9.1.x-feature", "9.0.x"],
+                "predict": ["9.0.x"],
+                "visualinspection": ["9.1.x-feature", "9.0.x"],
+                "aibroker": ["9.0.x"],
+            },
             "9.0.x": {
                 "assist": ["9.0.x", "8.8.x"],
                 "iot": ["9.0.x", "8.8.x"],
@@ -151,7 +161,7 @@ class BaseApp(PrintMixin, PromptMixin):
                 "optimizer": ["9.0.x", "8.5.x"],
                 "predict": ["9.0.x", "8.9.x"],
                 "visualinspection": ["9.0.x", "8.9.x"],
-                "aibroker": ["9.0.x"]
+                "aibroker": ["9.0.x"],
             },
             "8.11.x": {
                 "assist": ["8.8.x", "8.7.x"],
@@ -160,7 +170,7 @@ class BaseApp(PrintMixin, PromptMixin):
                 "monitor": ["8.11.x", "8.10.x"],
                 "optimizer": ["8.5.x", "8.4.x"],
                 "predict": ["8.9.x", "8.8.x"],
-                "visualinspection": ["8.9.x", "8.8.x"]
+                "visualinspection": ["8.9.x", "8.8.x"],
             },
             "8.10.x": {
                 "assist": ["8.7.x", "8.6.x"],
@@ -170,8 +180,8 @@ class BaseApp(PrintMixin, PromptMixin):
                 "monitor": ["8.10.x", "8.9.x"],
                 "optimizer": ["8.4.x", "8.3.x"],
                 "predict": ["8.8.x", "8.7.x"],
-                "visualinspection": ["8.8.x", "8.7.x"]
-            }
+                "visualinspection": ["8.8.x", "8.7.x"],
+            },
         }
 
         self.spinner = {

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

@@ -113,10 +113,11 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
     @logMethodCall
     def licensePrompt(self):
         licenses = {
-            "8.9.x": " - <Orange><u>https://ibm.biz/MAS89-License</u></Orange>",
-            "8.10.x": " - <Orange><u>https://ibm.biz/MAS810-License</u></Orange>",
-            "8.11.x": " - <Orange><u>https://ibm.biz/MAS811-License</u></Orange>\n - <Orange><u>https://ibm.biz/MAXIT81-License</u></Orange>",
-            "9.0.x": " - <Orange><u>https://ibm.biz/MAS90-License</u></Orange>\n - <Orange><u>https://ibm.biz/MaximoIT90-License</u></Orange>\n - <Orange><u>https://ibm.biz/MAXArcGIS90-License</u></Orange>"
+            "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:
@@ -179,12 +180,14 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         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"]
@@ -209,6 +212,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             },
             {
                 "": "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"]
@@ -221,6 +225,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             },
             {
                 "": "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"]

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

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

{mas_cli-11.11.2 → mas_cli-11.12.0}/src/mas/cli/install/settings/db2Settings.py

@@ -164,8 +164,8 @@ class Db2SettingsMixin():
                     "Note that the same settings are applied to both the IoT and Manage Db2 instances",
                     "Use existing node labels and taints to control scheduling of the Db2 workload in your cluster",
                     "For more information refer to the Red Hat documentation:",
-                    " - <Orange><u>https://docs.openshift.com/container-platform/4.12/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
-                    " - <Orange><u>https://docs.openshift.com/container-platform/4.12/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u></Orange>"
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.16/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.16/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u></Orange>"
                 ])
 
                 if self.yesOrNo("Configure node affinity"):

{mas_cli-11.11.2 → mas_cli-11.12.0}/src/mas/cli/install/settings/mongodbSettings.py

@@ -22,6 +22,10 @@ class MongoDbSettingsMixin():
         if self.architecture != "s390x" and self.yesOrNo("Create MongoDb cluster using MongoDb Community Edition Operator"):
             if self.showAdvancedOptions:
                 self.promptForString("MongoDb namespace", "mongodb_namespace", default="mongoce")
+            else:
+                # Even though "" works as the default, we use this value to contruct other values so we need to explicitly set it
+                self.setParam("mongodb_namespace", "mongoce")
+
             self.setParam("mongodb_action", "install")
             self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{self.getParam('mongodb_namespace')}.yml")
         else: