mas-cli 21.7.0__tar.gz → 21.8.2__tar.gz

{mas_cli-21.7.0/python/src/mas_cli.egg-info → mas_cli-21.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-cli
-Version: 21.7.0
+Version: 21.8.2
 Summary: Python Admin CLI for Maximo Application Suite
 Author-email: David Parker <parkerda@uk.ibm.com>
 License-Expression: EPL-1.0

{mas_cli-21.7.0 → mas_cli-21.8.2}/python/src/mas/cli/__init__.py

@@ -10,4 +10,4 @@
 
 from .cli import BaseApp  # noqa: F401
 
-__version__ = "21.7.0"  # Python module compatible semver
+__version__ = "21.8.2"  # Python module compatible semver

{mas_cli-21.7.0 → mas_cli-21.8.2}/python/src/mas/cli/aiservice/install/app.py

@@ -207,6 +207,31 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
             if key in requiredParams:
                 if value is None:
                     self.fatalError(f"{key} must be set")
+
+                # Special handling for ibm_entitlement_key: validate it
+                if key == "ibm_entitlement_key":
+                    isValid = self.validateEntitlementKey(value)
+                    if not isValid:
+                        if self.noConfirm:
+                            # Non-interactive with --no-confirm: warn but continue
+                            self.printWarning("IBM entitlement key validation failed, but continuing due to --no-confirm flag")
+                        else:
+                            # Non-interactive without --no-confirm: offer options
+                            self.printWarning("IBM entitlement key validation failed")
+                            print()
+                            self.printDescription(
+                                [
+                                    "What would you like to do?",
+                                    "  1. Continue anyway (skip validation)",
+                                    "  2. Quit (exit the application)",
+                                ]
+                            )
+                            choice = self.promptForInt("Select an option", min=1, max=2)
+                            if choice == 2:
+                                logger.info("User chose to quit due to invalid entitlement key")
+                                exit(1)
+                            # If choice == 1, continue with the invalid key
+
                 self.setParam(key, value)
 
             # These fields we just pass straight through to the parameters
@@ -734,7 +759,7 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
     @logMethodCall
     def configICRCredentials(self):
         self.printH1("Configure IBM Container Registry")
-        self.promptForString("IBM entitlement key", "ibm_entitlement_key", isPassword=True)
+        self.promptForEntitlementKey("IBM entitlement key", "ibm_entitlement_key")
         if self.devMode:
             self.promptForString("Artifactory username", "artifactory_username")
             self.promptForString("Artifactory token", "artifactory_token", isPassword=True)

{mas_cli-21.7.0 → mas_cli-21.8.2}/python/src/mas/cli/backup/app.py

@@ -76,6 +76,7 @@ class BackupApp(BaseApp):
                 # Manage App Backup
                 "manage_workspace_id",
                 "backup_manage_app",
+                "backup_manage_include_pvc",
                 "backup_manage_db",
                 "manage_db2_namespace",
                 "manage_db2_instance_name",
@@ -84,6 +85,7 @@ class BackupApp(BaseApp):
                 # Facilities App Backup
                 "facilities_workspace_id",
                 "backup_facilities_app",
+                "backup_facilities_include_pvc",
                 "backup_facilities_db",
                 "facilities_db2_namespace",
                 "facilities_db2_instance_name",
@@ -187,6 +189,7 @@ class BackupApp(BaseApp):
             self.printH2("Manage Application Backup")
             self.printSummary("Backup Manage App", "Yes")
             self.printSummary("Workspace ID", self.getParam("manage_workspace_id"))
+            self.printSummary("Include PVC Backup", "Yes" if self.getParam("backup_manage_include_pvc") == "true" else "No")
             self.printSummary("Backup Manage incluster Db2 Database", "Yes" if self.getParam("backup_manage_db") == "true" else "No")
             if self.getParam("backup_manage_db") == "true":
                 self.printSummary("Db2 Namespace", self.getParam("manage_db2_namespace"))
@@ -197,6 +200,7 @@ class BackupApp(BaseApp):
             self.printH2("Facilities Application Backup")
             self.printSummary("Backup Facilities App", "Yes")
             self.printSummary("Workspace ID", self.getParam("facilities_workspace_id"))
+            self.printSummary("Include PVC Backup", "Yes" if self.getParam("backup_facilities_include_pvc") == "true" else "No")
             self.printSummary("Backup Facilities incluster Db2 Database", "Yes" if self.getParam("backup_facilities_db") == "true" else "No")
             if self.getParam("backup_facilities_db") == "true":
                 self.printSummary("Db2 Namespace", self.getParam("facilities_db2_namespace"))
@@ -571,6 +575,21 @@ class BackupApp(BaseApp):
                 workspaceId = self.promptForString("Enter Manage workspace ID")
                 self.setParam("manage_workspace_id", workspaceId)
 
+            # Ask about PVC backup
+            self.printH2("Manage PVC Backup")
+            self.printDescription(
+                [
+                    "The Manage application uses persistent volumes that can be backed up.",
+                    "This will include PVC data in the backup.",
+                ]
+            )
+            backupPvc = self.yesOrNo("Do you want to include PVC backup for Manage")
+
+            if backupPvc:
+                self.setParam("backup_manage_include_pvc", "true")
+            else:
+                self.setParam("backup_manage_include_pvc", "false")
+
             # Ask about DB2 backup
             self.printH2("Manage Database Backup")
             self.printDescription(
@@ -657,6 +676,21 @@ class BackupApp(BaseApp):
                 workspaceId = self.promptForString("Enter Facilities workspace ID")
                 self.setParam("facilities_workspace_id", workspaceId)
 
+            # Ask about PVC backup
+            self.printH2("Facilities PVC Backup")
+            self.printDescription(
+                [
+                    "The Facilities application uses persistent volumes that can be backed up.",
+                    "This will include PVC data in the backup.",
+                ]
+            )
+            backupPvc = self.yesOrNo("Do you want to include PVC backup for Facilities")
+
+            if backupPvc:
+                self.setParam("backup_facilities_include_pvc", "true")
+            else:
+                self.setParam("backup_facilities_include_pvc", "false")
+
             # Ask about DB2 backup
             self.printH2("Facilities Database Backup")
             self.printDescription(

{mas_cli-21.7.0 → mas_cli-21.8.2}/python/src/mas/cli/backup/argParser.py

@@ -69,6 +69,22 @@ manageAppArgGroup.add_argument(
     "--backup-manage-app", dest="backup_manage_app", required=False, action="store_const", const="true", help="Backup the Manage application"
 )
 manageAppArgGroup.add_argument("--manage-workspace-id", dest="manage_workspace_id", required=False, help="Manage workspace ID")
+manageAppArgGroup.add_argument(
+    "--backup-manage-include-pvc",
+    dest="backup_manage_include_pvc",
+    required=False,
+    action="store_const",
+    const="true",
+    help="Include PVC backup for Manage application",
+)
+manageAppArgGroup.add_argument(
+    "--backup-manage-exclude-pvc",
+    dest="backup_manage_include_pvc",
+    required=False,
+    action="store_const",
+    const="false",
+    help="Exclude PVC backup for Manage application",
+)
 manageAppArgGroup.add_argument(
     "--backup-manage-db", dest="backup_manage_db", required=False, action="store_const", const="true", help="Backup the Manage application database (Db2)"
 )
@@ -87,6 +103,22 @@ facilitiesAppArgGroup.add_argument(
     "--backup-facilities-app", dest="backup_facilities_app", required=False, action="store_const", const="true", help="Backup the Facilities application"
 )
 facilitiesAppArgGroup.add_argument("--facilities-workspace-id", dest="facilities_workspace_id", required=False, help="Facilities workspace ID")
+facilitiesAppArgGroup.add_argument(
+    "--backup-facilities-include-pvc",
+    dest="backup_facilities_include_pvc",
+    required=False,
+    action="store_const",
+    const="true",
+    help="Include PVC backup for Facilities application",
+)
+facilitiesAppArgGroup.add_argument(
+    "--backup-facilities-exclude-pvc",
+    dest="backup_facilities_include_pvc",
+    required=False,
+    action="store_const",
+    const="false",
+    help="Exclude PVC backup for Facilities application",
+)
 facilitiesAppArgGroup.add_argument(
     "--backup-facilities-db",
     dest="backup_facilities_db",

{mas_cli-21.7.0 → mas_cli-21.8.2}/python/src/mas/cli/cli.py

@@ -32,6 +32,7 @@ from prompt_toolkit import prompt, print_formatted_text, HTML
 
 from mas.devops.mas import isAirgapInstall
 from mas.devops.ocp import connect, isSNO, getNodes
+from mas.devops.utils import validateIBMEntitlementKey
 
 from .displayMixins import PrintMixin, PromptMixin
 
@@ -126,7 +127,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger("urllib3").setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version: str = "21.7.0"
+        self.version: str = "21.8.2"
         self.h1count: int = 0
         self.h2count: int = 0
 
@@ -509,3 +510,98 @@ class BaseApp(PrintMixin, PromptMixin):
         if self.localConfigDir is None:
             # You need to tell us where the configuration file can be found
             self.localConfigDir = self.promptForDir("Select Local configuration directory")
+
+    @logMethodCall
+    def validateEntitlementKey(self, entitlementKey: str, repository: str = "cp/mas/coreapi", timeout: int = 30) -> bool:
+        """
+        Validate IBM entitlement key using mas.devops.utils.validateIBMEntitlementKey.
+
+        Args:
+            entitlementKey: The entitlement key to validate
+            repository: Docker repository to test against. Defaults to "cp/mas/coreapi".
+            timeout: Timeout in seconds for validation. Defaults to 30.
+
+        Returns:
+            bool: True if valid, False if invalid
+        """
+        try:
+            logger.info(f"Validating IBM entitlement key against repository: {repository}")
+            isValid = validateIBMEntitlementKey(entitlementKey, repository, timeout)
+            if isValid:
+                logger.info("IBM entitlement key validation successful")
+            else:
+                logger.warning("IBM entitlement key validation failed")
+            return isValid
+        except Exception as e:
+            logger.error(f"Error validating IBM entitlement key: {e}")
+            logger.exception(e, stack_info=True)
+            return False
+
+    @logMethodCall
+    def promptForEntitlementKey(self, message: str, param: str, repository: str = "cp/mas/coreapi", timeout: int = 30) -> str:
+        """
+        Prompt for IBM entitlement key with validation.
+
+        In interactive mode:
+        - Validates the key after user input
+        - If invalid, offers: 1) Try again, 2) Continue anyway, 3) Quit
+        - Loops until valid key or user chooses to continue/quit
+
+        In non-interactive mode with --no-confirm:
+        - Validates but only warns if invalid, does not block
+
+        Args:
+            message: Prompt message to display
+            param: Parameter name to store the key
+            repository: Docker repository to test against
+            timeout: Timeout in seconds for validation
+
+        Returns:
+            str: The entitlement key (validated or user chose to continue anyway)
+        """
+        while True:
+            # Prompt for the entitlement key
+            entitlementKey = self.promptForString(message, param=None, isPassword=True)
+
+            # Validate the key
+            isValid = self.validateEntitlementKey(entitlementKey, repository, timeout)
+
+            if isValid:
+                # Key is valid, show success message and continue
+                self.printHighlight("✓ IBM entitlement key validated successfully")
+                self.setParam(param, entitlementKey)
+                return entitlementKey
+
+            # Key is invalid
+            if self.noConfirm:
+                # Non-interactive mode with --no-confirm: warn but continue
+                self.printWarning("IBM entitlement key validation failed, but continuing due to --no-confirm flag")
+                self.setParam(param, entitlementKey)
+                return entitlementKey
+
+            # Interactive mode or non-interactive without --no-confirm: offer options
+            self.printWarning("IBM entitlement key validation failed")
+            print()
+            self.printDescription(
+                [
+                    "What would you like to do?",
+                    "  1. Try again (re-enter the entitlement key)",
+                    "  2. Continue anyway (skip validation)",
+                    "  3. Quit (exit the application)",
+                ]
+            )
+
+            choice = self.promptForInt("Select an option", min=1, max=3)
+
+            if choice == 1:
+                # Try again - loop will continue
+                continue
+            elif choice == 2:
+                # Continue anyway
+                logger.warning("User chose to continue with invalid entitlement key")
+                self.setParam(param, entitlementKey)
+                return entitlementKey
+            else:  # choice == 3
+                # Quit
+                logger.info("User chose to quit due to invalid entitlement key")
+                exit(1)

{mas_cli-21.7.0 → mas_cli-21.8.2}/python/src/mas/cli/install/app.py

@@ -72,6 +72,7 @@ from mas.devops.tekton import (
 )
 from mas.devops.pre_install import applyPreInstallMASRBAC
 from ..rbac_utils import evaluatePreinstallRBACAccess
+from .facilities.agents import facilitiesAgents, facilitiesAgentsDeploymentModes
 
 logger = logging.getLogger(__name__)
 
@@ -212,7 +213,7 @@ class InstallApp(
     @logMethodCall
     def configICRCredentials(self):
         self.printH1("Configure IBM Container Registry")
-        self.promptForString("IBM entitlement key", "ibm_entitlement_key", isPassword=True)
+        self.promptForEntitlementKey("IBM entitlement key", "ibm_entitlement_key")
         if self.devMode:
             self.promptForString("Artifactory username", "artifactory_username")
             self.promptForString("Artifactory token", "artifactory_token", isPassword=True)
@@ -1474,6 +1475,9 @@ class InstallApp(
             )
 
             if self.showAdvancedOptions:
+                # Check MAS version - Custom FACILITIES.properties and Agents Deployment Flexibility are only supported in MAS 9.2+
+                mas_facilities_channel = self.getParam("mas_app_channel_facilities")
+
                 self.printH2("Maximo Real Estate and Facilities Settings - Advanced")
                 self.printDescription(
                     ["Advanced configurations for Real Estate and Facilities are added through an additional file called facilities-configs.yaml"]
@@ -1504,9 +1508,6 @@ class InstallApp(
                         "mas_ws_facilities_vault_secret",
                     )
 
-                # Check MAS version - Custom FACILITIES.properties is only supported in MAS 9.2+
-                mas_facilities_channel = self.getParam("mas_app_channel_facilities")
-
                 # Only prompt for custom FACILITIES.properties file if MAS 9.2+
                 if mas_facilities_channel and isVersionEqualOrAfter("9.2.0", mas_facilities_channel):
                     if self.yesOrNo("Upload custom FACILITIES.properties file"):
@@ -1670,6 +1671,32 @@ class InstallApp(
                         validator=JsonValidator(),
                     )
 
+                # Only prompt for Agents Deployments Flexibility file if MAS 9.2+
+                if mas_facilities_channel and isVersionEqualOrAfter("9.2.0", mas_facilities_channel):
+                    if self.yesOrNo("Configure Agents Deployments Flexibility"):
+                        self.printDescription(
+                            [
+                                "Define deployment mode for each Facilities Agents:",
+                                "  1. shared - the agent is activated in the shared multiagents POD",
+                                "  2. dedicated - the agent is activated in a dedicated POD",
+                                "  3. disabled - the agent is not activated at all (not applicable for wfagent and reportqueueagent)",
+                            ]
+                        )
+                        for agent in facilitiesAgents:
+                            self.promptForListSelect(
+                                f"Select {agent} deployment mode:",
+                                facilitiesAgentsDeploymentModes[agent][:-1],
+                                f"mas_ws_facilities_{agent}_deploymentmode",
+                                default=1,
+                            )
+                    else:
+                        for agent in facilitiesAgents:
+                            self.setParam(f"mas_ws_facilities_{agent}_deploymentmode", "")
+                else:
+                    # For MAS 9.1 and earlier, skip the prompt and use default behavior
+                    for agent in facilitiesAgents:
+                        self.setParam(f"mas_ws_facilities_{agent}_deploymentmode", "")
+
                 # If advanced options is selected, we need to create a file to add props not supported by Tekton
                 self.selectLocalConfigDir()
                 if self.localConfigDir is not None:
@@ -1914,6 +1941,7 @@ class InstallApp(
         self.slsLicenseFileLocal = None
         self.db2LicenseFileLocal = None
         self.aiserviceTenantSchedulingConfigFileLocal = None
+        self.facilitiesPropertiesFileLocal = None
 
         if simplified:
             self.showAdvancedOptions = False
@@ -2005,6 +2033,7 @@ class InstallApp(
         self.slsLicenseFileLocal = None
         self.db2LicenseFileLocal = None
         self.aiserviceTenantSchedulingConfigFileLocal = None
+        self.facilitiesPropertiesFileLocal = None
 
         self.approvals: Dict[str, Dict[str, Any]] = {
             "approval_core": {"id": "suite-verify"},  # After Core Platform verification has completed
@@ -2028,6 +2057,31 @@ class InstallApp(
             if key in requiredParams:
                 if value is None:
                     self.fatalError(f"{key} must be set")
+
+                # Special handling for ibm_entitlement_key: validate it
+                if key == "ibm_entitlement_key":
+                    isValid = self.validateEntitlementKey(value)
+                    if not isValid:
+                        if self.noConfirm:
+                            # Non-interactive with --no-confirm: warn but continue
+                            self.printWarning("IBM entitlement key validation failed, but continuing due to --no-confirm flag")
+                        else:
+                            # Non-interactive without --no-confirm: offer options
+                            self.printWarning("IBM entitlement key validation failed")
+                            print()
+                            self.printDescription(
+                                [
+                                    "What would you like to do?",
+                                    "  1. Continue anyway (skip validation)",
+                                    "  2. Quit (exit the application)",
+                                ]
+                            )
+                            choice = self.promptForInt("Select an option", min=1, max=2)
+                            if choice == 2:
+                                logger.info("User chose to quit due to invalid entitlement key")
+                                exit(1)
+                            # If choice == 1, continue with the invalid key
+
                 self.setParam(key, value)
 
             # These fields we just pass straight through to the parameters
@@ -2082,11 +2136,13 @@ class InstallApp(
             elif key == "pod_templates":
                 # For the named configurations we will convert into the path
                 if value in ["best-effort", "guaranteed"]:
+                    self.podTemplatesKeyword = value
                     self.setParam(
                         "mas_pod_templates_dir",
                         path.join(self.templatesDir, "pod-templates", value),
                     )
                 else:
+                    self.podTemplatesKeyword = None
                     self.setParam("mas_pod_templates_dir", value)
 
             # We check for both None and "" values for the application channel parameters

{mas_cli-21.7.0 → mas_cli-21.8.2}/python/src/mas/cli/install/argBuilder.py

@@ -8,6 +8,7 @@
 #
 # *****************************************************************************
 
+from .facilities.agents import facilitiesAgents
 import logging
 
 logger = logging.getLogger(__name__)
@@ -86,8 +87,12 @@ class installArgBuilderMixin:
 
         if self.localConfigDir is not None:
             command += f'  --additional-configs "{self.localConfigDir}"{newline}'
-        if self.getParam("pod_templates") != "":
-            command += f"  --pod-templates \"{self.getParam('pod_templates')}\"{newline}"
+        if self.getParam("mas_pod_templates_dir") != "":
+            # Use keyword for built-in templates, otherwise use the full path
+            if hasattr(self, "podTemplatesKeyword") and self.podTemplatesKeyword is not None:
+                command += f'  --pod-templates "{self.podTemplatesKeyword}"{newline}'
+            else:
+                command += f"  --pod-templates \"{self.getParam('mas_pod_templates_dir')}\"{newline}"
 
         if self.operationalMode == 2:
             command += f"  --non-prod{newline}"
@@ -351,11 +356,14 @@ class installArgBuilderMixin:
             if self.getParam("mas_ws_facilities_server_timezone") != "":
                 command += f"  --facilities-server-timezone \"{self.getParam('mas_ws_facilities_server_timezone')}\"{newline}"
 
-            if self.getParam("mas_ws_facilities_properties_file_local") != "":
-                command += f"  --facilities-properties-file \"{self.getParam('mas_ws_facilities_properties_file_local')}\"{newline}"
+            if self.facilitiesPropertiesFileLocal:
+                command += f'  --facilities-properties-file "{self.facilitiesPropertiesFileLocal}"{newline}'
             if self.getParam("mas_ws_facilities_properties_secret_name") != "":
                 command += f"  --facilities-properties-secret-name \"{self.getParam('mas_ws_facilities_properties_secret_name')}\"{newline}"
 
+            for agent in facilitiesAgents:
+                if self.getParam(f"mas_ws_facilities_{agent}_deploymentmode") != "":
+                    command += f'  --facilities-{agent}-deploymentmode "{self.getParam(f"mas_ws_facilities_{agent}_deploymentmode")}"{newline}'
         # AI Service Advanced Settings
         # -----------------------------------------------------------------------------
         if self.installAIService:

{mas_cli-21.7.0 → mas_cli-21.8.2}/python/src/mas/cli/install/argParser.py

@@ -13,6 +13,7 @@ from os import path
 
 from .. import __version__ as packageVersion
 from ..cli import getHelpFormatter
+from .facilities.agents import facilitiesAgents, facilitiesAgentsDeploymentModes
 
 # Constants for argument choices
 DNS_PROVIDERS = ["cloudflare", "cis", "route53"]
@@ -123,7 +124,7 @@ masAdvancedArgGroup.add_argument(
 masAdvancedArgGroup.add_argument(
     "--pod-templates",
     required=False,
-    help="Path to directory containing custom podTemplates configuration files to be applied",
+    help="Pod templates to apply. Use 'guaranteed' or 'best-effort' for built-in templates, or provide a path to a directory containing custom podTemplates configuration files",
 )
 masAdvancedArgGroup.add_argument(
     "--non-prod",
@@ -839,7 +840,15 @@ facilitiesArgGroup.add_argument(
     help="Custom name for the Facilities properties secret (default: facilities-properties)",
     default="custom-facilities-properties",
 )
-
+for agent in facilitiesAgents:
+    facilitiesArgGroup.add_argument(
+        f"--facilities-{agent}-deploymentmode",
+        dest=f"mas_ws_facilities_{agent}_deploymentmode",
+        required=False,
+        help=f"Facilities agent {agent} deployment mode",
+        default="",
+        choices=facilitiesAgentsDeploymentModes[agent],
+    )
 # Open Data Hub
 # -----------------------------------------------------------------------------
 odhArgGroup = installArgParser.add_argument_group("Open Data Hub")

mas_cli-21.8.2/python/src/mas/cli/install/facilities/agents.py

@@ -0,0 +1,31 @@
+# *****************************************************************************
+# 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
+#
+# *****************************************************************************
+
+_FACILITIES_AGENTS_DEPLOYMENT_MODES = ["shared", "dedicated", "disabled", ""]
+
+_FACILITIES_AGENTS_DEPLOYMENT_MODES_NO_DISABLED = ["shared", "dedicated", ""]
+
+facilitiesAgentsDeploymentModes = {
+    "dataconnectagent": _FACILITIES_AGENTS_DEPLOYMENT_MODES,
+    "extendedformulaagent": _FACILITIES_AGENTS_DEPLOYMENT_MODES,
+    "formularecalcagent": _FACILITIES_AGENTS_DEPLOYMENT_MODES,
+    "incomingmailagent": _FACILITIES_AGENTS_DEPLOYMENT_MODES,
+    "objectmigrationagent": _FACILITIES_AGENTS_DEPLOYMENT_MODES,
+    "objectpublishagent": _FACILITIES_AGENTS_DEPLOYMENT_MODES,
+    "maintenanceagent": _FACILITIES_AGENTS_DEPLOYMENT_MODES,
+    "reportqueueagent": _FACILITIES_AGENTS_DEPLOYMENT_MODES_NO_DISABLED,
+    "wfagent": _FACILITIES_AGENTS_DEPLOYMENT_MODES_NO_DISABLED,
+    "wffutureagent": _FACILITIES_AGENTS_DEPLOYMENT_MODES,
+    "wfnotificationagent": _FACILITIES_AGENTS_DEPLOYMENT_MODES,
+    "reservesmtpagent": _FACILITIES_AGENTS_DEPLOYMENT_MODES,
+    "scheduleragent": _FACILITIES_AGENTS_DEPLOYMENT_MODES,
+}
+
+facilitiesAgents = list(facilitiesAgentsDeploymentModes.keys())

{mas_cli-21.7.0 → mas_cli-21.8.2}/python/src/mas/cli/install/params.py

@@ -178,6 +178,19 @@ optionalParams = [
     "mas_ws_facilities_properties_file_local",
     "mas_ws_facilities_custom_properties",
     "mas_ws_facilities_properties_secret_name",
+    "mas_ws_facilities_dataconnectagent_deploymentmode",
+    "mas_ws_facilities_extendedformulaagent_deploymentmode",
+    "mas_ws_facilities_formularecalcagent_deploymentmode",
+    "mas_ws_facilities_incomingmailagent_deploymentmode",
+    "mas_ws_facilities_objectmigrationagent_deploymentmode",
+    "mas_ws_facilities_objectpublishagent_deploymentmode",
+    "mas_ws_facilities_maintenanceagent_deploymentmode",
+    "mas_ws_facilities_reportqueueagent_deploymentmode",
+    "mas_ws_facilities_wfagent_deploymentmode",
+    "mas_ws_facilities_wffutureagent_deploymentmode",
+    "mas_ws_facilities_wfnotificationagent_deploymentmode",
+    "mas_ws_facilities_reservesmtpagent_deploymentmode",
+    "mas_ws_facilities_scheduleragent_deploymentmode",
     # DB2 for Facilities
     "db2_facilities_timezone",
     # Special chars

{mas_cli-21.7.0 → mas_cli-21.8.2}/python/src/mas/cli/install/settings/additionalConfigs.py

@@ -137,10 +137,13 @@ class AdditionalConfigsMixin:
             podTemplateChoice = self.promptForInt("Select pod templates profile")
 
             if podTemplateChoice == 1:
+                self.podTemplatesKeyword = "guaranteed"
                 self.setParam("mas_pod_templates_dir", path.join(self.templatesDir, "pod-templates", "guaranteed"))
             elif podTemplateChoice == 2:
+                self.podTemplatesKeyword = "best-effort"
                 self.setParam("mas_pod_templates_dir", path.join(self.templatesDir, "pod-templates", "best-effort"))
             elif podTemplateChoice == 3:
+                self.podTemplatesKeyword = None
                 self.setParam("mas_pod_templates_dir", self.promptForDir("Pod templates directory", mustExist=True))
             else:
                 self.fatalError(f"Invalid selection: {podTemplateChoice}")
@@ -230,13 +233,13 @@ class AdditionalConfigsMixin:
         mas_facilities_channel = self.getParam("mas_app_channel_facilities")
 
         # Only process custom file if MAS 9.2+ and file is provided
-        facilitiesPropertiesFileLocal = self.getParam("mas_ws_facilities_properties_file_local")
+        self.facilitiesPropertiesFileLocal = self.getParam("mas_ws_facilities_properties_file_local")
 
         if (
             mas_facilities_channel
             and isVersionEqualOrAfter("9.2.0", mas_facilities_channel)
-            and facilitiesPropertiesFileLocal
-            and facilitiesPropertiesFileLocal != ""
+            and self.facilitiesPropertiesFileLocal
+            and self.facilitiesPropertiesFileLocal != ""
         ):
             # Get custom secret name or use default
             secretName = self.getParam("mas_ws_facilities_properties_secret_name")
@@ -246,9 +249,9 @@ class AdditionalConfigsMixin:
             facilitiesPropertiesSecret = {"apiVersion": "v1", "kind": "Secret", "type": "Opaque", "metadata": {"name": "pipeline-facilities-properties"}}
 
             # Read the file from user's local path
-            self.facilitiesPropertiesSecret = self.addFilesToSecret(facilitiesPropertiesSecret, facilitiesPropertiesFileLocal, "")
+            self.facilitiesPropertiesSecret = self.addFilesToSecret(facilitiesPropertiesSecret, self.facilitiesPropertiesFileLocal, "")
 
-            # Now update the parameters
+            # Now update the parameters - set workspace path for pipeline use
             self.setParam("mas_ws_facilities_custom_properties", "true")
             self.setParam("mas_ws_facilities_properties_file_local", "/workspace/facilities/FACILITIES.properties")
             self.setParam("mas_ws_facilities_properties_secret_name", secretName)

{mas_cli-21.7.0 → mas_cli-21.8.2}/python/src/mas/cli/install/settings/manageSettings.py

@@ -10,7 +10,7 @@
 
 from typing import TYPE_CHECKING, Dict, List, NoReturn
 from prompt_toolkit.completion import WordCompleter
-from mas.cli.validators import LanguageValidator
+from mas.cli.validators import CustomizationArchiveNameValidator, LanguageValidator
 from mas.devops.aiservice import listAiServiceTenantInstances, listAiServiceInstances
 from openshift.dynamic.exceptions import ResourceNotFoundError
 from ...validators import AiserviceTeanantIDValidator
@@ -280,7 +280,7 @@ class ManageSettingsMixin:
             self.printDescription([f"Provide a customization archive to be used in the {self.manageAppName} build process"])
 
             if self.yesOrNo("Include customization archive"):
-                self.promptForString("Customization archive name", "mas_app_settings_customization_archive_name")
+                self.promptForString("Customization archive name", "mas_app_settings_customization_archive_name", validator=CustomizationArchiveNameValidator())
                 self.promptForString("Customization archive path/url", "mas_app_settings_customization_archive_url")
                 if self.yesOrNo("Provide authentication to access customization archive URL"):
                     self.promptForString("Username", "mas_app_settings_customization_archive_username")
@@ -325,7 +325,7 @@ class ManageSettingsMixin:
         self.setParam("mas_app_settings_secondary_langs", secondaryLanguages.upper())
 
     def manageSettingsCP4D(self) -> None:
-        if isVersionEqualOrAfter("8.7.0", self.getParam("mas_app_channel_manage")) and self.showAdvancedOptions:
+        if self.showAdvancedOptions:
             self.printDescription(
                 [
                     f"Integration with Cognos Analytics provides additional support for reporting features in Maximo {self.manageAppName}, for more information refer to the documentation online: ",