Revert "tests: add bgp yang module registery to attr test"

This reverts commit 15cbc382061ee8807dbe79827c96ae94a4aa90c6.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/tests/bgpd/test_peer_attr.c b/tests/bgpd/test_peer_attr.c
index 45e9912a31d48641badacbdf3b66edb0d26d48f0..e64f838de381c858d1cd61f9222f77bbfa4f7b26 100644 (file)
--- a/tests/bgpd/test_peer_attr.c
+++ b/tests/bgpd/test_peer_attr.c
@@ -30,9 +30,6 @@
 #include "bgpd/bgp_vty.h"
 #include "bgpd/bgp_zebra.h"
 #include "bgpd/bgp_network.h"
-#include "lib/routing_nb.h"
-#include "lib/northbound_cli.h"
-#include "bgpd/bgp_nb.h"
 
 #ifdef ENABLE_BGP_VNC
 #include "bgpd/rfapi/rfapi_backend.h"
@@ -777,10 +774,6 @@ static void test_execute(struct test *test, const char *fmt, ...)
 
        /* Execute command (non-strict). */
        ret = cmd_execute_command(vline, test->vty, NULL, 0);
-       if (ret == CMD_SUCCESS) {
-               /* Commit any pending changes, irnore error */
-               ret = nb_cli_pending_commit_check(test->vty);
-       }
        if (ret != CMD_SUCCESS) {
                test->state = TEST_COMMAND_ERROR;
                test->error = str_printf(
@@ -1385,15 +1378,6 @@ static void test_peer_attr(struct test *test, struct test_peer_attr *pa)
        test_process(test, pa, p, g->conf, true, false);
 }
 
-static const struct frr_yang_module_info *const bgpd_yang_modules[] = {
-       &frr_bgp_info,
-       &frr_filter_info,
-       &frr_interface_info,
-       &frr_route_map_info,
-       &frr_routing_info,
-       &frr_vrf_info,
-};
-
 static void bgp_startup(void)
 {
        cmd_init(1);
@@ -1402,7 +1386,7 @@ static void bgp_startup(void)
        zprivs_init(&bgpd_privs);
 
        master = thread_master_create(NULL);
-       nb_init(master, bgpd_yang_modules, array_size(bgpd_yang_modules), false);
+       nb_init(master, NULL, 0, false);
        bgp_master_init(master, BGP_SOCKET_SNDBUF_SIZE, list_new());
        bgp_option_set(BGP_OPT_NO_LISTEN);
        vrf_init(NULL, NULL, NULL, NULL, NULL);

diff --git a/tests/subdir.am b/tests/subdir.am
index 86c1aa42842db8ad28f537814370b063bab1b1ac..45236287cf6df24e96b4ee28a69310a79b29b070 100644 (file)
--- a/tests/subdir.am
+++ b/tests/subdir.am
@@ -222,19 +222,6 @@ tests_bgpd_test_peer_attr_CFLAGS = $(TESTS_CFLAGS)
 tests_bgpd_test_peer_attr_CPPFLAGS = $(TESTS_CPPFLAGS)
 tests_bgpd_test_peer_attr_LDADD = $(BGP_TEST_LDADD)
 tests_bgpd_test_peer_attr_SOURCES = tests/bgpd/test_peer_attr.c
-nodist_tests_bgpd_test_peer_attr_SOURCES = \
-    yang/frr-bgp-types.yang.c \
-    yang/frr-bgp.yang.c \
-    yang/frr-bgp-common-structure.yang.c \
-    yang/frr-bgp-common.yang.c \
-    yang/frr-bgp-common-multiprotocol.yang.c \
-    yang/frr-bgp-neighbor.yang.c \
-    yang/frr-bgp-peer-group.yang.c \
-    yang/frr-bgp-bmp.yang.c \
-    yang/frr-bgp-rpki.yang.c \
-    yang/frr-deviations-bgp-datacenter.yang.c \
-    # end
-
 
 tests_isisd_test_fuzz_isis_tlv_CFLAGS = $(TESTS_CFLAGS) -I$(top_builddir)/tests/isisd
 tests_isisd_test_fuzz_isis_tlv_CPPFLAGS = $(TESTS_CPPFLAGS) -I$(top_builddir)/tests/isisd