mas-cli 23.7.2__tar.gz → 23.9.0__tar.gz

{mas_cli-23.7.2/python/src/mas_cli.egg-info → mas_cli-23.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-cli
-Version: 23.7.2
+Version: 23.9.0
 Summary: Python Admin CLI for Maximo Application Suite
 Author-email: David Parker <parkerda@uk.ibm.com>
 License-Expression: EPL-1.0

{mas_cli-23.7.2 → mas_cli-23.9.0}/README.md

@@ -19,4 +19,4 @@ Want to contribute to MAS Command Line Interface?
 --------------------------------------------------------------------------------
 We welcome every Maximo Application Suite users, developers and enthusiasts to contribute to the MAS Command Line Interface while fixing code issues and implementing new automated functionalities.
 
-You can contribute to this collection by raising [a new issue](https://github.com/ibm-mas/cli/issues) with suggestions on how to make our MAS automation engine even better, or if you want to become a new code contributor, please refer to the [Contributing Guidelines](CONTRIBUTING.md) and learn more about how to get started.
+You can contribute to this collection by raising [a new issue](https://github.com/ibm-mas/cli/issues) with suggestions on how to make our MAS automation engine even better, or if you want to become a new code contributor, please refer to the [Contributing Guidelines](CONTRIBUTING.md) and learn more about how to get started.

{mas_cli-23.7.2 → mas_cli-23.9.0}/python/src/mas/cli/__init__.py

@@ -10,4 +10,4 @@
 
 from .cli import BaseApp  # noqa: F401
 
-__version__ = "23.7.2"  # Python module compatible semver
+__version__ = "23.9.0"  # Python module compatible semver

{mas_cli-23.7.2 → mas_cli-23.9.0}/python/src/mas/cli/aiservice/install/app.py

@@ -313,14 +313,14 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
                     self.setParam("environment_type", "production")
                     self.setParam("aiservice_odh_model_deployment_type", "raw")
                     self.setParam("aiservice_rhoai_model_deployment_type", "raw")
-                    self.setParam("rhoai", "false")
+                    self.setParam("rhoai", "true")
                 else:
                     self.operationalMode = 2
                     self.setParam("mas_annotations", "mas.ibm.com/operationalMode=nonproduction")
                     self.setParam("environment_type", "non-production")
                     self.setParam("aiservice_odh_model_deployment_type", "serverless")
                     self.setParam("aiservice_rhoai_model_deployment_type", "serverless")
-                    self.setParam("rhoai", "false")
+                    self.setParam("rhoai", "true")
 
             elif key == "additional_configs":
                 self.localConfigDir = value
@@ -673,23 +673,13 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
             self.promptForString("Storage tenants bucket", "aiservice_s3_tenants_bucket")
             self.promptForString("Storage templates bucket", "aiservice_s3_templates_bucket")
 
-        # Configure AI Data Science Platform
-        self.printH2("Configure AI Data Science Platform")
-        self.printDescription(
-            [
-                "Choose which AI data science platform to install:",
-                " - <b>Note for 9.1.x</b>: Open Data Hub (ODH) is the supported platform for AI Service 9.1.x",
-                " - <b>Note for 9.2.x</b>: Red Hat OpenShift AI (RHOAI) is the recommended platform for AI Service 9.2.x",
-                "",
-                "  1. Red Hat OpenShift AI (RHOAI)",
-                "  2. Open Data Hub (ODH)",
-            ]
+        # AI Data Science Platform - defaults to Red Hat OpenShift AI (RHOAI)
+        self.setParam("rhoai", "true")
+        self.printWarning(
+            "Starting with AI Service 9.1.18, support for Open Data Hub (ODH) has been dropped. "
+            "Only Red Hat OpenShift AI (RHOAI) 2.25.10 or later is supported going forward. "
+            "If an existing ODH installation is detected, the installer will automatically migrate it to RHOAI."
         )
-        platformChoice = self.promptForInt("AI Data Science Platform", default=1, min=1, max=2)
-        if platformChoice == 2:
-            self.setParam("rhoai", "false")
-        else:
-            self.setParam("rhoai", "true")
 
         # Configure Certificate Issuer
         self.configCertIssuer()

{mas_cli-23.7.2 → mas_cli-23.9.0}/python/src/mas/cli/cli.py

@@ -126,7 +126,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger("urllib3").setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version: str = "23.7.2"
+        self.version: str = "23.9.0"
         self.h1count: int = 0
         self.h2count: int = 0
 

{mas_cli-23.7.2 → mas_cli-23.9.0}/python/src/mas/cli/install/app.py

@@ -709,7 +709,7 @@ class InstallApp(
             self.setParam("aiservice_odh_model_deployment_type", "serverless")
             self.setParam("aiservice_rhoai_model_deployment_type", "serverless")
 
-        self.setParam("rhoai", "false")
+        self.setParam("rhoai", "true")
 
     @logMethodCall
     def configAdminMode(self):
@@ -1837,23 +1837,13 @@ class InstallApp(
                 self.promptForString("Storage tenants bucket", "aiservice_s3_tenants_bucket")
                 self.promptForString("Storage templates bucket", "aiservice_s3_templates_bucket")
 
-            # Configure AI Data Science Platform
-            self.printH2("Configure AI Data Science Platform")
-            self.printDescription(
-                [
-                    "Choose which AI data science platform to install:",
-                    " - <b>Note for 9.1.x</b>: Open Data Hub (ODH) is the supported platform for AI Service 9.1.x",
-                    " - <b>Note for 9.2.x</b>: Red Hat OpenShift AI (RHOAI) is the recommended platform for AI Service 9.2.x",
-                    "",
-                    "  1. Red Hat OpenShift AI (RHOAI)",
-                    "  2. Open Data Hub (ODH)",
-                ]
+            # AI Data Science Platform - defaults to Red Hat OpenShift AI (RHOAI)
+            self.setParam("rhoai", "true")
+            self.printWarning(
+                "Starting with AI Service 9.1.18, support for Open Data Hub (ODH) has been dropped. "
+                "Only Red Hat OpenShift AI (RHOAI) 2.25.10 or later is supported going forward. "
+                "If an existing ODH installation is detected, the installer will automatically migrate it to RHOAI."
             )
-            platformChoice = self.promptForInt("AI Data Science Platform", default=1, min=1, max=2)
-            if platformChoice == 2:
-                self.setParam("rhoai", "false")
-            else:
-                self.setParam("rhoai", "true")
 
             # Configure Certificate Issuer
             self.configAIServiceCertIssuer()
@@ -2196,11 +2186,15 @@ class InstallApp(
                     self.operationalMode = 1
                     self.setParam("environment_type", "production")
                     self.setParam("aiservice_odh_model_deployment_type", "raw")
+                    self.setParam("aiservice_rhoai_model_deployment_type", "raw")
+                    self.setParam("rhoai", "true")
                 else:
                     self.operationalMode = 2
                     self.setParam("mas_annotations", "mas.ibm.com/operationalMode=nonproduction")
                     self.setParam("environment_type", "non-production")
                     self.setParam("aiservice_odh_model_deployment_type", "serverless")
+                    self.setParam("aiservice_rhoai_model_deployment_type", "serverless")
+                    self.setParam("rhoai", "true")
 
             elif key == "additional_configs":
                 self.localConfigDir = value

{mas_cli-23.7.2 → mas_cli-23.9.0}/python/src/mas/cli/install/catalogs.py

@@ -9,19 +9,19 @@
 # *****************************************************************************
 supportedCatalogs = {
     "amd64": [
-        "v9-260805-amd64",
+        "v9-260827-amd64",
         "v9-260730-amd64",
         "v9-260625-amd64",
         "v9-260527-amd64",
     ],
     "s390x": [
-        "v9-260805-s390x",
+        "v9-260827-s390x",
         "v9-260730-s390x",
         "v9-260625-s390x",
         "v9-260527-s390x",
     ],
     "ppc64le": [
-        "v9-260805-ppc64le",
+        "v9-260827-ppc64le",
         "v9-260730-ppc64le",
         "v9-260625-ppc64le",
         "v9-260527-ppc64le",

{mas_cli-23.7.2 → mas_cli-23.9.0}/python/src/mas/cli/must_gather/mas/apps.py

@@ -23,6 +23,7 @@ from kubernetes.dynamic import DynamicClient
 from mas.cli.must_gather.common import generateReconcileLogsCollectionTasks
 from mas.cli.must_gather.common.task_generation import generateNamespaceCollectionTasks
 from .manage import collectManageNetworkTests
+from .facilities import collectFacilitiesLogs
 
 logger = logging.getLogger(__name__)
 
@@ -212,6 +213,8 @@ def _generateMASAppCollectionTasks(
     # Add Manage-specific network connectivity test
     if appId == "manage":
         tasks.append(("network_tests", collectManageNetworkTests, dynClient, namespace, outputDir))
+    elif appId == "facilities":
+        tasks.append(("facilities_logs", collectFacilitiesLogs, namespace, outputDir))
 
     return tasks
 

mas_cli-23.9.0/python/src/mas/cli/must_gather/mas/facilities.py

@@ -0,0 +1,185 @@
+# *****************************************************************************
+# Copyright (c) 2026 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
+#
+# *****************************************************************************
+
+"""MAS Facilities collector for must-gather.
+
+This module provides functionality to collect Facilities-specific logs from
+pods running in the Facilities namespace. Logs are extracted from
+/home/wiotp/log/ inside each Facilities pod and saved to the must-gather
+output directory.
+"""
+
+import logging
+import os
+import shutil
+import tarfile
+import tempfile
+from typing import List
+
+from kubernetes import client
+from kubernetes.stream import stream
+
+from mas.cli.must_gather.common.thread_safe_client import createThreadLocalDynamicClient
+
+logger = logging.getLogger(__name__)
+
+_FACILITIES_LOG_DIR = "/home/wiotp/log"
+_FACILITIES_APP_TYPES = ["dwfagent", "appserver", "agent"]
+
+
+def _findFacilitiesLogFiles(coreV1Api: client.CoreV1Api, namespace: str, podName: str) -> List[str]:
+    """Find log files inside a Facilities pod at /home/wiotp/log.
+
+    Executes ``find /home/wiotp/log -type f`` inside the pod and returns the
+    list of matching paths.
+
+    """
+    try:
+        resp = stream(
+            coreV1Api.connect_get_namespaced_pod_exec,
+            podName,
+            namespace,
+            command=["find", _FACILITIES_LOG_DIR, "-type", "f"],
+            stderr=False,
+            stdin=False,
+            stdout=True,
+            tty=False,
+        )
+        if resp:
+            return [line.strip() for line in resp.strip().split("\n") if line.strip()]
+        return []
+    except Exception as e:
+        logger.warning(f"Error listing Facilities log files in pod {podName}: {e}")
+        return []
+
+
+def _downloadAndExtractFacilitiesLogs(coreV1Api: client.CoreV1Api, namespace: str, podName: str, logFiles: List[str], outputDir: str) -> bool:
+    """Stream a tar archive of Facilities log files out of the pod and extract it.
+
+    Creates a ``tar -czf -`` of the discovered log files inside the pod, streams
+    the archive to a temporary file, extracts it, and moves the files to
+    ``{outputDir}/facilities-logs/{namespace}/{podName}/``.
+
+    """
+    destDir = os.path.join(outputDir, "facilities-logs", namespace, podName)
+    os.makedirs(destDir, exist_ok=True)
+
+    tarCommand = ["tar", "-czf", "-"] + logFiles
+
+    try:
+        with tempfile.TemporaryFile(mode="w+b") as tarBuffer:
+            try:
+                execStream = stream(
+                    coreV1Api.connect_get_namespaced_pod_exec,
+                    podName,
+                    namespace,
+                    command=tarCommand,
+                    stderr=False,
+                    stdin=False,
+                    stdout=True,
+                    tty=False,
+                    _preload_content=False,
+                    binary=True,
+                )
+            except Exception as e:
+                logger.warning(f"Failed to execute tar command in pod {podName}: {e}")
+                return False
+
+            try:
+                while execStream.is_open():
+                    execStream.update(timeout=1)
+                    if execStream.peek_stdout():
+                        tarBuffer.write(execStream.read_stdout())
+            except Exception as e:
+                logger.warning(f"Error reading tar stream from pod {podName}: {e}")
+                return False
+            finally:
+                execStream.close()
+
+            tarBuffer.flush()
+            tarBuffer.seek(0)
+
+            try:
+                with tarfile.open(fileobj=tarBuffer, mode="r:gz") as tar:
+                    with tempfile.TemporaryDirectory() as tmpDir:
+                        try:
+                            tar.extractall(path=tmpDir, filter="data")
+                        except Exception as e:
+                            logger.warning(f"Incomplete Facilities log archive from {podName}: {e}")
+
+                        # Walk extracted tree and copy all files flat into destDir
+                        for dirpath, _dirnames, filenames in os.walk(tmpDir):
+                            for fname in filenames:
+                                src = os.path.join(dirpath, fname)
+                                dst = os.path.join(destDir, fname)
+                                shutil.copy2(src, dst)
+            except tarfile.TarError as e:
+                logger.warning(f"Failed to open tar archive from pod {podName}: {e}")
+                return False
+
+        return True
+
+    except OSError as e:
+        logger.warning(f"Failed to create temporary file for Facilities tar archive: {e}")
+        return False
+
+
+def collectFacilitiesLogs(namespace: str, outputDir: str) -> bool:
+    """Collect logs from Facilities pods at /home/wiotp/log.
+
+    Discovers pods with label ``mas.ibm.com/appType`` set to one of
+    ``dwfagent``, ``appserver``, or ``agent``, finds all files inside each
+    pod's ``/home/wiotp/log/`` directory, and streams them out into
+    ``{outputDir}/facilities-logs/{namespace}/{podName}/``.
+
+    """
+    logger.info(f"Collecting Facilities logs from namespace {namespace}")
+
+    dynClient = createThreadLocalDynamicClient()
+    podApi = dynClient.resources.get(api_version="v1", kind="Pod")
+    coreV1Api = client.CoreV1Api(api_client=dynClient.client)
+
+    # Collect pods across all target appTypes, deduplicate by pod name
+    seenPods = set()
+    podsToProcess = []
+
+    for appType in _FACILITIES_APP_TYPES:
+        labelSelector = f"mas.ibm.com/appType={appType}"
+        try:
+            pods = podApi.get(namespace=namespace, label_selector=labelSelector)
+        except Exception as e:
+            logger.warning(f"Failed to list Facilities pods in {namespace} with label {labelSelector}: {e}")
+            continue
+
+        for pod in pods.items:
+            podName = pod.metadata.name
+            if podName not in seenPods:
+                seenPods.add(podName)
+                podsToProcess.append((podName, appType))
+
+    if not podsToProcess:
+        logger.debug(f"No Facilities pods found in {namespace} with appTypes {_FACILITIES_APP_TYPES}")
+        return True
+
+    for podName, appType in podsToProcess:
+        logger.debug(f"  - Collecting Facilities logs from '{podName}' (appType={appType})")
+
+        logFiles = _findFacilitiesLogFiles(coreV1Api, namespace, podName)
+        if not logFiles:
+            logger.debug(f"    - No log files found in {podName} at {_FACILITIES_LOG_DIR}")
+            continue
+
+        success = _downloadAndExtractFacilitiesLogs(coreV1Api, namespace, podName, logFiles, outputDir)
+        if success:
+            logger.info(f"Collected Facilities logs from {podName}")
+        else:
+            logger.warning(f"Unable to get Facilities logs from {podName}")
+
+    return True