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

Jump to bottom

Removing Vnet with scope default #2239

Merged
merged 3 commits into from
Apr 26, 2022
Merged

Removing Vnet with scope default #2239

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b9bf93
Delete vnetvrf object when scope is not default
sumukhatv Apr 25, 2022
36a723f
Fix typo
sumukhatv Apr 25, 2022
79064f8
Add vstest
sumukhatv Apr 26, 2022
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
12 changes: 7 additions & 5 deletions orchagent/vnetorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,13 @@ VNetVrfObject::~VNetVrfObject()
set<sai_object_id_t> vr_ent = getVRids();
for (auto it : vr_ent)
{
sai_status_t status = sai_virtual_router_api->remove_virtual_router(it);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to remove virtual router name: %s, rv:%d",
vnet_name_.c_str(), status);
if (it != gVirtualRouterId) {
sumukhatv marked this conversation as resolved.
Show resolved Hide resolved
sai_status_t status = sai_virtual_router_api->remove_virtual_router(it);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to remove virtual router name: %s, rv:%d",
vnet_name_.c_str(), status);
}
}
}

Expand Down