Skip to content

Commit

Permalink
Merged PR 3788673: Reintroduce the msft templates for multi-asic(3164)
Browse files Browse the repository at this point in the history 
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.

sonic-net#5520
sonic-net#5760
sonic-net/sonic-swss-common#389
sonic-net/sonic-utilities#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%]
  • Loading branch information
@judyjoseph @abdosi
judyjoseph authored and abdosi committed May 19, 2022
1 parent 25d369d commit d8aca71
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions files/build_templates/docker_image_ctl.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d8aca71

Please sign in to comment.