From a09ff52cd503e0814b2de268d1c17a1e575513b5 Mon Sep 17 00:00:00 2001 From: Shi Su <67605788+shi-su@users.noreply.github.com> Date: Wed, 3 Feb 2021 15:33:49 -0800 Subject: [PATCH] [bgpcfgd]: Fix unit test for bgp manager (#6668) The check for check_neig_meta was not following the value in constants. Fix it to match the value in constants. --- src/sonic-bgpcfgd/tests/test_bgp.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sonic-bgpcfgd/tests/test_bgp.py b/src/sonic-bgpcfgd/tests/test_bgp.py index 8cbd51c90a..a4c5ef9977 100644 --- a/src/sonic-bgpcfgd/tests/test_bgp.py +++ b/src/sonic-bgpcfgd/tests/test_bgp.py @@ -12,11 +12,12 @@ TEMPLATE_PATH = os.path.abspath('../../dockers/docker-fpm-frr/frr') def constructor(): cfg_mgr = MagicMock() + constants = load_constants()['constants'] common_objs = { 'directory': Directory(), 'cfg_mgr': cfg_mgr, 'tf': TemplateFabric(TEMPLATE_PATH), - 'constants': load_constants()['constants'] + 'constants': constants } return_value_map = { @@ -27,7 +28,7 @@ def constructor(): bgpcfgd.managers_bgp.run_command = lambda cmd: return_value_map[str(cmd)] m = bgpcfgd.managers_bgp.BGPPeerMgrBase(common_objs, "CONFIG_DB", swsscommon.CFG_BGP_NEIGHBOR_TABLE_NAME, "general", True) assert m.peer_type == "general" - assert m.check_neig_meta == False # Because constants['bgp']['use_neighbors_meta'] is false in constants.yml + assert m.check_neig_meta == ('bgp' in constants and 'use_neighbors_meta' in constants['bgp'] and constants['bgp']['use_neighbors_meta']) m.directory.put("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost", {"bgp_asn": "65100"}) m.directory.put("CONFIG_DB", swsscommon.CFG_LOOPBACK_INTERFACE_TABLE_NAME, "Loopback0|11.11.11.11/32", {})