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

[SAIP4] Add EntryBuilder function to assign a multicast group for specific IP addresses & Adding action constraint. #598

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[SAIP4] Add EntryBuilder function to assign a multicast group for specific IP addresses & Adding action constraint. #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
35e409a
[SAIP4] Add rest of the required match fields to mirror and redirect …
kheradmandG Dec 7, 2023
9bc1b60
[SAIP4] Add redirect_to_nexthop action to mirror and redirect table.
kheradmandG Dec 8, 2023
e699e66
[SAIP4] Model multicast.
smolkaj Aug 6, 2023
bdf6a06
[SAIP4] Use testing::Key instead of alternatives in sai_p4_bmv2_vlan_…
kheradmandG Oct 15, 2023
1a8b72d
[SAIP4] Add EntryBuilder function to assign a multicast group for spe…
kishanps Nov 28, 2023
b5a65c6
Merge branch 'main' of https://github.com/divyagayathri-hcl/sonic-pin…
divyagayathri-hcl Oct 5, 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
8 changes: 8 additions & 0 deletions sai_p4/fixed/routing.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ control routing(in headers_t headers,
// TODO: Remove @unsupported when the switch supports this
// action.
@unsupported
@action_restriction("
// Disallow reserved VLAN IDs with implementation-defined semantics.
vlan_id != 0 && vlan_id != 4095"
)
action set_port_and_src_mac_and_vlan_id(@id(1) port_id_t port,
@id(2) @format(MAC_ADDRESS)
ethernet_addr_t src_mac,
Expand Down Expand Up @@ -442,6 +446,10 @@ control routing(in headers_t headers,
// supports multicast.
@unsupported
@id(ROUTING_SET_MULTICAST_GROUP_ID_ACTION_ID)
@action_restriction("
// Disallow 0 since it encodes 'no multicast' in V1Model.
multicast_group_id != 0"
)
action set_multicast_group_id(
@id(1)
// TODO: Add this once supported by PDPI and its customers.
Expand Down
2 changes: 2 additions & 0 deletions sai_p4/instantiations/google/fabric_border_router.p4info.pb.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,7 @@ actions {
name: "ingress.routing.set_port_and_src_mac_and_vlan_id"
alias: "set_port_and_src_mac_and_vlan_id"
annotations: "@unsupported"
annotations: "@action_restriction(\"\n // Disallow reserved VLAN IDs with implementation-defined semantics.\n vlan_id != 0 && vlan_id != 4095\")"
}
params {
id: 1
Expand Down Expand Up @@ -1231,6 +1232,7 @@ actions {
name: "ingress.routing.set_multicast_group_id"
alias: "set_multicast_group_id"
annotations: "@unsupported"
annotations: "@action_restriction(\"\n // Disallow 0 since it encodes \'no multicast\' in V1Model.\n multicast_group_id != 0\")"
}
params {
id: 1
Expand Down
2 changes: 2 additions & 0 deletions sai_p4/instantiations/google/middleblock.p4info.pb.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,6 +908,7 @@ actions {
name: "ingress.routing.set_port_and_src_mac_and_vlan_id"
alias: "set_port_and_src_mac_and_vlan_id"
annotations: "@unsupported"
annotations: "@action_restriction(\"\n // Disallow reserved VLAN IDs with implementation-defined semantics.\n vlan_id != 0 && vlan_id != 4095\")"
}
params {
id: 1
Expand Down Expand Up @@ -1161,6 +1162,7 @@ actions {
name: "ingress.routing.set_multicast_group_id"
alias: "set_multicast_group_id"
annotations: "@unsupported"
annotations: "@action_restriction(\"\n // Disallow 0 since it encodes \'no multicast\' in V1Model.\n multicast_group_id != 0\")"
}
params {
id: 1
Expand Down
2 changes: 2 additions & 0 deletions sai_p4/instantiations/google/middleblock_with_s2_ecmp_profile.p4info.pb.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,6 +964,7 @@ actions {
name: "ingress.routing.set_port_and_src_mac_and_vlan_id"
alias: "set_port_and_src_mac_and_vlan_id"
annotations: "@unsupported"
annotations: "@action_restriction(\"\n // Disallow reserved VLAN IDs with implementation-defined semantics.\n vlan_id != 0 && vlan_id != 4095\")"
}
params {
id: 1
Expand Down Expand Up @@ -1241,6 +1242,7 @@ actions {
name: "ingress.routing.set_multicast_group_id"
alias: "set_multicast_group_id"
annotations: "@unsupported"
annotations: "@action_restriction(\"\n // Disallow 0 since it encodes \'no multicast\' in V1Model.\n multicast_group_id != 0\")"
}
params {
id: 1
Expand Down
4 changes: 4 additions & 0 deletions sai_p4/instantiations/google/test_tools/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ cc_library(
"//p4_pdpi:ir_cc_proto",
"//p4_pdpi:pd",
"//p4_pdpi:translation_options",
"//p4_pdpi/netaddr:ipv4_address",
"//p4_pdpi/netaddr:ipv6_address",
"//p4_pdpi/netaddr:mac_address",
"//p4_pdpi/string_encodings:hex_string",
"//sai_p4/instantiations/google:sai_pd_cc_proto",
Expand All @@ -57,6 +59,8 @@ cc_test(
"//gutil:testing",
"//p4_pdpi:ir_cc_proto",
"//p4_pdpi:pd",
"//p4_pdpi/netaddr:ipv4_address",
"//p4_pdpi/netaddr:ipv6_address",
"//p4_pdpi/netaddr:mac_address",
"//sai_p4/instantiations/google:instantiations",
"//sai_p4/instantiations/google:sai_p4info_cc",
Expand Down
32 changes: 32 additions & 0 deletions sai_p4/instantiations/google/test_tools/test_entries.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#include "p4/v1/p4runtime.pb.h"
#include "p4_pdpi/ir.h"
#include "p4_pdpi/ir.pb.h"
#include "p4_pdpi/netaddr/ipv4_address.h"
#include "p4_pdpi/netaddr/ipv6_address.h"
#include "p4_pdpi/netaddr/mac_address.h"
#include "p4_pdpi/pd.h"
#include "p4_pdpi/string_encodings/hex_string.h"
Expand Down Expand Up @@ -401,6 +403,36 @@ EntryBuilder& EntryBuilder::AddMulticastRouterInterfaceEntry(
return *this;
}

EntryBuilder& EntryBuilder::AddRouteForwardingIpv4PacketsToGivenMulticastGroup(
int multicast_group_id, absl::string_view vrf, netaddr::Ipv4Address& dst_ip,
int prefix_length) {
sai::Ipv4TableEntry& entry =
*entries_.add_entries()->mutable_ipv4_table_entry();
entry.mutable_match()->set_vrf_id(vrf);
auto* ipv4_dst = entry.mutable_match()->mutable_ipv4_dst();
ipv4_dst->set_value(dst_ip.ToString());
ipv4_dst->set_prefix_length(prefix_length);
entry.mutable_action()
->mutable_set_multicast_group_id()
->set_multicast_group_id(pdpi::BitsetToHexString<16>(multicast_group_id));
return *this;
}

EntryBuilder& EntryBuilder::AddRouteForwardingIpv6PacketsToGivenMulticastGroup(
int multicast_group_id, absl::string_view vrf, netaddr::Ipv6Address& dst_ip,
int prefix_length) {
sai::Ipv6TableEntry& entry =
*entries_.add_entries()->mutable_ipv6_table_entry();
entry.mutable_match()->set_vrf_id(vrf);
auto* ipv6_dst = entry.mutable_match()->mutable_ipv6_dst();
ipv6_dst->set_value(dst_ip.ToString());
ipv6_dst->set_prefix_length(prefix_length);
entry.mutable_action()
->mutable_set_multicast_group_id()
->set_multicast_group_id(pdpi::BitsetToHexString<16>(multicast_group_id));
return *this;
}

EntryBuilder& EntryBuilder::AddIngressAclDroppingAllPackets() {
*entries_.add_entries() = gutil::ParseProtoOrDie<sai::TableEntry>(R"pb(
acl_ingress_table_entry {
Expand Down
8 changes: 8 additions & 0 deletions sai_p4/instantiations/google/test_tools/test_entries.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
#include "absl/types/span.h"
#include "p4/v1/p4runtime.pb.h"
#include "p4_pdpi/ir.pb.h"
#include "p4_pdpi/netaddr/ipv4_address.h"
#include "p4_pdpi/netaddr/ipv6_address.h"
#include "p4_pdpi/netaddr/mac_address.h"
#include "sai_p4/instantiations/google/sai_pd.pb.h"

Expand Down Expand Up @@ -156,6 +158,12 @@ class EntryBuilder {
std::optional<absl::string_view> vlan_hexstr = std::nullopt);
EntryBuilder& AddDefaultRouteForwardingAllPacketsToGivenMulticastGroup(
int multicast_group_id, IpVersion ip_version, absl::string_view vrf);
EntryBuilder& AddRouteForwardingIpv4PacketsToGivenMulticastGroup(
int multicast_group_id, absl::string_view vrf,
netaddr::Ipv4Address& dst_ip, int prefix_length);
EntryBuilder& AddRouteForwardingIpv6PacketsToGivenMulticastGroup(
int multicast_group_id, absl::string_view vrf,
netaddr::Ipv6Address& dst_ip, int prefix_length);
EntryBuilder& AddPreIngressAclEntryAssigningVrfForGivenIpType(
absl::string_view vrf, IpVersion ip_version);
EntryBuilder& AddEntryDecappingAllIpInIpv6PacketsAndSettingVrf(
Expand Down
78 changes: 78 additions & 0 deletions sai_p4/instantiations/google/test_tools/test_entries_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
#include "p4_pdpi/netaddr/mac_address.h"
#include "p4/v1/p4runtime.pb.h"
#include "p4_pdpi/ir.pb.h"
#include "p4_pdpi/netaddr/ipv4_address.h"
#include "p4_pdpi/netaddr/ipv6_address.h"
#include "p4_pdpi/netaddr/mac_address.h"
#include "p4_pdpi/pd.h"
#include "sai_p4/instantiations/google/instantiations.h"
#include "sai_p4/instantiations/google/sai_p4info.h"
Expand Down Expand Up @@ -351,6 +354,81 @@ TEST(EntryBuilder, AddMulticastRouterInterfaceEntryAddsEntry) {
)pb"))));
}

TEST(EntryBuilder,
AddRouteForwardingIpv4PacketsToGivenMulticastGroupAddsEntry) {
pdpi::IrP4Info kIrP4Info = GetIrP4Info(Instantiation::kFabricBorderRouter);
ASSERT_OK_AND_ASSIGN(auto dst_ip,
netaddr::Ipv4Address::OfString("225.10.20.32"));
ASSERT_OK_AND_ASSIGN(
pdpi::IrEntities entities,
EntryBuilder()
.AddRouteForwardingIpv4PacketsToGivenMulticastGroup(
/*multicast_group_id=*/17, /*vrf=*/"vrf-1", dst_ip, 32)
.LogPdEntries()
.GetDedupedIrEntities(kIrP4Info, /*allow_unsupported=*/true));
EXPECT_THAT(entities.entities(), Contains(Partially(EqualsProto(R"pb(
table_entry {
table_name: "ipv4_table"
matches {
name: "vrf_id"
exact { str: "vrf-1" }
}
matches {
name: "ipv4_dst"
lpm {
value { ipv4: "225.10.20.32" }
prefix_length: 32
}
}
action {
name: "set_multicast_group_id"
params {
name: "multicast_group_id"
value { hex_str: "0x0011" }
}
}
}
)pb"))));
}

TEST(EntryBuilder,
AddRouteForwardingIpv6PacketsToGivenMulticastGroupAddsEntry) {
pdpi::IrP4Info kIrP4Info = GetIrP4Info(Instantiation::kFabricBorderRouter);
ASSERT_OK_AND_ASSIGN(auto dst_ip,
netaddr::Ipv6Address::OfString(
"ff00:8888:1111:2222:3333:4444:5555:6666"));
ASSERT_OK_AND_ASSIGN(
pdpi::IrEntities entities,
EntryBuilder()
.AddRouteForwardingIpv6PacketsToGivenMulticastGroup(
/*multicast_group_id=*/33, /*vrf=*/"vrf-2", dst_ip, 128)
.LogPdEntries()
.GetDedupedIrEntities(kIrP4Info, /*allow_unsupported=*/true));
EXPECT_THAT(entities.entities(), Contains(Partially(EqualsProto(R"pb(
table_entry {
table_name: "ipv6_table"
matches {
name: "vrf_id"
exact { str: "vrf-2" }
}
matches {
name: "ipv6_dst"
lpm {
value { ipv6: "ff00:8888:1111:2222:3333:4444:5555:6666" }
prefix_length: 128
}
}
action {
name: "set_multicast_group_id"
params {
name: "multicast_group_id"
value { hex_str: "0x0021" }
}
}
}
)pb"))));
}

TEST(EntryBuilder, AddIngressAclDroppingAllPacketsAddsEntry) {
pdpi::IrP4Info kIrP4Info = GetIrP4Info(Instantiation::kFabricBorderRouter);
ASSERT_OK_AND_ASSIGN(pdpi::IrEntities entities,
Expand Down
2 changes: 2 additions & 0 deletions sai_p4/instantiations/google/tor.p4info.pb.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1221,6 +1221,7 @@ actions {
name: "ingress.routing.set_port_and_src_mac_and_vlan_id"
alias: "set_port_and_src_mac_and_vlan_id"
annotations: "@unsupported"
annotations: "@action_restriction(\"\n // Disallow reserved VLAN IDs with implementation-defined semantics.\n vlan_id != 0 && vlan_id != 4095\")"
}
params {
id: 1
Expand Down Expand Up @@ -1474,6 +1475,7 @@ actions {
name: "ingress.routing.set_multicast_group_id"
alias: "set_multicast_group_id"
annotations: "@unsupported"
annotations: "@action_restriction(\"\n // Disallow 0 since it encodes \'no multicast\' in V1Model.\n multicast_group_id != 0\")"
}
params {
id: 1
Expand Down
2 changes: 2 additions & 0 deletions sai_p4/instantiations/google/unioned_p4info.pb.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,6 +1473,7 @@ actions {
name: "ingress.routing.set_port_and_src_mac_and_vlan_id"
alias: "set_port_and_src_mac_and_vlan_id"
annotations: "@unsupported"
annotations: "@action_restriction(\"\n // Disallow reserved VLAN IDs with implementation-defined semantics.\n vlan_id != 0 && vlan_id != 4095\")"
}
params {
id: 1
Expand Down Expand Up @@ -1726,6 +1727,7 @@ actions {
name: "ingress.routing.set_multicast_group_id"
alias: "set_multicast_group_id"
annotations: "@unsupported"
annotations: "@action_restriction(\"\n // Disallow 0 since it encodes \'no multicast\' in V1Model.\n multicast_group_id != 0\")"
}
params {
id: 1
Expand Down
Loading