[dhcp-relay] Reduce Calls to SONiC Cfggen

dockers/docker-dhcp-relay/Dockerfile.j2

@@ -25,7 +25,7 @@ RUN apt-get clean -y         && \
     rm -rf /debs
 
 COPY ["docker_init.sh", "start.sh", "/usr/bin/"]
-COPY ["docker-dhcp-relay.supervisord.conf.j2", "wait_for_intf.sh.j2", "/usr/share/sonic/templates/"]
+COPY ["docker-dhcp-relay.supervisord.conf.j2", "port-name-alias-map.txt.j2", "wait_for_intf.sh.j2", "/usr/share/sonic/templates/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor"]
 

dockers/docker-dhcp-relay/docker_init.sh

@@ -2,15 +2,21 @@
 
 # Generate supervisord config file
 mkdir -p /etc/supervisor/conf.d/
-sonic-cfggen -d -t /usr/share/sonic/templates/docker-dhcp-relay.supervisord.conf.j2 > /etc/supervisor/conf.d/docker-dhcp-relay.supervisord.conf
 
-# Generate the script that waits for all interfaces to come up and make it executable
-sonic-cfggen -d -t /usr/share/sonic/templates/wait_for_intf.sh.j2 > /usr/bin/wait_for_intf.sh
-chmod +x /usr/bin/wait_for_intf.sh
+# Generate the following files from templates:
+# 1. supervisord configuration 
+# 2. wait_for_intf.sh, which waits for all interfaces to come up
+# 3. port-to-alias name map
+CFGGEN_PARAMS=" \
+    -d \
+    -t /usr/share/sonic/templates/docker-dhcp-relay.supervisord.conf.j2,/etc/supervisor/conf.d/docker-dhcp-relay.supervisord.conf \
+    -t /usr/share/sonic/templates/wait_for_intf.sh.j2,/usr/bin/wait_for_intf.sh \
+    -t /usr/share/sonic/templates/port-name-alias-map.txt.j2,/tmp/port-name-alias-map.txt \
+"
+sonic-cfggen $CFGGEN_PARAMS
 
-# Generate port name-alias map for isc-dhcp-relay to parse. Each line contains one
-# name-alias pair of the form "<name> <alias>"
-sonic-cfggen -d --var-json "PORT" | python -c "import sys, json, os; [sys.stdout.write('%s %s\n' % (k, v['alias'] if 'alias' in v else k)) for (k, v) in json.load(sys.stdin).iteritems()]" > /tmp/port-name-alias-map.txt
+# Make the script that waits for all interfaces to come up executable
+chmod +x /usr/bin/wait_for_intf.sh
 
 # The docker container should start this script as PID 1, so now that supervisord is
 # properly configured, we exec supervisord so that it runs as PID 1 for the

dockers/docker-dhcp-relay/port-name-alias-map.txt.j2

@@ -0,0 +1,5 @@
+{# Generate port name-alias map for isc-dhcp-relay to parse. Each line contains one #}
+{#  name-alias pair of the form "<name> <alias>" #}
+{% for port, config in PORT.items() %}
+    {{- port }} {% if "alias" in config %}{{ config["alias"] }}{% else %}{{ port }}{% endif %} {{- "\n" -}}
+{% endfor -%}