mas-cli 19.6.0__tar.gz → 19.7.0__tar.gz

{mas_cli-19.6.0 → mas_cli-19.7.0}/PKG-INFO

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

{mas_cli-19.6.0 → mas_cli-19.7.0}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "19.6.0"  # Python module compatible semver
+__version__ = "19.7.0"  # Python module compatible semver

{mas_cli-19.6.0 → mas_cli-19.7.0}/src/mas/cli/cli.py

@@ -120,7 +120,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version: str = "19.6.0"
+        self.version: str = "19.7.0"
         self.h1count: int = 0
         self.h2count: int = 0
 
@@ -153,6 +153,8 @@ class BaseApp(PrintMixin, PromptMixin):
                 "manage": ["9.2.x-feature", "9.1.x"],
                 "optimizer": ["9.2.x-feature", "9.1.x"],
                 "visualinspection": ["9.2.x-feature", "9.1.x"],
+                "iot": ["9.2.x-feature", "9.1.x"],
+                "monitor": ["9.2.x-feature", "9.1.x"],
             },
             "9.1.x": {
                 "facilities": ["9.1.x"],

{mas_cli-19.6.0 → mas_cli-19.7.0}/src/mas/cli/install/app.py

@@ -846,7 +846,11 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         if self.isSNO():
             self.setParam("mongodb_replicas", "1")
             self.setParam("mongodb_cpu_requests", "500m")
+            self.setParam("redis_replicas", "1")
             self.setParam("mas_app_settings_aio_flag", "false")
+        else:
+            # Multi-node cluster: use 3 replicas for Redis HA
+            self.setParam("redis_replicas", "3")
 
     @logMethodCall
     def configDNSAndCerts(self):
@@ -1718,6 +1722,12 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 if value is not None and value != "":
                     self.setParam(key, value)
                     self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{value}.yml")
+            # Redis
+            elif key == "redis_namespace":
+                if value is not None and value != "":
+                    self.setParam(key, value)
+                    self.setParam("redis_action", "install")
+                    self.setParam("redis_cfg_file", f"/workspace/configs/redis-{value}.yml")
 
             # SLS
             elif key == "license_file":
@@ -1870,6 +1880,14 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         if ((self.getParam("mas_app_channel_predict") is not None and self.getParam("mas_app_channel_predict") != "") and 'health' not in self.getParam("mas_appws_components")):
             self.fatalError("--manage-components must include 'health' component when installing Predict")
 
+        # Configure Redis if Collaborate addon is enabled
+        if self.installManage and "collaborate=" in self.getParam("mas_appws_components"):
+            logger.debug("Collaborate addon detected in mas_appws_components, configuring Redis")
+            self.setParam("redis_action", "install")
+            if self.getParam("redis_namespace") == "":
+                self.setParam("redis_namespace", "redis")
+            self.setParam("redis_cfg_file", f"/workspace/configs/redis-{self.getParam('redis_namespace')}.yml")
+
         # Validate ArcGIS installation requirements in non-interactive mode
         if self.installArcgis:
             hasSpatial = self.installManage and "spatial=" in self.getParam("mas_appws_components")

{mas_cli-19.6.0 → mas_cli-19.7.0}/src/mas/cli/install/argBuilder.py

@@ -180,6 +180,11 @@ class installArgBuilderMixin():
         if self.getParam('mongodb_namespace') != "":
             command += f"  --mongodb-namespace \"{self.getParam('mongodb_namespace')}\"{newline}"
 
+        # Redis Configuration
+        # -----------------------------------------------------------------------------
+        if self.getParam('redis_namespace') != "":
+            command += f"  --redis-namespace \"{self.getParam('redis_namespace')}\"{newline}"
+
         # OCP Configuration
         # -----------------------------------------------------------------------------
         if self.getParam('ocp_ingress_tls_secret_name') != "":

{mas_cli-19.6.0 → mas_cli-19.7.0}/src/mas/cli/install/argParser.py

@@ -423,6 +423,18 @@ mongoArgGroup.add_argument(
     help="Namespace for MongoDB Community Operator"
 )
 
+# Redis Configuration
+# -----------------------------------------------------------------------------
+redisArgGroup = installArgParser.add_argument_group(
+    "Redis",
+    "Configure the namespace for Redis deployment (required for Collaborate addon)."
+)
+redisArgGroup.add_argument(
+    "--redis-namespace",
+    required=False,
+    help="Namespace for Redis deployment (default: redis)"
+)
+
 # OCP Configuration
 # -----------------------------------------------------------------------------
 ocpArgGroup = installArgParser.add_argument_group(

{mas_cli-19.6.0 → mas_cli-19.7.0}/src/mas/cli/install/settings/__init__.py

@@ -10,12 +10,13 @@
 
 from .db2Settings import Db2SettingsMixin
 from .mongodbSettings import MongoDbSettingsMixin
+from .redisSettings import RedisSettingsMixin
 from .kafkaSettings import KafkaSettingsMixin
 from .manageSettings import ManageSettingsMixin
 from .additionalConfigs import AdditionalConfigsMixin
 
 
-class InstallSettingsMixin(Db2SettingsMixin, MongoDbSettingsMixin, KafkaSettingsMixin, ManageSettingsMixin, AdditionalConfigsMixin):
+class InstallSettingsMixin(Db2SettingsMixin, MongoDbSettingsMixin, RedisSettingsMixin, KafkaSettingsMixin, ManageSettingsMixin, AdditionalConfigsMixin):
     """
     This class collects all the Mixins providing interactive prompts for mas-install
     """

{mas_cli-19.6.0 → mas_cli-19.7.0}/src/mas/cli/install/settings/manageSettings.py

@@ -176,6 +176,10 @@ class ManageSettingsMixin():
                     self.params["mas_appws_components"] += ",aip=latest"
                 if self.yesOrNo(" - Vegetation Management"):
                     self.params["mas_appws_components"] += ",vegm=latest"
+                if self.yesOrNo(" - Collaborate"):
+                    self.params["mas_appws_components"] += ",collaborate=latest"
+                    # Configure Redis for Collaborate addon
+                    self.configRedis()
                 logger.debug(f"Generated mas_appws_components = {self.params['mas_appws_components']}")
 
                 if ",icd=" in self.params["mas_appws_components"]:

mas_cli-19.7.0/src/mas/cli/install/settings/redisSettings.py

@@ -0,0 +1,70 @@
+# *****************************************************************************
+# Copyright (c) 2024, 2026 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 typing import TYPE_CHECKING, Dict, List
+
+
+if TYPE_CHECKING:
+    from prompt_toolkit.completion import WordCompleter
+    from prompt_toolkit.validation import Validator
+
+
+class RedisSettingsMixin():
+    if TYPE_CHECKING:
+        # Attributes from BaseApp and other mixins
+        params: Dict[str, str]
+        showAdvancedOptions: bool
+
+        # Methods from BaseApp
+        def setParam(self, param: str, value: str) -> None:
+            ...
+
+        def getParam(self, param: str) -> str:
+            ...
+
+        # Methods from PrintMixin
+        def printH1(self, message: str) -> None:
+            ...
+
+        def printDescription(self, content: List[str]) -> None:
+            ...
+
+        # Methods from PromptMixin
+        def promptForString(
+            self,
+            message: str,
+            param: str | None = None,
+            default: str = "",
+            isPassword: bool = False,
+            validator: Validator | None = None,
+            completer: WordCompleter | None = None
+        ) -> str:
+            ...
+
+    def configRedis(self) -> None:
+        """
+        Configure Redis for Collaborate addon.
+        Redis will be deployed automatically when Collaborate is enabled.
+        """
+        self.printH1("Configure Redis for Collaborate")
+        self.printDescription([
+            "Redis is required for the Collaborate addon to support caching.",
+            "The installer will automatically deploy Redis with high availability (Sentinel + HAProxy)."
+        ])
+
+        if self.showAdvancedOptions:
+            self.promptForString("Redis namespace", "redis_namespace", default="redis")
+        else:
+            # Use default namespace
+            self.setParam("redis_namespace", "redis")
+
+        # Always install Redis when Collaborate is enabled
+        self.setParam("redis_action", "install")
+        self.setParam("redis_cfg_file", f"/workspace/configs/redis-{self.getParam('redis_namespace')}.yml")

{mas_cli-19.6.0 → mas_cli-19.7.0}/src/mas/cli/install/summarizer.py

@@ -198,6 +198,7 @@ class InstallSummarizerMixin():
                 self.printSummary("  + Workday Applications", "Enabled" if "workday=" in self.getParam("mas_appws_components") else "Disabled")
                 self.printSummary("  + AIP", "Enabled" if "aip=" in self.getParam("mas_appws_components") else "Disabled")
                 self.printSummary("  + Vegetation Management", "Enabled" if "vegm=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Collaborate", "Enabled" if "collaborate=" in self.getParam("mas_appws_components") else "Disabled")
 
                 self.printParamSummary("+ Upgrade Type", "mas_appws_upgrade_type")
 
@@ -375,6 +376,12 @@ class InstallSummarizerMixin():
         else:
             self.fatalError(f"Unexpected value for mongodb_action parameter: {self.getParam('mongodb_action')}")
 
+    def redisSummary(self) -> None:
+        if self.getParam("redis_action") == "install":
+            self.printH2("Redis")
+            self.printSummary("Type", "Redis with Sentinel HA")
+            self.printParamSummary("Install Namespace", "redis_namespace")
+
     def kafkaSummary(self) -> None:
         if self.getParam("kafka_action_system") != "":
             self.printH2("Kafka")
@@ -445,6 +452,7 @@ class InstallSummarizerMixin():
 
         # Application Dependencies
         self.mongoSummary()
+        self.redisSummary()
         self.db2Summary()
         self.cosSummary()
         self.kafkaSummary()