lib: add support for confirmed commits

[mirror_frr.git] / tests / bgpd / test_peer_attr.c

diff --git a/tests/bgpd/test_peer_attr.c b/tests/bgpd/test_peer_attr.c
index 2f464d7217334cb46386899fa115c210258e52cf..78016dc9cefe544dfde53ab6bdb3ac386e95e640 100644 (file)
--- a/tests/bgpd/test_peer_attr.c
+++ b/tests/bgpd/test_peer_attr.c
@@ -254,6 +254,8 @@ TEST_STR_ATTR_HANDLER_DECL(password, password, "FRR-Peer", "FRR-Group");
 TEST_ATTR_HANDLER_DECL(local_as, change_local_as, 1, 2);
 TEST_ATTR_HANDLER_DECL(timers_1, keepalive, 10, 20);
 TEST_ATTR_HANDLER_DECL(timers_2, holdtime, 30, 60);
+TEST_ATTR_HANDLER_DECL(addpath_types, addpath_type[pa->afi][pa->safi],
+                      BGP_ADDPATH_ALL, BGP_ADDPATH_BEST_PER_AS);
 TEST_SU_ATTR_HANDLER_DECL(update_source_su, update_source, "255.255.255.1",
                          "255.255.255.2");
 TEST_STR_ATTR_HANDLER_DECL(update_source_if, update_if, "IF-PEER", "IF-GROUP");
@@ -414,12 +416,11 @@ static struct test_peer_attr test_peer_attrs[] = {
 
        /* Address Family Attributes */
        {
-               .cmd = "addpath-tx-all-paths",
-               .u.flag = PEER_FLAG_ADDPATH_TX_ALL_PATHS,
-       },
-       {
-               .cmd = "addpath-tx-bestpath-per-AS",
-               .u.flag = PEER_FLAG_ADDPATH_TX_BESTPATH_PER_AS,
+               .cmd = "addpath",
+               .peer_cmd = "addpath-tx-all-paths",
+               .group_cmd = "addpath-tx-bestpath-per-AS",
+               .type = PEER_AT_AF_CUSTOM,
+               .handlers[0] = TEST_HANDLER(addpath_types),
        },
        {
                .cmd = "allowas-in",
@@ -1383,10 +1384,10 @@ static void bgp_startup(void)
                 LOG_DAEMON);
        zprivs_preinit(&bgpd_privs);
        zprivs_init(&bgpd_privs);
-       yang_init();
-       nb_init(NULL, 0);
 
        master = thread_master_create(NULL);
+       yang_init();
+       nb_init(master, NULL, 0);
        bgp_master_init(master);
        bgp_option_set(BGP_OPT_NO_LISTEN);
        vrf_init(NULL, NULL, NULL, NULL, NULL);