Skip to content
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

Allowing the first time FEC and AN configuration to be pushed to SAI #1705

Merged
merged 3 commits into from
Apr 15, 2021
Merged

Allowing the first time FEC and AN configuration to be pushed to SAI #1705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87f0518
Allowing the first time FEC and AN configuration to be pushed to SAI
dgsudharsan Apr 5, 2021
b019850
Modifying autoneg values from 0/1 to on/off
dgsudharsan Apr 13, 2021
3194287
Correcting tests
dgsudharsan Apr 14, 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
2 changes: 2 additions & 0 deletions orchagent/port.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ class Port
SystemPortInfo m_system_port_info;
SystemLagInfo m_system_lag_info;

bool m_fec_cfg = false;
bool m_an_cfg = false;
};

}
Expand Down
7 changes: 5 additions & 2 deletions orchagent/portsorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2564,12 +2564,13 @@ void PortsOrch::doPortTask(Consumer &consumer)
}
else
{
if (an != -1 && an != p.m_autoneg)
if (an != -1 && (!p.m_an_cfg || an != p.m_autoneg))
{
if (setPortAutoNeg(p.m_port_id, an))
{
SWSS_LOG_NOTICE("Set port %s AutoNeg to %u", alias.c_str(), an);
p.m_autoneg = an;
p.m_an_cfg = true;
m_portList[alias] = p;

// Once AN is changed
Expand Down Expand Up @@ -2702,7 +2703,7 @@ void PortsOrch::doPortTask(Consumer &consumer)
if (fec_mode_map.find(fec_mode) != fec_mode_map.end())
{
/* reset fec mode upon mode change */
if (p.m_fec_mode != fec_mode_map[fec_mode])
if (!p.m_fec_cfg || p.m_fec_mode != fec_mode_map[fec_mode])
{
if (p.m_admin_state_up)
{
Expand All @@ -2716,6 +2717,7 @@ void PortsOrch::doPortTask(Consumer &consumer)

p.m_admin_state_up = false;
p.m_fec_mode = fec_mode_map[fec_mode];
p.m_fec_cfg = true;

if (setPortFec(p, p.m_fec_mode))
{
Expand All @@ -2733,6 +2735,7 @@ void PortsOrch::doPortTask(Consumer &consumer)
{
/* Port is already down, setting fec mode*/
p.m_fec_mode = fec_mode_map[fec_mode];
p.m_fec_cfg = true;
if (setPortFec(p, p.m_fec_mode))
{
m_portList[alias] = p;
Expand Down
22 changes: 22 additions & 0 deletions tests/test_port.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,28 @@ def test_PortNotification(self, dvs, testlog):

assert oper_status == "up"

def test_PortFecForce(self, dvs, testlog):
db = swsscommon.DBConnector(0, dvs.redis_sock, 0)
adb = dvs.get_asic_db()

ptbl = swsscommon.ProducerStateTable(db, "PORT_TABLE")

# set fec
fvs = swsscommon.FieldValuePairs([("fec","none")])
ptbl.set("Ethernet0", fvs)
fvs = swsscommon.FieldValuePairs([("fec","rs")])
ptbl.set("Ethernet4", fvs)

# validate if fec none is pushed to asic db when set first time
port_oid = adb.port_name_map["Ethernet0"]
expected_fields = {"SAI_PORT_ATTR_FEC_MODE":"SAI_PORT_FEC_MODE_NONE"}
adb.wait_for_field_match("ASIC_STATE:SAI_OBJECT_TYPE_PORT", port_oid, expected_fields)

# validate if fec rs is pushed to asic db when set first time
port_oid = adb.port_name_map["Ethernet4"]
expected_fields = {"SAI_PORT_ATTR_FEC_MODE":"SAI_PORT_FEC_MODE_RS"}
adb.wait_for_field_match("ASIC_STATE:SAI_OBJECT_TYPE_PORT", port_oid, expected_fields)

def test_PortFec(self, dvs, testlog):
dvs.runcmd("config interface startup Ethernet0")
dvs.runcmd("config interface ip add Ethernet0 10.0.0.0/31")
Expand Down
23 changes: 23 additions & 0 deletions tests/test_port_an.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,29 @@


class TestPortAutoNeg(object):
def test_PortAutoNegForce(self, dvs, testlog):

db = swsscommon.DBConnector(0, dvs.redis_sock, 0)
adb = dvs.get_asic_db()

tbl = swsscommon.ProducerStateTable(db, "PORT_TABLE")
fvs = swsscommon.FieldValuePairs([("autoneg","off")])
tbl.set("Ethernet0", fvs)

tbl = swsscommon.ProducerStateTable(db, "PORT_TABLE")
fvs = swsscommon.FieldValuePairs([("autoneg","on"), ("speed", "1000")])
tbl.set("Ethernet4", fvs)

# validate if autoneg false is pushed to asic db when set first time
port_oid = adb.port_name_map["Ethernet0"]
expected_fields = {"SAI_PORT_ATTR_AUTO_NEG_MODE":"false"}
adb.wait_for_field_match("ASIC_STATE:SAI_OBJECT_TYPE_PORT", port_oid, expected_fields)

# validate if autoneg true is pushed to asic db when set first time
port_oid = adb.port_name_map["Ethernet4"]
expected_fields = {"SAI_PORT_ATTR_AUTO_NEG_MODE":"true"}
adb.wait_for_field_match("ASIC_STATE:SAI_OBJECT_TYPE_PORT", port_oid, expected_fields)

def test_PortAutoNegCold(self, dvs, testlog):

db = swsscommon.DBConnector(0, dvs.redis_sock, 0)
Expand Down