mas-cli 13.24.0__tar.gz → 13.25.1__tar.gz

{mas_cli-13.24.0 → mas_cli-13.25.1}/PKG-INFO

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

{mas_cli-13.24.0 → mas_cli-13.25.1}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "13.24.0"  # Python module compatible semver
+__version__ = "13.25.1"  # Python module compatible semver

{mas_cli-13.24.0 → mas_cli-13.25.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.24.0"
+        self.version = "13.25.1"
         self.h1count = 0
         self.h2count = 0
 
@@ -145,6 +145,9 @@ class BaseApp(PrintMixin, PromptMixin):
         self.architecture = None
 
         self.compatibilityMatrix = {
+            "9.1.x": {
+                "facilities": ["9.1.x"]
+            },
             "9.1.x-feature": {
                 "assist": ["9.0.x"],
                 "iot": ["9.0.x"],

{mas_cli-13.24.0 → mas_cli-13.25.1}/src/mas/cli/install/app.py

@@ -44,7 +44,11 @@ from mas.cli.validators import (
 )
 
 from mas.devops.ocp import createNamespace, getStorageClasses
-from mas.devops.mas import getCurrentCatalog, getDefaultStorageClasses
+from mas.devops.mas import (
+    getCurrentCatalog,
+    getDefaultStorageClasses,
+    isVersionEqualOrAfter
+)
 from mas.devops.sls import findSLSByNamespace
 from mas.devops.data import getCatalog
 from mas.devops.tekton import (
@@ -175,6 +179,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 "Optimizer": "mas_optimizer_version",
                 "Predict": "mas_predict_version",
                 "Inspection": "mas_visualinspection_version",
+                "Facilities": "mas_facilities_version",
             }
         else:
             applications = {
@@ -194,11 +199,12 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         # Generate catalogTable
         for application, key in applications.items():
             # Add 9.1-feature channel based off 9.0 to those apps that have not onboarded yet
-            tempChosenCatalog = self.chosenCatalog[key].copy()
-            if '9.1.x-feature' not in tempChosenCatalog:
-                tempChosenCatalog.update({"9.1.x-feature": tempChosenCatalog["9.0.x"]})
+            if key in self.chosenCatalog:
+                tempChosenCatalog = self.chosenCatalog[key].copy()
+                if '9.1.x-feature' not in tempChosenCatalog:
+                    tempChosenCatalog.update({"9.1.x-feature": tempChosenCatalog["9.0.x"]})
 
-            self.catalogTable.append({"": application} | {key.replace(".x", ""): value for key, value in sorted(tempChosenCatalog.items(), reverse=True)})
+                self.catalogTable.append({"": application} | {key.replace(".x", ""): value for key, value in sorted(tempChosenCatalog.items(), reverse=True)})
 
         if self.architecture == "s390x" or self.architecture == "ppc64le":
             summary = [
@@ -644,7 +650,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             self.configAppChannel("predict")
 
         # Assist is only installable on MAS 9.0.x due to withdrawal of support for Watson Discovery in our managed dependency stack and the inability of Assist 8.x to support this
-        if not self.getParam("mas_channel").startswith("8."):
+        if isVersionEqualOrAfter('9.0.0', self.getParam("mas_channel")):
             self.installAssist = self.yesOrNo("Install Assist")
             if self.installAssist:
                 self.configAppChannel("assist")
@@ -663,6 +669,13 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         if self.installAiBroker:
             self.configAppChannel("aibroker")
 
+        if isVersionEqualOrAfter('9.1.0', self.getParam("mas_channel")) and self.getParam("mas_channel") != '9.1.x-feature':
+            self.installFacilities = self.yesOrNo("Install Real Estate and Facilities")
+            if self.installFacilities:
+                self.configAppChannel("facilities")
+        else:
+            self.installFacilities = False
+
     @logMethodCall
     def configAppChannel(self, appId):
         versions = self.getCompatibleVersions(self.params["mas_channel"], appId)
@@ -756,6 +769,71 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 self.promptForString("IBM Cloud API Key", "cos_apikey", isPassword=True)
                 self.promptForString("IBM Cloud Resource Group", "cos_resourcegroup")
 
+    @logMethodCall
+    # TODO: Fix type for storage sizes and max conn pool size
+    def facilitiesSettings(self) -> None:
+        if self.installFacilities:
+            self.printH1("Configure Maximo Real Estate and Facilities")
+            self.printDescription([
+                "Real Estate and Facilities custom configurations"
+            ])
+            self.printDescription([
+                "Maximo Real Estate and Facilities Size:",
+                "  1. Small",
+                "  2. Medium",
+                "  3. Large"
+            ])
+            self.promptForListSelect("Select the size:", ["small", "medium", "large"], "mas_ws_facilities_size")
+
+            if self.showAdvancedOptions:
+                if self.yesOrNo("Supply extra XML tags for Real Estate and Facilities server.xml"):
+                    self.promptForString("Real Estate and Facilities Liberty Extension Secret Name", "mas_ws_facilities_liberty_extension_XML")
+                if self.yesOrNo("Supply custom AES Encryption Password"):
+                    self.promptForString("Real Estate and Facilities AES Vault Secret Name", "mas_ws_facilities_vault_secret")
+
+                self.promptForString("Set Real Estate and Facilities Routes Timeout:", "mas_ws_facilities_routes_timeout", default="600s")
+                # self.promptForInt("Set Facilities maximum connection poll size:", default=200)
+
+                self.printDescription(["Real Estate and Facilities Persistent Volume Storage Configuration"])
+                defaultStorageClasses = getDefaultStorageClasses(self.dynamicClient)
+                notUseAutodetectedStorageClasses = False
+                if defaultStorageClasses.provider is not None:
+                    self.storageClassProvider = defaultStorageClasses.provider
+                    print_formatted_text(HTML(f"<MediumSeaGreen>Storage provider auto-detected: {defaultStorageClasses.providerName}</MediumSeaGreen>"))
+                    print_formatted_text(HTML(f"<LightSlateGrey>  - Storage class (ReadWriteMany): {defaultStorageClasses.rwx}</LightSlateGrey>"))
+                    print_formatted_text(HTML(f"<LightSlateGrey>  - Storage class (ReadWriteOnce): {defaultStorageClasses.rwo}</LightSlateGrey>"))
+                    if self.yesOrNo("Use the auto-detected storage classes"):
+                        self.printDescription([
+                            "Storage Mode for Userfiles PVC:",
+                            "  1. ReadWriteMany",
+                            "  2. ReadWriteOnce"
+                        ])
+                        storageMode = self.promptForListSelect("Select the storage mode for user files PVC:", ["ReadWriteMany", "ReadWriteOnce"], "mas_ws_facilities_storage_userfiles_mode", default=1)
+                        _ = self.setParam("mas_ws_facilities_storage_userfiles_class", defaultStorageClasses.rwx) if storageMode == "ReadWriteMany" else self.setParam("mas_ws_facilities_storage_userfiles_class", defaultStorageClasses.rwo)
+                        # self.promptForInt("User file PVC size (Gb):", "mas_ws_facilities_storage_userfiles_size", default=50)
+                        storageMode = self.promptForListSelect("Select the storage mode for log PVC:", ["ReadWriteMany", "ReadWriteOnce"], "mas_ws_facilities_storage_log_mode", default=1)
+                        _ = self.setParam("mas_ws_facilities_storage_log_class", defaultStorageClasses.rwx) if storageMode == "ReadWriteMany" else self.setParam("mas_ws_facilities_storage_log_class", defaultStorageClasses.rwo)
+                        # self.promptForInt("Log PVC size (Gb):", "mas_ws_facilities_storage_log_size", default=30)
+                    else:
+                        notUseAutodetectedStorageClasses = True
+                if defaultStorageClasses.provider is None or notUseAutodetectedStorageClasses:
+                    for storageClass in getStorageClasses(self.dynamicClient):
+                        print_formatted_text(HTML(f"<LightSlateGrey>  - {storageClass.metadata.name}</LightSlateGrey>"))
+                    self.promptForString("Select storage class for user files PVC:", "mas_ws_facilities_storage_userfiles_class")
+                    self.promptForString("Select storage class for log PVC:", "mas_ws_facilities_storage_log_class")
+                    self.printDescription([
+                        "Storage Mode for Userfiles PVC:",
+                        "  1. ReadWriteMany",
+                        "  2. ReadWriteOnce"
+                    ])
+                    self.promptForListSelect("Select the storage mode for user files PVC:", ["ReadWriteMany", "ReadWriteOnce"], "mas_ws_facilities_storage_userfiles_mode", default=1)
+                    self.promptForListSelect("Select the storage mode for log PVC:", ["ReadWriteMany", "ReadWriteOnce"], "mas_ws_facilities_storage_log_mode", default=1)
+                    # self.promptForInt("User file PVC size (Gb):", "mas_ws_facilities_storage_userfiles_size", default=50)
+                    # self.promptForInt("Log PVC size (Gb):", "mas_ws_facilities_storage_log_size", default=30)
+
+                if self.yesOrNo("Supply configuration for dedicated workflow agents"):
+                    self.promptForString("Dedicated Workflow Agent JSON:")
+
     @logMethodCall
     def chooseInstallFlavour(self) -> None:
         self.printH1("Choose Install Mode")
@@ -773,6 +851,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             " - Enable optional Maximo Manage integration Cognos Analytics and Watson Studio Local",
             " - Enable optional Maximo Predict integration with SPSS",
             " - Enable optional IBM Turbonomic integration",
+            " - Enable optional Real Estate and Facilities configurations",
             " - Customize Db2 node affinity and tolerations, memory, cpu, and storage settings (when using the IBM Db2 Universal Operator)",
             " - Choose alternative Apache Kafka providers (default to Strimzi)",
             " - Customize Grafana storage settings"
@@ -819,6 +898,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         self.predictSettings()
         self.assistSettings()
         self.aibrokerSettings()
+        self.facilitiesSettings()
 
         # Dependencies
         self.configMongoDb()
@@ -849,6 +929,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         self.installInspection = False
         self.installOptimizer = False
         self.installAiBroker = False
+        self.installFacilities = False
         self.deployCP4D = False
         self.db2SetAffinity = False
         self.db2SetTolerations = False
@@ -862,7 +943,8 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             "approval_monitor": {"id": "app-cfg-monitor"},  # After Monitor workspace has been configured
             "approval_optimizer": {"id": "app-cfg-optimizer"},  # After Optimizer workspace has been configured
             "approval_predict": {"id": "app-cfg-predict"},  # After Predict workspace has been configured
-            "approval_visualinspection": {"id": "app-cfg-visualinspection"}  # After Visual Inspection workspace has been configured
+            "approval_visualinspection": {"id": "app-cfg-visualinspection"},  # After Visual Inspection workspace has been configured
+            "approval_facilities": {"id": "app-cfg-facilities"},  # After Facilities workspace has been configured 
         }
 
         self.configGrafana()
@@ -956,6 +1038,10 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             elif key == "optimizer_plan":
                 if value is not None and value != "":
                     self.setParam("mas_app_plan_optimizer", value)
+            elif key == "facilities_channel":
+                if value is not None and value != "":
+                    self.setParam("mas_app_channel_facilities", value)
+                    self.installFacilities = True
 
             # Manage advanced settings that need extra processing
             elif key == "mas_app_settings_server_bundle_size":

{mas_cli-13.24.0 → mas_cli-13.25.1}/src/mas/cli/install/argBuilder.py

@@ -171,6 +171,8 @@ class installArgBuilderMixin():
             command += f"  --predict-channel \"{self.getParam('mas_app_channel_predict')}\"{newline}"
         if self.installInspection:
             command += f"  --visualinspection-channel \"{self.getParam('mas_app_channel_visualinspection')}\"{newline}"
+        if self.installFacilities:
+            command += f"  --facilities-channel \"{self.getParam('mas_app_channel_facilities')}\"{newline}"
 
         # Arcgis
         # -----------------------------------------------------------------------------
@@ -235,6 +237,45 @@ class installArgBuilderMixin():
             if self.getParam('mas_appws_bindings_health_wsl_flag') == "true":
                 command += f"  --manage-health-wsl{newline}"
 
+        # Facilities Advanced Settings
+        # -----------------------------------------------------------------------------
+        # TODO: Fix type for storage sizes and max conn pool size
+        if self.installFacilities:
+            if self.getParam('mas_ws_facilities_size') != "":
+                command += f"  --facilities-size \"{self.getParam('mas_ws_facilities_size')}\"{newline}"
+
+            if self.getParam('mas_ws_facilities_pull_policy') != "":
+                command += f"  --facilities-pull-policy \"{self.getParam('mas_ws_facilities_pull_policy')}\"{newline}"
+
+            if self.getParam('mas_ws_facilities_routes_timeout') != "":
+                command += f"  --facilities-routes-timeout \"{self.getParam('mas_ws_facilities_routes_timeout')}\"{newline}"
+
+            if self.getParam('mas_ws_facilities_liberty_extension_XML') != "":
+                command += f"  --facilities-xml-extension \"{self.getParam('mas_ws_facilities_liberty_extension_XML')}\"{newline}"
+
+            if self.getParam('mas_ws_facilities_vault_secret') != "":
+                command += f"  --facilities-vault-secret \"{self.getParam('mas_ws_facilities_vault_secret')}\"{newline}"
+
+            # if self.getParam('mas_ws_facilities_dwfagents') != "":
+            #     command += f"  --facilities-dwfagent \"{self.getParam('mas_ws_facilities_dwfagents')}\"{newline}"
+
+            # if self.getParam('mas_ws_facilities_db_maxconnpoolsize') != "":
+            #     command += f"  --facilities-maxconnpoolsize \"{self.getParam('mas_ws_facilities_db_maxconnpoolsize')}\"{newline}"
+
+            if self.getParam('mas_ws_facilities_storage_log_class') != "":
+                command += f"  --facilities-log-storage-class \"{self.getParam('mas_ws_facilities_storage_log_class')}\"{newline}"
+            if self.getParam('mas_ws_facilities_storage_log_mode') != "":
+                command += f"  --facilities-log-storage-mode \"{self.getParam('mas_ws_facilities_storage_log_mode')}\"{newline}"
+            # if self.getParam('mas_ws_facilities_storage_log_size') != "":
+            #     command += f"  --facilities-log-storage-size \"{self.getParam('mas_ws_facilities_storage_log_size')}\"{newline}"
+
+            if self.getParam('mas_ws_facilities_storage_userfiles_class') != "":
+                command += f"  --facilities-userfiles-storage-class \"{self.getParam('mas_ws_facilities_storage_userfiles_class')}\"{newline}"
+            if self.getParam('mas_ws_facilities_storage_userfiles_mode') != "":
+                command += f"  --facilities-userfiles-storage-mode \"{self.getParam('mas_ws_facilities_storage_userfiles_mode')}\"{newline}"
+            # if self.getParam('mas_ws_facilities_storage_userfiles_size') != "":
+            #     command += f"  --facilities-userfiles-storage-size \"{self.getParam('mas_ws_facilities_storage_userfiles_size')}\"{newline}"
+
         # IBM Cloud Pak for Data
         # -----------------------------------------------------------------------------
         if self.getParam('cpd_product_version') != "":
@@ -253,11 +294,13 @@ class installArgBuilderMixin():
 
         # IBM Db2 Universal Operator
         # -----------------------------------------------------------------------------
-        if self.getParam('db2_action_system') == "install" or self.getParam('db2_action_manage') == "install":
+        if self.getParam('db2_action_system') == "install" or self.getParam('db2_action_manage') == "install" or self.getParam('db2_action_facilities') == "install":
             if self.getParam('db2_action_system') == "install":
                 command += f"  --db2-system{newline}"
             if self.getParam('db2_action_manage') == "install":
                 command += f"  --db2-manage{newline}"
+            if self.getParam('db2_action_facilities') == "install":
+                command += f"  --db2-facilities{newline}"
 
             if self.getParam('db2_channel') != "":
                 command += f"  --db2-channel \"{self.getParam('db2_channel')}\"{newline}"
@@ -398,6 +441,8 @@ class installArgBuilderMixin():
             command += f"  --approval-predict \"{self.getParam('approval_predict')}\"{newline}"
         if self.getParam('approval_visualinspection') != "":
             command += f"  --approval-visualinspection \"{self.getParam('approval_visualinspection')}\"{newline}"
+        if self.getParam('approval_facilities') != "":
+            command += f"  --approval-facilities \"{self.getParam('approval_facilities')}\"{newline}"
 
         # More Options
         # -----------------------------------------------------------------------------

{mas_cli-13.24.0 → mas_cli-13.25.1}/src/mas/cli/install/argParser.py

@@ -378,6 +378,11 @@ masAppsArgGroup.add_argument(
     required=False,
     help="Subscription channel for Maximo Ai Broker"
 )
+masAppsArgGroup.add_argument(
+    "--facilities-channel",
+    required=False,
+    help="Subscription channel for Maximo Real Estate and Facilities"
+)
 
 # AI Broker
 # -----------------------------------------------------------------------------
@@ -704,6 +709,92 @@ manageArgGroup.add_argument(
     choices=["cr", "db"]
 )
 
+# Facilities Advanced Settings
+# TODO: Fix type for storage sizes and max conn pool size
+facilitiesArgGroup = installArgParser.add_argument_group("Facilities Advanced Configuration")
+facilitiesArgGroup.add_argument(
+    "--facilities-size",
+    dest="mas_ws_facilities_size",
+    required=False,
+    help="Defines the size of Facilities deployment",
+    choices=['small', 'medium', 'large'],
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-pull-policy",
+    dest="mas_ws_facilities_pull_policy",
+    required=False,
+    help="Defines the pull policy for the images",
+    choices=["IfNotPresent", "Always"],
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-routes-timeout",
+    dest="mas_ws_facilities_routes_timeout",
+    required=False,
+    help="Defines the timeout for the routes",
+    default="600s",
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-xml-extension",
+    dest="mas_ws_facilities_liberty_extension_XML",
+    required=False,
+    help="Defines the name of the secret that holds the extensions for Liberty server",
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-vault-secret",
+    dest="mas_ws_facilities_vault_secret",
+    required=False,
+    help="Defines the name of the secret that holds the AES Encryption password",
+)
+# facilitiesArgGroup.add_argument(
+#     "--facilities-dwfagent",
+#     dest="mas_ws_facilities_dwfagents",
+#     required=False,
+#     help="Defines the list of dedicates workflow agents",
+# )
+# facilitiesArgGroup.add_argument(
+#     "--facilities-maxconnpoolsize",
+#     dest="mas_ws_facilities_db_maxconnpoolsize",
+#     required=False,
+#     help="Defines the maximum connection pool size",
+#     default=200,
+# )
+facilitiesArgGroup.add_argument(
+    "--facilities-log-storage-class",
+    dest="mas_ws_facilities_storage_log_class",
+    required=False,
+    help="Defines the log storage class",
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-log-storage-mode",
+    dest="mas_ws_facilities_storage_log_mode",
+    required=False,
+    help="Defines the log storage mode",
+)
+# facilitiesArgGroup.add_argument(
+#     "--facilities-log-storage-size",
+#     dest="mas_ws_facilities_storage_log_size",
+#     required=False,
+#     help="Defines the logs storage size",
+# )
+facilitiesArgGroup.add_argument(
+    "--facilities-userfiles-storage-class",
+    dest="mas_ws_facilities_storage_userfiles_class",
+    required=False,
+    help="Defines the user files storage class",
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-userfiles-storage-mode",
+    dest="mas_ws_facilities_storage_userfiles_mode",
+    required=False,
+    help="Defines the user files storage mode",
+)
+# facilitiesArgGroup.add_argument(
+#     "--facilities-userfiles-storage-size",
+#     dest="mas_ws_facilities_storage_userfiles_size",
+#     required=False,
+#     help="Defines the user files storage size",
+# )
+
 # IBM Cloud Pak for Data
 # -----------------------------------------------------------------------------
 cpdAppsArgGroup = installArgParser.add_argument_group("IBM Cloud Pak for Data")
@@ -783,6 +874,14 @@ db2ArgGroup.add_argument(
     action="store_const",
     const="install"
 )
+db2ArgGroup.add_argument(
+    "--db2-facilities",
+    dest="db2_action_facilities",
+    required=False,
+    help="Install a dedicated Db2u instance for Maximo Real Estate and Facilities (supported by Facilities)",
+    action="store_const",
+    const="install"
+)
 db2ArgGroup.add_argument(
     "--db2-type",
     required=False,
@@ -1132,6 +1231,11 @@ approvalsGroup.add_argument(
     default="",
     help="Require approval after the Maximo Visual Inspection workspace has been configured"
 )
+approvalsGroup.add_argument(
+    "--approval-facilities",
+    default="",
+    help="Require approval after the Maximo Real Estate and Facilities workspace has been configured"
+)
 
 
 # More Options

{mas_cli-13.24.0 → mas_cli-13.25.1}/src/mas/cli/install/params.py

@@ -78,6 +78,7 @@ optionalParams = [
     # Db2
     "db2_action_system",
     "db2_action_manage",
+    "db2_action_facilities",
     "db2_type",
     "db2_timezone",
     "db2_namespace",
@@ -175,6 +176,20 @@ optionalParams = [
     "mas_aibroker_db_secret_name",
     "mas_aibroker_db_secret_key",
     "mas_aibroker_db_secret_value",
+    # Facilities
+    "mas_ws_facilities_size",
+    "mas_ws_facilities_routes_timeout",
+    "mas_ws_facilities_liberty_extension_XML",
+    "mas_ws_facilities_vault_secret",
+    "mas_ws_facilities_pull_policy",
+    "mas_ws_facilities_storage_log_class",
+    "mas_ws_facilities_storage_log_mode",
+    # "mas_ws_facilities_storage_log_size",
+    "mas_ws_facilities_storage_userfiles_class",
+    "mas_ws_facilities_storage_userfiles_mode",
+    # "mas_ws_facilities_storage_userfiles_size",
+    # "mas_ws_facilities_dwfagents",
+    # "mas_ws_facilities_db_maxconnpoolsize",
     # Special chars
     "mas_special_characters"
 ]

{mas_cli-13.24.0 → mas_cli-13.25.1}/src/mas/cli/install/settings/additionalConfigs.py

@@ -163,6 +163,10 @@ class AdditionalConfigsMixin():
                 "mas_app_channel_optimizer": {
                     "dir": self.manualCertsDir + "/optimizer/",
                     "keyPrefix": "optimizer."
+                },
+                "mas_app_channel_facilities": {
+                    "dir": self.manualCertsDir + "/facilities/",
+                    "keyPrefix": "facilities."
                 }
             }
 

{mas_cli-13.24.0 → mas_cli-13.25.1}/src/mas/cli/install/settings/db2Settings.py

@@ -21,12 +21,12 @@ class Db2SettingsMixin():
         # The channel used for Db2 used has not changed since the January 2024 catalog update
         self.params["db2_channel"] = "v110509.0"
 
-        # If neither Iot or Manage is being installed, we have nothing to do
-        if not self.installIoT and not self.installManage:
-            if not silentMode:
-                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")
+        # 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:
+            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")
+            self.setParam("db2_action_facilities", "none")
             return
 
         # For now we are limiting users to bring your own database for Manage on s390x & ppc64le
@@ -55,10 +55,10 @@ class Db2SettingsMixin():
             return
 
         # Proceed as normal
-        # We know we are installing either IoT or Manage, and on amd64 target architecture
+        # We know we are installing either IoT, Manage or Facilities, and on amd64 target architecture
         if not silentMode:
             self.printDescription([
-                f"The installer can setup one or more IBM Db2 instances in your OpenShift cluster for the use of applications that require a JDBC datasource (IoT, {self.manageAppName}, Monitor, & Predict) or you may choose to configure MAS to use an existing database"
+                f"The installer can setup one or more IBM Db2 instances in your OpenShift cluster for the use of applications that require a JDBC datasource (IoT, {self.manageAppName}, Monitor, & Predict, Real Estate and Facilities) or you may choose to configure MAS to use an existing database"
             ])
 
         self.setDB2DefaultSettings()
@@ -146,8 +146,31 @@ class Db2SettingsMixin():
         else:
             self.setParam("db2_action_manage", "none")
 
+        # Do we need to create and configure a Db2 for Facilities ?
+        if self.installFacilities:
+            self.printH2("Database Configuration for Maximo Real Estate and Facilities")
+            if self.yesOrNo("Create Real Estate and Facilities dedicated Db2 instance using the IBM Db2 Universal Operator"):
+                self.setParam("db2_action_facilities", "install")
+            else:
+                self.setParam("db2_action_facilities", "none")
+                instanceId = self.getParam('mas_instance_id')
+                workspaceId = self.getParam("mas_workspace_id")
+                self.selectLocalConfigDir()
+
+                # Check if a configuration already exists before creating a new one
+                jdbcCfgFile = path.join(self.localConfigDir, f"jdbc-{instanceId}-facilities.yaml")
+                print_formatted_text(f"Searching for Real Estate and Facilities database configuration file in {jdbcCfgFile} ...")
+                if path.exists(jdbcCfgFile):
+                    if self.yesOrNo(f"Real Estate and Facilities database configuration file 'jdbc-{instanceId}-facilities.yaml' already exists.  Do you want to generate a new one"):
+                        self.generateJDBCCfg(instanceId=instanceId, scope="workspace-application", workspaceId=workspaceId, appId="facilities", destination=jdbcCfgFile)
+                else:
+                    print_formatted_text(f"Expected file ({jdbcCfgFile}) was not found, generating a valid Real Estate and Facilities database configuration file now ...")
+                    self.generateJDBCCfg(instanceId=instanceId, scope="workspace-application", workspaceId=workspaceId, appId="facilities", destination=jdbcCfgFile)
+        else:
+            self.setParam("db2_action_facilities", "none")
+
         # Do we need to configure Db2u?
-        if self.getParam("db2_action_system") == "install" or self.getParam("db2_action_manage") == "install":
+        if self.getParam("db2_action_system") == "install" or self.getParam("db2_action_manage") == "install" or self.getParam("db2_action_facilities") == "install":
             if self.showAdvancedOptions:
                 self.printH2("Installation Namespace")
                 self.promptForString("Install namespace", "db2_namespace", default="db2u")

{mas_cli-13.24.0 → mas_cli-13.25.1}/src/mas/cli/install/summarizer.py

@@ -217,6 +217,30 @@ class InstallSummarizerMixin():
         else:
             self.printSummary("Manage", "Do Not Install")
 
+    def facilitiesSummary(self) -> None:
+        # TODO: Fix type for storage sizes and max conn pool size
+        if self.installFacilities:
+            self.printSummary("Facilities", self.params["mas_app_channel_facilities"])
+            print_formatted_text(HTML("  <SkyBlue>+ Maximo Real Estate and Facilities Settings</SkyBlue>"))
+            self.printParamSummary("  + Size", "mas_ws_facilities_size")
+            self.printParamSummary("  + Routes Timeout", "mas_ws_facilities_routes_timeout")
+            self.printParamSummary("  + XML Extension", "mas_ws_facilities_liberty_extension_XML")
+            self.printParamSummary("  + AES vault secret name", "mas_ws_facilities_vault_secret")
+            # self.printParamSummary("  + Dedicated Workflow Agents", "mas_ws_facilities_dwfagents")
+            # self.printParamSummary("  + Maximum pool size connection ", "mas_ws_facilities_db_maxconnpoolsize")
+            self.printParamSummary("  + Log Storage Class ", "mas_ws_facilities_storage_log_class")
+            self.printParamSummary("  + Log Storage Mode", "mas_ws_facilities_storage_log_mode")
+            # self.printParamSummary("  + Log Storage Size", "mas_ws_facilities_storage_log_size")
+            self.printParamSummary("  + Userfiles Storage Class ", "mas_ws_facilities_storage_userfiles_class")
+            self.printParamSummary("  + User files Storage Mode", "mas_ws_facilities_storage_userfiles_mode")
+            # self.printParamSummary("  + User files Storage Size", "mas_ws_facilities_storage_userfiles_size")
+            if self.getParam("db2_action_facilities") == 'none':
+                self.printParamSummary("  + Dedicated DB2 Database", "No")
+            else:
+                self.printParamSummary("  + Dedicated DB2 Database", "db2_action_facilities")
+        else:
+            self.printSummary("Facilities", "Do Not Install")
+
     def db2Summary(self) -> None:
         if self.getParam("db2_action_system") == "install" or self.getParam("db2_action_manage") == "install":
             self.printH2("IBM Db2 Univeral Operator Configuration")
@@ -379,6 +403,7 @@ class InstallSummarizerMixin():
         self.assistSummary()
         self.inspectionSummary()
         self.aibrokerSummary()
+        self.facilitiesSummary()
 
         # Application Dependencies
         self.mongoSummary()