Fix the Unit test to remove the QUEUE configured on system_port of the front panel port so the removePort will be successful

Signed-off-by: saksarav <[email protected]>

Author: saksarav-nokia

tests/test_virtual_chassis.py

@@ -930,26 +930,36 @@ def test_chassis_add_remove_ports(self, vct):
             asic_db = dvs.get_asic_db()
             metatbl = config_db.get_entry("DEVICE_METADATA", "localhost")
             cfg_switch_type = metatbl.get("switch_type")
+            cfg_hostname = metatbl.get("hostname")
+            cfg_asic_name = metatbl.get("asic_name")
 
             if cfg_switch_type == "voq":
                 num_ports = len(asic_db.get_keys("ASIC_STATE:SAI_OBJECT_TYPE_PORT"))
                 # Get the port info we'll flap
                 port = config_db.get_keys('PORT')[0]
                 port_info = config_db.get_entry("PORT", port)
+                system_port = cfg_hostname+"|"+cfg_asic_name+"|"+port
 
                 # Remove port's other configs
                 pgs = config_db.get_keys('BUFFER_PG')
-                queues = config_db.get_keys('BUFFER_QUEUE')
+                buf_queues = config_db.get_keys('BUFFER_QUEUE')
+                queues = config_db.get_keys('QUEUE')
+
                 for key in pgs:
                     if port in key:
                         config_db.delete_entry('BUFFER_PG', key)
                         app_db.wait_for_deleted_entry('BUFFER_PG_TABLE', key)
 
-                for key in queues:
+                for key in buf_queues:
                     if port in key:
                         config_db.delete_entry('BUFFER_QUEUE', key)
                         app_db.wait_for_deleted_entry('BUFFER_QUEUE_TABLE', key)
 
+                for key in queues:
+                    if system_port in key:
+                        config_db.delete_entry('QUEUE', key)
+                        app_db.wait_for_deleted_entry('QUEUE_TABLE', key)
+
                 # Remove port
                 config_db.delete_entry('PORT', port)
                 app_db.wait_for_deleted_entry('PORT_TABLE', port)