From a88e9e9b8ca8e756d2627083361db51041d88d98 Mon Sep 17 00:00:00 2001
From: zhonghaojun <young@micasnetworks.com>
Date: Thu, 30 Jul 2026 14:41:22 +0800
Subject: [PATCH] [orchagent] Skip default VLAN and bridge port removal during
 warm restart

Signed-off-by: zhonghaojun <young@micasnetworks.com>
---
 orchagent/portsorch.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/orchagent/portsorch.cpp b/orchagent/portsorch.cpp
index e684119d94..bc56402ef5 100644
--- a/orchagent/portsorch.cpp
+++ b/orchagent/portsorch.cpp
@@ -1077,8 +1077,11 @@ PortsOrch::PortsOrch(DBConnector *db, DBConnector *stateDb, vector<table_name_wi
         // Get System ports
         getSystemPorts();
 
-        removeDefaultVlanMembers();
-        removeDefaultBridgePorts();
+        if (!WarmStart::isWarmStart())
+        {
+            removeDefaultVlanMembers();
+            removeDefaultBridgePorts();
+        }
     }
 
     // Enable fdb event notifications after all ports are removed from default 1Q bridge