From 85643a963ab0efc438eddfbc5b1fd118212cf843 Mon Sep 17 00:00:00 2001
From: Eric Murray <eric.murray@vodafone.com>
Date: Fri, 12 Jun 2026 15:10:41 +0100
Subject: [PATCH 1/3] Rename Config to Config2 to avoid validation warning

---
 code/API_definitions/device-data-volume-subscriptions.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/API_definitions/device-data-volume-subscriptions.yaml b/code/API_definitions/device-data-volume-subscriptions.yaml
index 677c835..5039d98 100644
--- a/code/API_definitions/device-data-volume-subscriptions.yaml
+++ b/code/API_definitions/device-data-volume-subscriptions.yaml
@@ -362,7 +362,7 @@ components:
         device:
           $ref: "../common/CAMARA_common.yaml#/components/schemas/Device"
 
-    Config:
+    Config2:
       description: Config schema allowing for device to be specified as part of subscription detail
       allOf:
         - $ref: "../common/CAMARA_event_common.yaml#/components/schemas/Config"
@@ -496,7 +496,7 @@ components:
           items:
             $ref: "#/components/schemas/ApiEventType"
         config:
-          $ref: "#/components/schemas/Config"
+          $ref: "#/components/schemas/Config2"
       discriminator:
         propertyName: protocol
         mapping:

From 78b2ec4fd0a7a123daa456bc5f47ae56f824177b Mon Sep 17 00:00:00 2001
From: Eric Murray <eric.murray@vodafone.com>
Date: Fri, 12 Jun 2026 15:11:53 +0100
Subject: [PATCH 2/3] Rename Config to Config2 to avoid validation warning

---
 code/API_definitions/device-data-volume-subscriptions.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/API_definitions/device-data-volume-subscriptions.yaml b/code/API_definitions/device-data-volume-subscriptions.yaml
index 5039d98..4a0e340 100644
--- a/code/API_definitions/device-data-volume-subscriptions.yaml
+++ b/code/API_definitions/device-data-volume-subscriptions.yaml
@@ -438,7 +438,7 @@ components:
           items:
             $ref: "#/components/schemas/ApiEventType"
         config:
-          $ref: "#/components/schemas/Config"
+          $ref: "#/components/schemas/Config2"
         id:
           $ref: "../common/CAMARA_event_common.yaml#/components/schemas/SubscriptionId"
         startsAt:

From 2669dee277181f21ff279a15cd463126399d0710 Mon Sep 17 00:00:00 2001
From: Eric Murray <eric.murray@vodafone.com>
Date: Wed, 8 Jul 2026 14:46:16 +0100
Subject: [PATCH 3/3] Rename schemas for subscription details and config

---
 .../device-data-volume-subscriptions.yaml              | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/API_definitions/device-data-volume-subscriptions.yaml b/code/API_definitions/device-data-volume-subscriptions.yaml
index dc42079..3226aed 100644
--- a/code/API_definitions/device-data-volume-subscriptions.yaml
+++ b/code/API_definitions/device-data-volume-subscriptions.yaml
@@ -355,21 +355,21 @@ components:
         $ref: "../common/CAMARA_event_common.yaml#/components/schemas/SubscriptionId"
 
   schemas:
-    SubscriptionDetail:
+    SubscriptionDetailLocal:
       description: The details of the requested device data volume subscription.
       type: object
       properties:
         device:
           $ref: "../common/CAMARA_common.yaml#/components/schemas/Device"
 
-    Config2:
+    ConfigLocal:
       description: Config schema allowing for device to be specified as part of subscription detail
       allOf:
         - $ref: "../common/CAMARA_event_common.yaml#/components/schemas/Config"
         - type: object
           properties:
             subscriptionDetail:
-              $ref: "#/components/schemas/SubscriptionDetail"
+              $ref: "#/components/schemas/SubscriptionDetailLocal"
 
     ApiEventType:
       type: string
@@ -440,7 +440,7 @@ components:
           items:
             $ref: "#/components/schemas/ApiEventType"
         config:
-          $ref: "#/components/schemas/Config2"
+          $ref: "#/components/schemas/ConfigLocal"
         id:
           $ref: "../common/CAMARA_event_common.yaml#/components/schemas/SubscriptionId"
         startsAt:
@@ -498,7 +498,7 @@ components:
           items:
             $ref: "#/components/schemas/ApiEventType"
         config:
-          $ref: "#/components/schemas/Config2"
+          $ref: "#/components/schemas/ConfigLocal"
       discriminator:
         propertyName: protocol
         mapping: