Merge pull request #210 from Cray-HPE/CASMCMS-8797

CASMCMS-8797: Update BOS session template templates
Cray-HPE · Sep 12, 2023 · b514f8d · b514f8d
2 parents 66ca16d + 30c4c7c
commit b514f8d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+### Changed
+- Removed non-v2 fields from v1 session template template
+- Provide more useful example values in v1 and v2 session template templates
 
 ## [2.6.3] - 08-22-2023
 ### Changed

diff --git a/src/bos/server/controllers/v1/sessiontemplate.py b/src/bos/server/controllers/v1/sessiontemplate.py
@@ -38,18 +38,15 @@
 LOGGER = logging.getLogger('bos.server.controllers.v1.sessiontemplate')
 DB = dbutils.get_wrapper(db='session_templates')
 
-
 EXAMPLE_BOOT_SET = {
-    "type": "your-boot-type",
-    "boot_ordinal": 1,
-    "etag": "your_boot_image_etag",
+    "type": "s3",
+    "etag": "boot-image-s3-etag",
     "kernel_parameters": "your-kernel-parameters",
-    "network": "nmn",
     "node_list": [
         "xname1", "xname2", "xname3"],
-    "path": "your-boot-path",
-    "rootfs_provider": "your-rootfs-provider",
-    "rootfs_provider_passthrough": "your-rootfs-provider-passthrough"}
+    "path": "s3://boot-images/boot-image-ims-id/manifest.json",
+    "rootfs_provider": "cpss3",
+    "rootfs_provider_passthrough": "dvs:api-gw-service-nmn.local:300:hsn0,nmn0:0"}
 
 EXAMPLE_SESSION_TEMPLATE = {
     "boot_sets": {

diff --git a/src/bos/server/controllers/v2/sessiontemplates.py b/src/bos/server/controllers/v2/sessiontemplates.py
@@ -35,15 +35,15 @@
 BASEKEY = "/sessionTemplates"
 
 EXAMPLE_BOOT_SET = {
-    "type": "your-boot-type",
-    "etag": "your_boot_image_etag",
+    "type": "s3",
+    "etag": "boot-image-s3-etag",
     "kernel_parameters": "your-kernel-parameters",
     "cfs": {"configuration": "bootset-specific-cfs-override"},
     "node_list": [
         "xname1", "xname2", "xname3"],
-    "path": "your-boot-path",
-    "rootfs_provider": "your-rootfs-provider",
-    "rootfs_provider_passthrough": "your-rootfs-provider-passthrough"}
+    "path": "s3://boot-images/boot-image-ims-id/manifest.json",
+    "rootfs_provider": "cpss3",
+    "rootfs_provider_passthrough": "dvs:api-gw-service-nmn.local:300:hsn0,nmn0:0"}
 
 EXAMPLE_SESSION_TEMPLATE = {
     "boot_sets": {