Correct confidentiality offset field name. Also set format for intege…

…r fields.
open-traffic-generator · Jan 20, 2025 · 0024884 · 0024884
1 parent 6733259
commit 0024884
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/device/macsec/basic.yaml b/device/macsec/basic.yaml
@@ -47,18 +47,19 @@ components:
               x-field-uid: 3
             gcm_aes_xpn_256:
               x-field-uid: 4
-        confidentialty_offset:
+        confidentiality_offset:
           description: |-
             Confidentiality offset.
           type: integer
-          default: '0'
+          format: uint32
+          default: 0
           x-field-uid: 2
           x-enum:
-            '0':
+            0:
               x-field-uid: 1
-            '30':
+            30:
               x-field-uid: 2
-            '50':
+            50:
               x-field-uid: 3
     Macsec.SecY.Basic.KeyGeneration.Static.Sak:
       description: >-

diff --git a/device/macsec/cryptoengine.yaml b/device/macsec/cryptoengine.yaml
@@ -83,6 +83,8 @@ components:
           description: >-
             Fixed Tx PN.
           type: integer
+          format: uint32
+          minimum: 1
           default: 6 
           x-field-uid: 1
     Macsec.SecY.CryptoEngine.Type.StatelessEncryptionOnly.IncrementingPn:
@@ -94,12 +96,16 @@ components:
           description: >-
             Count of packet numbers in series. 
           type: integer
+          format: uint32
+          minimum: 2
           default: 100
           x-field-uid: 1
         first:
           description: >-
             First PN.
           type: integer
+          format: uint32
+          minimum: 1
           default: 10000
           x-field-uid: 2
     Macsec.SecY.CryptoEngine.Type.StatelessEncryptionOnly.Traffic:
@@ -122,6 +128,8 @@ components:
           description: >-
             Initial Tx PN.
           type: integer
+          format: uint32
+          minimum: 1
           default: 1
           x-field-uid: 1
     Macsec.SecY.CryptoEngine.Type.StatefulEncryptionDecryption.HardwareAcceleration:

diff --git a/device/macsec/rxsc.yaml b/device/macsec/rxsc.yaml
@@ -23,6 +23,9 @@ components:
           description: |-
             DUT SCI Port ID. 
           type: integer
+          format: uint32
+          minimum: 1
+          maximum: 65535
           default: 1
           x-field-uid: 2
         replay_protection:
@@ -35,6 +38,8 @@ components:
           description: |-
             Replay window size. 
           type: integer
+          format: uint32
+          minimum: 1
           default: 1
           x-field-uid: 4
         sak_pool:

diff --git a/device/macsec/txsc.yaml b/device/macsec/txsc.yaml
@@ -23,6 +23,9 @@ components:
           description: |-
             Port ID. 
           type: integer
+          format: uint32
+          minimum: 1
+          maximum: 65535
           default: 1
           x-field-uid: 2
         end_station: