test: fix isis-snmp test

Remove ifindex values being tested because it can change
between runs of the test.

Signed-off-by: Lynne Morrison <lynne@voltanet.io>

diff --git a/tests/topotests/isis-snmp/r1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-snmp/r1/show_yang_interface_isis_adjacencies.ref
index 0391a79c1f1e29055f7e8e8748e18dcc023cd90f..390fda749e26a7cd4e6baddb7073b4321a643127 100644 (file)
--- a/tests/topotests/isis-snmp/r1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-snmp/r1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,6 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0004",
-                  "neighbor-extended-circuit-id": 2,
                   "state": "up"
                 }
               ]
@@ -29,7 +28,6 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "neighbor-extended-circuit-id": 0,
                   "state": "up"
                 }
               ]

diff --git a/tests/topotests/isis-snmp/r2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-snmp/r2/show_yang_interface_isis_adjacencies.ref
index 68a9f4a8a1d5077ba45cbcc19964a5ce539aa3a7..52550daf141790cdd30b6a91323a1877bb39f2b7 100644 (file)
--- a/tests/topotests/isis-snmp/r2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-snmp/r2/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,6 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0005",
-                  "neighbor-extended-circuit-id": 0,
                   "state": "up"
                 }
               ]
@@ -29,7 +28,6 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "neighbor-extended-circuit-id": 0,
                   "state": "up"
                 }
               ]

diff --git a/tests/topotests/isis-snmp/r3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-snmp/r3/show_yang_interface_isis_adjacencies.ref
index 0922192361365fc4c736699c0c44d4166e15d52f..3aafab4e2e3608da58f0d6f3ecd8f71494da6467 100644 (file)
--- a/tests/topotests/isis-snmp/r3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-snmp/r3/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,6 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "neighbor-extended-circuit-id": 0,
                   "state": "up"
                 }
               ]
@@ -29,7 +28,6 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "neighbor-extended-circuit-id": 0,
                   "state": "up"
                 }
               ]

diff --git a/tests/topotests/isis-snmp/r4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-snmp/r4/show_yang_interface_isis_adjacencies.ref
index 38562e39e764ada5c55eea2b730af0a9b911bb64..86fcfea1a632802f6155a441ef06c32a325d8d8b 100644 (file)
--- a/tests/topotests/isis-snmp/r4/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-snmp/r4/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,6 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "neighbor-extended-circuit-id": 2,
                   "state": "up"
                 }
               ]
@@ -29,7 +28,6 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0005",
-                  "neighbor-extended-circuit-id": 0,
                   "state": "up"
                 }
               ]

diff --git a/tests/topotests/isis-snmp/r5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-snmp/r5/show_yang_interface_isis_adjacencies.ref
index c009f53ef6c8c2e615409d13bf6e25848701e8ba..994e8166ce8def62077fe6eabc70da83c8be265c 100644 (file)
--- a/tests/topotests/isis-snmp/r5/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-snmp/r5/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,6 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "neighbor-extended-circuit-id": 0,
                   "state": "up"
                 }
               ]
@@ -29,7 +28,6 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0004",
-                  "neighbor-extended-circuit-id": 0,
                   "state": "up"
                 }
               ]

diff --git a/tests/topotests/isis-snmp/test_isis_snmp.py b/tests/topotests/isis-snmp/test_isis_snmp.py
index fe411aa8fdcfb9dddc2b8df5ebdc304618f57cda..1bcd0eefc678b9a3c6131443c4b9778771b31c6c 100755 (executable)
--- a/tests/topotests/isis-snmp/test_isis_snmp.py
+++ b/tests/topotests/isis-snmp/test_isis_snmp.py
@@ -236,7 +236,6 @@ def test_r1_scalar_snmp():
 
 
 circtable_test = {
-    "isisCircIfIndex": ["2", "3", "1"],
     "isisCircAdminState": ["on(1)", "on(1)", "on(1)"],
     "isisCircExistState": ["active(1)", "active(1)", "active(1)"],
     "isisCircType": ["broadcast(1)", "ptToPt(2)", "staticIn(3)"],
@@ -272,7 +271,6 @@ circleveltable_test = {
     "isisCircLevelMetric": ["10", "10", "10", "10"],
     "isisCircLevelWideMetric": ["10", "10", "0", "0"],
     "isisCircLevelISPriority": ["64", "64", "64", "64"],
-    "isisCircLevelIDOctet": ["2", "0", "0", "0"],
     "isisCircLevelHelloMultiplier": ["10", "10", "10", "10"],
     "isisCircLevelHelloTimer": ["3000 milliseconds", "3000 milliseconds", "3000 milliseconds", "3000 milliseconds"],
     "isisCircLevelMinLSPRetransInt": ["1 seconds", "1 seconds", "0 seconds", "0 seconds"],
@@ -305,7 +303,6 @@ adjtable_test = {
     "isisISAdj3WayState": ["down(2)", "up(0)"],
     "isisISAdjNeighSysType": ["l1IntermediateSystem(1)", "l1IntermediateSystem(1)"],
     "isisISAdjNeighSysID": ["00 00 00 00 00 04", "00 00 00 00 00 03"],
-    "isisISAdjNbrExtendedCircID": ["0", "0"],
     "isisISAdjUsage": ["0", "level1(1)"],
     "isisISAdjNeighPriority": ["64", "0"],
 }
@@ -315,7 +312,6 @@ adjtable_down_test = {
     "isisISAdj3WayState": ["down(2)"],
     "isisISAdjNeighSysType": ["l1IntermediateSystem(1)"],
     "isisISAdjNeighSysID": ["00 00 00 00 00 04"],
-    "isisISAdjNbrExtendedCircID": ["0"],
     "isisISAdjUsage": ["0"],
     "isisISAdjNeighPriority": ["64"],
 }