From 5578c9371f2dad5c119f4b0442df272c64a1d74e Mon Sep 17 00:00:00 2001 From: manan-patel Date: Mon, 9 Dec 2024 11:19:25 -0500 Subject: [PATCH 1/2] TE-16.1 TTL deviation removed --- .../gribi/otg_tests/basic_encap_test/basic_encap_test.go | 8 +++----- .../gribi/otg_tests/basic_encap_test/metadata.textproto | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/feature/gribi/otg_tests/basic_encap_test/basic_encap_test.go b/feature/gribi/otg_tests/basic_encap_test/basic_encap_test.go index a864237ba74..9189dae6b57 100644 --- a/feature/gribi/otg_tests/basic_encap_test/basic_encap_test.go +++ b/feature/gribi/otg_tests/basic_encap_test/basic_encap_test.go @@ -1058,11 +1058,9 @@ func validatePacketCapture(t *testing.T, args *testArgs, otgPortNames []string, t.Errorf("Dscp value mismatch, got %d, want %d", got, pa.dscp) break } - if !deviations.TTLCopyUnsupported(args.dut) { - if got := uint32(v4Packet.TTL); got != pa.ttl { - t.Errorf("TTL mismatch, got: %d, want: %d", got, pa.ttl) - break - } + if got := uint32(v4Packet.TTL); got != pa.ttl { + t.Errorf("TTL mismatch, got: %d, want: %d", got, pa.ttl) + break } if v4Packet.DstIP.String() == tunnelDstIP1 { tunnel1Pkts++ diff --git a/feature/gribi/otg_tests/basic_encap_test/metadata.textproto b/feature/gribi/otg_tests/basic_encap_test/metadata.textproto index 26ca7986368..3cbd8aef0f7 100644 --- a/feature/gribi/otg_tests/basic_encap_test/metadata.textproto +++ b/feature/gribi/otg_tests/basic_encap_test/metadata.textproto @@ -13,7 +13,6 @@ platform_exceptions: { ipv4_missing_enabled: true gribi_mac_override_with_static_arp: true interface_ref_interface_id_format: true - ttl_copy_unsupported: true pf_require_match_default_rule: true pf_require_sequential_order_pbr_rules: true } From 0281d0245b9d22a9b274c4856ef2e300dfdb3e65 Mon Sep 17 00:00:00 2001 From: manan-patel Date: Mon, 9 Dec 2024 12:26:48 -0500 Subject: [PATCH 2/2] removed deviation only for cisco --- .../gribi/otg_tests/basic_encap_test/basic_encap_test.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/feature/gribi/otg_tests/basic_encap_test/basic_encap_test.go b/feature/gribi/otg_tests/basic_encap_test/basic_encap_test.go index 9189dae6b57..a864237ba74 100644 --- a/feature/gribi/otg_tests/basic_encap_test/basic_encap_test.go +++ b/feature/gribi/otg_tests/basic_encap_test/basic_encap_test.go @@ -1058,9 +1058,11 @@ func validatePacketCapture(t *testing.T, args *testArgs, otgPortNames []string, t.Errorf("Dscp value mismatch, got %d, want %d", got, pa.dscp) break } - if got := uint32(v4Packet.TTL); got != pa.ttl { - t.Errorf("TTL mismatch, got: %d, want: %d", got, pa.ttl) - break + if !deviations.TTLCopyUnsupported(args.dut) { + if got := uint32(v4Packet.TTL); got != pa.ttl { + t.Errorf("TTL mismatch, got: %d, want: %d", got, pa.ttl) + break + } } if v4Packet.DstIP.String() == tunnelDstIP1 { tunnel1Pkts++