Fix dhcrelay unittest conflict

richardyu-ms · Sep 1, 2022 · c4e2c33 · c4e2c33
1 parent 239a2b2
commit c4e2c33
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
@@ -93,9 +93,9 @@ programs=
 {% if 'dhcp_server' not in DEVICE_METADATA['localhost'] or 'enable' not in DEVICE_METADATA['localhost']['dhcp_server'] %}
 {% include 'dhcpv4-relay.agents.j2' %}
 {% endif %}
-{% include 'dhcpv6-relay.agents.j2' %}
 {% endfor %}
 
+{% include 'dhcpv6-relay.agents.j2' %}
 {% include 'dhcp-relay.monitors.j2' %}
 {% endif %}
 {% endif %}
diff --git a/...nic-config-engine/tests/sample_output/py2/docker-dhcp-relay-no-ip-helper.supervisord.conf b/...nic-config-engine/tests/sample_output/py2/docker-dhcp-relay-no-ip-helper.supervisord.conf
@@ -39,6 +39,10 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 
+
+[group:dhcp-server]
+programs=
+
 [group:dhcp-relay]
 programs=isc-dhcpv4-relay-Vlan1000,dhcp6relay
 

diff --git a/...nic-config-engine/tests/sample_output/py3/docker-dhcp-relay-no-ip-helper.supervisord.conf b/...nic-config-engine/tests/sample_output/py3/docker-dhcp-relay-no-ip-helper.supervisord.conf
@@ -39,6 +39,10 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 
+
+[group:dhcp-server]
+programs=
+
 [group:dhcp-relay]
 programs=isc-dhcpv4-relay-Vlan1000,dhcp6relay