[202012] dhcprelay add Loopback0 as source interface in dualtor scena…

…rio (sonic-net#15744) #### Why I did it 1. sonic-build image side change to fix source interface selection in dual tor scenario. dhcprelay related PR: sonic-net/sonic-dhcp-relay#40 2. Announce dhcprelay submodule to 3578eb3 (to invoke [#40](sonic-net/sonic-dhcp-relay#40 ) PR) ##### Work item tracking - Microsoft ADO 24243215 #### How to verify it run test case, dhcp_relay/test_dhcpv6_relay.py
liushilongbuaa · Jul 25, 2023 · 3c8ae45 · 3c8ae45
1 parent b1e5a7a
commit 3c8ae45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
@@ -13,7 +13,7 @@
 [program:dhcp6relay]
 command=/usr/sbin/dhcp6relay
 {#- Dual ToR Option #}
-{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -d{% endif %}
+{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -u Loopback0 {% endif %}
 
 priority=3
 autostart=false

diff --git a/src/dhcprelay b/src/dhcprelay
+2 −0		.azure-pipelines/build.yml
+10 −2		src/configInterface.cpp
+1 −0		src/configInterface.h
+13 −4		src/main.cpp
+328 −91		src/relay.cpp
+38 −25		src/relay.h
+64 −12		test/MockRelay.cpp
+1 −0		test/main.cpp