mas-cli 13.28.0__tar.gz → 14.0.0__tar.gz

{mas_cli-13.28.0 → mas_cli-14.0.0}/PKG-INFO

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

mas_cli-14.0.0/src/mas/cli/__init__.py

@@ -0,0 +1,11 @@
+# *****************************************************************************
+# Copyright (c) 2024 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
+#
+# *****************************************************************************
+
+__version__ = "14.0.0"  # Python module compatible semver

{mas_cli-13.28.0 → mas_cli-14.0.0}/src/mas/cli/aiservice/install/argBuilder.py

@@ -30,6 +30,14 @@ class aiServiceInstallArgBuilderMixin():
 
         command += f"mas aiservice-install --mas-catalog-version {self.getParam('mas_catalog_version')}"
 
+        if self.getParam('mas_catalog_digest') != "":
+            command += f" --mas-catalog-digest {self.getParam('mas_catalog_digest')}"
+
+        command += f" --ibm-entitlement-key $IBM_ENTITLEMENT_KEY{newline}"
+
+        # Aibroker Instance Id
+        command += f"  --aibroker-instance-id  \"{self.getParam('aibroker_instance_id')}\"{newline}"
+
         # MAS Advanced Configuration
         # -----------------------------------------------------------------------------
 
@@ -211,22 +219,28 @@ class aiServiceInstallArgBuilderMixin():
             command += f"  --tenant-entitlement-start-date \"{self.getParam('tenant_entitlement_start_date')}\"{newline}"
         if self.getParam('tenant_entitlement_end_date') != "":
             command += f"  --tenant-entitlement-end-date \"{self.getParam('tenant_entitlement_end_date')}\"{newline}"
-        if self.getParam('tenant_entitlement_end_date') != "":
+        if self.getParam('mas_aibroker_s3_bucket_prefix') != "":
             command += f"  --mas-aibroker-s3-bucket-prefix \"{self.getParam('mas_aibroker_s3_bucket_prefix')}\"{newline}"
-        if self.getParam('tenant_entitlement_end_date') != "":
+        if self.getParam('mas_aibroker_s3_endpoint_url') != "":
             command += f"  --mas-aibroker-s3-endpoint-url \"{self.getParam('mas_aibroker_s3_endpoint_url')}\"{newline}"
-        if self.getParam('tenant_entitlement_end_date') != "":
+        if self.getParam('mas_aibroker_s3_region') != "":
             command += f"  --mas-aibroker-s3-region \"{self.getParam('mas_aibroker_s3_region')}\"{newline}"
-        if self.getParam('tenant_entitlement_end_date') != "":
+        if self.getParam('mas_aibroker_tenant_s3_bucket_prefix') != "":
             command += f"  --mas-aibroker-tenant-s3-bucket-prefix \"{self.getParam('mas_aibroker_tenant_s3_bucket_prefix')}\"{newline}"
-        if self.getParam('tenant_entitlement_end_date') != "":
+        if self.getParam('mas_aibroker_tenant_s3_region') != "":
             command += f"  --mas-aibroker-tenant-s3-region \"{self.getParam('mas_aibroker_tenant_s3_region')}\"{newline}"
-        if self.getParam('tenant_entitlement_end_date') != "":
+        if self.getParam('mas_aibroker_tenant_s3_endpoint_url') != "":
             command += f"  --mas-aibroker-tenant-s3-endpoint-url \"{self.getParam('mas_aibroker_tenant_s3_endpoint_url')}\"{newline}"
-        if self.getParam('tenant_entitlement_end_date') != "":
+        if self.getParam('mas_aibroker_tenant_s3_access_key') != "":
             command += f"  --mas-aibroker-tenant-s3-access-key \"{self.getParam('mas_aibroker_tenant_s3_access_key')}\"{newline}"
-        if self.getParam('tenant_entitlement_end_date') != "":
+        if self.getParam('mas_aibroker_tenant_s3_secret_key') != "":
             command += f"  --mas-aibroker-tenant-s3-secret-key \"{self.getParam('mas_aibroker_tenant_s3_secret_key')}\"{newline}"
+        if self.getParam('rsl_url') != "":
+            command += f"  --rsl-url \"{self.getParam('rsl_url')}\"{newline}"
+        if self.getParam('rsl_org_id') != "":
+            command += f"  --rsl-org-id \"{self.getParam('rsl_org_id')}\"{newline}"
+        if self.getParam('rsl_token') != "":
+            command += f"  --rsl-token \"{self.getParam('rsl_token')}\"{newline}"
 
         command += "  --accept-license --no-confirm"
         return command

{mas_cli-13.28.0 → mas_cli-14.0.0}/src/mas/cli/aiservice/install/summarizer.py

@@ -82,7 +82,6 @@ class aiServiceInstallSummarizerMixin():
                 self.printParamSummary("  + Tenant entitlement type", "tenant_entitlement_type")
                 self.printParamSummary("  + Tenant start date", "tenant_entitlement_start_date")
                 self.printParamSummary("  + Tenant end date", "tenant_entitlement_end_date")
-                self.printParamSummary("  + Tenant end date", "tenant_entitlement_end_date")
                 self.printParamSummary("  + S3 bucket prefix", "mas_aibroker_s3_bucket_prefix")
                 self.printParamSummary("  + S3 endpoint url", "mas_aibroker_s3_endpoint_url")
                 self.printParamSummary("  + S3 bucket prefix (tenant level)", "mas_aibroker_tenant_s3_bucket_prefix")

{mas_cli-13.28.0 → mas_cli-14.0.0}/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.28.0"
+        self.version = "14.0.0"
         self.h1count = 0
         self.h2count = 0
 

{mas_cli-13.28.0 → mas_cli-14.0.0}/src/mas/cli/install/app.py

@@ -632,12 +632,9 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             if not self.getParam("mas_channel").startswith("8.") and not self.getParam("mas_channel").startswith("9.0"):
                 self.installManage = True
                 self.isManageFoundation = True
-                self.setParam("is_full_manage", "false")
                 self.setParam("mas_app_settings_aio_flag", "false")
                 self.manageAppName = "Manage foundation"
                 self.printDescription([f"{self.manageAppName} installs the following capabilities: User, Security groups, Application configurator and Mobile configurator."])
-        else:
-            self.setParam("is_full_manage", "true")
 
         if self.installManage:
             self.configAppChannel("manage")
@@ -1113,9 +1110,6 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 self.fatalError(f"Unknown option: {key} {value}")
 
         if self.installManage:
-            # If Manage is being installed and --is-full-manage was set to something different than "false", assume it is "true"
-            if self.getParam("is_full_manage") != "false":
-                self.setParam("is_full_manage", "true")
 
             # Configure Storage and Access mode
             self.manageStorageAndAccessMode()
@@ -1143,6 +1137,14 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             self.validateCatalogSource()
             self.licensePrompt()
 
+        # Version before 9.1 cannot have empty components
+        if (self.getParam("mas_channel").startswith("8.") or self.getParam("mas_channel").startswith("9.0")) and self.getParam("mas_appws_components") == "":
+            self.fatalError("--mas_appws_components must be set for versions earlier than 9.1.0")
+
+        #  An error should be raised if "health" is not specified when installing Predict.
+        if ((self.getParam("mas_app_channel_predict") is not None and self.getParam("mas_app_channel_predict") != "") and 'health' not in self.getParam("mas_appws_components")):
+            self.fatalError("--mas_appws_components must include 'health' component when installing Predict")
+
     @logMethodCall
     def install(self, argv):
         """

{mas_cli-13.28.0 → mas_cli-14.0.0}/src/mas/cli/install/argBuilder.py

@@ -163,7 +163,6 @@ class installArgBuilderMixin():
             command += f"  --monitor-channel \"{self.getParam('mas_app_channel_monitor')}\"{newline}"
         if self.installManage:
             command += f"  --manage-channel \"{self.getParam('mas_app_channel_manage')}\"{newline}"
-            command += f"  --is-full-manage \"{self.getParam('is_full_manage')}\"{newline}"
         if self.installOptimizer:
             command += f"  --optimizer-channel \"{self.getParam('mas_app_channel_optimizer')}\""
             command += f" --optimizer-plan \"{self.getParam('mas_app_plan_optimizer')}\"{newline}"
@@ -237,6 +236,9 @@ class installArgBuilderMixin():
             if self.getParam('mas_appws_bindings_health_wsl_flag') == "true":
                 command += f"  --manage-health-wsl{newline}"
 
+            if self.getParam('mas_appws_upgrade_type') == "true":
+                command += f"  --manage-upgrade-type \"{self.getParam('mas_appws_upgrade_type')}\"{newline}"
+
         # Facilities Advanced Settings
         # -----------------------------------------------------------------------------
         # TODO: Fix type for storage sizes and max conn pool size

{mas_cli-13.28.0 → mas_cli-14.0.0}/src/mas/cli/install/argParser.py

@@ -346,11 +346,6 @@ masAppsArgGroup.add_argument(
     required=False,
     help="Subscription channel for Maximo Manage"
 )
-masAppsArgGroup.add_argument(
-    "--is-full-manage",
-    required=False,
-    help="Full Manage instead of Manage Foundation"
-)
 masAppsArgGroup.add_argument(
     "--predict-channel",
     required=False,
@@ -442,7 +437,7 @@ manageArgGroup.add_argument(
     dest="mas_appws_components",
     required=False,
     help="Set Manage Components to be installed (e.g 'base=latest,health=latest,civil=latest')",
-    default="base=latest,health=latest"
+    default=""
 )
 
 manageArgGroup.add_argument(
@@ -550,6 +545,15 @@ manageArgGroup.add_argument(
     help="Manage server timezone. Default is `GMT`"
 )
 
+manageArgGroup.add_argument(
+    "--manage-upgrade-type",
+    dest="mas_appws_upgrade_type",
+    required=False,
+    help="Set Manage upgrade type. Default is `regularUpgrade`",
+    default="regularUpgrade",
+    choices=["regularUpgrade", "onlineUpgrade"]
+)
+
 # Manage Attachments
 # -----------------------------------------------------------------------------
 manageArgGroup.add_argument(

{mas_cli-13.28.0 → mas_cli-14.0.0}/src/mas/cli/install/params.py

@@ -38,7 +38,6 @@ optionalParams = [
     "mas_superuser_password",
     "mas_trust_default_cas",
     "mas_app_settings_server_bundles_size",
-    "is_full_manage",
     "mas_app_settings_default_jms",
     "mas_app_settings_persistent_volumes_flag",
     "mas_app_settings_demodata",
@@ -61,6 +60,7 @@ optionalParams = [
     "mas_appws_components",
     "mas_appws_bindings_health_wsl_flag",
     "mas_domain",
+    "mas_appws_upgrade_type",
     # IPV6
     "enable_ipv6",
     # SLS

{mas_cli-13.28.0 → mas_cli-14.0.0}/src/mas/cli/install/summarizer.py

@@ -155,8 +155,8 @@ class InstallSummarizerMixin():
 
     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"])
-            if self.getParam("is_full_manage") != "false":
+            self.printSummary(f"{'Manage foundation' if self.getParam('mas_appws_components') == '' else 'Manage'}", self.params["mas_app_channel_manage"])
+            if self.getParam("mas_appws_components") == "":
                 print_formatted_text(HTML("  <SkyBlue>+ Components</SkyBlue>"))
                 self.printSummary("  + ACM", "Enabled" if "acm=" in self.getParam("mas_appws_components") else "Disabled")
                 self.printSummary("  + Aviation", "Enabled" if "aviation=" in self.getParam("mas_appws_components") else "Disabled")
@@ -178,6 +178,8 @@ class InstallSummarizerMixin():
                 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("+ Upgrade Type", "mas_appws_upgrade_type")
+
                 self.printParamSummary("+ Server bundle size", "mas_app_settings_server_bundles_size")
                 self.printParamSummary("+ Enable JMS queues", "mas_app_settings_default_jms")
                 self.printParamSummary("+ Server Timezone", "mas_app_settings_server_timezone")