Merge pull request #1059 from AkhileshSamineni/nat_changes_in_sonic

Natmgrd changes in sonic-swss sub module to support NAT feature.
sonic-net · Jan 16, 2020 · 85036df · 85036df
2 parents 1eac91e + 2086ad2
commit 85036df
Show file tree

Hide file tree

Showing 7 changed files with 7,951 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -54,6 +54,7 @@ cfgmgr/vlanmgrd
 cfgmgr/vrfmgrd
 cfgmgr/nbrmgrd
 cfgmgr/vxlanmgrd
+cfgmgr/natmgrd
 neighsyncd/neighsyncd
 portsyncd/portsyncd
 orchagent/orchagent

diff --git a/cfgmgr/Makefile.am b/cfgmgr/Makefile.am
@@ -3,7 +3,7 @@ CFLAGS_SAI = -I /usr/include/sai
 LIBNL_CFLAGS = -I/usr/include/libnl3
 LIBNL_LIBS = -lnl-genl-3 -lnl-route-3 -lnl-3
 
-bin_PROGRAMS = vlanmgrd teammgrd portmgrd intfmgrd buffermgrd vrfmgrd nbrmgrd vxlanmgrd sflowmgrd
+bin_PROGRAMS = vlanmgrd teammgrd portmgrd intfmgrd buffermgrd vrfmgrd nbrmgrd vxlanmgrd sflowmgrd natmgrd
 
 if DEBUG
 DBGFLAGS = -ggdb -DDEBUG
@@ -55,3 +55,8 @@ sflowmgrd_SOURCES = sflowmgrd.cpp sflowmgr.cpp $(top_srcdir)/orchagent/orch.cpp
 sflowmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
 sflowmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
 sflowmgrd_LDADD = -lswsscommon
+
+natmgrd_SOURCES = natmgrd.cpp natmgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp shellcmd.h
+natmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
+natmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
+natmgrd_LDADD = -lswsscommon
diff --git a/cfgmgr/intfmgr.cpp b/cfgmgr/intfmgr.cpp
@@ -390,6 +390,7 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
     string vrf_name = "";
     string mtu = "";
     string adminStatus = "";
+    string nat_zone = "";
     for (auto idx : data)
     {
         const auto &field = fvField(idx);
@@ -404,6 +405,11 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
         {
             adminStatus = value;
         }
+
+        if (field == "nat_zone")
+        {
+            nat_zone = value;
+        }
     }
 
     if (op == SET_COMMAND)
@@ -431,6 +437,15 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
         {
             addLoopbackIntf(alias);
         }
+        else
+        {
+            /* Set nat zone */
+            if (!nat_zone.empty())
+            {
+                FieldValueTuple fvTuple("nat_zone", nat_zone);
+                data.push_back(fvTuple);
+            }
+        }
 
         if (!vrf_name.empty())
         {