summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Bahr <nbahr@atcorp.com>2024-11-01 16:46:41 +0000
committerNathan Bahr <nbahr@atcorp.com>2024-11-01 16:46:41 +0000
commit5b3c3b1710c704799e26b427b48633d44d36ebb9 (patch)
treecdd49c78dc406cfda2a0d636cecec8a15ecdc447
parenta69f66176da7085cb592ae359078a9350b592fee (diff)
tests: Remove unnecessary fields from expected JSON
Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
-rw-r--r--tests/topotests/zebra_rib/r1/import_init_mrib_table.json16
-rw-r--r--tests/topotests/zebra_rib/r1/import_init_table.json16
-rw-r--r--tests/topotests/zebra_rib/r1/import_mrib_table_2.json32
-rw-r--r--tests/topotests/zebra_rib/r1/import_mrib_table_3.json36
-rw-r--r--tests/topotests/zebra_rib/r1/import_mrib_table_4.json32
-rw-r--r--tests/topotests/zebra_rib/r1/import_table_2.json32
-rw-r--r--tests/topotests/zebra_rib/r1/import_table_3.json36
-rw-r--r--tests/topotests/zebra_rib/r1/import_table_4.json32
8 files changed, 0 insertions, 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 a6807d2cdd..80c19dacf2 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 a6807d2cdd..80c19dacf2 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 0a7915df0f..61aaaede6e 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 11bbcf8ec8..27a0b9f264 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 4375b9cde6..5a8f0eecd5 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 0a7915df0f..61aaaede6e 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 11bbcf8ec8..27a0b9f264 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 4375b9cde6..5a8f0eecd5 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,