From 0b7bde4d8d2aab07a5738c8629b5e1d56a3bef90 Mon Sep 17 00:00:00 2001 From: "Mitch Harding (the weird one)" Date: Mon, 11 Sep 2023 12:28:25 -0400 Subject: [PATCH 1/2] CASMCMS-8797: Remove non-v2 fields from v1 session template template --- CHANGELOG.md | 2 ++ src/bos/server/controllers/v1/sessiontemplate.py | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1660c250..ea584f03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ 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 ## [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 index 40c781e0..5706bcff 100644 --- a/src/bos/server/controllers/v1/sessiontemplate.py +++ b/src/bos/server/controllers/v1/sessiontemplate.py @@ -38,13 +38,10 @@ 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", "kernel_parameters": "your-kernel-parameters", - "network": "nmn", "node_list": [ "xname1", "xname2", "xname3"], "path": "your-boot-path", From 30c4c7cb721f147d671f5f25ea9a32dd6ebea1af Mon Sep 17 00:00:00 2001 From: "Mitch Harding (the weird one)" Date: Mon, 11 Sep 2023 12:28:50 -0400 Subject: [PATCH 2/2] CASMCMS-8797: Provide more useful example values in v1 and v2 session template templates --- CHANGELOG.md | 1 + src/bos/server/controllers/v1/sessiontemplate.py | 10 +++++----- src/bos/server/controllers/v2/sessiontemplates.py | 10 +++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea584f03..c5b1ecbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## 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 index 5706bcff..2936751a 100644 --- a/src/bos/server/controllers/v1/sessiontemplate.py +++ b/src/bos/server/controllers/v1/sessiontemplate.py @@ -39,14 +39,14 @@ DB = dbutils.get_wrapper(db='session_templates') EXAMPLE_BOOT_SET = { - "type": "your-boot-type", - "etag": "your_boot_image_etag", + "type": "s3", + "etag": "boot-image-s3-etag", "kernel_parameters": "your-kernel-parameters", "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 index f032be14..69076a82 100644 --- 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": {