-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Dvaas] Compare ports of dvaas::Packet during comparison in CompareSw…
…itchOutputs. (#753) Co-authored-by: kheradmandG <[email protected]> Co-authored-by: kishanps <[email protected]>
- Loading branch information
3 people
authored
Nov 25, 2024
1 parent
d62a47c
commit b41d1bc
Showing
4 changed files
with
197 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| #include "dvaas/test_run_validation.h" | ||
|
|
||
| #include "dvaas/test_vector.pb.h" | ||
| #include "gmock/gmock.h" | ||
| #include "google/protobuf/descriptor.h" | ||
| #include "gtest/gtest.h" | ||
| #include "gutil/proto_matchers.h" | ||
| #include "gutil/testing.h" | ||
| #include "p4_pdpi/packetlib/packetlib.pb.h" | ||
|
|
||
| namespace dvaas { | ||
| namespace { | ||
|
|
||
| using gutil::EqualsProto; | ||
| using testing::HasSubstr; | ||
|
|
||
| TEST(TestRunValidationTest, | ||
| PacketFieldIsIgnoredIfAndOnlyIfIncludedInIgnoredPacketlibFields) { | ||
| const PacketTestRun test_run = gutil::ParseProtoOrDie<PacketTestRun>(R"pb( | ||
| test_vector { | ||
| acceptable_outputs { | ||
| packets { | ||
| port: "1" | ||
| parsed { headers { ethernet_header { ethertype: "0x0888" } } } | ||
| } | ||
| } | ||
| } | ||
| actual_output { | ||
| packets { | ||
| port: "1" | ||
| parsed { headers { ethernet_header { ethertype: "0x0111" } } } | ||
| } | ||
| } | ||
| )pb"); | ||
|
|
||
| // Without ignoring ethertype, validation must fail. | ||
| ASSERT_THAT(ValidateTestRun(test_run).failure().description(), | ||
| HasSubstr("modified:")); | ||
|
|
||
| const google::protobuf::FieldDescriptor* ethertype_field_descriptor = | ||
| packetlib::EthernetHeader::descriptor()->FindFieldByName("ethertype"); | ||
| ASSERT_THAT(ethertype_field_descriptor, testing::NotNull()); | ||
|
|
||
| // Ignoring ethertype, validation must succeed. | ||
| ASSERT_THAT(ValidateTestRun( | ||
| test_run, | ||
| { | ||
| .ignored_packetlib_fields = {ethertype_field_descriptor}, | ||
| }), | ||
| EqualsProto(R"pb()pb")); | ||
| } | ||
|
|
||
| TEST(TestRunValidationTest, | ||
| PacketInFieldIsIgnoredIfAndOnlyIfIncludedInIgnoredPacketlibFields) { | ||
| const PacketTestRun test_run = gutil::ParseProtoOrDie<PacketTestRun>(R"pb( | ||
| test_vector { | ||
| acceptable_outputs { | ||
| packet_ins { | ||
| parsed { headers { ethernet_header { ethertype: "0x0888" } } } | ||
| } | ||
| } | ||
| } | ||
| actual_output { | ||
| packet_ins { | ||
| parsed { headers { ethernet_header { ethertype: "0x0111" } } } | ||
| } | ||
| } | ||
| )pb"); | ||
|
|
||
| // Without ignoring ethertype, validation must fail. | ||
| ASSERT_THAT(ValidateTestRun(test_run).failure().description(), | ||
| HasSubstr("modified:")); | ||
|
|
||
| const google::protobuf::FieldDescriptor* ethertype_field_descriptor = | ||
| packetlib::EthernetHeader::descriptor()->FindFieldByName("ethertype"); | ||
| ASSERT_THAT(ethertype_field_descriptor, testing::NotNull()); | ||
|
|
||
| // Ignoring ethertype, validation must succeed. | ||
| ASSERT_THAT(ValidateTestRun( | ||
| test_run, | ||
| { | ||
| .ignored_packetlib_fields = {ethertype_field_descriptor}, | ||
| }), | ||
| EqualsProto(R"pb()pb")); | ||
| } | ||
|
|
||
| TEST(TestRunValidationTest, | ||
| PacketInMetadataIsIgnoredIfAndOnlyIfIncludedInIgnoredPacketinMetadata) { | ||
| const PacketTestRun test_run = gutil::ParseProtoOrDie<PacketTestRun>(R"pb( | ||
| test_vector { | ||
| acceptable_outputs { | ||
| packet_ins { | ||
| metadata { | ||
| name: "target_egress_port" | ||
| value { str: "1" } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| actual_output { | ||
| packet_ins { | ||
| metadata { | ||
| name: "target_egress_port" | ||
| value { str: "2" } | ||
| } | ||
| } | ||
| } | ||
| )pb"); | ||
|
|
||
| // Without ignoring target_egress_port, validation must fail. | ||
| ASSERT_THAT(ValidateTestRun(test_run).failure().description(), | ||
| HasSubstr("modified:")); | ||
|
|
||
| // Ignoring target_egress_port, validation must succeed. | ||
| ASSERT_THAT( | ||
| ValidateTestRun(test_run, | ||
| { | ||
| .ignored_packet_in_metadata = {"target_egress_port"}, | ||
| }), | ||
| EqualsProto(R"pb()pb")); | ||
| } | ||
|
|
||
| TEST(TestRunValidationTest, | ||
| DifferenceBetweenPortsInActualAndAcceptableOutputLeadToFailure) { | ||
| // Without ignoring target_egress_port, validation must fail. | ||
| ASSERT_THAT(ValidateTestRun(gutil::ParseProtoOrDie<PacketTestRun>(R"pb( | ||
| test_vector { acceptable_outputs { packets { port: "1" } } } | ||
| actual_output { packets { port: "2" } } | ||
| )pb")) | ||
| .failure() | ||
| .description(), | ||
| HasSubstr("mismatched ports:")); | ||
| } | ||
|
|
||
| } // namespace | ||
| } // namespace dvaas |