Add UnreferencedAftFibAckUnsupported deviation

feature/gribi/otg_tests/gribigo_compliance_test/gribigo_compliance_test.go

@@ -105,7 +105,7 @@ var moreSkipReasons = map[string]string{
 	"Election - Ensure that a client with mismatched parameters is rejected": "b/233111738",
 }
 
-func shouldSkip(tt *compliance.TestSpec) string {
+func shouldSkip(tt *compliance.TestSpec, dut *ondatra.DUTDevice) string {
 	switch {
 	case *skipFIBACK && tt.In.RequiresFIBACK:
 		return "This RequiresFIBACK test is skipped by --skip_fiback"
@@ -122,6 +122,11 @@ func shouldSkip(tt *compliance.TestSpec) string {
 	case *skipIPv6 && tt.In.RequiresIPv6:
 		return "This RequiresIPv6 test is skipped by --skip_ipv6"
 	}
+	if (tt.In.ShortName == "Error: Missing NextHopGroup for the IPv4Entry" ||
+		tt.In.ShortName == "Error: Empty NextHopGroup for the IPv4Entry") &&
+		deviations.UnreferencedAftFibAckUnsupported(dut) {
+		return "This test is skipped by unreferenced_aft_fiback_unsupported deviation"
+	}
 	return moreSkipReasons[tt.In.ShortName]
 }
 
@@ -152,7 +157,7 @@ func TestCompliance(t *testing.T) {
 
 	for _, tt := range compliance.TestSuite {
 		t.Run(tt.In.ShortName, func(t *testing.T) {
-			if reason := shouldSkip(tt); reason != "" {
+			if reason := shouldSkip(tt, dut); reason != "" {
 				t.Skip(reason)
 			}
 			compliance.SetDefaultNetworkInstanceName(deviations.DefaultNetworkInstance(dut))

feature/gribi/otg_tests/gribigo_compliance_test/metadata.textproto

@@ -30,5 +30,6 @@ platform_exceptions: {
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"
+    unreferenced_aft_fib_ack_unsupported: true
   }
 }

internal/deviations/deviations.go

@@ -1352,3 +1352,8 @@ func BgpDistanceOcPathUnsupported(dut *ondatra.DUTDevice) bool {
 func IsisMplsUnsupported(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetIsisMplsUnsupported()
 }
+
+// UnreferencedAftFibAckUnsupported returns true if no FIB_ACK for unreferenced NH/NHG entries
+func UnreferencedAftFibAckUnsupported(dut *ondatra.DUTDevice) bool {
+	return lookupDUTDeviations(dut).GetUnreferencedAftFibAckUnsupported()
+}

proto/metadata.proto

@@ -743,6 +743,9 @@ message Metadata {
     // Devices that do not support ISIS MPLS
     bool isis_mpls_unsupported = 268;
 
+    // No FIB_ACK support for unreferenced NH/NHG entries
+    bool unreferenced_aft_fib_ack_unsupported = 269;
+
     // Reserved field numbers and identifiers.
     reserved 84, 9, 28, 20, 38, 43, 90, 97, 55, 89, 19, 36, 35, 40, 113, 131, 141, 173, 234, 254;
   }