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

[intfsorch] Enable ipv6 proxy ndp along with proxy arp #3045

Merged
merged 5 commits into from
Feb 27, 2024
Merged

[intfsorch] Enable ipv6 proxy ndp along with proxy arp #3045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
784e3e0
[intfsorch] Enable ipv6 proxy ndp along with proxy arp
Ndancejic Feb 7, 2024
c3492f5
Merge branch 'master' into mcast
Ndancejic Feb 23, 2024
aad2673
fixing compile error
Ndancejic Feb 23, 2024
d69b380
Merge branch 'master' into mcast
prsunny Feb 24, 2024
815b816
adding check in check_router_interface to test asic entry change
Ndancejic Feb 26, 2024
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
15 changes: 15 additions & 0 deletions orchagent/intfsorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,21 @@ bool IntfsOrch::setIntfVlanFloodType(const Port &port, sai_vlan_flood_control_ty
}
}

// Also set ipv6 multicast flood type
attr.id = SAI_VLAN_ATTR_UNKNOWN_MULTICAST_FLOOD_CONTROL_TYPE;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may want to pass this as an attribute vector

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SAI API doesn't seem to support passing an attribute vector for set_vlan_attribute, and looking at other examples it doesn't seem like we're using it that way anywhere else:

/**
 * @brief Set VLAN Attribute
 *
 * @param[in] vlan_id VLAN ID
 * @param[in] attr Attribute structure containing ID and value
 *
 * @return #SAI_STATUS_SUCCESS on success, failure status code on error
 */
typedef sai_status_t (*sai_set_vlan_attribute_fn)(
        _In_ sai_object_id_t vlan_id,
        _In_ const sai_attribute_t *attr);

attr.value.s32 = vlan_flood_type;

status = sai_vlan_api->set_vlan_attribute(port.m_vlan_info.vlan_oid, &attr);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to set multicast flood type for VLAN %u, rv:%d", port.m_vlan_info.vlan_id, status);
task_process_status handle_status = handleSaiSetStatus(SAI_API_VLAN, status);
if (handle_status != task_success)
{
return parseHandleSaiStatusFailure(handle_status);
}
}

return true;
}

Expand Down
3 changes: 3 additions & 0 deletions tests/test_vnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,9 @@ def check_router_interface(self, dvs, intf_name, name, vlan_oid=0):
expected_attr = { 'SAI_VLAN_ATTR_BROADCAST_FLOOD_CONTROL_TYPE': 'SAI_VLAN_FLOOD_CONTROL_TYPE_NONE' }
check_object(asic_db, self.ASIC_VLAN_TABLE, vlan_oid, expected_attr)

expected_attr = { 'SAI_VLAN_ATTR_UNKNOWN_MULTICAST_FLOOD_CONTROL_TYPE': 'SAI_VLAN_FLOOD_CONTROL_TYPE_NONE' }
check_object(asic_db, self.ASIC_VLAN_TABLE, vlan_oid, expected_attr)

check_linux_intf_arp_proxy(dvs, intf_name)

self.rifs.add(new_rif)
Expand Down
Loading