Skip to content

Commit a6c00c9

Browse files
kellyyehkellyyeh
committed
Add dhcprelay submodule
1 parent 01a8af1 commit a6c00c9

25 files changed

+46
-1733
lines changed

‎.gitmodules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,7 @@
8383
[submodule "src/sonic-ztp"]
8484
path = src/sonic-ztp
8585
url = https://github.com/Azure/sonic-ztp
86+
[submodule "src/dhcprelay"]
87+
path = src/dhcprelay
88+
url = https://github.com/sonic-net/sonic-dhcp-relay.git
89+
branch = 201911

‎dockers/docker-dhcp-relay/dhcp-relay.monitors.j2‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ programs=
66
{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
77
{% set _dummy = monitor_instance.update({'flag': True}) %}
88
{%- endif %}
9-
{% if DHCP_RELAY and vlan_name in DHCP_RELAY and DHCP_RELAY[vlan_name]['dhcpv6_servers']|length > 0 %}
10-
{% set _dummy = monitor_instance.update({'flag': True}) %}
11-
{%- endif %}
129
{% if monitor_instance.flag %}
1310
{% if add_preceding_comma.flag %},{% endif %}
1411
{% set _dummy = add_preceding_comma.update({'flag': True}) %}
@@ -20,7 +17,6 @@ dhcpmon-{{ vlan_name }}
2017

2118
{# Create a program entry for each DHCP MONitor instance #}
2219
{% set relay_for_ipv4 = { 'flag': False } %}
23-
{% set relay_for_ipv6 = { 'flag': False } %}
2420
{% for vlan_name in VLAN_INTERFACE %}
2521
{# Check DHCPv4 agents #}
2622
{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
@@ -30,15 +26,7 @@ dhcpmon-{{ vlan_name }}
3026
{% endif %}
3127
{% endfor %}
3228
{% endif %}
33-
{# Check DHCPv6 agents #}
34-
{% if DHCP_RELAY and vlan_name in DHCP_RELAY and DHCP_RELAY[vlan_name]['dhcpv6_servers']|length > 0 %}
35-
{% for dhcpv6_server in VLAN[vlan_name]['dhcpv6_servers'] %}
36-
{% if dhcpv6_server | ipv6 %}
37-
{% set _dummy = relay_for_ipv6.update({'flag': True}) %}
38-
{% endif %}
39-
{% endfor %}
40-
{% endif %}
41-
{% if relay_for_ipv4.flag or relay_for_ipv6.flag %}
29+
{% if relay_for_ipv4.flag %}
4230
[program:dhcpmon-{{ vlan_name }}]
4331
{# We treat this VLAN as a downstream interface (-id), as we only want to listen for requests #}
4432
command=/usr/sbin/dhcpmon -id {{ vlan_name }}
@@ -71,6 +59,5 @@ dependent_startup_wait_for=
7159

7260

7361
{% set _dummy = relay_for_ipv4.update({'flag': False}) %}
74-
{% set _dummy = relay_for_ipv6.update({'flag': False}) %}
7562
{% endif %}
7663
{% endfor %}

‎rules/dhcp6relay.mk‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎rules/dhcprelay.mk‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# SONiC DHCPV6 RELAY Package
2+
3+
SONIC_DHCPRELAY_VERSION = 1.0.0-0
4+
SONIC_DHCPRELAY_PKG_NAME = dhcp6relay
5+
6+
SONIC_DHCPRELAY = sonic-$(SONIC_DHCPRELAY_PKG_NAME)_$(SONIC_DHCPRELAY_VERSION)_$(CONFIGURED_ARCH).deb
7+
$(SONIC_DHCPRELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
8+
$(SONIC_DHCPRELAY)_SRC_PATH = $(SRC_PATH)/dhcprelay
9+
SONIC_DPKG_DEBS += $(SONIC_DHCPRELAY)
10+
11+
SONIC_DHCPRELAY_DBG = sonic-$(SONIC_DHCPRELAY_PKG_NAME)-dbgsym_$(SONIC_DHCPRELAY_VERSION)_amd64.deb
12+
$(eval $(call add_derived_package,$(SONIC_DHCPRELAY),$(SONIC_DHCPRELAY_DBG)))

‎rules/docker-dhcp-relay.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ DOCKER_DHCP_RELAY_DBG = $(DOCKER_DHCP_RELAY_STEM)-$(DBG_IMAGE_MARK).gz
66

77
$(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/$(DOCKER_DHCP_RELAY_STEM)
88

9-
$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(REDIS_TOOLS) $(SONIC_DHCPMON) $(SONIC_DHCP6RELAY) $(LIBSWSSCOMMON)
9+
$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(REDIS_TOOLS) $(SONIC_DHCPMON) $(SONIC_DHCPRELAY) $(LIBSWSSCOMMON)
1010
$(DOCKER_DHCP_RELAY)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS)
11-
$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCP6RELAY_DBG)
11+
$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCPRELAY_DBG)
1212

1313
$(DOCKER_DHCP_RELAY)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)
1414

‎sonic-dhcp-relay‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/dhcp6relay/.gitignore‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/dhcp6relay/Makefile‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎src/dhcp6relay/debian/changelog‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/dhcp6relay/debian/compat‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)