Vxlan evpn p2mp changes for Layer2 functionality

orchagent/fdborch.cpp

@@ -630,17 +630,33 @@ void FdbOrch::doTask(Consumer& consumer)
 
             /* FDB type is either dynamic or static */
             assert(type == "dynamic" || type == "static");
+            bool check_vlan_member = true;
 
             if(origin == FDB_ORIGIN_VXLAN_ADVERTIZED)
             {
                 VxlanTunnelOrch* tunnel_orch = gDirectory.get<VxlanTunnelOrch*>();
 
-                if(!remote_ip.length())
+                if (tunnel_orch->dipTunnelsUsed())
                 {
-                    it = consumer.m_toSync.erase(it);
-                    continue;
+                    if(!remote_ip.length())
+                    {
+                        it = consumer.m_toSync.erase(it);
+                        continue;
+                    }
+                    port = tunnel_orch->getTunnelPortName(remote_ip);
+                }
+                else
+                {
+                    EvpnNvoOrch* evpn_nvo_orch = gDirectory.get<EvpnNvoOrch*>();
+                    VxlanTunnel* sip_tunnel = evpn_nvo_orch->getEVPNVtep();
+                    check_vlan_member = false;
+                    if (sip_tunnel == NULL)
+                    {
+                        it = consumer.m_toSync.erase(it);
+                        continue;
+                    }
+                    port = tunnel_orch->getTunnelPortName(sip_tunnel->getSrcIP().to_string(), true);
                 }
-                port = tunnel_orch->getTunnelPortName(remote_ip);
             }
 
 
@@ -651,7 +667,7 @@ void FdbOrch::doTask(Consumer& consumer)
             fdbData.remote_ip = remote_ip;
             fdbData.esi = esi;
             fdbData.vni = vni;
-            if (addFdbEntry(entry, port, fdbData))
+            if (addFdbEntry(entry, port, fdbData, check_vlan_member))
                 it = consumer.m_toSync.erase(it);
             else
                 it++;
@@ -959,15 +975,15 @@ void FdbOrch::updateVlanMember(const VlanMemberUpdate& update)
 }
 
 bool FdbOrch::addFdbEntry(const FdbEntry& entry, const string& port_name,
-        FdbData fdbData)
+        FdbData fdbData, bool check_vlan_member)
 {
     Port vlan;
     Port port;
 
     SWSS_LOG_ENTER();
-    SWSS_LOG_INFO("mac=%s bv_id=0x%" PRIx64 " port_name=%s type=%s origin=%d",
+    SWSS_LOG_INFO("mac=%s bv_id=0x%" PRIx64 " port_name=%s type=%s origin=%d remote_ip=%s",
             entry.mac.to_string().c_str(), entry.bv_id, port_name.c_str(),
-            fdbData.type.c_str(), fdbData.origin);
+            fdbData.type.c_str(), fdbData.origin, fdbData.remote_ip.c_str());
 
     if (!m_portsOrch->getPort(entry.bv_id, vlan))
     {
@@ -985,7 +1001,7 @@ bool FdbOrch::addFdbEntry(const FdbEntry& entry, const string& port_name,
     }
 
     /* Retry until port is member of vlan*/
-    if (vlan.m_members.find(port_name) == vlan.m_members.end())
+    if (check_vlan_member && vlan.m_members.find(port_name) == vlan.m_members.end())
     {
         SWSS_LOG_INFO("Saving a fdb entry until port %s becomes vlan %s member", port_name.c_str(), vlan.m_alias.c_str());
         saved_fdb_entries[port_name].push_back({entry.mac,
@@ -1001,6 +1017,7 @@ bool FdbOrch::addFdbEntry(const FdbEntry& entry, const string& port_name,
 
     Port oldPort;
     string oldType;
+    string oldRemoteIp;
     FdbOrigin oldOrigin = FDB_ORIGIN_INVALID ;
     bool macUpdate = false;
     auto it = m_entries.find(entry);
@@ -1009,19 +1026,21 @@ bool FdbOrch::addFdbEntry(const FdbEntry& entry, const string& port_name,
         /* get existing port and type */
         oldType = it->second.type;
         oldOrigin = it->second.origin;
+        oldRemoteIp = it->second.remote_ip;
 
         if (!m_portsOrch->getPortByBridgePortId(it->second.bridge_port_id, oldPort))
         {
             SWSS_LOG_ERROR("Existing port 0x%" PRIx64 " details not found", it->second.bridge_port_id);
             return false;
         }
 
-        if ((oldOrigin == fdbData.origin) && (oldType == fdbData.type) && (port.m_bridge_port_id == it->second.bridge_port_id))
+        if ((oldOrigin == fdbData.origin) && (oldType == fdbData.type) && (port.m_bridge_port_id == it->second.bridge_port_id)
+            && (oldRemoteIp == fdbData.remote_ip))
         {
             /* Duplicate Mac */
-            SWSS_LOG_INFO("FdbOrch: mac=%s %s port=%s type=%s origin=%d is duplicate", entry.mac.to_string().c_str(),
+            SWSS_LOG_INFO("FdbOrch: mac=%s %s port=%s type=%s origin=%d  remote_ip=%s is duplicate", entry.mac.to_string().c_str(),
                     vlan.m_alias.c_str(), port_name.c_str(),
-                    fdbData.type.c_str(), fdbData.origin);
+                    fdbData.type.c_str(), fdbData.origin, fdbData.remote_ip.c_str());
             return true;
         }
         else if (fdbData.origin != oldOrigin)

orchagent/fdborch.h

@@ -114,7 +114,7 @@ class FdbOrch: public Orch, public Subject, public Observer
     void updateVlanMember(const VlanMemberUpdate&);
     void updatePortOperState(const PortOperStateUpdate&);
 
-    bool addFdbEntry(const FdbEntry&, const string&, FdbData fdbData);
+    bool addFdbEntry(const FdbEntry&, const string&, FdbData fdbData, bool check_vlan_member=true);
     void deleteFdbEntryFromSavedFDB(const MacAddress &mac, const unsigned short &vlanId, FdbOrigin origin, const string portName="");
 
     bool storeFdbEntryState(const FdbUpdate& update);

orchagent/main.cpp

@@ -46,6 +46,7 @@ sai_object_id_t gUnderlayIfId;
 sai_object_id_t gSwitchId = SAI_NULL_OBJECT_ID;
 MacAddress gMacAddress;
 MacAddress gVxlanMacAddress;
+bool       gP2PTunnelSupported;
 
 extern size_t gMaxBulkSize;
 
@@ -643,6 +644,32 @@ int main(int argc, char **argv)
         orchDaemon = make_shared<FabricOrchDaemon>(&appl_db, &config_db, &state_db, chassis_app_db.get()); 
     }
 
+    uint32_t max_tunnel_modes = 2;
+    vector<int32_t>  tunnel_peer_modes(max_tunnel_modes, 0);
+    sai_s32_list_t values;
+    values.count = max_tunnel_modes;
+    values.list = tunnel_peer_modes.data();
+
+    status = sai_query_attribute_enum_values_capability(gSwitchId, SAI_OBJECT_TYPE_TUNNEL,
+                                                        SAI_TUNNEL_ATTR_PEER_MODE, &values);
+    if (status != SAI_STATUS_SUCCESS)
+    {
+        SWSS_LOG_WARN("Unable to get supported tunnel peer modes. Defaulting to P2P");
+        gP2PTunnelSupported = true;
+    }
+    else
+    {
+        gP2PTunnelSupported = false;
+        for (uint32_t idx = 0; idx < values.count; idx++)
+        {
+            if (values.list[idx] == SAI_TUNNEL_PEER_MODE_P2P)
+            {
+                gP2PTunnelSupported = true;
+                break;
+            }
+        }
+    }
+
     if (!orchDaemon->init())
     {
         SWSS_LOG_ERROR("Failed to initialize orchestration daemon");

orchagent/orchdaemon.cpp

@@ -20,6 +20,7 @@ using namespace swss;
 extern sai_switch_api_t*           sai_switch_api;
 extern sai_object_id_t             gSwitchId;
 extern bool                        gSaiRedisLogRotate;
+extern bool                        gP2PTunnelSupported;
 
 extern void syncd_apply_view();
 /*
@@ -163,19 +164,18 @@ bool OrchDaemon::init()
     CoppOrch  *copp_orch  = new CoppOrch(m_applDb, APP_COPP_TABLE_NAME);
     TunnelDecapOrch *tunnel_decap_orch = new TunnelDecapOrch(m_applDb, APP_TUNNEL_DECAP_TABLE_NAME);
 
-    VxlanTunnelOrch *vxlan_tunnel_orch = new VxlanTunnelOrch(m_stateDb, m_applDb, APP_VXLAN_TUNNEL_TABLE_NAME);
-    gDirectory.set(vxlan_tunnel_orch);
     VxlanTunnelMapOrch *vxlan_tunnel_map_orch = new VxlanTunnelMapOrch(m_applDb, APP_VXLAN_TUNNEL_MAP_TABLE_NAME);
     gDirectory.set(vxlan_tunnel_map_orch);
     VxlanVrfMapOrch *vxlan_vrf_orch = new VxlanVrfMapOrch(m_applDb, APP_VXLAN_VRF_TABLE_NAME);
     gDirectory.set(vxlan_vrf_orch);
 
-    EvpnRemoteVniOrch* evpn_remote_vni_orch = new EvpnRemoteVniOrch(m_applDb, APP_VXLAN_REMOTE_VNI_TABLE_NAME);
-    gDirectory.set(evpn_remote_vni_orch);
 
     EvpnNvoOrch* evpn_nvo_orch = new EvpnNvoOrch(m_applDb, APP_VXLAN_EVPN_NVO_TABLE_NAME);
     gDirectory.set(evpn_nvo_orch);
 
+    VxlanTunnelOrch *vxlan_tunnel_orch = new VxlanTunnelOrch(m_stateDb, m_applDb,
+                                                             APP_VXLAN_TUNNEL_TABLE_NAME, gP2PTunnelSupported);
+    gDirectory.set(vxlan_tunnel_orch);
 
     vector<string> qos_tables = {
         CFG_TC_TO_QUEUE_MAP_TABLE_NAME,
@@ -334,7 +334,20 @@ bool OrchDaemon::init()
     m_orchList.push_back(vxlan_tunnel_orch);
     m_orchList.push_back(evpn_nvo_orch);
     m_orchList.push_back(vxlan_tunnel_map_orch);
-    m_orchList.push_back(evpn_remote_vni_orch);
+
+    if (gP2PTunnelSupported)
+    {
+        EvpnRemoteVnip2pOrch* evpn_remote_vni_orch = new EvpnRemoteVnip2pOrch(m_applDb, APP_VXLAN_REMOTE_VNI_TABLE_NAME);
+        gDirectory.set(evpn_remote_vni_orch);
+        m_orchList.push_back(evpn_remote_vni_orch);
+    }
+    else
+    {
+        EvpnRemoteVnip2mpOrch* evpn_remote_vni_orch = new EvpnRemoteVnip2mpOrch(m_applDb, APP_VXLAN_REMOTE_VNI_TABLE_NAME);
+        gDirectory.set(evpn_remote_vni_orch);
+        m_orchList.push_back(evpn_remote_vni_orch);
+    }
+
     m_orchList.push_back(vxlan_vrf_orch);
     m_orchList.push_back(cfg_vnet_rt_orch);
     m_orchList.push_back(vnet_orch);

orchagent/port.h

@@ -38,11 +38,17 @@ struct VlanMemberEntry
 
 typedef std::map<sai_vlan_id_t, VlanMemberEntry> vlan_members_t;
 
+typedef std::map<std::string, sai_object_id_t> endpoint_ip_l2mc_group_member_map_t;
+
 struct VlanInfo
 {
     sai_object_id_t     vlan_oid = 0;
     sai_vlan_id_t       vlan_id = 0;
     sai_object_id_t     host_intf_id = SAI_NULL_OBJECT_ID;
+    sai_vlan_flood_control_type_t uuc_flood_type = SAI_VLAN_FLOOD_CONTROL_TYPE_ALL;
+    sai_vlan_flood_control_type_t bc_flood_type = SAI_VLAN_FLOOD_CONTROL_TYPE_ALL;
+    sai_object_id_t    l2mc_group_id = SAI_NULL_OBJECT_ID;
+    endpoint_ip_l2mc_group_member_map_t l2mc_members;
 };
 
 struct SystemPortInfo