Merge to main @1.12.0

open-traffic-generator · Aug 30, 2024 · 5b7943d · 5b7943d
2 parents 65ead56 + 43cca25
commit 5b7943d
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 73 deletions.
diff --git a/api/info.yaml b/api/info.yaml
@@ -8,7 +8,7 @@ info:
     Contributions can be made in the following ways:
     - [open an issue](https://github.com/open-traffic-generator/models/issues) in the models repository
     - [fork the models repository](https://github.com/open-traffic-generator/models) and submit a PR
-  version: 1.10.0
+  version: 1.12.0
   contact:
     url: https://github.com/open-traffic-generator/models
   license:

diff --git a/artifacts/openapi.html b/artifacts/openapi.html
diff --git a/artifacts/openapi.yaml b/artifacts/openapi.yaml
diff --git a/artifacts/otg.proto b/artifacts/otg.proto
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
 click==8.0.4
-openapiart==0.3.18
+openapiart==0.3.19
diff --git a/result/dhcpv6interface.yaml b/result/dhcpv6interface.yaml
@@ -26,38 +26,20 @@ components:
             The name of a DHCPv6 Client.
           type: string
           x-field-uid: 1
-        iapds:
+        iapd_addresses:
           description: >-
             The IPv6 IAPD addresses and prefixes associated with this DHCP Client session.
           type: array
           items:
             $ref: '#/components/schemas/Dhcpv6Interface.Iapd'
           x-field-uid: 2
-        addresses:
+        ia_addresses:
           description: >-
-            The IPv6 addresses and gateways associated with this DHCP Client session.
+            The IPv6 IATA/IANA addresses and gateways associated with this DHCP Client session.
           type: array
           items:
-            $ref: '#/components/schemas/Dhcpv6Interface.AddressInfo'
+            $ref: '#/components/schemas/Dhcpv6Interface.Ia'
           x-field-uid: 3
-        lease_time:
-          description: >-
-            The duration of the IPv6 address lease, in seconds.
-          type: integer
-          format: uint32
-          x-field-uid: 4
-        renew_time:
-          description: >-
-            Time in seconds until the DHCPv6 client starts renewing the lease.
-          type: integer
-          format: uint32
-          x-field-uid: 5
-        rebind_time:
-          description: >-
-            Time in seconds until the DHCPv6 client starts rebinding.
-          type: integer
-          format: uint32
-          x-field-uid: 6
 
     Dhcpv6Interface.Iapd:
       description: >-
@@ -77,10 +59,16 @@ components:
           format: uint32
           maximum: 128
           x-field-uid: 2
+        lease_time:
+          description: >-
+            The duration of the IPv6 address lease, in seconds.
+          type: integer
+          format: uint32
+          x-field-uid: 3
 
-    Dhcpv6Interface.AddressInfo:
+    Dhcpv6Interface.Ia:
       description: >-
-        The IPv6 address and gateway associated with this DHCP Client session.
+        The IPv6 IATA/IANA address and gateway associated with this DHCP Client session.
       type: object
       properties:
         address:
@@ -92,7 +80,12 @@ components:
         gateway:
           description: >-
             The Gateway address associated with this DHCPv6 Client session.
+          type: string
+          format: ipv6
+          x-field-uid: 2
+        lease_time:
+          description: >-
+            The duration of the IPv6 address lease, in seconds.
           type: integer
           format: uint32
-          maximum: 128
-          x-field-uid: 2
+          x-field-uid: 3