From: Philippe Guibert <philippe.guibert@6wind.com>
Date: Fri, 25 Apr 2025 14:11:41 +0000 (+0200)
Subject: topotests: adapt static_srv6_sids to uN notation
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9d4ad7fcdc392a492708af8913b8fb228111cf5a;p=mirror%2Ffrr.git

topotests: adapt static_srv6_sids to uN notation

The 'show ipv6 route' command now displays the seg6local action in uN
notation when sids are micro SIDs. Propagate the changes in the test
for End, End.X, and End.DT[4/6/46] operations.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
---

diff --git a/tests/topotests/static_srv6_sids/expected_srv6_sids.json b/tests/topotests/static_srv6_sids/expected_srv6_sids.json
index 1796c870a6..1cdf3cd1d6 100644
--- a/tests/topotests/static_srv6_sids/expected_srv6_sids.json
+++ b/tests/topotests/static_srv6_sids/expected_srv6_sids.json
@@ -25,7 +25,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End",
+						"action": "uN",
 						"sidStructure": {
 							"blockLen": 32,
 							"nodeLen": 16,
@@ -66,7 +66,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT4",
+						"action": "uDT4",
 						"sidStructure": {
 							"blockLen": 32,
 							"nodeLen": 16,
@@ -107,7 +107,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT6",
+						"action": "uDT6",
 						"sidStructure": {
 							"blockLen": 32,
 							"nodeLen": 16,
@@ -148,7 +148,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT46",
+						"action": "uDT46",
 						"sidStructure": {
 							"blockLen": 32,
 							"nodeLen": 16,
@@ -189,7 +189,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.X"
+						"action": "uA"
 					},
 					"seg6localContext": {
 						"nh6": "2001::2"
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 bd1f4bf87a..573d8284da 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,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT4",
+						"action": "uDT4",
 						"sidStructure": {
 							"blockLen": 32,
 							"nodeLen": 16,
@@ -66,7 +66,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT6",
+						"action": "uDT6",
 						"sidStructure": {
 							"blockLen": 32,
 							"nodeLen": 16,
@@ -107,7 +107,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT46",
+						"action": "uDT46",
 						"sidStructure": {
 							"blockLen": 32,
 							"nodeLen": 16,
@@ -148,7 +148,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.X"
+						"action": "uA"
 					},
 					"seg6localContext": {
 						"nh6": "2001::2"
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 2bd40cdb5c..02748ccd35 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,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT4",
+						"action": "uDT4",
 						"sidStructure": {
 							"blockLen": 32,
 							"nodeLen": 16,
@@ -66,7 +66,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT46",
+						"action": "uDT46",
 						"sidStructure": {
 							"blockLen": 32,
 							"nodeLen": 16,
@@ -107,7 +107,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.X"
+						"action": "uA"
 					},
 					"seg6localContext": {
 						"nh6": "2001::2"
diff --git a/tests/topotests/static_srv6_sids/expected_srv6_sids_sid_modify.json b/tests/topotests/static_srv6_sids/expected_srv6_sids_sid_modify.json
index 070b7ade20..ec5efb5297 100644
--- a/tests/topotests/static_srv6_sids/expected_srv6_sids_sid_modify.json
+++ b/tests/topotests/static_srv6_sids/expected_srv6_sids_sid_modify.json
@@ -25,7 +25,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End",
+						"action": "uN",
 						"sidStructure": {
 							"blockLen": 32,
 							"nodeLen": 16,
@@ -66,7 +66,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT4",
+						"action": "uDT4",
 						"sidStructure": {
 							"blockLen": 32,
 							"nodeLen": 16,
@@ -107,7 +107,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT46",
+						"action": "uDT46",
 						"sidStructure": {
 							"blockLen": 32,
 							"nodeLen": 16,
@@ -148,7 +148,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.DT46",
+						"action": "uDT46",
 						"sidStructure": {
 							"blockLen": 32,
 							"nodeLen": 16,
@@ -189,7 +189,7 @@
 					"active": true,
 					"weight": 1,
 					"seg6local": {
-						"action": "End.X"
+						"action": "uA"
 					},
 					"seg6localContext": {
 						"nh6": "2001::2"