mas-cli 11.2.1__py3-none-any.whl → 11.4.0__py3-none-any.whl

mas/cli/uninstall/app.py

@@ -35,6 +35,7 @@ class UninstallApp(BaseApp):
         """
         args = uninstallArgParser.parse_args(args=argv)
         instanceId = args.mas_instance_id
+        droNamespace = args.dro_namespace
         self.noConfirm = args.no_confirm
 
         if args.uninstall_all_deps:
@@ -184,7 +185,8 @@ class UninstallApp(BaseApp):
                     uninstallCommonServices = uninstallCommonServices,
                     uninstallUDS = uninstallUDS,
                     uninstallMongoDb = uninstallMongoDb,
-                    uninstallSLS = uninstallSLS
+                    uninstallSLS = uninstallSLS,
+                    droNamespace = droNamespace
                 )
                 if pipelineURL is not None:
                     h.stop_and_persist(symbol=self.successIcon, text=f"PipelineRun for {instanceId} uninstall submitted")

mas/cli/uninstall/argParser.py

@@ -33,6 +33,13 @@ masArgGroup.add_argument(
     help="The MAS instance ID to be uninstalled"
 )
 
+masArgGroup.add_argument(
+    '--dro-namespace',
+    required=False,
+    default='redhat-marketplace',
+    help="The DRO namespace to be uninstalled"
+)
+
 depsArgGroup = uninstallArgParser.add_argument_group('MAS Dependencies Selection')
 depsArgGroup.add_argument(
     '--uninstall-all-deps',

mas/cli/update/app.py

@@ -37,6 +37,7 @@ class UpdateApp(BaseApp):
         """
         self.args = updateArgParser.parse_args(args=argv)
         self.noConfirm = self.args.no_confirm
+        self.devMode = self.args.dev_mode
 
         if self.args.mas_catalog_version:
             # Non-interactive mode
@@ -53,7 +54,13 @@ class UpdateApp(BaseApp):
                 "dro_migration",
                 "dro_storage_class",
                 "dro_namespace",
-                "skip_pre_check"
+                "skip_pre_check",
+                "dev_mode",
+                "cpd_product_version",
+                # Dev Mode
+                "artifactory_username",
+                "artifactory_token"
+
             ]
             for key, value in vars(self.args).items():
                 # These fields we just pass straight through to the parameters and fail if they are not set
@@ -92,7 +99,8 @@ class UpdateApp(BaseApp):
             self.chooseCatalog()
 
         # Validations
-        self.validateCatalog()
+        if not self.devMode:
+            self.validateCatalog()
 
         self.printH1("Dependency Update Checks")
         with Halo(text='Checking for IBM Watson Discovery', spinner=self.spinner) as h:
@@ -236,13 +244,13 @@ class UpdateApp(BaseApp):
         self.printH1("Select IBM Maximo Operator Catalog Version")
         self.printDescription([
             "Select MAS Catalog",
-            "  1) Aug 27 2024 Update (MAS 9.0.2, 8.11.14, & 8.10.17)",
-            "  2) July 30 2024 Update (MAS 9.0.1, 8.11.13, & 8.10.16)",
-            "  3) June 25 2024 Update (MAS 9.0.0, 8.11.12, & 8.10.15)"
+            "  1) Oct 03 2024 Update (MAS 9.0.3, 8.11.15, & 8.10.18)",
+            "  2) Aug 27 2024 Update (MAS 9.0.2, 8.11.14, & 8.10.17)",
+            "  3) July 30 2024 Update (MAS 9.0.1, 8.11.13, & 8.10.16)"
         ])
 
         catalogOptions = [
-           "v9-240827-amd64", "v9-240730-amd64", "v9-240625-amd64"
+           "v9-241003-amd64", "v9-240827-amd64", "v9-240730-amd64"
         ]
         self.promptForListSelect("Select catalog version", catalogOptions, "mas_catalog_version", default=1)
 
@@ -333,13 +341,19 @@ class UpdateApp(BaseApp):
                     # the case bundles in there anymore
                     # Longer term we will centralise this information inside the mas-devops python collection,
                     # where it can be made available to both the ansible collection and this python package.
+                    defaultMongoVersion = "6.0.12"
                     mongoVersions = {
                         "v9-240625-amd64": "6.0.12",
                         "v9-240730-amd64": "6.0.12",
-                        "v9-240827-amd64": "6.0.12"
+                        "v9-240827-amd64": "6.0.12",
+                        "v9-241003-amd64": "6.0.12"
                     }
+                    catalogVersion = self.getParam('mas_catalog_version')
+                    if catalogVersion in mongoVersions:
+                        targetMongoVersion = mongoVersions[self.getParam('mas_catalog_version')]
+                    else:
+                        targetMongoVersion = defaultMongoVersion
 
-                    targetMongoVersion = mongoVersions[self.getParam('mas_catalog_version')]
                     self.setParam("mongodb_version", targetMongoVersion)
 
                     targetMongoVersionMajor = targetMongoVersion.split(".")[0]
@@ -454,7 +468,8 @@ class UpdateApp(BaseApp):
         cp4dVersions = {
             "v9-240625-amd64": "4.8.0",
             "v9-240730-amd64": "4.8.0",
-            "v9-240827-amd64": "4.8.0"
+            "v9-240827-amd64": "4.8.0",
+            "v9-241003-amd64": "4.8.0"
             
         }
 
@@ -476,7 +491,10 @@ class UpdateApp(BaseApp):
                 if len(cpds) > 0:
                     cpdInstanceNamespace = cpds[0]["metadata"]["namespace"]
                     cpdInstanceVersion = cpds[0]["spec"]["version"]
-                    cpdTargetVersion = cp4dVersions[self.getParam("mas_catalog_version")]
+                    if self.args.cpd_product_version:
+                        cpdTargetVersion = self.getParam("cpd_product_version")
+                    else:
+                        cpdTargetVersion = cp4dVersions[self.getParam("mas_catalog_version")]
 
                     currentCpdVersionMajorMinor = f"{cpdInstanceVersion.split('.')[0]}.{cpdInstanceVersion.split('.')[1]}"
                     targetCpdVersionMajorMinor = f"{cpdTargetVersion.split('.')[0]}.{cpdTargetVersion.split('.')[1]}"
@@ -492,7 +510,7 @@ class UpdateApp(BaseApp):
                                 "<u>Dependency Update Notice</u>",
                                 f"Cloud Pak For Data is currently running version {cpdInstanceVersion} and will be updated to version {cpdTargetVersion}",
                                 "It is recommended that you backup your Cloud Pak for Data instance before proceeding:",
-                                "  <u>https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=administering-backing-up-restoring-cloud-pak-data</u>"
+                                "  <u>https://www.ibm.com/docs/en/cloud-paks/cp-data/5.0.x?topic=administering-backing-up-restoring-cloud-pak-data</u>"
                             ])
 
                         # Lookup the storage classes already used by CP4D

mas/cli/update/argParser.py

@@ -104,8 +104,36 @@ droArgGroup.add_argument(
     help="Set Custom Namespace for DRO(Default: redhat-marketplace)",
 )
 
+# Development Mode
+# -----------------------------------------------------------------------------
+devArgGroup = updateArgParser.add_argument_group("Development Mode")
+devArgGroup.add_argument(
+    "--artifactory-username",
+    required=False,
+    help="Username for access to development builds on Artifactory"
+)
+devArgGroup.add_argument(
+    "--artifactory-token",
+    required=False,
+    help="API Token for access to development builds on Artifactory"
+)
 
+# More Options
+# -----------------------------------------------------------------------------
 otherArgGroup = updateArgParser.add_argument_group('More')
+otherArgGroup.add_argument(
+    "--dev-mode",
+    required=False,
+    action="store_true",
+    default=False,
+    help="Configure installation for development mode",
+)
+otherArgGroup.add_argument(
+    "--cp4d-version",
+    dest="cpd_product_version",
+    required=False,
+    help="Product version of CP4D to use"
+)
 otherArgGroup.add_argument(
     '--no-confirm',
     required=False,

{mas_cli-11.2.1.dist-info → mas_cli-11.4.0.dist-info}/METADATA

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

{mas_cli-11.2.1.dist-info → mas_cli-11.4.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-mas/cli/__init__.py,sha256=PJb41tKrxyi99cgpG_QiN32t9ZrWGocVH2HeKnfaZjw,526
-mas/cli/cli.py,sha256=wm7Ptd8zC8Uc1ZvIvY7h6lQDgFXjm8S3DNy0zWbKCZ4,14563
+mas/cli/__init__.py,sha256=b0mEzsD32qjAyt58076AzTBlzG6lLCmTO53XOq5TkZc,526
+mas/cli/cli.py,sha256=AAxyOl7jPP1uqIK3_YkGqwfYlTrxC-IvLh7B8WoECAw,14563
 mas/cli/displayMixins.py,sha256=ygDJ8KPLdJpip_JQ4JDPWbvo7ZIdsOZQfQoVnMdAauM,5594
 mas/cli/gencfg.py,sha256=57ik5x73gQBFXPl_8h2byXmV_vhCgxfeSDZk4Wg5-Pw,2102
 mas/cli/validators.py,sha256=vi1pFA8QtqMhqtGk1NlkkNDUrlFCi53kS5wJqFGDgOU,5108
 mas/cli/install/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY,494
-mas/cli/install/app.py,sha256=HDWGxBYcw9G6_-02lq1JfHNwZZ0OPXPX71z0XSlaOH8,55958
+mas/cli/install/app.py,sha256=SigGUQwmtrxWlm2TJzEW8FJxLyDivSD-0Y3AxcW1odY,55998
 mas/cli/install/argBuilder.py,sha256=kOkoQ5Ksj-SiSr9s3Pjn7tXLY1NYK78hwyAFAU6tGes,22741
 mas/cli/install/argParser.py,sha256=Yin9uxUOAxzfD1kIWehlKNgylle2VCo5YKSI7JpmFHM,26835
 mas/cli/install/summarizer.py,sha256=9dxRDOdGGH4TOsNWAwIigqusqVUMa-R8tj9TPPKTx_4,18907
@@ -14,7 +14,7 @@ mas/cli/install/settings/db2Settings.py,sha256=mR0XL81Talvwvm1bekw0o9VOwV42QkS0j
 mas/cli/install/settings/kafkaSettings.py,sha256=bjAji5OZfSBpttiYHKM5B5Lvva8L8PUzi8QSs6opQcE,6997
 mas/cli/install/settings/manageSettings.py,sha256=TSByaLXVF9hRH0hqhX-eBc7dIHrOf4zgviOq2YrjSHc,13658
 mas/cli/install/settings/turbonomicSettings.py,sha256=eqMDocZxJnGEnWh41Yh8rmmVKVR_JnA8qrbfRrFAOaQ,1588
-mas/cli/templates/ibm-mas-tekton.yaml,sha256=G289umEXq13RQx_EIC7WsYq9vQrdHpsNqfmAv3izAbA,714707
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=uZQ4L3R0zdV7INdQlOO6ORwCSK8Bgwwat14d_6L8Uc4,727008
 mas/cli/templates/jdbccfg.yml.j2,sha256=cANbwkUkKEPQp-P3_BB_Llbt94457Ciagah2hOdySIM,1644
 mas/cli/templates/pod-templates/best-effort/ibm-data-dictionary-assetdatadictionary.yml,sha256=8VG_FDFcEjWNaAOZTcS58Pe0tWOXC10SJLloNqzEMC8,757
 mas/cli/templates/pod-templates/best-effort/ibm-mas-bascfg.yml,sha256=rkq8c2pVJoskgict9tCZzCchGSE2MBC-dJ47JyMYm7A,1559
@@ -87,16 +87,16 @@ mas/cli/templates/pod-templates/guaranteed/ibm-mas-suite.yml,sha256=aB-buCWUAqD0
 mas/cli/templates/pod-templates/guaranteed/ibm-mas-visualinspection.yml,sha256=NiXBlXKe3j2RvroEcx3kCSuD92G6WB-jcpNAYGAg3T0,1975
 mas/cli/templates/pod-templates/guaranteed/ibm-sls-licenseservice.yml,sha256=CKt1yim4L3ClloVcQDHiXLD8EMvmKXIltmDxJTxNdDs,546
 mas/cli/uninstall/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY,494
-mas/cli/uninstall/app.py,sha256=obuGe-czCnXpa7j_N8QC9zZBuD0s3xXmNRUWt-f6omI,9981
-mas/cli/uninstall/argParser.py,sha256=VO6_u8Qv_munelgZMxBw9mdJBwF_9j688b6nUxQD2RM,3298
+mas/cli/uninstall/app.py,sha256=VFF7X8kI6wqmxoyjCXIN6jjcJrVZXtCYA0Guo5wRWME,10072
+mas/cli/uninstall/argParser.py,sha256=5uT2gT8P-wbahtiiI3C1aT1Ygp7E8UM-_G4SR4zcyc4,3451
 mas/cli/update/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY,494
-mas/cli/update/app.py,sha256=dejW8lJ4zb91Ce1gLMEkj_ninBBwok6Aul8aKn7lNcg,37003
-mas/cli/update/argParser.py,sha256=Xm0qXmMrCZH-ikVYlKVlp7g0cbwCavXDwtwRKZ_t8vQ,3843
+mas/cli/update/app.py,sha256=ToCdWf7xZ6CX2nIaBcqid3W_KAVutR4RoSGCw6kyoSM,37782
+mas/cli/update/argParser.py,sha256=ch0VZhrWLTZzhUAANihUCdkbcyx7rNhc690B9pX-L3U,4710
 mas/cli/upgrade/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY,494
 mas/cli/upgrade/app.py,sha256=AjRI1uCVfl--edonhUb9ZTrp_QifJTQPp-ORT1S_uO8,5375
 mas/cli/upgrade/argParser.py,sha256=jl8SU0mXDMAkpfqXaKE4MPNUmVoD0LSsvMUSJjU1dbQ,1881
-mas_cli-11.2.1.data/scripts/mas-cli,sha256=sEPYV6KUzcq4ukiTM4tMLsYKv-d9Ms0aJI9Uhjg_G9Y,3436
-mas_cli-11.2.1.dist-info/METADATA,sha256=cgHDVjqqtIjfAqem2OZ0htJAZoGqrFn0UqqZYC-XZu0,2076
-mas_cli-11.2.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-mas_cli-11.2.1.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-11.2.1.dist-info/RECORD,,
+mas_cli-11.4.0.data/scripts/mas-cli,sha256=sEPYV6KUzcq4ukiTM4tMLsYKv-d9Ms0aJI9Uhjg_G9Y,3436
+mas_cli-11.4.0.dist-info/METADATA,sha256=RYVDcUYAa6K8yG-gswpBkCYdcf4rSx0H0dCSChxalZ4,2076
+mas_cli-11.4.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+mas_cli-11.4.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-11.4.0.dist-info/RECORD,,