Skip to content

Adding new secondary field to VLAN_INTERFACE table#16827

Merged
lguohan merged 7 commits intosonic-net:masterfrom
shbalaku-microsoft:add-secondary-in-vlan-interface
Nov 22, 2023
Merged

Adding new secondary field to VLAN_INTERFACE table#16827
lguohan merged 7 commits intosonic-net:masterfrom
shbalaku-microsoft:add-secondary-in-vlan-interface

Conversation

@shbalaku-microsoft
Copy link
Contributor

@shbalaku-microsoft shbalaku-microsoft commented Oct 10, 2023

Why I did it

This is change taken as part of the HLD: sonic-net/SONiC#1470.
In this PR we add the logic to parse the SecondarySubnets field in the minigraph and add a flag in "secondary" in the vlan_interface table of the config db.

Work item tracking
  • Microsoft ADO (number only): 16784946

How I did it

Made changes in the minigraph.py to parse the xml entry and add the parsed value to the config db

How to verify it

Added python tests in the sonic-config-engine folder to test the config db entries.

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Adding new secondary field to VLAN_INTERFACE table

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

Copy link
Contributor

@prsunny prsunny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, please address the comment from Venkat

@prsunny
Copy link
Contributor

prsunny commented Nov 21, 2023

@venkatmahalingam , can you signoff?

lguohan pushed a commit that referenced this pull request Nov 22, 2023
This is change taken as part of the HLD: sonic-net/SONiC#1470 and this is a follow up on the PR #16827 where in the docker-dhcp we pick the value of primary gateway of the interface from the VLAN_Interface table which has "secondary" flag set in the config_db

Microsoft ADO (number only): 16784946

How did I do it
-  Changes in the j2 file to add a new "-pg" parameter in the dhcpv4-relay.agents.j2, the ip would be retrieved from the config db's vlan_interface table such that the interface which are picked will have secondary field set.

- Changes in isc-dhcp to re-order the addresses of the discovered interface and which has the ip which has the passed parameter.
@lguohan lguohan merged commit 418ed10 into sonic-net:master Nov 22, 2023
yxieca pushed a commit that referenced this pull request Dec 4, 2023
This is change taken as part of the HLD: sonic-net/SONiC#1470 and this is a follow up on the PR #16827 where in the docker-dhcp we pick the value of primary gateway of the interface from the VLAN_Interface table which has "secondary" flag set in the config_db

Microsoft ADO (number only): 16784946

How did I do it
-  Changes in the j2 file to add a new "-pg" parameter in the dhcpv4-relay.agents.j2, the ip would be retrieved from the config db's vlan_interface table such that the interface which are picked will have secondary field set.

- Changes in isc-dhcp to re-order the addresses of the discovered interface and which has the ip which has the passed parameter.
yxieca pushed a commit that referenced this pull request Dec 4, 2023
This is change taken as part of the HLD: sonic-net/SONiC#1470.
In this PR we add the logic to parse the SecondarySubnets field in the minigraph and add a flag in "secondary" in the vlan_interface table of the config db.

Microsoft ADO (number only): 16784946

How I did it
Made changes in the minigraph.py to parse the xml entry and add the parsed value to the config db

How to verify it
Added python tests in the sonic-config-engine folder to test the config db entries.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants