mas-cli 11.13.0__py3-none-any.whl → 12.1.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of mas-cli might be problematic. Click here for more details.

Files changed (13) hide show
  1. mas/cli/__init__.py +1 -1
  2. mas/cli/cli.py +16 -1
  3. mas/cli/install/app.py +23 -65
  4. mas/cli/install/catalogs.py +3 -3
  5. mas/cli/templates/ibm-mas-tekton.yaml +227 -117
  6. mas/cli/update/app.py +1 -1
  7. mas/cli/upgrade/app.py +25 -6
  8. mas/cli/upgrade/argParser.py +6 -1
  9. {mas_cli-11.13.0.dist-info → mas_cli-12.1.0.dist-info}/METADATA +1 -1
  10. {mas_cli-11.13.0.dist-info → mas_cli-12.1.0.dist-info}/RECORD +13 -13
  11. {mas_cli-11.13.0.data → mas_cli-12.1.0.data}/scripts/mas-cli +0 -0
  12. {mas_cli-11.13.0.dist-info → mas_cli-12.1.0.dist-info}/WHEEL +0 -0
  13. {mas_cli-11.13.0.dist-info → mas_cli-12.1.0.dist-info}/top_level.txt +0 -0
mas/cli/__init__.py CHANGED
@@ -8,4 +8,4 @@
8
8
  #
9
9
  # *****************************************************************************
10
10
 
11
- __version__ = "11.13.0" # Python module compatible semver
11
+ __version__ = "12.1.0" # Python module compatible semver
mas/cli/cli.py CHANGED
@@ -117,7 +117,7 @@ class BaseApp(PrintMixin, PromptMixin):
117
117
  logging.getLogger('asyncio').setLevel(logging.INFO)
118
118
 
119
119
  # Supports extended semver, unlike mas.cli.__version__
120
- self.version = "11.13.0"
120
+ self.version = "12.1.0"
121
121
  self.h1count = 0
122
122
  self.h2count = 0
123
123
 
@@ -184,6 +184,21 @@ class BaseApp(PrintMixin, PromptMixin):
184
184
  },
185
185
  }
186
186
 
187
+ self.licenses = {
188
+ "8.9.x": " - <u>https://ibm.biz/MAS89-License</u>",
189
+ "8.10.x": " - <u>https://ibm.biz/MAS810-License</u>",
190
+ "8.11.x": " - <u>https://ibm.biz/MAS811-License</u>\n - <u>https://ibm.biz/MAXIT81-License</u>",
191
+ "9.0.x": " - <u>https://ibm.biz/MAS90-License</u>\n - <u>https://ibm.biz/MaximoIT90-License</u>\n - <u>https://ibm.biz/MAXArcGIS90-License</u>",
192
+ "9.1.x-feature": " - <u>https://ibm.biz/MAS90-License</u>\n - <u>https://ibm.biz/MaximoIT90-License</u>\n - <u>https://ibm.biz/MAXArcGIS90-License</u>\n\nBe aware, this channel subscription is supported for non-production use only. \nIt allows early access to new features for evaluation in non-production environments. \nThis subscription is offered alongside and in parallel with our normal maintained streams. \nWhen using this subscription, IBM Support will only accept cases for the latest available bundle deployed in a non-production environment. \nSeverity must be either 3 or 4 and cases cannot be escalated. \nPlease refer to IBM documentation for more details.\n",
193
+ }
194
+
195
+ self.upgrade_path = {
196
+ "9.0.x": "9.1.x-feature",
197
+ "8.11.x": "9.0.x",
198
+ "8.10.x": "8.11.x",
199
+ "8.9.x": "8.10.x",
200
+ }
201
+
187
202
  self.spinner = {
188
203
  "interval": 80,
189
204
  "frames": [" ⠋", " ⠙", " ⠹", " ⠸", " ⠼", " ⠴", " ⠦", " ⠧", " ⠇", " ⠏"]
mas/cli/install/app.py CHANGED
@@ -112,19 +112,11 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
112
112
 
113
113
  @logMethodCall
114
114
  def licensePrompt(self):
115
- licenses = {
116
- "8.9.x": " - <u>https://ibm.biz/MAS89-License</u>",
117
- "8.10.x": " - <u>https://ibm.biz/MAS810-License</u>",
118
- "8.11.x": " - <u>https://ibm.biz/MAS811-License</u>\n - <u>https://ibm.biz/MAXIT81-License</u>",
119
- "9.0.x": " - <u>https://ibm.biz/MAS90-License</u>\n - <u>https://ibm.biz/MaximoIT90-License</u>\n - <u>https://ibm.biz/MAXArcGIS90-License</u>",
120
- "9.1.x-feature": " - <u>https://ibm.biz/MAS90-License</u>\n - <u>https://ibm.biz/MaximoIT90-License</u>\n - <u>https://ibm.biz/MAXArcGIS90-License</u>\n\n - Be aware, this channel subscription is supported for non-production use only. It allows early access to new features for evaluation is non-production environments. This subscription is offered alongside and in parallel with our normal maintained streams. When using this subscription, IBM Support will only accept cases for the latest available bundle deployed in a non-production environment. Severity must be either 3 or 4 and cases cannot be escalated. Please refer to IBM documentation for more details.\n",
121
- }
122
-
123
115
  if not self.licenseAccepted:
124
116
  self.printH1("License Terms")
125
117
  self.printDescription([
126
118
  "To continue with the installation, you must accept the license terms:",
127
- licenses[self.getParam('mas_channel')]
119
+ self.licenses[self.getParam('mas_channel')]
128
120
  ])
129
121
 
130
122
  if self.noConfirm:
@@ -175,62 +167,28 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
175
167
  self.catalogCp4dVersion = self.chosenCatalog["cpd_product_version_default"]
176
168
  self.catalogMongoDbVersion = self.chosenCatalog["mongo_extras_version_default"]
177
169
 
178
- self.catalogReleases = ["9.0.x", "8.11.x", "8.10.x"]
179
-
180
- self.catalogTable = [
181
- {
182
- "": "Core",
183
- "9.1.x-feature": self.chosenCatalog["mas_core_version"]["9.1.x-feature"],
184
- "9.0.x": self.chosenCatalog["mas_core_version"]["9.0.x"],
185
- "8.11.x": self.chosenCatalog["mas_core_version"]["8.11.x"],
186
- "8.10.x": self.chosenCatalog["mas_core_version"]["8.10.x"]
187
- },
188
- {
189
- "": "Manage",
190
- "9.1.x-feature": self.chosenCatalog["mas_manage_version"]["9.1.x-feature"],
191
- "9.0.x": self.chosenCatalog["mas_manage_version"]["9.0.x"],
192
- "8.11.x": self.chosenCatalog["mas_manage_version"]["8.11.x"],
193
- "8.10.x": self.chosenCatalog["mas_manage_version"]["8.10.x"]
194
- },
195
- {
196
- "": "IoT",
197
- "9.0.x": self.chosenCatalog["mas_iot_version"]["9.0.x"],
198
- "8.11.x": self.chosenCatalog["mas_iot_version"]["8.11.x"],
199
- "8.10.x": self.chosenCatalog["mas_iot_version"]["8.10.x"]
200
- },
201
- {
202
- "": "Monitor",
203
- "9.0.x": self.chosenCatalog["mas_monitor_version"]["9.0.x"],
204
- "8.11.x": self.chosenCatalog["mas_monitor_version"]["8.11.x"],
205
- "8.10.x": self.chosenCatalog["mas_monitor_version"]["8.10.x"]
206
- },
207
- {
208
- "": "Assist",
209
- "9.0.x": self.chosenCatalog["mas_assist_version"]["9.0.x"],
210
- "8.11.x": self.chosenCatalog["mas_assist_version"]["8.11.x"],
211
- "8.10.x": self.chosenCatalog["mas_assist_version"]["8.10.x"]
212
- },
213
- {
214
- "": "Optimizer",
215
- "9.1.x-feature": self.chosenCatalog["mas_optimizer_version"]["9.1.x-feature"],
216
- "9.0.x": self.chosenCatalog["mas_optimizer_version"]["9.0.x"],
217
- "8.11.x": self.chosenCatalog["mas_optimizer_version"]["8.11.x"],
218
- "8.10.x": self.chosenCatalog["mas_optimizer_version"]["8.10.x"]
219
- },
220
- {
221
- "": "Predict",
222
- "9.0.x": self.chosenCatalog["mas_predict_version"]["9.0.x"],
223
- "8.11.x": self.chosenCatalog["mas_predict_version"]["8.11.x"],
224
- "8.10.x": self.chosenCatalog["mas_predict_version"]["8.10.x"]
225
- },
226
- {
227
- "": "Inspection",
228
- "9.1.x-feature": self.chosenCatalog["mas_visualinspection_version"]["9.1.x-feature"],
229
- "9.0.x": self.chosenCatalog["mas_visualinspection_version"]["9.0.x"],
230
- "8.11.x": self.chosenCatalog["mas_visualinspection_version"]["8.11.x"],
231
- "8.10.x": self.chosenCatalog["mas_visualinspection_version"]["8.10.x"]
232
- }
233
- ]
170
+ self.catalogReleases = []
171
+ self.catalogTable = []
172
+
173
+ applications = {
174
+ "Core": "mas_core_version",
175
+ "Manage": "mas_manage_version",
176
+ "IoT": "mas_iot_version",
177
+ "Monitor": "mas_monitor_version",
178
+ "Assist": "mas_assist_version",
179
+ "Optimizer": "mas_optimizer_version",
180
+ "Predict": "mas_predict_version",
181
+ "Inspection": "mas_visualinspection_version",
182
+ }
183
+
184
+ # Dynamically fetch the channels from the chosen catalog
185
+ # based on mas core
186
+ for channel in self.chosenCatalog["mas_core_version"]:
187
+ self.catalogReleases.append(channel)
188
+
189
+ # Generate catalogTable
190
+ for application, key in applications.items():
191
+ self.catalogTable.append({"": application} | self.chosenCatalog[key])
234
192
 
235
193
  summary = [
236
194
  "",
mas/cli/install/catalogs.py CHANGED
@@ -9,13 +9,13 @@
9
9
  # *****************************************************************************
10
10
  supportedCatalogs = {
11
11
  "amd64": [
12
+ "v9-241205-amd64",
12
13
  "v9-241107-amd64",
13
14
  "v9-241003-amd64",
14
15
  "v9-240827-amd64",
15
- "v9-241205-amd64"
16
16
  ],
17
17
  "s390x": [
18
+ "v9-241205-s390x",
18
19
  "v9-241107-s390x",
19
- "v9-241205-s390x"
20
- ]
20
+ ],
21
21
  }