mas-cli 13.25.1__py3-none-any.whl → 13.27.0__py3-none-any.whl

mas/cli/install/argParser.py

@@ -170,7 +170,6 @@ masAdvancedArgGroup.add_argument(
     required=False,
     help="Configure MAS with a custom domain"
 )
-
 masAdvancedArgGroup.add_argument(
     "--disable-walkme",
     dest="mas_enable_walkme",
@@ -373,153 +372,12 @@ masAppsArgGroup.add_argument(
     choices=["full", "limited"],
     help="Install plan for Maximo Optimizer"
 )
-masAppsArgGroup.add_argument(
-    "--aibroker-channel",
-    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
-# -----------------------------------------------------------------------------
-aibrokerArgGroup = installArgParser.add_argument_group("Maximo AI Broker")
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-provider",
-    dest="mas_aibroker_storage_provider",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-accesskey",
-    dest="mas_aibroker_storage_accesskey",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-secretkey",
-    dest="mas_aibroker_storage_secretkey",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-host",
-    dest="mas_aibroker_storage_host",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-port",
-    dest="mas_aibroker_storage_port",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-ssl",
-    dest="mas_aibroker_storage_ssl",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-region",
-    dest="mas_aibroker_storage_region",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-pipelines-bucket",
-    dest="mas_aibroker_storage_pipelines_bucket",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-tenants-bucket",
-    dest="mas_aibroker_storage_tenants_bucket",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-templates-bucket",
-    dest="mas_aibroker_storage_templates_bucket",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-tenant-name",
-    dest="mas_aibroker_tenant_name",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-watsonxai-apikey",
-    dest="mas_aibroker_watsonxai_apikey",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-watsonxai-url",
-    dest="mas_aibroker_watsonxai_url",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-watsonxai-project-id",
-    dest="mas_aibroker_watsonxai_project_id",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-watsonx-action",
-    dest="mas_aibroker_watsonx_action",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-host",
-    dest="mas_aibroker_db_host",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-port",
-    dest="mas_aibroker_db_port",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-user",
-    dest="mas_aibroker_db_user",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-database",
-    dest="mas_aibroker_db_database",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-secret-name",
-    dest="mas_aibroker_db_secret_name",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-secret-key",
-    dest="mas_aibroker_db_secret_key",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-secret-value",
-    dest="mas_aibroker_db_secret_value",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-
 # Arcgis
 # -----------------------------------------------------------------------------
 arcgisArgGroup = installArgParser.add_argument_group("Maximo Location Services for Esri (arcgis)")
@@ -745,19 +603,20 @@ facilitiesArgGroup.add_argument(
     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-dwfagent",
+    dest="mas_ws_facilities_dwfagents",
+    required=False,
+    help="Defines the list of dedicates workflow agents",
+    type=str
+)
+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",
@@ -770,12 +629,12 @@ facilitiesArgGroup.add_argument(
     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-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",
@@ -788,12 +647,12 @@ facilitiesArgGroup.add_argument(
     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",
-# )
+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
 # -----------------------------------------------------------------------------

mas/cli/install/catalogs.py

@@ -9,17 +9,18 @@
 # *****************************************************************************
 supportedCatalogs = {
     "amd64": [
+        "v9-250624-amd64",
         "v9-250501-amd64",
         "v9-250403-amd64",
         "v9-250306-amd64",
-        "v9-250206-amd64",
     ],
     "s390x": [
+        "v9-250624-s390x",
         "v9-250501-s390x",
         "v9-250403-s390x",
         "v9-250306-s390x",
-        "v9-250206-s390x",
     ],
     "ppc64le": [
+        "v9-250624-ppc64le",
     ],
 }

mas/cli/install/params.py

@@ -184,12 +184,12 @@ optionalParams = [
     "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_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",
+    "mas_ws_facilities_storage_userfiles_size",
+    "mas_ws_facilities_dwfagents",
+    "mas_ws_facilities_db_maxconnpoolsize",
     # Special chars
     "mas_special_characters"
 ]

mas/cli/install/settings/db2Settings.py

@@ -182,8 +182,10 @@ class Db2SettingsMixin():
                     f"Note that the same settings are applied to both the IoT and {self.manageAppName} Db2 instances",
                     "Use existing node labels and taints to control scheduling of the Db2 workload in your cluster",
                     "For more information refer to the Red Hat documentation:",
-                    " - <Orange><u>https://docs.openshift.com/container-platform/4.16/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
-                    " - <Orange><u>https://docs.openshift.com/container-platform/4.16/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u></Orange>"
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.18/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.18/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u></Orange>",
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.17/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.17/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u></Orange>"
                 ])
 
                 if self.yesOrNo("Configure node affinity"):

mas/cli/install/settings/manageSettings.py

@@ -119,6 +119,8 @@ class ManageSettingsMixin():
                     self.params["mas_appws_components"] += ",utilities=latest"
                 if self.yesOrNo(" - Workday Applications"):
                     self.params["mas_appws_components"] += ",workday=latest"
+                if self.yesOrNo(" - AIP"):
+                    self.params["mas_appws_components"] += ",aip=latest"
                 logger.debug(f"Generated mas_appws_components = {self.params['mas_appws_components']}")
 
                 if ",icd=" in self.params["mas_appws_components"]:
@@ -207,7 +209,7 @@ class ManageSettingsMixin():
                 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")
-                    self.promptForString("Password", "mas_app_settings_customization_archive_password", isPassword=True)
+                    self.promptForString("Password", "mas_app_settings_customization_archive_password", isPassword=True)  # pragma: allowlist secret
 
     def manageSettingsDemodata(self) -> None:
         self.yesOrNo("Create demo data", "mas_app_settings_demodata")
@@ -269,29 +271,3 @@ class ManageSettingsMixin():
                 self.manageSettingsTimezone()
                 self.manageSettingsLanguages()
                 self.manageSettingsCP4D()
-
-    def aibrokerSettings(self) -> None:
-        if self.installAiBroker:
-            self.printH2("Maximo AI Broker Settings - Storage, WatsonX, MariaDB details")
-            self.printDescription(["Customise AI Broker details"])
-            self.promptForString("Storage provider", "mas_aibroker_storage_provider")
-            self.promptForString("Storage access key", "mas_aibroker_storage_accesskey")
-            self.promptForString("Storage secret key", "mas_aibroker_storage_secretkey")
-            self.promptForString("Storage host", "mas_aibroker_storage_host")
-            self.promptForString("Storage port", "mas_aibroker_storage_port")
-            self.promptForString("Storage ssl", "mas_aibroker_storage_ssl")
-            self.promptForString("Storage region", "mas_aibroker_storage_region")
-            self.promptForString("Storage pipelines bucket", "mas_aibroker_storage_pipelines_bucket")
-            self.promptForString("Storage tenants bucket", "mas_aibroker_storage_tenants_bucket")
-            self.promptForString("Storage templates bucket", "mas_aibroker_storage_templates_bucket")
-
-            self.promptForString("Watsonxai api key", "mas_aibroker_watsonxai_apikey")
-            self.promptForString("Watsonxai machine learning url", "mas_aibroker_watsonxai_url")
-            self.promptForString("Watsonxai project id", "mas_aibroker_watsonxai_project_id")
-
-            self.promptForString("Database host", "mas_aibroker_db_host")
-            self.promptForString("Database port", "mas_aibroker_db_port")
-            self.promptForString("Database user", "mas_aibroker_db_user")
-            self.promptForString("Database name", "mas_aibroker_db_database")
-            self.promptForString("Database Secretname", "mas_aibroker_db_secret_name")
-            self.promptForString("Database password", "mas_aibroker_db_secret_value")

mas/cli/install/summarizer.py

@@ -153,32 +153,6 @@ class InstallSummarizerMixin():
         else:
             self.printSummary("Visual Inspection", "Do Not Install")
 
-    def aibrokerSummary(self) -> None:
-        if self.installAiBroker:
-            self.printSummary("AI Broker", self.params["mas_app_channel_aibroker"])
-            print_formatted_text(HTML("  <SkyBlue>+ Maximo AI Broker Settings</SkyBlue>"))
-            self.printParamSummary("  + Storage provider", "mas_aibroker_storage_provider")
-            self.printParamSummary("  + Storage access key", "mas_aibroker_storage_accesskey")
-            self.printParamSummary("  + Storage secret key", "mas_aibroker_storage_secretkey")
-            self.printParamSummary("  + Storage host", "mas_aibroker_storage_host")
-            self.printParamSummary("  + Storage port", "mas_aibroker_storage_port")
-            self.printParamSummary("  + Storage ssl", "mas_aibroker_storage_ssl")
-            self.printParamSummary("  + Storage region", "mas_aibroker_storage_region")
-            self.printParamSummary("  + Storage pipelines bucket", "mas_aibroker_storage_pipelines_bucket")
-            self.printParamSummary("  + Storage tenants bucket", "mas_aibroker_storage_tenants_bucket")
-            self.printParamSummary("  + Storage templates bucket", "mas_aibroker_storage_templates_bucket")
-            self.printParamSummary("  + Watsonxai api key", "mas_aibroker_watsonxai_apikey")
-            self.printParamSummary("  + Watsonxai machine learning url", "mas_aibroker_watsonxai_url")
-            self.printParamSummary("  + Watsonxai project id", "mas_aibroker_watsonxai_project_id")
-            self.printParamSummary("  + Database host", "mas_aibroker_db_host")
-            self.printParamSummary("  + Database port", "mas_aibroker_db_port")
-            self.printParamSummary("  + Database user", "mas_aibroker_db_user")
-            self.printParamSummary("  + Database name", "mas_aibroker_db_database")
-            self.printParamSummary("  + Database Secretname", "mas_aibroker_db_secret_name")
-            self.printParamSummary("  + Database password", "mas_aibroker_db_secret_value")
-        else:
-            self.printSummary("AI Broker", "Do Not Install")
-
     def manageSummary(self) -> None:
         if self.installManage:
             self.printSummary(f"{'Manage foundation' if self.getParam('is_full_manage') == 'false' else 'Manage'}", self.params["mas_app_channel_manage"])
@@ -202,6 +176,7 @@ class InstallSummarizerMixin():
                 self.printSummary("  + Tririga", "Enabled" if "tririga=" in self.getParam("mas_appws_components") else "Disabled")
                 self.printSummary("  + Utilities", "Enabled" if "utilities=" in self.getParam("mas_appws_components") else "Disabled")
                 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.printParamSummary("+ Server bundle size", "mas_app_settings_server_bundles_size")
                 self.printParamSummary("+ Enable JMS queues", "mas_app_settings_default_jms")
@@ -377,6 +352,10 @@ class InstallSummarizerMixin():
         self.printH2("Grafana")
         self.printSummary("Install Grafana", "Install" if self.getParam("grafana_action") == "install" else "Do Not Install")
 
+    def installSummary(self) -> None:
+        self.printH2("Install Process")
+        self.printSummary("Wait for PVCs to bind", "No" if self.getParam("no_wait_for_pvc") else "Yes")
+
     def displayInstallSummary(self) -> None:
         self.printH1("Review Settings")
         self.printDescription([
@@ -402,7 +381,6 @@ class InstallSummarizerMixin():
         self.optimizerSummary()
         self.assistSummary()
         self.inspectionSummary()
-        self.aibrokerSummary()
         self.facilitiesSummary()
 
         # Application Dependencies
@@ -413,3 +391,6 @@ class InstallSummarizerMixin():
         self.cp4dSummary()
         self.grafanaSummary()
         self.turbonomicSummary()
+
+        # Install options
+        self.installSummary()

mas/cli/templates/facilities-configs.yml.j2

@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: facilities-config
+  namespace: mas-{{ mas_instance_id }}-pipelines
+data:
+  mas_ws_facilities_storage_log_size: |
+    {{ mas_ws_facilities_storage_log_size }}
+  mas_ws_facilities_storage_userfiles_size: |
+    {{ mas_ws_facilities_storage_userfiles_size }}
+  mas_ws_facilities_db_maxconnpoolsize: |
+    {{ mas_ws_facilities_db_maxconnpoolsize }}
+  mas_ws_facilities_dwfagents: |
+{%- if mas_ws_facilities_dwfagents is defined and mas_ws_facilities_dwfagents != '' %}
+{%- for agent in mas_ws_facilities_dwfagents %}
+    - name: "{{ agent.name }}"
+      members:
+{%- for member in agent.members %}
+        - name: "{{ member.name }}"
+          class: "{{ member.class }}"
+{%- endfor %}
+{%- endfor %}
+{%- else %}
+    []
+{% endif %}