mas-cli 13.22.1__tar.gz → 13.23.1__tar.gz

{mas_cli-13.22.1 → mas_cli-13.23.1}/PKG-INFO

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

{mas_cli-13.22.1 → mas_cli-13.23.1}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "13.22.1"  # Python module compatible semver
+__version__ = "13.23.1"  # Python module compatible semver

{mas_cli-13.22.1 → mas_cli-13.23.1}/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 = "13.22.1"
+        self.version = "13.23.1"
         self.h1count = 0
         self.h2count = 0
 
@@ -380,7 +380,7 @@ class BaseApp(PrintMixin, PromptMixin):
             self.architecture = nodes[0]["status"]["nodeInfo"]["architecture"]
             logger.debug(f"Target architecture: {self.architecture}")
 
-        if self.architecture not in ["amd64", "s390x"]:
+        if self.architecture not in ["amd64", "s390x", "ppc64le"]:
             self.fatalError(f"Unsupported worker node architecture: {self.architecture}")
 
     @logMethodCall

{mas_cli-13.22.1 → mas_cli-13.23.1}/src/mas/cli/install/app.py

@@ -163,7 +163,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
     def processCatalogChoice(self) -> list:
         self.catalogDigest = self.chosenCatalog["catalog_digest"]
         self.catalogMongoDbVersion = self.chosenCatalog["mongo_extras_version_default"]
-        if self.architecture != "s390x":
+        if self.architecture != "s390x" and self.architecture != "ppc64le":
             self.catalogCp4dVersion = self.chosenCatalog["cpd_product_version_default"]
 
             applications = {
@@ -200,7 +200,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
 
             self.catalogTable.append({"": application} | {key.replace(".x", ""): value for key, value in sorted(tempChosenCatalog.items(), reverse=True)})
 
-        if self.architecture == "s390x":
+        if self.architecture == "s390x" or self.architecture == "ppc64le":
             summary = [
                 "",
                 "<u>Catalog Details</u>",
@@ -326,8 +326,8 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
 
     @logMethodCall
     def configGrafana(self) -> None:
-        if self.architecture == "s390x":
-            # We are not supporting Grafana on s390x at the moment
+        if self.architecture == "s390x" or self.architecture == "ppc64le":
+            # We are not supporting Grafana on s390x /ppc64le at the moment
             self.setParam("grafana_action", "none")
         else:
             try:

{mas_cli-13.22.1 → mas_cli-13.23.1}/src/mas/cli/install/catalogs.py

@@ -20,4 +20,6 @@ supportedCatalogs = {
         "v9-250306-s390x",
         "v9-250206-s390x",
     ],
+    "ppc64le": [
+    ],
 }

{mas_cli-13.22.1 → mas_cli-13.23.1}/src/mas/cli/install/settings/db2Settings.py

@@ -29,12 +29,12 @@ class Db2SettingsMixin():
                 self.setParam("db2_action_manage", "none")
             return
 
-        # For now we are limiting users to bring your own database for Manage on s390x
-        # Eventually we will be able to remove this clause and allow the standard logic to work for both s390x and amd64
-        if self.architecture == "s390x" and self.installManage:
-            # silentMode does not apply for s390x because it requires interaction when selecting local config directory
+        # For now we are limiting users to bring your own database for Manage on s390x & ppc64le
+        # Eventually we will be able to remove this clause and allow the standard logic to work for s390x, ppc64le and amd64
+        if (self.architecture == "s390x" or self.architecture == "ppc64le") and self.installManage:
+            # silentMode does not apply for s390x/ppc64le because it requires interaction when selecting local config directory
             self.printDescription([
-                "Installation of a Db2 instance using the IBM Db2 Universal Operator is not currently supported on s390x, please provide configuration details for the database you wish to use.",
+                "Installation of a Db2 instance using the IBM Db2 Universal Operator is not currently supported on s390x /ppc64le, please provide configuration details for the database you wish to use.",
             ])
             instanceId = self.getParam('mas_instance_id')
             workspaceId = self.getParam("mas_workspace_id")

{mas_cli-13.22.1 → mas_cli-13.23.1}/src/mas/cli/install/settings/manageSettings.py

@@ -63,13 +63,13 @@ class ManageSettingsMixin():
             storageClass = self.getParam("storage_class_rwo")
             accessMode = "ReadWriteOnce"
 
-            self.setParam("mas_app_settings_doclinks_pvc_storage_class", storageClass)
-            self.setParam("mas_app_settings_bim_pvc_storage_class", storageClass)
-            self.setParam("mas_app_settings_jms_queue_pvc_storage_class", storageClass)
+        self.setParam("mas_app_settings_doclinks_pvc_storage_class", storageClass)
+        self.setParam("mas_app_settings_bim_pvc_storage_class", storageClass)
+        self.setParam("mas_app_settings_jms_queue_pvc_storage_class", storageClass)
 
-            self.setParam("mas_app_settings_doclinks_pvc_accessmode", accessMode)
-            self.setParam("mas_app_settings_bim_pvc_accessmode", accessMode)
-            self.setParam("mas_app_settings_jms_queue_pvc_accessmode", accessMode)
+        self.setParam("mas_app_settings_doclinks_pvc_accessmode", accessMode)
+        self.setParam("mas_app_settings_bim_pvc_accessmode", accessMode)
+        self.setParam("mas_app_settings_jms_queue_pvc_accessmode", accessMode)
 
     def manageSettingsComponents(self) -> None:
         # Only ask to install Manage components if this is a full Manage installation

{mas_cli-13.22.1 → mas_cli-13.23.1}/src/mas/cli/install/settings/mongodbSettings.py

@@ -19,7 +19,7 @@ class MongoDbSettingsMixin():
             "The installer can setup mongoce in your OpenShift cluster (available only for amd64) or you may choose to configure MAS to use an existing mongodb"
         ])
 
-        if self.architecture != "s390x" and self.yesOrNo("Create MongoDb cluster using MongoDb Community Edition Operator"):
+        if (self.architecture != "s390x" and self.architecture != "ppc64le") and self.yesOrNo("Create MongoDb cluster using MongoDb Community Edition Operator"):
             if self.showAdvancedOptions:
                 self.promptForString("MongoDb namespace", "mongodb_namespace", default="mongoce")
             else: