mas-cli 19.4.0__tar.gz → 19.5.1__tar.gz

{mas_cli-19.4.0 → mas_cli-19.5.1}/PKG-INFO

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

{mas_cli-19.4.0 → mas_cli-19.5.1}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "19.4.0"  # Python module compatible semver
+__version__ = "19.5.1"  # Python module compatible semver

{mas_cli-19.4.0 → mas_cli-19.5.1}/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.4.0"
+        self.version: str = "19.5.1"
         self.h1count: int = 0
         self.h2count: int = 0
 

{mas_cli-19.4.0 → mas_cli-19.5.1}/src/mas/cli/install/app.py

@@ -978,20 +978,79 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
     @logMethodCall
     def configApps(self):
         self.printH1("Application Selection")
-        self.installIoT = self.yesOrNo("Install IoT")
 
+        # For Monitor >= 9.2.0: Monitor and IoT are independent (no dependency)
+        # For Monitor < 9.2.0: Monitor depends on IoT (original behavior)
+        # For IoT >= 9.2.0: IoT depends on Monitor
+
+        self.installIoT = self.yesOrNo("Install IoT")
         if self.installIoT:
             self.configAppChannel("iot")
+            iotChannel = self.getParam("mas_app_channel_iot")
+
+            # Prompt for Monitor installation
             self.installMonitor = self.yesOrNo("Install Monitor")
+            if self.installMonitor:
+                self.configAppChannel("monitor")
+
+                # Validate version compatibility between IoT and Monitor
+                monitorChannel = self.getParam("mas_app_channel_monitor")
+                if iotChannel and monitorChannel:
+                    iotIs920OrLater = isVersionEqualOrAfter('9.2.0', iotChannel)
+                    monitorIs920OrLater = isVersionEqualOrAfter('9.2.0', monitorChannel)
+
+                    # IoT >= 9.2.0 requires Monitor >= 9.2.0
+                    if iotIs920OrLater and not monitorIs920OrLater:
+                        self.printDescription([
+                            "",
+                            "<Red>Error: IoT version 9.2.0 or later requires Monitor version 9.2.0 or later.</Red>",
+                            f"<Yellow>IoT channel: {iotChannel}, Monitor channel: {monitorChannel}</Yellow>",
+                            "<Yellow>Please select compatible versions for both applications.</Yellow>",
+                            ""
+                        ])
+                        self.fatalError("Incompatible IoT and Monitor versions selected")
+
+                    # IoT < 9.2.0 requires Monitor < 9.2.0
+                    if not iotIs920OrLater and monitorIs920OrLater:
+                        self.printDescription([
+                            "",
+                            "<Red>Error: IoT version earlier than 9.2.0 requires Monitor version earlier than 9.2.0.</Red>",
+                            f"<Yellow>IoT channel: {iotChannel}, Monitor channel: {monitorChannel}</Yellow>",
+                            "<Yellow>Please select compatible versions for both applications.</Yellow>",
+                            ""
+                        ])
+                        self.fatalError("Incompatible IoT and Monitor versions selected")
+            else:
+                # User declined Monitor installation
+                # Validate: IoT >= 9.2.0 requires Monitor
+                if iotChannel and isVersionEqualOrAfter('9.2.0', iotChannel):
+                    self.printDescription([
+                        "",
+                        "<Red>Error: IoT version 9.2.0 or later requires Monitor to be installed.</Red>",
+                        "<Yellow>Please install Monitor to proceed with IoT 9.2.0+ installation.</Yellow>",
+                        ""
+                    ])
+                    self.fatalError("IoT 9.2.0+ requires Monitor to be installed")
+                # For IoT < 9.2.0, Monitor is optional
         else:
-            self.installMonitor = False
+            # If IoT not selected, check Monitor version to determine if standalone is allowed
+            self.installMonitor = self.yesOrNo("Install Monitor")
+            if self.installMonitor:
+                self.configAppChannel("monitor")
+                monitorChannel = self.getParam("mas_app_channel_monitor")
+                # For Monitor < 9.2.0, Monitor requires IoT
+                if monitorChannel and not isVersionEqualOrAfter('9.2.0', monitorChannel):
+                    self.printDescription([
+                        "",
+                        "<Red>Error: Monitor version earlier than 9.2.0 requires IoT to be installed.</Red>",
+                        "<Yellow>Please install IoT first, or choose Monitor 9.2.0+ for standalone installation.</Yellow>",
+                        ""
+                    ])
+                    self.installMonitor = False
 
         # Initialize ArcGIS flag (will be set to True later in arcgisSettings() if needed)
         self.installArcgis = False
 
-        if self.installMonitor:
-            self.configAppChannel("monitor")
-
         self.manageAppName = "Manage"
         self.isManageFoundation = False
         self.installManage = self.yesOrNo(f"Install {self.manageAppName}")
@@ -1009,6 +1068,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         if self.installManage:
             self.configAppChannel("manage")
 
+        # Predict requires IoT + Manage (original behavior maintained)
         if self.installIoT and self.installManage:
             self.installPredict = self.yesOrNo("Install Predict")
         else:
@@ -1106,6 +1166,32 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             self.setParam("mas_app_settings_iot_fpl_pvc_storage_class", self.getParam("storage_class_rwo"))
             self.setParam("mas_app_settings_iot_mqttbroker_pvc_storage_class", self.getParam("storage_class_rwo"))
 
+    @logMethodCall
+    def setMonitorInstallOrder(self) -> None:
+        """
+        Determine the installation order for Monitor relative to IoT based on Monitor version.
+        Monitor >= 9.2.0 installs before IoT (new behavior)
+        Monitor < 9.2.0 installs after IoT (legacy behavior)
+        """
+        if self.installMonitor and self.installIoT:
+            from mas.devops.utils import isVersionEqualOrAfter
+            monitorChannel = self.getParam("mas_app_channel_monitor")
+
+            if monitorChannel and isVersionEqualOrAfter('9.2.0', monitorChannel):
+                # Monitor >= 9.2.0: Install Monitor before IoT
+                self.setParam("mas_monitor_install_order", "before-iot")
+                logger.debug(f"Monitor channel {monitorChannel} >= 9.2.0: Monitor will install before IoT")
+            else:
+                # Monitor < 9.2.0: Install Monitor after IoT (legacy)
+                self.setParam("mas_monitor_install_order", "after-iot")
+                logger.debug(f"Monitor channel {monitorChannel} < 9.2.0: Monitor will install after IoT (legacy behavior)")
+        elif self.installMonitor:
+            # Only Monitor, no IoT - order doesn't matter but set default
+            self.setParam("mas_monitor_install_order", "before-iot")
+        else:
+            # No Monitor installed - set default
+            self.setParam("mas_monitor_install_order", "after-iot")
+
     @logMethodCall
     def optimizerSettings(self) -> None:
         if self.installOptimizer:
@@ -1866,6 +1952,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
 
         # After we've configured the basic inputs, we can calculate these ones
         self.setIoTStorageClasses()
+        self.setMonitorInstallOrder()
         if self.deployCP4D:
             self.configCP4D()
 

{mas_cli-19.4.0 → mas_cli-19.5.1}/src/mas/cli/install/argBuilder.py

@@ -62,7 +62,7 @@ class installArgBuilderMixin():
         command += f" --mas-workspace-name \"{self.getParam('mas_workspace_name')}\"{newline}"
 
         if self.getParam('mas_special_characters') == "true":
-            command += f" --allow-special-chars \"{newline}"
+            command += f" --allow-special-chars {newline}"
 
         # ECK Integration
         # -----------------------------------------------------------------------------

{mas_cli-19.4.0 → mas_cli-19.5.1}/src/mas/cli/install/settings/db2Settings.py

@@ -93,8 +93,9 @@ class Db2SettingsMixin():
 
         self.setDB2DefaultChannel()  # Set default channel for Db2 if not already set
 
-        # If neither Iot, Manage or Facilities is being installed, we have nothing to do
-        if not self.installIoT and not self.installManage and not self.installFacilities:
+        # If neither Monitor, Manage or Facilities is being installed, we have nothing to do
+        # Note: For Monitor >= 9.2.0, Monitor requires Db2; for Monitor < 9.2.0, IoT requires Db2
+        if not self.installMonitor and not self.installIoT and not self.installManage and not self.installFacilities:
             print_formatted_text("No applications have been selected that require a Db2 installation")
             self.setParam("db2_action_system", "none")
             self.setParam("db2_action_manage", "none")
@@ -110,15 +111,34 @@ class Db2SettingsMixin():
 
         self.setDB2DefaultSettings()
 
+        # Determine which application requires the system database based on Monitor version
+        # For Monitor >= 9.2.0: Monitor requires system Db2
+        # For Monitor < 9.2.0: IoT requires system Db2 (original behavior)
+        from mas.devops.utils import isVersionEqualOrAfter
+        monitorChannel = self.getParam("mas_app_channel_monitor")
+        useNewDependency = monitorChannel and isVersionEqualOrAfter('9.2.0', monitorChannel)
         instanceId = self.getParam('mas_instance_id')
-        # Do we need to set up an IoT database?
-        if self.installIoT:
+        # Do we need to set up a system database?
+        if useNewDependency and self.installMonitor:
+            # New behavior: Monitor >= 9.2.0 requires system Db2
+            if not silentMode:
+                self.printH2("Database Configuration for Maximo Monitor")
+                self.printDescription([
+                    "Maximo Monitor requires a shared system-scope Db2 instance because other applications in the suite require access to the same database source",
+                    " - Only IBM Db2 is supported for this database"
+                ])
+        elif self.installIoT:
+            # Original behavior: IoT requires system Db2
             if not silentMode:
                 self.printH2("Database Configuration for Maximo IoT")
                 self.printDescription([
-                    "Maximo IoT requires a shared system-scope Db2 instance because others application in the suite require access to the same database source",
+                    "Maximo IoT requires a shared system-scope Db2 instance because other applications in the suite require access to the same database source",
                     " - Only IBM Db2 is supported for this database"
                 ])
+        else:
+            self.setParam("db2_action_system", "none")
+
+        if (useNewDependency and self.installMonitor) or (not useNewDependency and self.installIoT):
             createSystemDb2UsingUniversalOperator = True
             if not silentMode:
                 createSystemDb2UsingUniversalOperator = self.yesOrNo("Create system Db2 instance using the IBM Db2 Universal Operator")
@@ -153,7 +173,7 @@ class Db2SettingsMixin():
                 ])
             # Determine whether to use the system or a dedicated database
             reuseSystemDb2 = False
-            if self.installIoT:
+            if (useNewDependency and self.installMonitor) or (not useNewDependency and self.installIoT):
                 if not silentMode:
                     reuseSystemDb2 = self.yesOrNo(f"Re-use System Db2 instance for {self.manageAppName} application")
             if reuseSystemDb2:

{mas_cli-19.4.0 → mas_cli-19.5.1}/src/mas/cli/install/settings/kafkaSettings.py

@@ -11,6 +11,7 @@
 from typing import TYPE_CHECKING, Dict, List, NoReturn
 from os import path
 from prompt_toolkit import print_formatted_text
+from mas.devops.utils import isVersionEqualOrAfter
 
 
 if TYPE_CHECKING:
@@ -23,6 +24,7 @@ class KafkaSettingsMixin():
         # Attributes from BaseApp and other mixins
         params: Dict[str, str]
         installIoT: bool
+        installMonitor: bool
         showAdvancedOptions: bool
         localConfigDir: str | None
 
@@ -72,10 +74,15 @@ class KafkaSettingsMixin():
             ...
 
     def configKafka(self) -> None:
-        if self.installIoT:
+        # Check if we should use the new dependency (Monitor >= 9.2.0)
+        monitorChannel = self.getParam("mas_app_channel_monitor")
+        useNewDependency = monitorChannel and isVersionEqualOrAfter('9.2.0', monitorChannel)
+
+        if (useNewDependency and self.installMonitor) or (not useNewDependency and self.installIoT):
+            appName = "Monitor" if (useNewDependency and self.installMonitor) else "IoT"
             self.printH1("Configure Kafka")
             self.printDescription([
-                "Maximo IoT requires a shared system-scope Kafka instance",
+                f"Maximo {appName} requires a shared system-scope Kafka instance",
                 "Supported Kafka providers: Strimzi, Red Hat AMQ Streams, IBM Cloud Event Streams and AWS MSK",
                 "You may also choose to configure MAS to use an existing Kafka instance by providing a pre-existing configuration file"
             ])