CRAYSAT-1923: Update sat bootsys to support CFS v2 or v3

Cray-HPE · Dec 2, 2024 · 409e17f · 409e17f
1 parent cd20601
commit 409e17f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/docs/man/sat-bootsys.8.rst b/docs/man/sat-bootsys.8.rst
@@ -159,6 +159,9 @@ These options apply to both the ``shutdown`` and ``boot`` actions.
 **--bos-version BOS_VERSION**
         The version of the BOS API to use when launching BOS sessions.
 
+**--cfs-version CFS_VERSION**
+        The version of the CFS API to use when launching CFS sessions.
+
 **--cle-bos-template** *CLE_BOS_TEMPLATE*
         The name of the BOS session template for shutdown or boot of
         COS (formerly known as CLE) compute nodes. If not specified, no

diff --git a/requirements-dev.lock.txt b/requirements-dev.lock.txt
@@ -14,7 +14,7 @@ coverage==6.3.2
 cray-product-catalog==2.4.1
 croniter==0.3.37
 cryptography==43.0.1
-csm-api-client==2.2.3
+csm-api-client==2.3.0
 dataclasses-json==0.5.6
 docutils==0.17.1
 google-auth==2.6.0

diff --git a/requirements.lock.txt b/requirements.lock.txt
@@ -11,7 +11,7 @@ click==8.0.4
 cray-product-catalog==2.4.1
 croniter==0.3.37
 cryptography==43.0.1
-csm-api-client==2.2.3
+csm-api-client==2.3.0
 dataclasses-json==0.5.6
 google-auth==2.6.0
 htmlmin==0.1.12

diff --git a/requirements.txt b/requirements.txt
@@ -22,7 +22,7 @@ argcomplete
 boto3
 botocore
 cray-product-catalog >= 2.4.1
-csm-api-client >= 2.2.3, <3.0
+csm-api-client >= 2.3.0, <3.0
 croniter >= 0.3, < 1.0
 inflect >= 0.2.5, < 3.0
 Jinja2 >= 3.0, < 4.0

diff --git a/sat/cli/bootsys/parser.py b/sat/cli/bootsys/parser.py
@@ -285,6 +285,12 @@ def add_bootsys_subparser(subparsers):
         help='The version of the BOS API to use for BOS operations',
     )
 
+    bootsys_parser.add_argument(
+        '--cfs-version',
+        choices=['v2', 'v3'],
+        help='The version of the CFS API to use for CFS operations',
+    )
+
     actions_subparsers = bootsys_parser.add_subparsers(
         metavar='action', dest='action', help='The action to perform.'
     )

diff --git a/sat/cli/bootsys/service_activity.py b/sat/cli/bootsys/service_activity.py
@@ -383,7 +383,7 @@ def get_active_sessions(self):
         Raises:
             ServiceCheckError: if unable to get the active CFS sessions.
         """
-        cfs_client = CFSClientBase.get_cfs_client(SATSession(), 'v2')
+        cfs_client = CFSClientBase.get_cfs_client(SATSession(), get_config_value('cfs.api_version'))
         try:
             sessions = cfs_client.get('sessions').json()
         except (APIError, ValueError) as err: