From: Carmine Scarpitta <cscarpit@cisco.com>
Date: Sat, 8 Feb 2025 21:26:13 +0000 (+0100)
Subject: tests: Extend SRv6 static SIDs topotest to verify SID structure
X-Git-Tag: docker/10.3.0~29^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=92fa579d04ee9f6ee7f978cdfc104e92a3af7b9a;p=mirror%2Ffrr.git

tests: Extend SRv6 static SIDs topotest to verify SID structure

The `static_srv6_sids` topotest verifies that staticd correctly
programs the SIDs in the zebra RIB. Currently, the topotest only
validates the programmed behavior and SID attributes.

This commit extends the topotest to also validate the SID structure.

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
(cherry picked from commit a6d02fe2fb38b8e0c2e1c25fd863f6f96c2c40a6)
---

diff --git a/tests/topotests/static_srv6_sids/expected_srv6_sids.json b/tests/topotests/static_srv6_sids/expected_srv6_sids.json
index 5799d97988..de78878445 100644
--- a/tests/topotests/static_srv6_sids/expected_srv6_sids.json
+++ b/tests/topotests/static_srv6_sids/expected_srv6_sids.json
@@ -25,7 +25,13 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End"
+						"action": "End",
+						"sidStructure": {
+							"blockLen": 32,
+							"nodeLen": 16,
+							"funcLen": 0,
+							"argLen": 0
+						}
 					},
 					"seg6localContext": {
 
@@ -60,7 +66,13 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT4"
+						"action": "End.DT4",
+						"sidStructure": {
+							"blockLen": 32,
+							"nodeLen": 16,
+							"funcLen": 16,
+							"argLen": 0
+						}
 					},
 					"seg6localContext": {
 						"table": 10
@@ -95,7 +107,13 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT6"
+						"action": "End.DT6",
+						"sidStructure": {
+							"blockLen": 32,
+							"nodeLen": 16,
+							"funcLen": 16,
+							"argLen": 0
+						}
 					},
 					"seg6localContext": {
 						"table": 20
@@ -130,7 +148,13 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT46"
+						"action": "End.DT46",
+						"sidStructure": {
+							"blockLen": 32,
+							"nodeLen": 16,
+							"funcLen": 16,
+							"argLen": 0
+						}
 					},
 					"seg6localContext": {
 						"table": 30
diff --git a/tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_1.json b/tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_1.json
index e1a2a16afe..dd0850fb3c 100644
--- a/tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_1.json
+++ b/tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_1.json
@@ -25,7 +25,13 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT4"
+						"action": "End.DT4",
+						"sidStructure": {
+							"blockLen": 32,
+							"nodeLen": 16,
+							"funcLen": 16,
+							"argLen": 0
+						}
 					},
 					"seg6localContext": {
 						"table": 10
@@ -60,7 +66,13 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT6"
+						"action": "End.DT6",
+						"sidStructure": {
+							"blockLen": 32,
+							"nodeLen": 16,
+							"funcLen": 16,
+							"argLen": 0
+						}
 					},
 					"seg6localContext": {
 						"table": 20
@@ -95,7 +107,13 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT46"
+						"action": "End.DT46",
+						"sidStructure": {
+							"blockLen": 32,
+							"nodeLen": 16,
+							"funcLen": 16,
+							"argLen": 0
+						}
 					},
 					"seg6localContext": {
 						"table": 30
diff --git a/tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_2.json b/tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_2.json
index b5801d354b..4051c01425 100644
--- a/tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_2.json
+++ b/tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_2.json
@@ -25,7 +25,13 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT4"
+						"action": "End.DT4",
+						"sidStructure": {
+							"blockLen": 32,
+							"nodeLen": 16,
+							"funcLen": 16,
+							"argLen": 0
+						}
 					},
 					"seg6localContext": {
 						"table": 10
@@ -60,7 +66,13 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT46"
+						"action": "End.DT46",
+						"sidStructure": {
+							"blockLen": 32,
+							"nodeLen": 16,
+							"funcLen": 16,
+							"argLen": 0
+						}
 					},
 					"seg6localContext": {
 						"table": 30