Changed DHCP table name to DHCP_RELAY #8476
Merged
+21
−49
Conversation
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
tahmed-dev
reviewed
Aug 16, 2021
| @@ -159,7 +159,7 @@ | |||
| <Dhcpv6Relays>fc02:2000::3;fc02:2000::4</Dhcpv6Relays> | |||
| <Dhcpv6OptionRfc6939>false</Dhcpv6OptionRfc6939> | |||
There was a problem hiding this comment.
the Dhcpv6OptionRfc6939 is not in the minigraph, however it will be in the config and is always on.
tahmed-dev
reviewed
Aug 16, 2021
src/sonic-config-engine/minigraph.py
Outdated
| @@ -577,11 +577,11 @@ def parse_dpg(dpg, hname): | |||
| vlan_attributes['alias'] = vintfname | |||
| vlans[sonic_vlan_name] = vlan_attributes | |||
|
|
|||
| dhcp = child.find(str(QName(ns, "Dhcp"))) | |||
| dhcp_table = {} | |||
| dhcp_relay = child.find(str(QName(ns, "DhcpRelay"))) | |||
There was a problem hiding this comment.
Sorry, I missed that earlier. There will no new node in the minigraph with DhcpRelay name. The server/helper IPs will be provided as follows:
<VlanInterfaces>
<VlanInterface>
<ElementType>VlanInterface</ElementType>
<Name>Vlan2</Name>
<AttachTo>Ethernet2/1;Ethernet2/3;Ethernet4/1;Ethernet4/3;Ethernet6/1;Ethernet6/3;Ethernet12/1;Ethernet12/3;Ethernet14/1;Ethernet14/3;Ethernet16/1;Ethernet16/3;Ethernet18/1;Ethernet18/3;Ethernet20/1;Ethernet20/3;Ethernet22/1;Ethernet22/3;Ethernet28/1;Ethernet28/3;Ethernet30/1;Ethernet30/3;Ethernet32/1;Ethernet32/3;Ethernet1/1;Ethernet3/1;Ethernet5/1;Ethernet11/1;Ethernet13/1;Ethernet15/1;Ethernet17/1;Ethernet19/1;Ethernet21/1;Ethernet27/1;Ethernet29/1;Ethernet31/1</AttachTo>
<FhrpProtoType i:nil="true"/>
<Type i:nil="true"/>
<DhcpRelays>13.107.194.100;13.107.194.101;13.107.194.102;13.107.194.103;10.254.32.207;10.254.32.223;10.254.32.95;10.254.32.127;10.254.32.191;10.254.32.159;10.254.45.31;10.254.45.63</DhcpRelays>
<Dhcpv6Relays>2603:10e1:0:1::;2603:10e1:0:1::1;2603:10e1:0:1::2;2603:10e1:0:1::3</Dhcpv6Relays>
<VlanID>2</VlanID>
<Tag>2</Tag>
<Subnets>25.99.157.0/26</Subnets>
<MacAddress i:nil="true"/>
<SecondarySubnets/>
</VlanInterface>
</VlanInterfaces>
tahmed-dev
approved these changes
Aug 20, 2021
|
This PR could not be cleanly cherry-pick to 202012. Please submit another PR. |
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why I did it
DHCP is rather generic and can be used for DHCP servers/other options in future.
How I did it
Changed corresponding name in minigraph to Dhcprelay and changed "DHCP" table name to "DHCP_RELAY" in config.
'DHCP_RELAY': {
'Vlan1000': {
'dhcpv6_servers': [
'fc02:2000::1',
'fc02:2000::2'
],
'dhcpv6_option|rfc6939_support': 'true'
},
'Vlan2000': {
'dhcpv6_servers': [
'fc02:2000::3',
'fc02:2000::4'
],
'dhcpv6_option|rfc6939_support': 'false'
}
}
How to verify it
Which release branch to backport (provide reason below if selected)
Description for the changelog
A picture of a cute animal (not mandatory but encouraged)