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 1796c870a68963e42a63f2674a2dde30c2cdc10f..1cdf3cd1d69a531fdc7869eb4d653884d4682f8a 100644 (file)
--- 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 bd1f4bf87a74ed6a808e13cf3db8896b887cba54..573d8284da6ed2f1c7794dd630f30ec5ef4d80f5 100644 (file)
--- 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 2bd40cdb5c2c795213d54b77709f983c843be27a..02748ccd35e021910e961071886b9c9e1d0dbadd 100644 (file)
--- 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 070b7ade20a2ce36e8b2c11ba59c4e2c6846bf9c..ec5efb5297f6fa08fffdf39d580cb65b177ecbfc 100644 (file)
--- 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"