Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[sonic-cfg]: Use vlanid to generate sonic vlan name #695

Merged
merged 8 commits into from
Jun 13, 2017
Merged

[sonic-cfg]: Use vlanid to generate sonic vlan name #695

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ea6318
Fix SAI submodule id
pavel-shirshov May 30, 2017
991124c
Merge remote-tracking branch 'upstream/master'
pavel-shirshov May 30, 2017
219c4d0
Merge remote-tracking branch 'upstream/master'
pavel-shirshov May 31, 2017
1db3b3d
Merge remote-tracking branch 'upstream/master'
pavel-shirshov Jun 1, 2017
ebb58b6
Merge remote-tracking branch 'upstream/master'
pavel-shirshov Jun 10, 2017
f1a9ca2
Merge remote-tracking branch 'upstream/master'
pavel-shirshov Jun 12, 2017
4aeec4e
Use Vlan{{vlanid}} schema name of sonic vlans
pavel-shirshov Jun 13, 2017
95fa462
Merge branch 'master' into pavelsh/vlan_id
pavel-shirshov Jun 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/sonic-config-engine/minigraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ def parse_dpg(dpg, hname):
for i, member in enumerate(vmbr_list):
vmbr_list[i] = port_alias_map[member]
vlan_attributes = {'name': vintfname, 'members': vmbr_list, 'vlanid': vlanid}
vlans[vintfname] = vlan_attributes
Copy link
Contributor

Choose a reason for hiding this comment

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

what was the vintfname before?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

and could be any string

Copy link
Collaborator

Choose a reason for hiding this comment

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

maybe it is better to add vlanid in the swss as the vlan name could be some meaningful string? like server v.s. bmc

sonic_vlan_name = "Vlan%s" % vlanid
vlans[sonic_vlan_name] = vlan_attributes

aclintfs = child.find(str(QName(ns, "AclInterfaces")))
acls = {}
Expand Down