Skip to content

Commit

Permalink
[portsorch] Configure hostif tagging for subports (#1573)
Browse files Browse the repository at this point in the history
Configure SAI_HOSTIF_VLAN_TAG_KEEP for the parent port hostif when a first subport is added and restore it to SAI_HOSTIF_VLAN_TAG_STRIP when the last subport is removed.

Signed-off-by: Vitaliy Senchyshyn <[email protected]>
  • Loading branch information
vsenchyshyn authored Jan 28, 2021
1 parent 008325c commit 91e231c
Showing 1 changed file with 26 additions and 0 deletions.
26 changes: 26 additions & 0 deletions orchagent/portsorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,17 @@ bool PortsOrch::addSubPort(Port &port, const string &alias, const bool &adminUp,
}
p.m_vlan_info.vlan_id = vlan_id;

// Change hostif vlan tag for the parent port only when a first subport is created
if (parentPort.m_child_ports.empty())
{
if (!setHostIntfsStripTag(parentPort, SAI_HOSTIF_VLAN_TAG_KEEP))
{
SWSS_LOG_ERROR("Failed to set %s for hostif of port %s",
hostif_vlan_tag[SAI_HOSTIF_VLAN_TAG_KEEP], parentPort.m_alias.c_str());
return false;
}
}

parentPort.m_child_ports.insert(p.m_alias);

m_portList[alias] = p;
Expand Down Expand Up @@ -742,6 +753,21 @@ bool PortsOrch::removeSubPort(const string &alias)
m_portList[parentPort.m_alias] = parentPort;

m_portList.erase(it);

// Restore hostif vlan tag for the parent port when the last subport is removed
if (parentPort.m_child_ports.empty())
{
if (parentPort.m_bridge_port_id == SAI_NULL_OBJECT_ID)
{
if (!setHostIntfsStripTag(parentPort, SAI_HOSTIF_VLAN_TAG_STRIP))
{
SWSS_LOG_ERROR("Failed to set %s for hostif of port %s",
hostif_vlan_tag[SAI_HOSTIF_VLAN_TAG_STRIP], parentPort.m_alias.c_str());
return false;
}
}
}

return true;
}

Expand Down

0 comments on commit 91e231c

Please sign in to comment.