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

Add function ActionSchemaByNameAndObjectType to allow different ActionSchema formats. #909

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add function ActionSchemaByNameAndObjectType to allow different ActionSchema formats. #909

Show file tree
Hide file tree
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
27 changes: 27 additions & 0 deletions common/saiaclschema.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,5 +328,32 @@ const ActionSchema &ActionSchemaByName(const std::string &action_name)
return lookup->second;
}

const ActionSchema& ActionSchemaByNameAndObjectType(
const std::string& action_name, const std::string& object_type) {
static const auto* const kRedirectObjectTypes =
new std::unordered_map<std::string, ActionSchema>({
{"SAI_OBJECT_TYPE_IPMC_GROUP",
{.format = Format::kHexString, .bitwidth = 16}},
{"SAI_OBJECT_TYPE_L2MC_GROUP",
{.format = Format::kHexString, .bitwidth = 16}},
// SAI_OBJECT_TYPE_BRIDGE_PORT
// SAI_OBJECT_TYPE_LAG
// SAI_OBJECT_TYPE_NEXT_HOP
// SAI_OBJECT_TYPE_NEXT_HOP_GROUP
// SAI_OBJECT_TYPE_PORT
// SAI_OBJECT_TYPE_SYSTEM_PORT
});

if (action_name == "SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT") {
auto lookup = kRedirectObjectTypes->find(object_type);
if (lookup != kRedirectObjectTypes->end()) {
return lookup->second;
}
}
// If we haven't defined the object type, fall through to the default
// SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT format.
return ActionSchemaByName(action_name);
}

} // namespace acl
} // namespace swss
4 changes: 4 additions & 0 deletions common/saiaclschema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ const MatchFieldSchema &MatchFieldSchemaByName(const std::string &match_field_na
// Throws std::invalid_argument for unknown actions and actions without schemas.
const ActionSchema &ActionSchemaByName(const std::string &action_name);

// Allow further format differentiation based on a SAI object type.
const ActionSchema& ActionSchemaByNameAndObjectType(
const std::string& action_name, const std::string& object_type);

} // namespace acl
} // namespace swss

Expand Down
36 changes: 36 additions & 0 deletions tests/saiaclschema_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,37 @@ TEST(SaiAclSchemaTest, ActionSchemaByNameSucceeds)
AllOf(Field(&ActionSchema::format, Format::kHexString), Field(&ActionSchema::bitwidth, 12)));
}

TEST(SaiAclSchemaTest, ActionSchemaByNameAndObjectTypeSucceeds) {
EXPECT_THAT(
ActionSchemaByNameAndObjectType("SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT",
"SAI_OBJECT_TYPE_IPMC_GROUP"),
AllOf(Field(&ActionSchema::format, Format::kHexString),
Field(&ActionSchema::bitwidth, 16)));
EXPECT_THAT(
ActionSchemaByNameAndObjectType("SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT",
"SAI_OBJECT_TYPE_L2MC_GROUP"),
AllOf(Field(&ActionSchema::format, Format::kHexString),
Field(&ActionSchema::bitwidth, 16)));
EXPECT_THAT(
ActionSchemaByNameAndObjectType("SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT",
"SAI_OBJECT_TYPE_NEXT_HOP"),
AllOf(Field(&ActionSchema::format, Format::kString),
Field(&ActionSchema::bitwidth, 0)));
EXPECT_THAT(ActionSchemaByNameAndObjectType(
"SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT", "SAI_OBJECT_TYPE_PORT"),
AllOf(Field(&ActionSchema::format, Format::kString),
Field(&ActionSchema::bitwidth, 0)));
}

TEST(SaiAclSchemaTest,
ActionSchemaByNameAndObjectTypeWithNonRedirectActionSucceeds) {
EXPECT_THAT(
ActionSchemaByNameAndObjectType("SAI_ACL_ENTRY_ATTR_ACTION_DECREMENT_TTL",
"SAI_OBJECT_TYPE_UNKNOWN"),
AllOf(Field(&ActionSchema::format, Format::kHexString),
Field(&ActionSchema::bitwidth, 1)));
}

// Invalid Lookup Tests

TEST(SaiAclSchemaTest, InvalidFormatNameThrowsException)
Expand All @@ -82,6 +113,11 @@ TEST(SaiAclSchemaTest, InvalidActionNameThrowsException)
EXPECT_THROW(ActionSchemaByName("Foo"), std::invalid_argument);
}

TEST(SaiAclSchemaTest, InvalidActionNameAndObjectTypeThrowsException) {
EXPECT_THROW(ActionSchemaByNameAndObjectType("Foo", "unknown"),
std::invalid_argument);
}

} // namespace
} // namespace acl
} // namespace swss
Loading