From d8aca7168a626124175877e18bd0dc5ca1b02fae Mon Sep 17 00:00:00 2001 From: Judy Joseph Date: Sat, 14 Nov 2020 02:16:10 +0000 Subject: [PATCH] Merged PR 3788673: Reintroduce the msft templates for multi-asic(3164) Reintroduce the msft templates for multi-asic(3164) after the following sonic public PR's ( for internal BGP neighbors) are available in internal-201911 branch. https://github.com/Azure/sonic-buildimage/pull/5520 https://github.com/Azure/sonic-buildimage/pull/5760 https://github.com/Azure/sonic-swss-common/pull/389 https://github.com/Azure/sonic-utilities/pull/1224 How did I verify ----------------- 1. Verified the external and internal BGP sessions are up, shown correctly in "show ip bgp summary -d all" and show ip interface commands. 2. Ran related 3164 tests to make sure it is passing. bgp/test_bgp_fact.py::test_bgp_facts[0-0] PASSED [ 16%] bgp/test_bgp_fact.py::test_bgp_facts[0-1] PASSED [ 33%] bgp/test_bgp_fact.py::test_bgp_facts[0-2] PASSED [ 50%] bgp/test_bgp_fact.py::test_bgp_facts[0-3] PASSED [ 66%] bgp/test_bgp_fact.py::test_bgp_facts[0-4] PASSED [ 83%] bgp/test_bgp_fact.py::test_bgp_facts[0-5] PASSED [100%] bgp/test_bgp_multipath_relax.py::test_bgp_multipath_relax[0] PASSED [ 57%] bgp/test_bgp_multipath_relax.py::test_bgp_multipath_relax[1] PASSED [ 63%] bgp/test_bgp_multipath_relax.py::test_bgp_multipath_relax[2] SKIPPED [ 68%] bgp/test_bgp_multipath_relax.py::test_bgp_multipath_relax[3] SKIPPED [ 73%] bgp/test_bgp_multipath_relax.py::test_bgp_multipath_relax[4] SKIPPED [ 78%] bgp/test_bgp_multipath_relax.py::test_bgp_multipath_relax[5] SKIPPED [ 84%] --- files/build_templates/docker_image_ctl.j2 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2 index c51548d9d332..d50d0debb107 100644 --- a/files/build_templates/docker_image_ctl.j2 +++ b/files/build_templates/docker_image_ctl.j2 @@ -295,10 +295,6 @@ start() { fi {%- if docker_container_name == "bgp" %} if [ "$DEV" ]; then - # update the template to be used as general for multi-asic - # this will be removed once we have templates dedicated for - # multi-asic - sudo sed -i 's/msft\.//g' /etc/sonic/constants.yml if [ ! -d "/etc/sonic/frr/$DEV" ]; then mkdir /etc/sonic/frr/$DEV cp -r /etc/sonic/frr/*.conf /etc/sonic/frr/$DEV