From 8b92c32069e333fc920425919aed0c80ff4b9b83 Mon Sep 17 00:00:00 2001 From: Alberto Ramos Monagas Date: Tue, 6 Oct 2026 12:11:04 +0200 Subject: [PATCH 1/3] chore: update API version from wip to 1.1.0 --- code/API_definitions/device-swap.yaml | 4 ++-- code/Test_definitions/device-swap-checkDeviceSwap.feature | 4 ++-- .../device-swap-retrieveDeviceSwapDate.feature | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/API_definitions/device-swap.yaml b/code/API_definitions/device-swap.yaml index 15633f0..7e51bf0 100644 --- a/code/API_definitions/device-swap.yaml +++ b/code/API_definitions/device-swap.yaml @@ -75,7 +75,7 @@ info: license: name: Apache 2.0 url: https://www.apache.org/licenses/LICENSE-2.0.html - version: wip + version: 1.1.0 x-camara-commonalities: 0.6 externalDocs: @@ -83,7 +83,7 @@ externalDocs: url: https://github.com/camaraproject/DeviceSwap servers: - - url: '{apiRoot}/device-swap/vwip' + - url: '{apiRoot}/device-swap/v1.1' variables: apiRoot: default: http://localhost:9091 diff --git a/code/Test_definitions/device-swap-checkDeviceSwap.feature b/code/Test_definitions/device-swap-checkDeviceSwap.feature index 6496e0b..cfd7010 100644 --- a/code/Test_definitions/device-swap-checkDeviceSwap.feature +++ b/code/Test_definitions/device-swap-checkDeviceSwap.feature @@ -1,4 +1,4 @@ -Feature: CAMARA Device Swap API, vwip - Operation checkDeviceSwap +Feature: CAMARA Device Swap API, v1.1.0 - Operation checkDeviceSwap # Input to be provided by the implementation to the tester # @@ -8,7 +8,7 @@ Feature: CAMARA Device Swap API, vwip - Operation checkDeviceSwap # References to OAS spec schemas refer to schemas specified in device-swap.yaml Background: Common checkDeviceSwap setup - Given the resource "device-swap/vwip/check" + Given the resource "device-swap/v1.1/check" And the header "Content-Type" is set to "application/json" And the header "Authorization" is set to a valid access token And the header "x-correlator" complies with the schema at "#/components/schemas/XCorrelator" diff --git a/code/Test_definitions/device-swap-retrieveDeviceSwapDate.feature b/code/Test_definitions/device-swap-retrieveDeviceSwapDate.feature index df2c695..63e9dea 100644 --- a/code/Test_definitions/device-swap-retrieveDeviceSwapDate.feature +++ b/code/Test_definitions/device-swap-retrieveDeviceSwapDate.feature @@ -1,4 +1,4 @@ -Feature: CAMARA Device Swap API, vwip - Operation retrieveDeviceSwapDate +Feature: CAMARA Device Swap API, v1.1.0 - Operation retrieveDeviceSwapDate # Input to be provided by the implementation to the tester # @@ -8,7 +8,7 @@ Feature: CAMARA Device Swap API, vwip - Operation retrieveDeviceSwapDate # References to OAS spec schemas refer to schemas specified in device-swap.yaml. Background: Common retrieveDeviceSwapDate setup - Given the resource "device-swap/vwip/retrieve-date" + Given the resource "device-swap/v1.1/retrieve-date" And the header "Content-Type" is set to "application/json" And the header "Authorization" is set to a valid access token And the header "x-correlator" complies with the schema at "#/components/schemas/XCorrelator" From 09e672583c9b71cf101248d7ea088dc445b7a75c Mon Sep 17 00:00:00 2001 From: Alberto Ramos Monagas Date: Tue, 6 Oct 2026 12:19:22 +0200 Subject: [PATCH 2/3] Remove '.0' from device-swap yaml L:86 --- code/API_definitions/device-swap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/API_definitions/device-swap.yaml b/code/API_definitions/device-swap.yaml index ef40b67..64ff824 100644 --- a/code/API_definitions/device-swap.yaml +++ b/code/API_definitions/device-swap.yaml @@ -83,7 +83,7 @@ externalDocs: url: https://github.com/camaraproject/DeviceSwap servers: - - url: '{apiRoot}/device-swap/v1.1.0' + - url: '{apiRoot}/device-swap/v1.1' variables: apiRoot: default: http://localhost:9091 From ec27e7b12077d23ee44064fab16dc88c5255df45 Mon Sep 17 00:00:00 2001 From: Alberto Ramos Monagas Date: Tue, 6 Oct 2026 12:26:49 +0200 Subject: [PATCH 3/3] fix: use /v1 URL segment per CAMARA convention for version 1.1.0 --- code/API_definitions/device-swap.yaml | 2 +- code/Test_definitions/device-swap-checkDeviceSwap.feature | 2 +- .../Test_definitions/device-swap-retrieveDeviceSwapDate.feature | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/API_definitions/device-swap.yaml b/code/API_definitions/device-swap.yaml index 64ff824..f86a606 100644 --- a/code/API_definitions/device-swap.yaml +++ b/code/API_definitions/device-swap.yaml @@ -83,7 +83,7 @@ externalDocs: url: https://github.com/camaraproject/DeviceSwap servers: - - url: '{apiRoot}/device-swap/v1.1' + - url: '{apiRoot}/device-swap/v1' variables: apiRoot: default: http://localhost:9091 diff --git a/code/Test_definitions/device-swap-checkDeviceSwap.feature b/code/Test_definitions/device-swap-checkDeviceSwap.feature index cfd7010..f4adbf9 100644 --- a/code/Test_definitions/device-swap-checkDeviceSwap.feature +++ b/code/Test_definitions/device-swap-checkDeviceSwap.feature @@ -8,7 +8,7 @@ Feature: CAMARA Device Swap API, v1.1.0 - Operation checkDeviceSwap # References to OAS spec schemas refer to schemas specified in device-swap.yaml Background: Common checkDeviceSwap setup - Given the resource "device-swap/v1.1/check" + Given the resource "device-swap/v1/check" And the header "Content-Type" is set to "application/json" And the header "Authorization" is set to a valid access token And the header "x-correlator" complies with the schema at "#/components/schemas/XCorrelator" diff --git a/code/Test_definitions/device-swap-retrieveDeviceSwapDate.feature b/code/Test_definitions/device-swap-retrieveDeviceSwapDate.feature index 63e9dea..075e3e8 100644 --- a/code/Test_definitions/device-swap-retrieveDeviceSwapDate.feature +++ b/code/Test_definitions/device-swap-retrieveDeviceSwapDate.feature @@ -8,7 +8,7 @@ Feature: CAMARA Device Swap API, v1.1.0 - Operation retrieveDeviceSwapDate # References to OAS spec schemas refer to schemas specified in device-swap.yaml. Background: Common retrieveDeviceSwapDate setup - Given the resource "device-swap/v1.1/retrieve-date" + Given the resource "device-swap/v1/retrieve-date" And the header "Content-Type" is set to "application/json" And the header "Authorization" is set to a valid access token And the header "x-correlator" complies with the schema at "#/components/schemas/XCorrelator"