Skip to content

Commit

Permalink
Merge pull request #17332 from nabahr/fix-import-test
Browse files Browse the repository at this point in the history 
tests: Remove unnecessary fields from expected JSON
  • Loading branch information
@donaldsharp
donaldsharp authored Nov 3, 2024
2 parents 03012e4 + 5b3c3b1 commit 4c525a4
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 232 deletions.
16 changes: 0 additions & 16 deletions tests/topotests/zebra_rib/r1/import_init_mrib_table.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 3,
"installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -45,10 +41,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 3,
"installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -76,10 +68,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 4,
"installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -107,10 +95,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 4,
"installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
Expand Down
16 changes: 0 additions & 16 deletions tests/topotests/zebra_rib/r1/import_init_table.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 3,
"installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -45,10 +41,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 3,
"installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -76,10 +68,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 4,
"installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -107,10 +95,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 4,
"installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
Expand Down
32 changes: 0 additions & 32 deletions tests/topotests/zebra_rib/r1/import_mrib_table_2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 3,
"installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -45,10 +41,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 3,
"installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -77,10 +69,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 7,
"installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -110,10 +98,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 7,
"installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -143,10 +127,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 8,
"installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -176,10 +156,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 8,
"installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -208,10 +184,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 4,
"installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -239,10 +211,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 4,
"installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
Expand Down
36 changes: 0 additions & 36 deletions tests/topotests/zebra_rib/r1/import_mrib_table_3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 3,
"installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -45,10 +41,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 3,
"installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -77,10 +69,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 7,
"installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -110,10 +98,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 7,
"installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -143,10 +127,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 8,
"installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -176,10 +156,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 8,
"installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -208,10 +184,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 4,
"installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -239,10 +211,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 4,
"installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -271,10 +239,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 8,
"installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
Expand Down
32 changes: 0 additions & 32 deletions tests/topotests/zebra_rib/r1/import_mrib_table_4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 3,
"installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -45,10 +41,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 3,
"installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -77,10 +69,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 7,
"installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -110,10 +98,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 7,
"installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -143,10 +127,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 8,
"installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -176,10 +156,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 8,
"installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -208,10 +184,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 4,
"installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
Expand Down Expand Up @@ -239,10 +211,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
"internalNextHopNum": 1,
"internalNextHopActiveNum": 1,
"nexthopGroupId": 4,
"installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
Expand Down
Loading

0 comments on commit 4c525a4

Please sign in to comment.