tests: factorize code in bgp_bmp

Factorize code in bgp_bmp

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>

tests/topotests/bgp_bmp/bmp1/bmp-update-loc-rib-step1.json

@@ -14,11 +14,11 @@
                 "peer_type": "loc-rib instance",
                 "policy": "loc-rib"
             },
-            "2111::1111/128": {
+            "2001::1111/128": {
                 "afi": 2,
                 "as_path": "65501 65502",
                 "bmp_log_type": "update",
-                "ip_prefix": "2111::1111/128",
+                "ip_prefix": "2001::1111/128",
                 "is_filtered": false,
                 "nxhp_ip": "192:168::2",
                 "origin": "IGP",

tests/topotests/bgp_bmp/bmp1/bmp-update-loc-rib-step2.json

@@ -1,11 +1,11 @@
 {
     "loc-rib": {
         "update": {
-            "2001::2222/128": {
+            "2001::1111/128": {
                 "afi": 2,
                 "as_path": "65501 65502",
                 "bmp_log_type": "update",
-                "ip_prefix": "2001::2222/128",
+                "ip_prefix": "2001::1111/128",
                 "is_filtered": false,
                 "label": 105,
                 "nxhp_ip": "192:168::2",
@@ -20,11 +20,11 @@
                 "rd": "555:2",
                 "safi": 128
             },
-            "172.31.10.1/32": {
+            "172.31.0.15/32": {
                 "afi": 1,
                 "as_path": "65501 65502",
                 "bmp_log_type": "update",
-                "ip_prefix": "172.31.10.1/32",
+                "ip_prefix": "172.31.0.15/32",
                 "is_filtered": false,
                 "label": 102,
                 "nxhp_ip": "192.168.0.2",

tests/topotests/bgp_bmp/bmp1/bmp-update-post-policy-step1.json

@@ -15,11 +15,11 @@
                 "peer_type": "global instance",
                 "policy": "post-policy"
             },
-            "2111::1111/128": {
+            "2001::1111/128": {
                 "afi": 2,
                 "as_path": "65501 65502",
                 "bmp_log_type": "update",
-                "ip_prefix": "2111::1111/128",
+                "ip_prefix": "2001::1111/128",
                 "ipv6": true,
                 "nxhp_ip": "192:168::2",
                 "origin": "IGP",

tests/topotests/bgp_bmp/bmp1/bmp-update-post-policy-step2.json

@@ -1,11 +1,11 @@
 {
     "post-policy": {
         "update": {
-            "172.31.10.1/32": {
+            "172.31.0.15/32": {
                 "afi": 1,
                 "as_path": "65501 65502",
                 "bmp_log_type": "update",
-                "ip_prefix": "172.31.10.1/32",
+                "ip_prefix": "172.31.0.15/32",
                 "ipv6": false,
                 "label": 102,
                 "nxhp_ip": "192.168.0.2",
@@ -20,11 +20,11 @@
                 "rd": "444:2",
                 "safi": 128
             },
-            "2001::2222/128": {
+            "2001::1111/128": {
                 "afi": 2,
                 "as_path": "65501 65502",
                 "bmp_log_type": "update",
-                "ip_prefix": "2001::2222/128",
+                "ip_prefix": "2001::1111/128",
                 "ipv6": true,
                 "label": 105,
                 "nxhp_ip": "192:168::2",

tests/topotests/bgp_bmp/bmp1/bmp-update-pre-policy-step1.json

@@ -15,11 +15,11 @@
                 "peer_type": "global instance",
                 "policy": "pre-policy"
             },
-            "2111::1111/128": {
+            "2001::1111/128": {
                 "afi": 2,
                 "as_path": "65501 65502",
                 "bmp_log_type": "update",
-                "ip_prefix": "2111::1111/128",
+                "ip_prefix": "2001::1111/128",
                 "ipv6": true,
                 "nxhp_ip": "192:168::2",
                 "origin": "IGP",

tests/topotests/bgp_bmp/bmp1/bmp-update-pre-policy-step2.json

@@ -1,11 +1,11 @@
 {
     "pre-policy": {
         "update": {
-            "172.31.10.1/32": {
+            "172.31.0.15/32": {
                 "afi": 1,
                 "as_path": "65501 65502",
                 "bmp_log_type": "update",
-                "ip_prefix": "172.31.10.1/32",
+                "ip_prefix": "172.31.0.15/32",
                 "ipv6": false,
                 "label": 102,
                 "nxhp_ip": "192.168.0.2",
@@ -20,11 +20,11 @@
                 "rd": "444:2",
                 "safi": 128
             },
-            "2001::2222/128": {
+            "2001::1111/128": {
                 "afi": 2,
                 "as_path": "65501 65502",
                 "bmp_log_type": "update",
-                "ip_prefix": "2001::2222/128",
+                "ip_prefix": "2001::1111/128",
                 "ipv6": true,
                 "label": 105,
                 "nxhp_ip": "192:168::2",

tests/topotests/bgp_bmp/bmp1/bmp-withdraw-loc-rib-step1.json

@@ -11,10 +11,10 @@
                 "peer_type": "loc-rib instance",
                 "policy": "loc-rib"
             },
-            "2111::1111/128": {
+            "2001::1111/128": {
                 "afi": 2,
                 "bmp_log_type": "withdraw",
-                "ip_prefix": "2111::1111/128",
+                "ip_prefix": "2001::1111/128",
                 "is_filtered": false,
                 "peer_asn": 65501,
                 "peer_bgp_id": "192.168.0.1",

tests/topotests/bgp_bmp/bmp1/bmp-withdraw-loc-rib-step2.json

@@ -1,10 +1,10 @@
 {
     "loc-rib": {
         "withdraw": {
-            "172.31.10.1/32": {
+            "172.31.0.15/32": {
                 "afi": 1,
                 "bmp_log_type": "withdraw",
-                "ip_prefix": "172.31.10.1/32",
+                "ip_prefix": "172.31.0.15/32",
                 "is_filtered": false,
                 "label": 0,
                 "peer_asn": 65501,
@@ -15,10 +15,10 @@
                 "rd": "444:2",
                 "safi": 128
             },
-            "2001::2222/128": {
+            "2001::1111/128": {
                 "afi": 2,
                 "bmp_log_type": "withdraw",
-                "ip_prefix": "2001::2222/128",
+                "ip_prefix": "2001::1111/128",
                 "is_filtered": false,
                 "label": 0,
                 "peer_asn": 65501,

tests/topotests/bgp_bmp/bmp1/bmp-withdraw-post-policy-step1.json

@@ -12,10 +12,10 @@
                 "peer_type": "global instance",
                 "policy": "post-policy"
             },
-            "2111::1111/128": {
+            "2001::1111/128": {
                 "afi": 2,
                 "bmp_log_type": "withdraw",
-                "ip_prefix": "2111::1111/128",
+                "ip_prefix": "2001::1111/128",
                 "ipv6": true,
                 "peer_asn": 65502,
                 "peer_bgp_id": "192.168.0.2",

tests/topotests/bgp_bmp/bmp1/bmp-withdraw-post-policy-step2.json

@@ -1,10 +1,10 @@
 {
     "post-policy": {
         "withdraw": {
-            "2001::2222/128": {
+            "2001::1111/128": {
                 "afi": 2,
                 "bmp_log_type": "withdraw",
-                "ip_prefix": "2001::2222/128",
+                "ip_prefix": "2001::1111/128",
                 "ipv6": true,
                 "label": 0,
                 "peer_asn": 65502,
@@ -16,10 +16,10 @@
                 "rd": "555:2",
                 "safi": 128
             },
-            "172.31.10.1/32": {
+            "172.31.0.15/32": {
                 "afi": 1,
                 "bmp_log_type": "withdraw",
-                "ip_prefix": "172.31.10.1/32",
+                "ip_prefix": "172.31.0.15/32",
                 "ipv6": false,
                 "label": 0,
                 "peer_asn": 65502,

tests/topotests/bgp_bmp/bmp1/bmp-withdraw-pre-policy-step1.json

@@ -12,10 +12,10 @@
                 "peer_type": "global instance",
                 "policy": "pre-policy"
             },
-            "2111::1111/128": {
+            "2001::1111/128": {
                 "afi": 2,
                 "bmp_log_type": "withdraw",
-                "ip_prefix": "2111::1111/128",
+                "ip_prefix": "2001::1111/128",
                 "ipv6": true,
                 "peer_asn": 65502,
                 "peer_bgp_id": "192.168.0.2",

tests/topotests/bgp_bmp/bmp1/bmp-withdraw-pre-policy-step2.json

@@ -1,10 +1,10 @@
 {
     "pre-policy": {
         "withdraw": {
-            "2001::2222/128": {
+            "2001::1111/128": {
                 "afi": 2,
                 "bmp_log_type": "withdraw",
-                "ip_prefix": "2001::2222/128",
+                "ip_prefix": "2001::1111/128",
                 "ipv6": true,
                 "label": 0,
                 "peer_asn": 65502,
@@ -16,10 +16,10 @@
                 "rd": "555:2",
                 "safi": 128
             },
-            "172.31.10.1/32": {
+            "172.31.0.15/32": {
                 "afi": 1,
                 "bmp_log_type": "withdraw",
-                "ip_prefix": "172.31.10.1/32",
+                "ip_prefix": "172.31.0.15/32",
                 "ipv6": false,
                 "label": 0,
                 "peer_asn": 65502,

tests/topotests/bgp_bmp/r1/show-bgp-ipv4-update-step2.json

@@ -2,7 +2,7 @@
     "routes": {
         "routeDistinguishers": {
             "444:2": {
-                "172.31.10.1/32": [
+                "172.31.0.15/32": [
                     {
                         "bestpath": true,
                         "pathFrom": "external",

tests/topotests/bgp_bmp/r1/show-bgp-ipv4-withdraw-step1.json

@@ -1,6 +1,6 @@
 {
     "routes": {
-        "172.31.0.15/32": null
+        "2001::1111/128": null
     }
 }
 

tests/topotests/bgp_bmp/r1/show-bgp-ipv4-withdraw-step2.json

@@ -2,7 +2,7 @@
     "routes": {
         "routeDistinguishers": {
             "444:2": {
-                "172.31.10.1/32": null
+                "2001::1111/128": null
             }
         }
     }

tests/topotests/bgp_bmp/r1/show-bgp-ipv6-update-step1.json

@@ -1,6 +1,6 @@
 {
     "routes": {
-        "2111::1111/128": [
+        "2001::1111/128": [
             {
                 "bestpath": true,
                 "pathFrom": "external",

tests/topotests/bgp_bmp/r1/show-bgp-ipv6-update-step2.json

@@ -2,7 +2,7 @@
     "routes": {
         "routeDistinguishers": {
             "555:2": {
-                "2001::2222/128": [
+                "2001::1111/128": [
                     {
                         "bestpath": true,
                         "pathFrom": "external",

tests/topotests/bgp_bmp/r1/show-bgp-ipv6-withdraw-step1.json

@@ -1,6 +1,6 @@
 {
     "routes": {
-        "2111::1111/128": null
+        "2001::1111/128": null
     }
 }
 

tests/topotests/bgp_bmp/r1/show-bgp-ipv6-withdraw-step2.json

@@ -2,7 +2,7 @@
     "routes": {
         "routeDistinguishers": {
             "555:2": {
-                "2001::2222/128": null
+                "2001::1111/128": null
             }
         }
     }

tests/topotests/bgp_bmp/test_bgp_bmp.py

@@ -371,7 +371,7 @@ def configure_prefixes(tgen, node, asn, safi, prefixes, vrf=None, update=True):
         tgen.gears[node].vtysh_cmd("".join(cmd))
 
 
-def unicast_prefixes(policy):
+def _test_prefixes(policy, vrf=None, step=0):
     """
     Setup the BMP  monitor policy, Add and withdraw ipv4/v6 prefixes.
     Check if the previous actions are logged in the BMP server with the right
@@ -379,52 +379,33 @@ def unicast_prefixes(policy):
     """
     tgen = get_topogen()
 
-    set_bmp_policy(tgen, "r1", 65501, "bmp1", "unicast", policy)
+    safi = "vpn" if vrf else "unicast"
 
+    set_bmp_policy(tgen, "r1", 65501, "bmp1", safi, policy)
+
+    prefixes = ["172.31.0.15/32", "2001::1111/128"]
+
+    for type in ("update", "withdraw"):
         update_seq()
 
-    prefixes = ["172.31.0.15/32", "2111::1111/128"]
+        configure_prefixes(
-    # add prefixes
+            tgen, "r2", 65502, "unicast", prefixes, vrf=vrf, update=(type == "update")
-    configure_prefixes(tgen, "r2", 65502, "unicast", prefixes)
-
-    for ipver in [4, 6]:
-        if UPDATE_EXPECTED_JSON:
-            continue
-        ref_file = "{}/r1/show-bgp-ipv{}-update-step1.json".format(CWD, ipver)
-        expected = json.loads(open(ref_file).read())
-
-        test_func = partial(
-            topotest.router_json_cmp,
-            tgen.gears["r1"],
-            f"show bgp ipv{ipver} json",
-            expected,
         )
-        _, res = topotest.run_and_expect(test_func, None, count=30, wait=1)
-        assertmsg = f"r1: BGP IPv{ipver} convergence failed"
-        assert res is None, assertmsg
 
-    logger.info("checking for updated prefixes")
+        logger.info(f"checking for prefixes {type}")
-    # check
-    test_func = partial(check_for_prefixes, prefixes, "update", policy, 1)
-    success, res = topotest.run_and_expect(test_func, None, count=30, wait=1)
-    assert success, "Checking the updated prefixes has been failed !. %s" % res
-
-    update_seq()
-
-    # withdraw prefixes
-    configure_prefixes(tgen, "r2", 65502, "unicast", prefixes, update=False)
-    logger.info("checking for withdrawn prefixes")
 
         for ipver in [4, 6]:
             if UPDATE_EXPECTED_JSON:
                 continue
-        ref_file = "{}/r1/show-bgp-ipv{}-withdraw-step1.json".format(CWD, ipver)
+            ref_file = "{}/r1/show-bgp-ipv{}-{}-step{}.json".format(
+                CWD, ipver, type, step
+            )
             expected = json.loads(open(ref_file).read())
 
             test_func = partial(
                 topotest.router_json_cmp,
                 tgen.gears["r1"],
-            f"show bgp ipv{ipver} json",
+                f"show bgp ipv{ipver} {safi} json",
                 expected,
             )
             _, res = topotest.run_and_expect(test_func, None, count=30, wait=1)
@@ -432,76 +413,9 @@ def unicast_prefixes(policy):
             assert res is None, assertmsg
 
         # check
-    test_func = partial(check_for_prefixes, prefixes, "withdraw", policy, 1)
+        test_func = partial(check_for_prefixes, prefixes, type, policy, step)
         success, res = topotest.run_and_expect(test_func, None, count=30, wait=1)
-    assert success, "Checking the withdrawn prefixes has been failed !. %s" % res
+        assert success, "Checking the updated prefixes has failed ! %s" % res
-
-
-def vpn_prefixes(policy):
-    """
-    Setup the BMP  monitor policy, Add and withdraw ipv4/v6 prefixes.
-    Check if the previous actions are logged in the BMP server with the right
-    message type and the right policy.
-    """
-    tgen = get_topogen()
-
-    set_bmp_policy(tgen, "r1", 65501, "bmp1", "vpn", policy)
-
-    update_seq()
-
-    prefixes = ["172.31.10.1/32", "2001::2222/128"]
-
-    # add prefixes
-    configure_prefixes(tgen, "r2", 65502, "unicast", prefixes, vrf="vrf1")
-
-    for ipver in [4, 6]:
-        if UPDATE_EXPECTED_JSON:
-            continue
-        ref_file = "{}/r1/show-bgp-ipv{}-update-step2.json".format(CWD, ipver)
-        expected = json.loads(open(ref_file).read())
-
-        test_func = partial(
-            topotest.router_json_cmp,
-            tgen.gears["r1"],
-            f"show bgp ipv{ipver} vpn json",
-            expected,
-        )
-        _, res = topotest.run_and_expect(test_func, None, count=30, wait=1)
-        assertmsg = f"r1: BGP IPv{ipver} convergence failed"
-        assert res is None, assertmsg
-
-    logger.info("checking for updated prefixes")
-    # check
-    test_func = partial(check_for_prefixes, prefixes, "update", policy, 2)
-    success, res = topotest.run_and_expect(test_func, None, count=30, wait=1)
-    assert success, "Checking the updated prefixes has been failed !. %s" % res
-
-    update_seq()
-
-    # withdraw prefixes
-    configure_prefixes(tgen, "r2", 65502, "unicast", prefixes, vrf="vrf1", update=False)
-    logger.info("checking for withdrawn prefixes")
-
-    for ipver in [4, 6]:
-        if UPDATE_EXPECTED_JSON:
-            continue
-        ref_file = "{}/r1/show-bgp-ipv{}-withdraw-step2.json".format(CWD, ipver)
-        expected = json.loads(open(ref_file).read())
-
-        test_func = partial(
-            topotest.router_json_cmp,
-            tgen.gears["r1"],
-            f"show bgp ipv{ipver} vpn json",
-            expected,
-        )
-        _, res = topotest.run_and_expect(test_func, None, count=30, wait=1)
-        assertmsg = f"r1: BGP IPv{ipver} convergence failed"
-        assert res is None, assertmsg
-
-    # check
-    test_func = partial(check_for_prefixes, prefixes, "withdraw", policy, 2)
-    success, res = topotest.run_and_expect(test_func, None, count=30, wait=1)
-    assert success, "Checking the withdrawn prefixes has been failed !. %s" % res
 
 
 def test_bmp_server_logging():
@@ -541,21 +455,21 @@ def test_bmp_bgp_unicast():
     Add/withdraw bgp unicast prefixes and check the bmp logs.
     """
     logger.info("*** Unicast prefixes pre-policy logging ***")
-    unicast_prefixes(PRE_POLICY)
+    _test_prefixes(PRE_POLICY, step=1)
     logger.info("*** Unicast prefixes post-policy logging ***")
-    unicast_prefixes(POST_POLICY)
+    _test_prefixes(POST_POLICY, step=1)
     logger.info("*** Unicast prefixes loc-rib logging ***")
-    unicast_prefixes(LOC_RIB)
+    _test_prefixes(LOC_RIB, step=1)
 
 
 def test_bmp_bgp_vpn():
     # check for the prefixes in the BMP server logging file
     logger.info("***** VPN prefixes pre-policy logging *****")
-    vpn_prefixes(PRE_POLICY)
+    _test_prefixes(PRE_POLICY, vrf="vrf1", step=2)
     logger.info("***** VPN prefixes post-policy logging *****")
-    vpn_prefixes(POST_POLICY)
+    _test_prefixes(POST_POLICY, vrf="vrf1", step=2)
     logger.info("***** VPN prefixes loc-rib logging *****")
-    vpn_prefixes(LOC_RIB)
+    _test_prefixes(LOC_RIB, vrf="vrf1", step=2)
 
 
 def test_peer_down():