[vxlan tunnel decap]: Add vxlan tunnel decapsulation support (sonic-net#457)

* Implementation of vxlanorch and a test for it

Author: pavel-shirshov

doc/swss-schema.md

@@ -647,6 +647,25 @@ Equivalent RedisDB entry:
                                             ; and push the delta to appDB
                                             ; Valid value is 1-9999. 0 is invalid.
 
+### VXLAN\_TUNNEL
+Stores vxlan tunnels configuration
+Status: ready
+
+    key       = VXLAN_TUNNEL:name               ; name is an arbitrary name of vxlan tunnel
+    src_ip    = ipv4_address                    ; tunnel source IP address. Mandatory
+    dst_ip    = ipv4_address                    ; tunnel destination IP address. Optional. When this attribute is omitted or equal to "0.0.0.0"
+                                                ; the created tunnel will be P2MP. Otherwise the created tunnel will be P2P
+
+### VXLAN\_TUNNEL\_MAP
+Stores vxlan tunnel map configuration. Defines mapping between vxlan vni and vlan interface
+Status: ready
+
+    key       = VXLAN_TUNNEL_MAP:tunnel_name:tunnel_map_name
+                                                ; tunnel_name is a reference to created vxlan tunnel
+                                                ; tunnel_map_name is an arbitrary name of the map
+    vni       = uint24                          ; vni id, defined for tunnel map
+    vlan      = "Vlan"vlan_id                   ; name of the existing vlan interface
+
 
 ## State DB schema
 

orchagent/Makefile.am

@@ -19,61 +19,64 @@ DBGFLAGS = -g -DNDEBUG
 endif
 
 orchagent_SOURCES = \
-		    main.cpp \
-		    orchdaemon.cpp \
-		    orch.cpp \
-		    notifications.cpp \
-		    routeorch.cpp \
-		    neighorch.cpp \
-		    intfsorch.cpp \
-		    portsorch.cpp \
-		    copporch.cpp \
-		    tunneldecaporch.cpp \
-		    qosorch.cpp \
-		    bufferorch.cpp \
-		    mirrororch.cpp \
-		    fdborch.cpp \
-		    aclorch.cpp \
-		    saihelper.cpp \
-	            switchorch.cpp \
-		    pfcwdorch.cpp \
-		    pfcactionhandler.cpp \
-		    crmorch.cpp \
-		    request_parser.cpp \
-		    vrforch.cpp \
-		    countercheckorch.cpp \
-		    dtelorch.cpp \
-		    flexcounterorch.cpp\
-		    acltable.h \
-		    aclorch.h \
-		    bufferorch.h \
-		    copporch.h \
-		    fdborch.h \
-		    intfsorch.h \
-		    mirrororch.h \
-		    neighorch.h \
-		    notifications.h \
-		    observer.h \
-		    orch.h \
-		    orchdaemon.h \
-		    pfcactionhandler.h \
-		    pfcwdorch.h \
-		    port.h \
-		    portsorch.h \
-		    qosorch.h \
-		    routeorch.h \
-		    saihelper.h \
-	            switchorch.h \
-		    swssnet.h \
-		    tunneldecaporch.h \
-		    crmorch.h        \
-		    request_parser.h \
-		    vrforch.h \
-		    dtelorch.h \
-		    countercheckorch.h \
-		    flexcounterorch.h   \
-		    $(top_srcdir)/warmrestart/warm_restart.cpp \
-		    $(top_srcdir)/warmrestart/warm_restart.h
+            main.cpp \
+            orchdaemon.cpp \
+            orch.cpp \
+            notifications.cpp \
+            routeorch.cpp \
+            neighorch.cpp \
+            intfsorch.cpp \
+            portsorch.cpp \
+            copporch.cpp \
+            tunneldecaporch.cpp \
+            qosorch.cpp \
+            bufferorch.cpp \
+            mirrororch.cpp \
+            fdborch.cpp \
+            aclorch.cpp \
+            saihelper.cpp \
+            switchorch.cpp \
+            pfcwdorch.cpp \
+            pfcactionhandler.cpp \
+            crmorch.cpp \
+            request_parser.cpp \
+            vrforch.cpp \
+            countercheckorch.cpp \
+            vxlanorch.cpp \
+            dtelorch.cpp \
+            flexcounterorch.cpp \
+            acltable.h \
+            aclorch.h \
+            bufferorch.h \
+            copporch.h \
+            directory.h \
+            fdborch.h \
+            intfsorch.h \
+            mirrororch.h \
+            neighorch.h \
+            notifications.h \
+            observer.h \
+            orch.h \
+            orchdaemon.h \
+            pfcactionhandler.h \
+            pfcwdorch.h \
+            port.h \
+            portsorch.h \
+            qosorch.h \
+            routeorch.h \
+            saihelper.h \
+            switchorch.h \
+            swssnet.h \
+            tunneldecaporch.h \
+            crmorch.h        \
+            request_parser.h \
+            vrforch.h \
+            dtelorch.h \
+            countercheckorch.h \
+            vxlanorch.h \
+            flexcounterorch.h   \
+            $(top_srcdir)/warmrestart/warm_restart.cpp \
+            $(top_srcdir)/warmrestart/warm_restart.h
 
 orchagent_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
 orchagent_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)

orchagent/directory.h

@@ -0,0 +1,80 @@
+#pragma once
+
+// The Directory class below allows us to store objects inside.
+// The objects are supposed to be derived from a common base class B.
+// All set/get operations are addressed by the type of the storing/stored object.
+
+#include <typeinfo>
+#include <string>
+#include <unordered_map>
+#include <algorithm>
+
+template <typename B>
+class Directory
+{
+public:
+
+    template <typename U>
+    void set(const U& value)
+    {
+        std::string type_name { typeid(U).name() };
+
+        if (m_values.find(type_name) != m_values.end())
+        {
+            throw std::logic_error(std::string("Type ") + type_name + " already registered");
+        }
+
+        m_values[type_name] = value;
+    }
+
+    template <typename U>
+    const U get() const
+    {
+        std::string type_name { typeid(U).name() };
+
+        if (m_values.find(type_name) == m_values.end())
+        {
+            return nullptr;
+        }
+
+        return static_cast<U>(m_values.at(type_name));
+    }
+
+    class iterator : public std::iterator<std::input_iterator_tag, B>
+    {
+    public:
+        explicit iterator(const typename std::unordered_map<std::string, B>::iterator& it) : it(it) {}
+
+        B& operator*() const
+        {
+            return it->second;
+        }
+
+        bool operator!=(iterator other) const
+        {
+            return it != other.it;
+        }
+
+        iterator& operator++()
+        {
+            ++it;
+            return *this;
+        }
+
+    private:
+        typename std::unordered_map<std::string, B>::iterator it;
+    };
+
+    iterator begin()
+    {
+        return iterator(m_values.begin());
+    }
+
+    iterator end()
+    {
+        return iterator(m_values.end());
+    }
+
+private:
+    std::unordered_map<std::string, B> m_values;
+};

orchagent/orchdaemon.cpp

@@ -29,6 +29,7 @@ AclOrch *gAclOrch;
 CrmOrch *gCrmOrch;
 BufferOrch *gBufferOrch;
 SwitchOrch *gSwitchOrch;
+Directory<Orch*> gDirectory;
 
 OrchDaemon::OrchDaemon(DBConnector *applDb, DBConnector *configDb, DBConnector *stateDb) :
         m_applDb(applDb),
@@ -72,6 +73,11 @@ 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_configDb, CFG_VXLAN_TUNNEL_TABLE_NAME);
+    gDirectory.set(vxlan_tunnel_orch);
+    VxlanTunnelMapOrch *vxlan_tunnel_map_orch = new VxlanTunnelMapOrch(m_configDb, CFG_VXLAN_TUNNEL_MAP_TABLE_NAME);
+    gDirectory.set(vxlan_tunnel_map_orch);
+
     vector<string> qos_tables = {
         CFG_TC_TO_QUEUE_MAP_TABLE_NAME,
         CFG_SCHEDULER_TABLE_NAME,
@@ -166,6 +172,8 @@ bool OrchDaemon::init()
     m_orchList.push_back(mirror_orch);
     m_orchList.push_back(gAclOrch);
     m_orchList.push_back(vrf_orch);
+    m_orchList.push_back(vxlan_tunnel_orch);
+    m_orchList.push_back(vxlan_tunnel_map_orch);
 
     m_select = new Select();
 

orchagent/orchdaemon.h

@@ -21,8 +21,10 @@
 #include "switchorch.h"
 #include "crmorch.h"
 #include "vrforch.h"
+#include "vxlanorch.h"
 #include "countercheckorch.h"
 #include "flexcounterorch.h"
+#include "directory.h"
 
 using namespace swss;
 

orchagent/request_parser.cpp

@@ -9,6 +9,7 @@
 
 #include "sai.h"
 #include "macaddress.h"
+#include "ipaddress.h"
 #include "orch.h"
 #include "request_parser.h"
 
@@ -87,6 +88,12 @@ void Request::parseKey(const KeyOpFieldsValuesTuple& request)
             case REQ_T_MAC_ADDRESS:
                 key_item_mac_addresses_[i] = parseMacAddress(key_items[i]);
                 break;
+            case REQ_T_IP:
+                key_item_ip_addresses_[i] = parseIpAddress(key_items[i]);
+                break;
+            case REQ_T_UINT:
+                key_item_uint_[i] = parseUint(key_items[i]);
+                break;
             default:
                 throw std::logic_error(std::string("Not implemented key type parser. Key '")
                                      + full_key_
@@ -129,6 +136,15 @@ void Request::parseAttrs(const KeyOpFieldsValuesTuple& request)
             case REQ_T_PACKET_ACTION:
                 attr_item_packet_actions_[fvField(*i)] = parsePacketAction(fvValue(*i));
                 break;
+            case REQ_T_VLAN:
+                attr_item_vlan_[fvField(*i)] = parseVlan(fvValue(*i));
+                break;
+            case REQ_T_IP:
+                attr_item_ip_[fvField(*i)] = parseIpAddress(fvValue(*i));
+                break;
+            case REQ_T_UINT:
+                attr_item_uint_[fvField(*i)] = parseUint(fvValue(*i));
+                break;
             default:
                 throw std::logic_error(std::string("Not implemented attribute type parser for attribute:") + fvField(*i));
         }
@@ -178,6 +194,69 @@ MacAddress Request::parseMacAddress(const std::string& str)
     return MacAddress(mac);
 }
 
+IpAddress Request::parseIpAddress(const std::string& str)
+{
+    try
+    {
+        IpAddress addr(str);
+        return addr;
+    }
+    catch (std::invalid_argument& _)
+    {
+        throw std::invalid_argument(std::string("Invalid ip address: ") + str);
+    }
+}
+
+uint64_t Request::parseUint(const std::string& str)
+{
+    try
+    {
+        uint64_t ret = std::stoul(str);
+        return ret;
+    }
+    catch(std::invalid_argument& _)
+    {
+        throw std::invalid_argument(std::string("Invalid unsigned integer: ") + str);
+    }
+    catch(std::out_of_range& _)
+    {
+        throw std::invalid_argument(std::string("Out of range unsigned integer: ") + str);
+    }
+}
+
+uint16_t Request::parseVlan(const std::string& str)
+{
+    uint16_t ret = 0;
+
+    const auto vlan_prefix = std::string("Vlan");
+    const auto prefix_len = vlan_prefix.length();
+
+    if (str.substr(0, prefix_len) != vlan_prefix)
+    {
+        throw std::invalid_argument(std::string("Invalid vlan interface: ") + str);
+    }
+
+    try
+    {
+        ret = static_cast<uint16_t>(std::stoul(str.substr(prefix_len)));
+    }
+    catch(std::invalid_argument& _)
+    {
+        throw std::invalid_argument(std::string("Invalid vlan id: ") + str);
+    }
+    catch(std::out_of_range& _)
+    {
+        throw std::invalid_argument(std::string("Out of range vlan id: ") + str);
+    }
+
+    if (ret == 0 || ret > 4094)
+    {
+        throw std::invalid_argument(std::string("Out of range vlan id: ") + str);
+    }
+
+    return ret;
+}
+
 sai_packet_action_t Request::parsePacketAction(const std::string& str)
 {
     std::unordered_map<std::string, sai_packet_action_t> m = {