From 5b3c3b1710c704799e26b427b48633d44d36ebb9 Mon Sep 17 00:00:00 2001 From: Nathan Bahr Date: Fri, 1 Nov 2024 16:46:41 +0000 Subject: [PATCH] tests: Remove unnecessary fields from expected JSON Signed-off-by: Nathan Bahr --- .../zebra_rib/r1/import_init_mrib_table.json | 16 --------- .../zebra_rib/r1/import_init_table.json | 16 --------- .../zebra_rib/r1/import_mrib_table_2.json | 32 ----------------- .../zebra_rib/r1/import_mrib_table_3.json | 36 ------------------- .../zebra_rib/r1/import_mrib_table_4.json | 32 ----------------- .../zebra_rib/r1/import_table_2.json | 32 ----------------- .../zebra_rib/r1/import_table_3.json | 36 ------------------- .../zebra_rib/r1/import_table_4.json | 32 ----------------- 8 files changed, 232 deletions(-) diff --git a/tests/topotests/zebra_rib/r1/import_init_mrib_table.json b/tests/topotests/zebra_rib/r1/import_init_mrib_table.json index a6807d2cdd4e..80c19dacf206 100644 --- a/tests/topotests/zebra_rib/r1/import_init_mrib_table.json +++ b/tests/topotests/zebra_rib/r1/import_init_mrib_table.json @@ -14,10 +14,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -45,10 +41,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -76,10 +68,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, @@ -107,10 +95,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, diff --git a/tests/topotests/zebra_rib/r1/import_init_table.json b/tests/topotests/zebra_rib/r1/import_init_table.json index a6807d2cdd4e..80c19dacf206 100644 --- a/tests/topotests/zebra_rib/r1/import_init_table.json +++ b/tests/topotests/zebra_rib/r1/import_init_table.json @@ -14,10 +14,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -45,10 +41,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -76,10 +68,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, @@ -107,10 +95,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, diff --git a/tests/topotests/zebra_rib/r1/import_mrib_table_2.json b/tests/topotests/zebra_rib/r1/import_mrib_table_2.json index 0a7915df0f2a..61aaaede6e52 100644 --- a/tests/topotests/zebra_rib/r1/import_mrib_table_2.json +++ b/tests/topotests/zebra_rib/r1/import_mrib_table_2.json @@ -14,10 +14,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -45,10 +41,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -77,10 +69,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 7, - "installedNexthopGroupId": 7, "nexthops": [ { "flags": 3, @@ -110,10 +98,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 7, - "installedNexthopGroupId": 7, "nexthops": [ { "flags": 3, @@ -143,10 +127,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, @@ -176,10 +156,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, @@ -208,10 +184,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, @@ -239,10 +211,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, diff --git a/tests/topotests/zebra_rib/r1/import_mrib_table_3.json b/tests/topotests/zebra_rib/r1/import_mrib_table_3.json index 11bbcf8ec83e..27a0b9f26470 100644 --- a/tests/topotests/zebra_rib/r1/import_mrib_table_3.json +++ b/tests/topotests/zebra_rib/r1/import_mrib_table_3.json @@ -14,10 +14,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -45,10 +41,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -77,10 +69,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 7, - "installedNexthopGroupId": 7, "nexthops": [ { "flags": 3, @@ -110,10 +98,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 7, - "installedNexthopGroupId": 7, "nexthops": [ { "flags": 3, @@ -143,10 +127,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, @@ -176,10 +156,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, @@ -208,10 +184,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, @@ -239,10 +211,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, @@ -271,10 +239,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, diff --git a/tests/topotests/zebra_rib/r1/import_mrib_table_4.json b/tests/topotests/zebra_rib/r1/import_mrib_table_4.json index 4375b9cde6c5..5a8f0eecd5a4 100644 --- a/tests/topotests/zebra_rib/r1/import_mrib_table_4.json +++ b/tests/topotests/zebra_rib/r1/import_mrib_table_4.json @@ -14,10 +14,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -45,10 +41,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -77,10 +69,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 7, - "installedNexthopGroupId": 7, "nexthops": [ { "flags": 3, @@ -110,10 +98,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 7, - "installedNexthopGroupId": 7, "nexthops": [ { "flags": 3, @@ -143,10 +127,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, @@ -176,10 +156,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, @@ -208,10 +184,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, @@ -239,10 +211,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, diff --git a/tests/topotests/zebra_rib/r1/import_table_2.json b/tests/topotests/zebra_rib/r1/import_table_2.json index 0a7915df0f2a..61aaaede6e52 100644 --- a/tests/topotests/zebra_rib/r1/import_table_2.json +++ b/tests/topotests/zebra_rib/r1/import_table_2.json @@ -14,10 +14,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -45,10 +41,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -77,10 +69,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 7, - "installedNexthopGroupId": 7, "nexthops": [ { "flags": 3, @@ -110,10 +98,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 7, - "installedNexthopGroupId": 7, "nexthops": [ { "flags": 3, @@ -143,10 +127,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, @@ -176,10 +156,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, @@ -208,10 +184,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, @@ -239,10 +211,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, diff --git a/tests/topotests/zebra_rib/r1/import_table_3.json b/tests/topotests/zebra_rib/r1/import_table_3.json index 11bbcf8ec83e..27a0b9f26470 100644 --- a/tests/topotests/zebra_rib/r1/import_table_3.json +++ b/tests/topotests/zebra_rib/r1/import_table_3.json @@ -14,10 +14,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -45,10 +41,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -77,10 +69,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 7, - "installedNexthopGroupId": 7, "nexthops": [ { "flags": 3, @@ -110,10 +98,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 7, - "installedNexthopGroupId": 7, "nexthops": [ { "flags": 3, @@ -143,10 +127,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, @@ -176,10 +156,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, @@ -208,10 +184,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, @@ -239,10 +211,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, @@ -271,10 +239,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, diff --git a/tests/topotests/zebra_rib/r1/import_table_4.json b/tests/topotests/zebra_rib/r1/import_table_4.json index 4375b9cde6c5..5a8f0eecd5a4 100644 --- a/tests/topotests/zebra_rib/r1/import_table_4.json +++ b/tests/topotests/zebra_rib/r1/import_table_4.json @@ -14,10 +14,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -45,10 +41,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 3, - "installedNexthopGroupId": 3, "nexthops": [ { "flags": 3, @@ -77,10 +69,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 7, - "installedNexthopGroupId": 7, "nexthops": [ { "flags": 3, @@ -110,10 +98,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 7, - "installedNexthopGroupId": 7, "nexthops": [ { "flags": 3, @@ -143,10 +127,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, @@ -176,10 +156,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 9, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 8, - "installedNexthopGroupId": 8, "nexthops": [ { "flags": 3, @@ -208,10 +184,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3, @@ -239,10 +211,6 @@ "table": 254, "internalStatus": 16, "internalFlags": 8, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthopGroupId": 4, - "installedNexthopGroupId": 4, "nexthops": [ { "flags": 3,