Skip to content

[portsorch]: Update comments #333

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

Merged
stcheng merged 1 commit into from
Oct 4, 2017
Merged

[portsorch]: Update comments #333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions orchagent/portsorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ bool PortsOrch::validatePortSpeed(sai_object_id_t port_id, sai_uint32_t speed)
attr.id = SAI_PORT_ATTR_SUPPORTED_SPEED;
attr.value.u32list.count = 0;
attr.value.u32list.list = NULL;

status = sai_port_api->get_port_attribute(port_id, 1, &attr);
if (status == SAI_STATUS_BUFFER_OVERFLOW)
{
Expand Down Expand Up @@ -542,7 +543,7 @@ bool PortsOrch::initPort(const string &alias, const set<int> &lane_set)
p.m_index = static_cast<int32_t>(m_portList.size()); // TODO: Assume no deletion of physical port
p.m_port_id = id;

/* Initialize the port and create router interface and host interface */
/* Initialize the port and create corresponding host interface */
if (initializePort(p))
{
/* Add port to port list */
Expand Down Expand Up @@ -679,7 +680,7 @@ void PortsOrch::doPortTask(Consumer &consumer)
}
else
{
++it;
it++;
}
}

Expand Down Expand Up @@ -709,6 +710,12 @@ void PortsOrch::doPortTask(Consumer &consumer)
}
else
{
/* Set port speed
* 1. Get supported speed list and validate if the target speed is within the list
* 2. Get the current port speed and check if it is the same as the target speed
* 3. Set port admin status to DOWN before changing the speed
* 4. Set port speed
*/
if (speed != 0)
{
sai_uint32_t current_speed;
Expand All @@ -724,7 +731,7 @@ void PortsOrch::doPortTask(Consumer &consumer)
{
if (speed != current_speed)
{
if(setPortAdminStatus(p.m_port_id, false))
if (setPortAdminStatus(p.m_port_id, false))
{
if (setPortSpeed(p.m_port_id, speed))
{
Expand All @@ -747,13 +754,14 @@ void PortsOrch::doPortTask(Consumer &consumer)
{
SWSS_LOG_ERROR("Failed to get current speed for port %s", alias.c_str());
}

}

if (admin_status != "")
{
if (setPortAdminStatus(p.m_port_id, admin_status == "up"))
{
SWSS_LOG_NOTICE("Set port %s admin status to %s", alias.c_str(), admin_status.c_str());
}
else
{
SWSS_LOG_ERROR("Failed to set port %s admin status to %s", alias.c_str(), admin_status.c_str());
Expand All @@ -765,7 +773,9 @@ void PortsOrch::doPortTask(Consumer &consumer)
if (mtu != 0)
{
if (setPortMtu(p.m_port_id, mtu))
{
SWSS_LOG_NOTICE("Set port %s MTU to %u", alias.c_str(), mtu);
}
else
{
SWSS_LOG_ERROR("Failed to set port %s MTU to %u", alias.c_str(), mtu);
Expand Down