From e4c885752d777ff011beeae6d3426f3d85544a02 Mon Sep 17 00:00:00 2001
From: Kevin Smith <Kevsy@users.noreply.github.com>
Date: Wed, 10 Jan 2024 11:52:59 +0000
Subject: [PATCH] Update CAMARA_common.yaml: add Device headers, fix address

Fixes #118  #119
---
 artifacts/CAMARA_common.yaml | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/artifacts/CAMARA_common.yaml b/artifacts/CAMARA_common.yaml
index e559c8f2..85275f83 100644
--- a/artifacts/CAMARA_common.yaml
+++ b/artifacts/CAMARA_common.yaml
@@ -10,6 +10,31 @@ info:
  version: 0.4.0
 paths: {}
 components:
+ parameters:
+  IPv4-Address:
+    in: header
+    name: IPv4-Address
+    required: false
+    schema:
+      $ref: "#/components/schemas/DeviceIpv4Address"
+  IPv6-Address:
+    in: header
+    name: IPv6-Address
+    required: false
+    schema:
+      $ref: "#/components/schemas/DeviceIpv6Address"
+  Phone-Number:
+    in: header
+    name: Phone-Number
+    required: false
+    schema:
+      $ref: "#/components/schemas/PhoneNumber"     
+  Network-Access-Identifier:
+    in: header
+    name: Network-Access-Identifier
+    required: false
+    schema:
+      $ref: "#/components/schemas/NetworkAccessIdentifier"
  schemas:
   TimePeriod:
    properties:
@@ -55,7 +80,7 @@ components:
     networkAccessIdentifier:
      $ref: "#/components/schemas/NetworkAccessIdentifier"
     ipv4Address:
-     $ref: "#/components/schemas/DeviceIpv4Addr"
+     $ref: "#/components/schemas/DeviceIpv4Address"
     ipv6Address:
      $ref: "#/components/schemas/DeviceIpv6Address"
    minProperties: 1
@@ -71,7 +96,7 @@ components:
    type: string
    example: "123456789@domain.com"
 
-  DeviceIpv4Addr:
+  DeviceIpv4Address:
    type: object
    description: |
     The device should be identified by either the public (observed) IP address and port as seen by the application server, or the private (local) and any public (observed) IP addresses in use by the device (this information can be obtained by various means, for example from some DNS servers).
@@ -83,9 +108,9 @@ components:
     In all cases, publicAddress must be specified, along with at least one of either privateAddress or publicPort, dependent upon which is known. In general, mobile devices cannot be identified by their public IPv4 address alone.
    properties:
     publicAddress:
-     $ref: "#/components/schemas/SingleIpv4Addr"
+     $ref: "#/components/schemas/SingleIpv4Address"
     privateAddress:
-     $ref: "#/components/schemas/SingleIpv4Addr"
+     $ref: "#/components/schemas/SingleIpv4Address"
     publicPort:
      $ref: "#/components/schemas/Port"
    anyOf:
@@ -95,7 +120,7 @@ components:
     publicAddress: "84.125.93.10"
     publicPort: 59765
 
-  SingleIpv4Addr:
+  SingleIpv4Address:
    description: A single IPv4 address with no subnet mask
    type: string
    format: ipv4