Revert "tests: ipv6 global removal in bgp_nexthop_mp_ipv4_6"

This reverts commit 04c220bedb63334a65677a46ef84938cc812221f.

diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step2.json
deleted file mode 100755 (executable)
index f7c5c7c..0000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "::",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65000 65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:2::3",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::2",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65000 65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:2::3",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::2",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step2.json
deleted file mode 100644 (file)
index 21f3608..0000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step2.json
deleted file mode 100644 (file)
index 21f3608..0000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step2.json
deleted file mode 100755 (executable)
index 7d0786c..0000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "2001:db8::2",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step2.json
deleted file mode 100755 (executable)
index 7d0786c..0000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "2001:db8::2",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step2.json
deleted file mode 100644 (file)
index 55912dd..0000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "nexthops": [
-          {
-            "ip": "2001:db8::2",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step2.json
deleted file mode 100644 (file)
index 8fe5f7c..0000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::6",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "::",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step2.json
deleted file mode 100644 (file)
index 20f4940..0000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::6",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "::",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step2.json
deleted file mode 100644 (file)
index 4ab0e1c..0000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "2001:db8::2",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "2001:db8::3",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/test_nexthop_mp_ipv4_6.py b/tests/topotests/bgp_nexthop_mp_ipv4_6/test_nexthop_mp_ipv4_6.py
index 911a6d757f8ab1badb94ec534bc647777414b9ea..4da13b16d17d02e23b2e12aafb2b224b4253c709 100644 (file)
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/test_nexthop_mp_ipv4_6.py
+++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/test_nexthop_mp_ipv4_6.py
@@ -226,58 +226,6 @@ def test_bgp_ping_ok_step1():
     check_ping("h1", "fd00:800::1", True, 5, 1)
 
 
-def test_bgp_ipv6_nexthop_step2():
-    """
-    Remove IPv6 global on r1 and r7
-    Assert that BGP has correct ipv6 nexthops.
-    """
-
-    tgen = get_topogen()
-    if tgen.routers_have_failure():
-        pytest.skip(tgen.errors)
-
-    tgen.gears["r1"].vtysh_cmd(
-        """
-configure
-interface eth-r2
- no ipv6 address fd00:0:1::1/64
-!
-interface eth-r3
- no ipv6 address fd00:0:2::1/64
-"""
-    )
-
-    for rname, router in tgen.routers().items():
-        if "h" in rname:
-            # hosts
-            continue
-        if "rs1" in rname:
-            continue
-        ref_file = "{}/{}/bgp_ipv6_step2.json".format(CWD, rname)
-        expected = json.loads(open(ref_file).read())
-        test_func = partial(
-            topotest.router_json_cmp,
-            router,
-            "show bgp ipv6 unicast json",
-            expected,
-        )
-        _, res = topotest.run_and_expect(test_func, None, count=30, wait=1)
-        assertmsg = "{}: BGP IPv6 Nexthop failure".format(rname)
-        assert res is None, assertmsg
-
-
-def test_bgp_ping_ok_step2():
-    "Check that h1 pings h2 and h3"
-    tgen = get_topogen()
-    if tgen.routers_have_failure():
-        pytest.skip(tgen.errors)
-
-    check_ping("h1", "192.168.7.1", True, 5, 1)
-    check_ping("h1", "fd00:700::1", True, 5, 1)
-    check_ping("h1", "192.168.8.1", True, 5, 1)
-    check_ping("h1", "fd00:800::1", True, 5, 1)
-
-
 if __name__ == "__main__":
     args = ["-s"] + sys.argv[1:]
     sys.exit(pytest.main(args))