-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[201811] Add DHCPv6 minigraph parsing support (#8970)
* Add DHCPv6 minigraph parsing support Co-authored-by: shlomibitton <60430976+shlomibitton@users.noreply.github.com> Logrotate for wtmp and btmp files to fix size getting too large. (#8744) Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> [201811][utilities][swss][snmpagent] advance sub module head snmpagent * 187aa10 2021-09-16 | [201811][RFC1213]: Initialize lag oid map in reinit_data (#233) (github/201811) [SuvarnaMeenakshi] swss: * 3503705 2021-09-05 | [201811][Cherry-pick] [acl mirror action] Mirror session ref count fix at acl rule attachment (#1898) (HEAD -> 201811, github/201811) [bingwang-ms] utilities: * f3f8667 2021-10-15 | [201811] disk_check.py: Allow remote user access when disk is read-only (#1873) (HEAD -> 201811, github/201811) [Renuka Manavalan] * 6b351c9 2021-10-14 | [201811] Remove exec from platform_reboot_plugin call to handle any hang issue. (#1880) [Sujin Kang] * d8d0461 2021-07-29 | [minigraph][port_config] Consume port_config.json while reloading minigraph (#1726) [Blueve] Signed-off-by: Ying Xie <ying.xie@microsoft.com> [201811] Invoke disk check periodically (#8951) * Invoke disk check periodically. (#7374) Why I did it Helps with periodic scan of disk for RO state. If found, this script makes transient fix and raise error message. Save DB dump after warm/fast reboot (#8913) Back porting the master branch change - #8803 Save the redis DB dump after warm reboot. [201811][swss] advance swss submodule head (#9049) * e0b115a 2021-10-22 | [copp] add dhcpv6 copp rules (#1979) (HEAD -> 201811, github/201811) [Ying Xie] Signed-off-by: Ying Xie <ying.xie@microsoft.com> [swssconfig] load dhcpv6 copp rules by default (#9047) Why I did it Need to enable DHCPv6 copp rule How I did it Add a separate DHCPv6 copp rule config file and load it during cold reboot. How to verify it cold reboot, and verify config being loaded and dhcpv6 rules got installed. Signed-off-by: Ying Xie ying.xie@microsoft.com [warmboot finalizer] load dhcpv6 copp rules when missing (#9048) Why I did it Need to enable DHCPv6 COPP rules. How I did it Load the separate DHCPv6 COPP rules after warm reboot if the rules are missing. How to verify it Warm reboot from an image doesn't have DHCPv6 COPP rules installed. Warm reboot from an image have DHCPv6 COPP rules already installed. In either case, the script did the right thing and only install the COPP rules if it is missing. Signed-off-by: Ying Xie ying.xie@microsoft.com
- Loading branch information
Showing
9 changed files
with
58 additions
and
241 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,27 @@ | ||
| {# Append DHCPv4 agents #} | ||
| {% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %} | ||
| {% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %} | ||
| {% if dhcp_server | ipv4 %} | ||
| {% set _dummy = relay_for_ipv4.update({'flag': True}) %} | ||
| {% endif %} | ||
| {% endfor %} | ||
| {% if relay_for_ipv4.flag %} | ||
| {% set _dummy = relay_for_ipv4.update({'flag': False}) %} | ||
| {# Create a program entry for each DHCP relay agent instance #} | ||
| {% for vlan_name in vlan_list %} | ||
| {% if VLAN and vlan_name in VLAN and VLAN[vlan_name]['dhcp_servers'] %} | ||
| [program:isc-dhcpv4-relay-{{ vlan_name }}] | ||
| {# We treat this VLAN as a downstream interface (-id), as we only want to listen for requests #} | ||
| command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id {{ vlan_name }} | ||
| {#- Dual ToR Option #} | ||
| {% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -U Loopback0 -dt{% endif -%} | ||
| {#- si option to use intf addr in relay #} | ||
| {% if DEVICE_METADATA['localhost']['deployment_id'] == '8' %} -si{% endif -%} | ||
| {#- We treat all other interfaces as upstream interfaces (-iu), as we only want to listen for replies #} | ||
| {% for (name, prefix) in VLAN_INTERFACE|pfx_filter %} | ||
| {% for (name, prefix) in VLAN_INTERFACE %} | ||
| {% if prefix | ipv4 and name != vlan_name %} -iu {{ name }}{% endif -%} | ||
| {% endfor %} | ||
| {% for (name, prefix) in INTERFACE|pfx_filter %} | ||
| {% for (name, prefix) in INTERFACE %} | ||
| {% if prefix | ipv4 %} -iu {{ name }}{% endif -%} | ||
| {% endfor %} | ||
| {% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %} | ||
| {% for (name, prefix) in PORTCHANNEL_INTERFACE %} | ||
| {% if prefix | ipv4 %} -iu {{ name }}{% endif -%} | ||
| {% endfor %} | ||
| {% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %} | ||
| {%- if dhcp_server | ipv4 %} {{ dhcp_server }}{% endif -%} | ||
| {% endfor %} | ||
| {% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %} {{ dhcp_server }}{% endfor %} | ||
|
|
||
| priority=3 | ||
| autostart=false | ||
| autorestart=false | ||
| stdout_logfile=syslog | ||
| stderr_logfile=syslog | ||
| dependent_startup=true | ||
| dependent_startup_wait_for=start:exited | ||
|
|
||
| {% endif %} | ||
| {% endif %} | ||
| {% endfor %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,32 @@ | ||
| {# Append DHCPv6 agents #} | ||
| {% if VLAN and vlan_name in VLAN and 'dhcpv6_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcpv6_servers']|length > 0 %} | ||
| {% for dhcpv6_server in VLAN[vlan_name]['dhcpv6_servers'] %} | ||
| {# Create a program entry for each DHCPv6 relay agent instance #} | ||
| {% for vlan_name in vlan_list %} | ||
| {% if VLAN and vlan_name in VLAN and 'dhcpv6_servers' in VLAN[vlan_name] %} | ||
| {% if dhcpv6_server | ipv6 %} | ||
| {% set _dummy = relay_for_ipv6.update({'flag': True}) %} | ||
| {% endif %} | ||
| {% endfor %} | ||
| {% if relay_for_ipv6.flag %} | ||
| {% set _dummy = relay_for_ipv6.update({'flag': False}) %} | ||
| {% endif %} | ||
| [program:isc-dhcpv6-relay-{{ vlan_name }}] | ||
| {# We treat this VLAN as a downstream interface (-l), as we only want to listen for requests #} | ||
| {# We treat this VLAN as a downstream interface (-id), as we only want to listen for requests #} | ||
| command=/usr/sbin/dhcrelay -d -6 --name-alias-map-file /tmp/port-name-alias-map.txt -l {{ vlan_name }} | ||
| {#- We treat all other interfaces as upstream interfaces (-u), as we only want to listen for replies #} | ||
| {%- for dhcpv6_server in VLAN[vlan_name]['dhcpv6_servers'] %} | ||
| {%- if dhcpv6_server | ipv6 %} | ||
| {%- for (name, prefix) in VLAN_INTERFACE|pfx_filter %} | ||
| {%- if prefix | ipv6 and name != vlan_name %} -u {{ dhcpv6_server }}%%{{ name }} {% endif -%} | ||
| {% endfor %} | ||
| {% for (name, prefix) in INTERFACE|pfx_filter %} | ||
| {% if prefix | ipv6 %} -u {{ dhcpv6_server }}%%{{ name }} {% endif -%} | ||
| {#- We treat all other interfaces as upstream interfaces (-iu), as we only want to listen for replies #} | ||
| {% for (name, prefix) in VLAN_INTERFACE %} | ||
| {% if prefix | ipv6 and name != vlan_name %} -u {{ dhcpv6_server }}%%{{ name }} {% endif -%} | ||
| {% endfor %} | ||
| {% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %} | ||
| {% if prefix | ipv6 %} -u {{ dhcpv6_server }}%%{{ name }} {% endif -%} | ||
| {% for (name, prefix) in INTERFACE %} | ||
| {% if prefix | ipv4 %} -iu {{ name }}{% endif -%} | ||
| {% endfor %} | ||
| {% endif -%} | ||
| {% for (name, prefix) in PORTCHANNEL_INTERFACE %} | ||
| {% if prefix | ipv4 %} -iu {{ name }} {% endif -%} | ||
| {% endfor %} | ||
|
|
||
| priority=3 | ||
| autostart=false | ||
| autorestart=false | ||
| stdout_logfile=syslog | ||
| stderr_logfile=syslog | ||
| dependent_startup=true | ||
| dependent_startup_wait_for=start:exited | ||
|
|
||
| {% endif %} | ||
| {% endif %} | ||
| {% endfor %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 0 additions & 79 deletions
79
src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.