From cfb75b71f7c31906e33a46c6ed5adff529ac6a23 Mon Sep 17 00:00:00 2001 From: vedganes Date: Tue, 29 Jun 2021 11:20:49 -0400 Subject: [PATCH] [vstest] Code review comments fix - 1 Changes done to remove comments and LGTM warnings. Signed-off-by: vedganes --- tests/conftest.py | 18 +++--------------- tests/test_virtual_chassis.py | 1 - 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 21f682699f2..8e1cb040e8c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -33,9 +33,7 @@ # a dynamic number of ports. GitHub Issue: Azure/sonic-swss#1384. NUM_PORTS = 32 -# 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. PR#6185 can't -# be merged before this PR. Otherwise it will cause swss voq test failures. +# Voq asics will have 16 fabric ports created (defined in Azure/sonic-buildimage#7629). FABRIC_NUM_PORTS = 16 def ensure_system(cmd): @@ -518,22 +516,12 @@ def _polling_function(): # Verify that all ports have been created asic_db = self.get_asic_db() - - # 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 + asic_db.wait_for_n_keys("ASIC_STATE:SAI_OBJECT_TYPE_PORT", num_ports + 1) # +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", FABRIC_NUM_PORTS, wait_at_least_n_keys) + self.state_db.wait_for_n_keys("FABRIC_PORT_TABLE", FABRIC_NUM_PORTS) def net_cleanup(self) -> None: """Clean up network, remove extra links.""" diff --git a/tests/test_virtual_chassis.py b/tests/test_virtual_chassis.py index 831e8ebf5a4..1709dfb0476 100644 --- a/tests/test_virtual_chassis.py +++ b/tests/test_virtual_chassis.py @@ -1,4 +1,3 @@ -import pytest from swsscommon import swsscommon from dvslib.dvs_database import DVSDatabase import ast