[DHCP Relay]: Add support for custom Option 82 circuit_id of the form '<hostname>:<portname>'

dockers/docker-dhcp-relay/Dockerfile.j2

@@ -0,0 +1,31 @@
+FROM docker-config-engine
+
+# Make apt-get non-interactive
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Update apt's cache of available packages
+RUN apt-get update
+
+{% if docker_dhcp_relay_debs.strip() -%}
+# Copy built Debian packages
+{%- for deb in docker_dhcp_relay_debs.split(' ') %}
+COPY debs/{{ deb }}{{' '}} debs/
+{%- endfor %}
+
+# Install built Debian packages and implicitly install their dependencies
+{%- for deb in docker_dhcp_relay_debs.split(' ') %}
+#RUN dpkg -i debs/{{ deb }}
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; dpkg_apt debs/{{ deb }}
+{%- endfor %}
+{%- endif %}
+
+# Clean up
+RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
+RUN rm -rf /debs
+
+COPY ["start.sh", "isc-dhcp-relay.sh", "/usr/bin/"]
+COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
+COPY ["isc-dhcp-relay.j2", "/usr/share/sonic/templates/"]
+
+ENTRYPOINT ["/usr/bin/supervisord"]
+

dockers/docker-dhcp-relay/isc-dhcp-relay.j2

@@ -24,6 +24,6 @@ INTERFACES="
 {%- endif %}
 {%- endfor %}"
 
-# '-a' option provides option 82 circuit id information
-OPTIONS="-a"
+# '-a' option provides option 82 circuit_id and remote_id information
+OPTIONS="-a \"%h:%p\" \"\""
 

rules/docker-dhcp-relay.mk

@@ -2,8 +2,9 @@
 
 DOCKER_DHCP_RELAY = docker-dhcp-relay.gz
 $(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/docker-dhcp-relay
+$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_COMMON) $(ISC_DHCP_RELAY)
 $(DOCKER_DHCP_RELAY)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE)
-SONIC_SIMPLE_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY)
+SONIC_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY)
 
 

rules/isc-dhcp.mk

@@ -0,0 +1,13 @@
+# isc-dhcp packages
+
+ISC_DHCP_VERSION = 4.3.1-6
+
+export ISC_DHCP_VERSION
+
+ISC_DHCP_COMMON = isc-dhcp-common_$(ISC_DHCP_VERSION)_amd64.deb
+$(ISC_DHCP_COMMON)_SRC_PATH = $(SRC_PATH)/isc-dhcp
+SONIC_MAKE_DEBS += $(ISC_DHCP_COMMON)
+
+ISC_DHCP_RELAY = isc-dhcp-relay_$(ISC_DHCP_VERSION)_amd64.deb
+$(eval $(call add_derived_package,$(ISC_DHCP_COMMON),$(ISC_DHCP_RELAY)))
+

sonic-slave/Dockerfile

@@ -216,6 +216,9 @@ RUN apt-get update && apt-get install -y \
 # For sonic config engine testing
         pyangbind
 
+# Install dependencies for building isc-dhcp-relay
+RUN apt-get -y build-dep isc-dhcp
+
 RUN cd /usr/src/gtest && cmake . && make -C /usr/src/gtest
 
 RUN mkdir /var/run/sshd

src/isc-dhcp/Makefile

@@ -0,0 +1,30 @@
+.ONESHELL:
+SHELL = /bin/bash
+.SHELLFLAGS += -e
+
+MAIN_TARGET = isc-dhcp-common_$(ISC_DHCP_VERSION)_amd64.deb
+DERIVED_TARGETS = isc-dhcp-relay_$(ISC_DHCP_VERSION)_amd64.deb
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+	# Remove any stale files
+	rm -rf ./isc-dhcp
+
+	# Clone isc-dhcp repo
+	git clone git://anonscm.debian.org/pkg-dhcp/isc-dhcp.git
+	pushd ./isc-dhcp
+	git checkout -f debian/4.3.1-6
+	popd
+
+	# Apply patch
+	patch -p1 < isc-dhcp-4.3.1_dhcrelay-custom-circuit_id-remote_id-and-bridge-iface-support.patch
+
+	# Build source and Debian packages
+	pushd ./isc-dhcp
+	dpkg-buildpackage -rfakeroot -b -us -uc
+	popd
+
+	# Move the newly-built .deb packages to the destination directory
+	mv $* $(DERIVED_TARGETS) $(DEST)/
+
+$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
+