mas-cli 13.27.2__tar.gz → 13.29.0__tar.gz

{mas_cli-13.27.2 → mas_cli-13.29.0}/PKG-INFO

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

{mas_cli-13.27.2 → mas_cli-13.29.0}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "13.27.2"  # Python module compatible semver
+__version__ = "13.29.0"  # Python module compatible semver

{mas_cli-13.27.2 → mas_cli-13.29.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.27.2 → mas_cli-13.29.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.27.2 → mas_cli-13.29.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.27.2"
+        self.version = "13.29.0"
         self.h1count = 0
         self.h2count = 0
 

{mas_cli-13.27.2 → mas_cli-13.29.0}/src/mas/cli/install/argBuilder.py

@@ -237,6 +237,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.27.2 → mas_cli-13.29.0}/src/mas/cli/install/argParser.py

@@ -550,6 +550,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.27.2 → mas_cli-13.29.0}/src/mas/cli/install/params.py

@@ -61,6 +61,7 @@ optionalParams = [
     "mas_appws_components",
     "mas_appws_bindings_health_wsl_flag",
     "mas_domain",
+    "mas_appws_upgrade_type",
     # IPV6
     "enable_ipv6",
     # SLS

{mas_cli-13.27.2 → mas_cli-13.29.0}/src/mas/cli/install/summarizer.py

@@ -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")