From 8fd50e895c353ee97f100d2f39a518b329f4cfa5 Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Sat, 26 Dec 2020 11:17:18 -0800
Subject: [PATCH] [submodule]: swss Tunnel Manager changes (#5843)

Introduce tunnel manager daemon. Start the process as part of swss container

Submodule update for swss:
9ed3026 - 2020-12-24 : [NAT] ACL Rule with DO_NOT_NAT action is getting failed. (#1502) [Akhilesh Samineni]
c39a4b1 - 2020-12-23 : Mux/IPTunnel orchagent changes (#1497) [Prince Sunny]
bc8df0e - 2020-12-23 : Add support for headroom pool watermark (#1567) [Neetha John]
---
 dockers/docker-orchagent/base_image_files/monit_swss |  5 +++++
 dockers/docker-orchagent/critical_processes          |  1 +
 dockers/docker-orchagent/supervisord.conf            | 10 ++++++++++
 platform/vs/docker-sonic-vs/start.sh                 |  2 ++
 platform/vs/docker-sonic-vs/supervisord.conf         |  7 +++++++
 src/sonic-swss                                       |  2 +-
 6 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/dockers/docker-orchagent/base_image_files/monit_swss b/dockers/docker-orchagent/base_image_files/monit_swss
index 38862f348b..1dcf4bf9b6 100644
--- a/dockers/docker-orchagent/base_image_files/monit_swss
+++ b/dockers/docker-orchagent/base_image_files/monit_swss
@@ -13,6 +13,8 @@
 ##  nbrmgrd
 ##  vxlanmgrd
 ##  coppmgrd
+##  tunnelmgrd
+
 ##############################################################################
 check program swss|orchagent with path "/usr/bin/process_checker swss /usr/bin/orchagent -d /var/log/swss"
     if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
@@ -49,3 +51,6 @@ check program swss|vxlanmgrd with path "/usr/bin/process_checker swss /usr/bin/v
 
 check program swss|coppmgrd with path "/usr/bin/process_checker swss /usr/bin/coppmgrd"
     if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
+
+check program swss|tunnelmgrd with path "/usr/bin/process_checker swss /usr/bin/tunnelmgrd"
+        if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
diff --git a/dockers/docker-orchagent/critical_processes b/dockers/docker-orchagent/critical_processes
index d2dc86a5f7..a650bdca2a 100644
--- a/dockers/docker-orchagent/critical_processes
+++ b/dockers/docker-orchagent/critical_processes
@@ -10,3 +10,4 @@ program:vrfmgrd
 program:nbrmgrd
 program:vxlanmgrd
 program:coppmgrd
+program:tunnelmgrd
diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index f1b8edd622..37ddade2ed 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -175,6 +175,16 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=swssconfig:exited
 
+[program:tunnelmgrd]
+command=/usr/bin/tunnelmgrd
+priority=17
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
+
 [program:enable_counters]
 command=/usr/bin/enable_counters.py
 priority=12
diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh
index 1c0960e598..7b246a49de 100755
--- a/platform/vs/docker-sonic-vs/start.sh
+++ b/platform/vs/docker-sonic-vs/start.sh
@@ -135,6 +135,8 @@ supervisorctl start natmgrd
 
 supervisorctl start natsyncd
 
+supervisorctl start tunnelmgrd
+
 # Start arp_update when VLAN exists
 VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
 if [ "$VLAN" != "" ]; then
diff --git a/platform/vs/docker-sonic-vs/supervisord.conf b/platform/vs/docker-sonic-vs/supervisord.conf
index 61fdb60bcc..977b84117e 100644
--- a/platform/vs/docker-sonic-vs/supervisord.conf
+++ b/platform/vs/docker-sonic-vs/supervisord.conf
@@ -229,3 +229,10 @@ autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
+[program:tunnelmgrd]
+command=/usr/bin/tunnelmgrd
+priority=26
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
diff --git a/src/sonic-swss b/src/sonic-swss
index ef41c4e9df..9ed3026e4a 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit ef41c4e9df80e64cc2aced424913fc9cae73cbec
+Subproject commit 9ed3026e4ac4fd05b8321d45848be3a85d96923e