tests: Drop `interfaceIp` from OSPF tests

Deprecated.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/tests/topotests/ospf_p2mp/test_ospf_p2mp_broadcast.py b/tests/topotests/ospf_p2mp/test_ospf_p2mp_broadcast.py
index 1f0f87959af190bb31b43f7fa94fa7accea65503..791d7cb09bb99059c7ce38ec45e3f45767e5754d 100644 (file)
--- a/tests/topotests/ospf_p2mp/test_ospf_p2mp_broadcast.py
+++ b/tests/topotests/ospf_p2mp/test_ospf_p2mp_broadcast.py
@@ -140,22 +140,6 @@ def verify_p2mp_interface(tgen, router, nbr_cnt, nbr_adj_cnt, nbr_filter):
         "interfaces": {
             "r1-eth0": {
                 "ospfEnabled": True,
-                "interfaceIp": {
-                    "10.1.0.1": {
-                        "ipAddress": "10.1.0.1",
-                        "ipAddressPrefixlen": 24,
-                        "ospfIfType": "Broadcast",
-                        "routerId": "1.1.1.1",
-                        "networkType": "POINTOMULTIPOINT",
-                        "cost": 10,
-                        "state": "Point-To-Point",
-                        "nbrCount": nbr_cnt,
-                        "nbrAdjacentCount": nbr_adj_cnt,
-                        "prefixSuppression": False,
-                        "p2mpDelayReflood": False,
-                        "nbrFilterPrefixList": nbr_filter,
-                    }
-                },
                 "ipAddress": "10.1.0.1",
                 "ipAddressPrefixlen": 24,
                 "ospfIfType": "Broadcast",
@@ -201,17 +185,6 @@ def verify_non_p2mp_interface(tgen):
         "interfaces": {
             "r1-eth0": {
                 "ospfEnabled": True,
-                "interfaceIp": {
-                    "10.1.0.1": {
-                        "ipAddress": "10.1.0.1",
-                        "ipAddressPrefixlen": 24,
-                        "ospfIfType": "Broadcast",
-                        "routerId": "1.1.1.1",
-                        "networkType": "BROADCAST",
-                        "cost": 10,
-                        "prefixSuppression": False,
-                    }
-                },
                 "ipAddress": "10.1.0.1",
                 "ipAddressPrefixlen": 24,
                 "ospfIfType": "Broadcast",

diff --git a/tests/topotests/ospf_p2mp/test_ospf_p2mp_non_broadcast.py b/tests/topotests/ospf_p2mp/test_ospf_p2mp_non_broadcast.py
index 175dca74e7a99e88d2dfa8ecce0bc801e3674638..f100aa624a59726341f5ce3b9ceaa54e7c520b70 100644 (file)
--- a/tests/topotests/ospf_p2mp/test_ospf_p2mp_non_broadcast.py
+++ b/tests/topotests/ospf_p2mp/test_ospf_p2mp_non_broadcast.py
@@ -144,22 +144,6 @@ def verify_p2mp_interface(tgen, router, nbr_cnt, nbr_adj_cnt, non_broadcast):
         "interfaces": {
             "r1-eth0": {
                 "ospfEnabled": True,
-                "interfaceIp": {
-                    "10.1.0.1": {
-                        "ipAddress": "10.1.0.1",
-                        "ipAddressPrefixlen": 24,
-                        "ospfIfType": "Broadcast",
-                        "routerId": "1.1.1.1",
-                        "networkType": "POINTOMULTIPOINT",
-                        "cost": 10,
-                        "state": "Point-To-Point",
-                        "nbrCount": nbr_cnt,
-                        "nbrAdjacentCount": nbr_adj_cnt,
-                        "prefixSuppression": False,
-                        "p2mpDelayReflood": False,
-                        "p2mpNonBroadcast": non_broadcast,
-                    }
-                },
                 "ipAddress": "10.1.0.1",
                 "ipAddressPrefixlen": 24,
                 "ospfIfType": "Broadcast",