diff --git a/orchagent/portsorch.cpp b/orchagent/portsorch.cpp index ac3524d006..abe9b7fb55 100644 --- a/orchagent/portsorch.cpp +++ b/orchagent/portsorch.cpp @@ -5097,7 +5097,7 @@ void PortsOrch::doVlanMemberTask(Consumer &consumer) if (op == SET_COMMAND) { - string tagging_mode = "untagged"; + string tagging_mode = (port.m_type == Port::TUNNEL)?"tagged":"untagged"; for (auto i : kfvFieldsValues(t)) { @@ -5120,7 +5120,6 @@ void PortsOrch::doVlanMemberTask(Consumer &consumer) it = consumer.m_toSync.erase(it); continue; } - if (addBridgePort(port) && addVlanMember(vlan, port, tagging_mode)) it = consumer.m_toSync.erase(it); else diff --git a/orchagent/vxlanorch.cpp b/orchagent/vxlanorch.cpp index 05a2d3e603..3dadc2caa0 100644 --- a/orchagent/vxlanorch.cpp +++ b/orchagent/vxlanorch.cpp @@ -2410,7 +2410,7 @@ bool EvpnRemoteVnip2pOrch::addOperation(const Request& request) // SAI Call to add tunnel to the VLAN flood domain - string tagging_mode = "untagged"; + string tagging_mode = "tagged"; gPortsOrch->addVlanMember(vlanPort, tunnelPort, tagging_mode); SWSS_LOG_INFO("remote_vtep=%s vni=%d vlanid=%d ", @@ -2570,7 +2570,7 @@ bool EvpnRemoteVnip2mpOrch::addOperation(const Request& request) // SAI Call to add tunnel to the VLAN flood domain - string tagging_mode = "untagged"; + string tagging_mode = "tagged"; gPortsOrch->addVlanMember(vlanPort, tunnelPort, tagging_mode, end_point_ip); SWSS_LOG_INFO("end_point_ip=%s vni=%d vlanid=%d ",