Disable checking fabric ports ready until sonic-buildimage#6185 merges.

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

Author: ngoc-do

tests/conftest.py

@@ -31,7 +31,10 @@
 # ports in the system (much like the rest of the test suite). This should be adjusted to accomodate
 # a dynamic number of ports. GitHub Issue: Azure/sonic-swss#1384.
 NUM_PORTS = 32
-FABRIC_NUM_PORTS = 16
+
+# FIXME: Voq asics will have 16 fabric ports created (defined in Azure/sonic-buildimage#6185).
+# Right now, we set FABRIC_NUM_PORTS to 0, and change to 16 when PR#6185 merges.
+FABRIC_NUM_PORTS = 0
 
 def ensure_system(cmd):
     rc, output = subprocess.getstatusoutput(cmd)
@@ -488,12 +491,22 @@ def _polling_function():
 
         # Verify that all ports have been created
         asic_db = self.get_asic_db()
-        asic_db.wait_for_n_keys("ASIC_STATE:SAI_OBJECT_TYPE_PORT", num_ports + 1)  # +1 CPU Port
+
+        # Verify that we have "at least" NUM_PORTS + FABRIC_NUM_PORTS, rather exact number.
+        # Right now, FABRIC_NUM_PORTS = 0. So it essentially waits for at least NUM_PORTS.
+        # This will allow us to merge Azure/sonic-buildimage#6185 that creates 16 fabric ports.
+        # When PR#6185 merges, FABRIC_NUM_PORTS should be 16, and so this verification (at least
+        # NUM_PORTS) still holds.
+        # Will update FABRIC_NUM_PORTS to 16, and revert back to wait exact NUM_PORTS + FABRIC_NUM_PORTS
+        # when PR#6185 merges.
+        wait_at_least_n_keys = True
+
+        asic_db.wait_for_n_keys("ASIC_STATE:SAI_OBJECT_TYPE_PORT", num_ports + 1, wait_at_least_n_keys)  # +1 CPU Port
 
         # Verify that fabric ports are monitored in STATE_DB
         if metadata.get('switch_type', 'npu') in ['voq', 'fabric']:
             self.get_state_db()
-            self.state_db.wait_for_n_keys("FABRIC_PORT_TABLE", 16)
+            self.state_db.wait_for_n_keys("FABRIC_PORT_TABLE", FABRIC_NUM_PORTS, wait_at_least_n_keys)
 
     def net_cleanup(self) -> None:
         """Clean up network, remove extra links."""

tests/dvslib/dvs_database.py

@@ -330,6 +330,7 @@ def wait_for_n_keys(
         self,
         table_name: str,
         num_keys: int,
+        wait_at_least_n_keys: bool = False, 
         polling_config: PollingConfig = PollingConfig(),
         failure_message: str = None,
     ) -> List[str]:
@@ -348,7 +349,10 @@ def wait_for_n_keys(
 
         def access_function():
             keys = self.get_keys(table_name)
-            return (len(keys) == num_keys, keys)
+            if wait_at_least_n_keys:
+                return (len(keys) >= num_keys, keys)
+            else:
+                return (len(keys) == num_keys, keys)
 
         status, result = wait_for_result(
             access_function, self._disable_strict_polling(polling_config)