From 6dfaf5e293d8da8a3e490bf6de8969dbf0be3447 Mon Sep 17 00:00:00 2001
From: jfeng-arista <98421150+jfeng-arista@users.noreply.github.com>
Date: Mon, 20 Nov 2023 16:21:03 -0800
Subject: [PATCH] [sonic-vs]: Add fabric port data for vs test, and start
 fabricmgrd in vs environment (#16791)

Add fabric port data for vs test, and start fabricmgrd in vs environment.

This PR depends on sonic-net/sonic-sairedis#1301

sonic-net/sonic-swss#2920 needs this one merge first.
---
 .../SONiC-VM/fabric_port_config.ini            | 18 ++++++++++++++++++
 platform/vs/docker-sonic-vs/start.sh           |  2 ++
 .../vs/docker-sonic-vs/supervisord.conf.j2     | 11 +++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/fabric_port_config.ini

diff --git a/device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/fabric_port_config.ini b/device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/fabric_port_config.ini
new file mode 100644
index 0000000000..899c586ffe
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64-r0/SONiC-VM/fabric_port_config.ini
@@ -0,0 +1,18 @@
+# name              lanes     isolateStatus
+Fabric0             0         False
+Fabric1             1         False
+Fabric2             2         False
+Fabric3             3         False
+Fabric4             4         False
+Fabric5             5         False
+Fabric6             6         False
+Fabric7             7         False
+Fabric8             8         False
+Fabric9             9         False
+Fabric10            10        False
+Fabric11            11        False
+Fabric12            12        False
+Fabric13            13        False
+Fabric14            14        False
+Fabric15            15        False
+Fabric16            16        False
diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh
index 5e3497850e..f28f05f370 100755
--- a/platform/vs/docker-sonic-vs/start.sh
+++ b/platform/vs/docker-sonic-vs/start.sh
@@ -176,6 +176,8 @@ supervisorctl start natsyncd
 
 supervisorctl start tunnelmgrd
 
+supervisorctl start fabricmgrd
+
 # 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.j2 b/platform/vs/docker-sonic-vs/supervisord.conf.j2
index a55e57ba6b..5b988a5a5d 100644
--- a/platform/vs/docker-sonic-vs/supervisord.conf.j2
+++ b/platform/vs/docker-sonic-vs/supervisord.conf.j2
@@ -314,3 +314,14 @@ stderr_logfile=syslog
 {% if ENABLE_ASAN == "y" %}
 environment=ASAN_OPTIONS="log_path=/var/log/asan/tunnelmgrd-asan.log{{ asan_extra_options }}"
 {% endif %}
+
+[program:fabricmgrd]
+command=/usr/bin/fabricmgrd
+priority=27
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+{% if ENABLE_ASAN == "y" %}
+environment=ASAN_OPTIONS="log_path=/var/log/asan/fabricmgrd-asan.log{{ asan_extra_options }}"
+{% endif %}