From 4ea631896ef386dfa7e0dfc8d91440152d84ca28 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Tue, 30 May 2017 13:04:06 -0700 Subject: [PATCH 1/2] Fix SAI submodule id --- src/SAI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SAI b/src/SAI index a6b5b3115f39..940c7b6afb1d 160000 --- a/src/SAI +++ b/src/SAI @@ -1 +1 @@ -Subproject commit a6b5b3115f39f599d39629ab9bfaeea17333d0bc +Subproject commit 940c7b6afb1db4e8504b7cdb24ccd669748dbde8 From 4aeec4e8cb8ae7675491b1ac7d911fc7e0b0905a Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Mon, 12 Jun 2017 17:00:07 -0700 Subject: [PATCH 2/2] Use Vlan{{vlanid}} schema name of sonic vlans --- src/sonic-config-engine/minigraph.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py index 49e8b104a46e..7dc060900886 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -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 + sonic_vlan_name = "Vlan%s" % vlanid + vlans[sonic_vlan_name] = vlan_attributes aclintfs = child.find(str(QName(ns, "AclInterfaces"))) acls = {}