Skip to content

Migrating sonic-swss tests to use hwsku instead of fakeplatform #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dgsudharsan wants to merge 7 commits into from
Closed

Migrating sonic-swss tests to use hwsku instead of fakeplatform #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
72343a8
Using hwsku instead of fake platform
dgsudharsan Sep 28, 2021
c839338
Migrating tests to use hwsku instead of fake platform
dgsudharsan Sep 29, 2021
d269cb2
Merge branch 'master' of github.com:Azure/sonic-swss into vs_sku
dgsudharsan Oct 12, 2021
c877d2d
Removing hwsku requirement for broadcom
dgsudharsan Oct 13, 2021
4a17eb0
Reverting fake_platform for broadcom
dgsudharsan Oct 13, 2021
cea763d
Refactoring mirror table logic based on platform
dgsudharsan Oct 19, 2021
34e31eb
Modifying mirror logic to include VS case
dgsudharsan Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions orchagent/aclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2436,7 +2436,8 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
platform == BFN_PLATFORM_SUBSTRING ||
platform == MRVL_PLATFORM_SUBSTRING ||
platform == INVM_PLATFORM_SUBSTRING ||
platform == NPS_PLATFORM_SUBSTRING)
platform == NPS_PLATFORM_SUBSTRING ||
platform == VS_PLATFORM_SUBSTRING)
{
m_mirrorTableCapabilities =
{
Expand All @@ -2459,19 +2460,17 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
SWSS_LOG_NOTICE(" ACL_TABLE_MIRRORV6: %s",
m_mirrorTableCapabilities[ACL_TABLE_MIRRORV6] ? "yes" : "no");

// In Broadcom platform, V4 and V6 rules are stored in the same table
if (platform == BRCM_PLATFORM_SUBSTRING ||
platform == NPS_PLATFORM_SUBSTRING ||
platform == BFN_PLATFORM_SUBSTRING ||
platform == INVM_PLATFORM_SUBSTRING) {
m_isCombinedMirrorV6Table = true;
}

// In Mellanox platform, V4 and V6 rules are stored in different tables
if (platform == MLNX_PLATFORM_SUBSTRING ||
platform == MRVL_PLATFORM_SUBSTRING) {
platform == MRVL_PLATFORM_SUBSTRING)
{
m_isCombinedMirrorV6Table = false;
}
else
{
m_isCombinedMirrorV6Table = true;
}


// Store the capabilities in state database
// TODO: Move this part of the code into syncd
Expand Down
3 changes: 0 additions & 3 deletions tests/test_mirror_ipv6_combined.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

from swsscommon import swsscommon

DVS_ENV = ["fake_platform=broadcom"]


class TestMirror(object):
def setup_db(self, dvs):
self.pdb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_mirror_ipv6_separate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from swsscommon import swsscommon

DVS_ENV = ["fake_platform=mellanox"]
DVS_ENV = ["HWSKU=Mellanox-SN2700"]


class TestMirror(object):
Expand Down