]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a69f661)
tests: Remove unnecessary fields from expected JSON 17332/head
authorNathan Bahr <nbahr@atcorp.com>
Fri, 1 Nov 2024 16:46:41 +0000 (16:46 +0000)
committerNathan Bahr <nbahr@atcorp.com>
Fri, 1 Nov 2024 16:46:41 +0000 (16:46 +0000)
Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
tests/topotests/zebra_rib/r1/import_init_mrib_table.json patch | blob | history
tests/topotests/zebra_rib/r1/import_init_table.json patch | blob | history
tests/topotests/zebra_rib/r1/import_mrib_table_2.json patch | blob | history
tests/topotests/zebra_rib/r1/import_mrib_table_3.json patch | blob | history
tests/topotests/zebra_rib/r1/import_mrib_table_4.json patch | blob | history
tests/topotests/zebra_rib/r1/import_table_2.json patch | blob | history
tests/topotests/zebra_rib/r1/import_table_3.json patch | blob | history
tests/topotests/zebra_rib/r1/import_table_4.json patch | blob | history

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 a6807d2cdd4eb240f99d22d79a5c527f64dfb6bb..80c19dacf206f4181ba369afad46f6413c506ecb 100644 (file)
--- 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 a6807d2cdd4eb240f99d22d79a5c527f64dfb6bb..80c19dacf206f4181ba369afad46f6413c506ecb 100644 (file)
--- 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 0a7915df0f2ac4121998c8fab898a202ed0e25d9..61aaaede6e52ffc6815c78149ef39b8a18c8c87c 100644 (file)
--- 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 11bbcf8ec83eff1c20b7bc6a7cac82c93134747a..27a0b9f26470ed4cdad7d790396423a292682a83 100644 (file)
--- 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 4375b9cde6c5c7494f2502f733a17b787c711edb..5a8f0eecd5a40d56fc8b86a01e3a97e7b118490c 100644 (file)
--- 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 0a7915df0f2ac4121998c8fab898a202ed0e25d9..61aaaede6e52ffc6815c78149ef39b8a18c8c87c 100644 (file)
--- 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 11bbcf8ec83eff1c20b7bc6a7cac82c93134747a..27a0b9f26470ed4cdad7d790396423a292682a83 100644 (file)
--- 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 4375b9cde6c5c7494f2502f733a17b787c711edb..5a8f0eecd5a40d56fc8b86a01e3a97e7b118490c 100644 (file)
--- 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,
Unnamed repository; edit this file 'description' to name the repository.