[patch] Enable Db2uInstance type rotation in build-system

README.md

@@ -20,3 +20,4 @@ Want to contribute to MAS Command Line Interface?
 We welcome every Maximo Application Suite users, developers and enthusiasts to contribute to the MAS Command Line Interface while fixing code issues and implementing new automated functionalities.
 
 You can contribute to this collection by raising [a new issue](https://github.com/ibm-mas/cli/issues) with suggestions on how to make our MAS automation engine even better, or if you want to become a new code contributor, please refer to the [Contributing Guidelines](CONTRIBUTING.md) and learn more about how to get started.
+

python/src/mas/cli/install/app.py

@@ -241,6 +241,7 @@ def processCatalogChoice(self) -> list:
         self.catalogDigest = self.chosenCatalog["catalog_digest"]
         self.catalogMongoDbVersion = self.chosenCatalog["mongo_extras_version_default"]
         self.catalogDb2Channel = self.chosenCatalog.get("db2_channel_default", "v110509.0")  # Returns fallback "v110509.0" for old catalogs without this field
+        self.catalogDb2uKind = self.chosenCatalog.get("db2u_kind_default", "db2ucluster")  # Returns Fallback if not found
         if self.architecture != "s390x" and self.architecture != "ppc64le":
             self.catalogCp4dVersion = self.chosenCatalog["cpd_product_version_default"]
 
@@ -2511,7 +2512,6 @@ def nonInteractiveMode(self) -> None:
         if not self.devMode:
             self.validateCatalogSource()
             self.licensePrompt()
-            self.setParam("db2u_kind", "db2ucluster")
 
         if self.getParam("mas_issuer_kind") != "" and not isVersionEqualOrAfter("9.2.0", self.getParam("mas_channel")):
             self.fatalError(f"--mas-issuer-kind is only supported for MAS 9.2+ (selected channel: {self.getParam('mas_channel')})")
@@ -2581,6 +2581,7 @@ def nonInteractiveMode(self) -> None:
             operation="installation",
         )
         self.setDB2DefaultChannel()
+        self.setDB2uKindDefault()
 
         # Version before 9.1 cannot have empty components
         if (

python/src/mas/cli/install/argParser.py

@@ -1285,7 +1285,7 @@ def isValidFile(parser: argparse.ArgumentParser, arg: str) -> str:
     "--db2u-kind",
     dest="db2u_kind",
     required=False,
-    help="Db2 resource kind in the cluster",
+    help="Db2 resource kind in the cluster(db2ucluster, db2uinstance)",
 )
 
 # ECK Integration

python/src/mas/cli/install/settings/db2Settings.py

@@ -79,6 +79,7 @@ def configDb2(self, silentMode=False) -> None:
             self.printH1("Configure Databases")
 
         self.setDB2DefaultChannel()  # Set default channel for Db2 if not already set
+        self.setDB2uKindDefault()  # Set default db2u_kind from catalog if not already set
 
         # 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
@@ -320,15 +321,13 @@ def configDb2(self, silentMode=False) -> None:
                     if self.yesOrNo("Select Db2 Custom Resource(CR)"):
                         self.printDescription(["Db2 Custom Resource", "  1. Db2uCluster", "  2. Db2uInstance"])
                         self.promptForListSelect("Select the CR Resource", ["db2ucluster", "db2uinstance"], "db2u_kind")
-                    else:
-                        self.setParam("db2u_kind", "db2ucluster")
             else:
                 self.setParam("db2_namespace", "db2u")
 
     def setDB2DefaultChannel(self) -> None:
         # Set the default db2-Channel
         if hasattr(self, "catalogDb2Channel"):
-            # Best case: catalogDb2Channel was set by processCatalogChoice()
+            # CatalogDb2Channel was set by processCatalogChoice()
             default_db2_channel = self.catalogDb2Channel
         elif hasattr(self, "chosenCatalog") and self.chosenCatalog is not None:
             # Fallback: Get directly from chosenCatalog if available
@@ -346,6 +345,25 @@ def setDB2DefaultChannel(self) -> None:
 
         self.params["db2_channel"] = db2_channel
 
+    def setDB2uKindDefault(self) -> None:
+        # Set the default db2u_kind from catalog, with dev mode Override support
+        # Get default from Catalog
+        if hasattr(self, "catalogDb2uKind"):
+            default_db2u_kind = self.catalogDb2uKind
+        elif hasattr(self, "chosenCatalog") and self.chosenCatalog is not None:
+            default_db2u_kind = self.chosenCatalog.get("db2u_kind_default", "db2ucluster")
+        else:
+            default_db2u_kind = "db2ucluster"
+
+        if not self.devMode:
+            db2u_kind = default_db2u_kind
+        else:
+            # In dev mode, allow user override if provided
+            user_kind = self.getParam("db2u_kind")
+            db2u_kind = user_kind if user_kind else default_db2u_kind
+
+        self.params["db2u_kind"] = db2u_kind
+
     def setDB2DefaultSettings(self) -> None:
 
         self.setParam("db2_cpu_requests", "4000m")

python/src/mas/cli/install/summarizer.py

@@ -459,6 +459,7 @@ def db2Summary(self) -> None:
             print()
             self.printParamSummary("Install Namespace", "db2_namespace")
             self.printParamSummary("Subscription Channel", "db2_channel")
+            self.printParamSummary("Db2 Resource Kind", "db2u_kind")
             print()
             self.printParamSummary("CPU Request", "db2_cpu_requests")
             self.printParamSummary("CPU Limit", "db2_cpu_limits")