configDB enforcer for VLAN (#356)

* configDB enforcer for VLAN

Signed-off-by: Jipan Yang <[email protected]>

* Use OrchBase for configDB vlan configuration enforcer

Signed-off-by: Jipan Yang <[email protected]>

* Rename vlanconf to vlanmgr, and spin off switchmgr

Signed-off-by: Jipan Yang <[email protected]>

* Use shell full path command macros

Signed-off-by: Jipan Yang <[email protected]>

* Optimize shell command execution error handling

Signed-off-by: Jipan Yang <[email protected]>

* Use Orch class for vlanmgrd orchestration

Signed-off-by: Jipan Yang <[email protected]>

* Support getting switch mac from configDB

Signed-off-by: Jipan Yang <[email protected]>

Author: jipanyang

.gitignore

@@ -43,6 +43,7 @@ deps/
 teamsyncd/teamsyncd
 fpmsyncd/fpmsyncd
 intfsyncd/intfsyncd
+cfgmgr/vlanmgrd
 neighsyncd/neighsyncd
 portsyncd/portsyncd
 orchagent/orchagent

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = fpmsyncd neighsyncd intfsyncd portsyncd orchagent swssconfig
+SUBDIRS = fpmsyncd neighsyncd intfsyncd portsyncd orchagent swssconfig cfgmgr
 
 if HAVE_LIBTEAM
 SUBDIRS += teamsyncd

cfgmgr/Makefile.am

@@ -0,0 +1,16 @@
+INCLUDES = -I $(top_srcdir) -I $(top_srcdir)/orchagent
+CFLAGS_SAI = -I /usr/include/sai
+
+bin_PROGRAMS = vlanmgrd
+
+if DEBUG
+DBGFLAGS = -ggdb -DDEBUG
+else
+DBGFLAGS = -g
+endif
+
+vlanmgrd_SOURCES = vlanmgrd.cpp vlanmgr.cpp $(top_srcdir)/orchagent/orch.cpp shellcmd.h
+vlanmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
+vlanmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
+vlanmgrd_LDADD = -lswsscommon
+

cfgmgr/shellcmd.h

@@ -0,0 +1,23 @@
+#ifndef __SHELLCMD__
+#define __SHELLCMD__
+
+#define IP_CMD               "/sbin/ip"
+#define BRIDGE_CMD           "/sbin/bridge"
+#define ECHO_CMD             "/bin/echo"
+#define REDIS_CLI_CMD        "/usr/bin/redis-cli"
+#define XARGS_CMD            "/usr/bin/xargs"
+#define GREP_CMD             "/bin/grep"
+#define AWK_CMD              "/usr/bin/awk"
+#define LS_CMD               "/bin/ls"
+#define PASTE_CMD            "/usr/bin/paste"
+#define SED_CMD              "/bin/sed"
+
+#define EXEC_WITH_ERROR_THROW(cmd, res)   ({    \
+    int ret = swss::exec(cmd, res);             \
+    if (ret != 0)                               \
+    {                                           \
+        throw runtime_error(cmd + " : " + res); \
+    }                                           \
+})
+
+#endif /* __SHELLCMD__ */