RT-5.6 interface_loopback_aggregate_test.go : Added deviation (openco…

…nfig#2304) * Added deviation for configuring loopback on aggregated link * Resolving conflicts * Resolved conflicts --------- Co-authored-by: Arul Kumar Sekar <[email protected]>
nokia · Nov 14, 2023 · 00d2c37 · 00d2c37
1 parent e0bea24
commit 00d2c37
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 37 deletions.
diff --git a/...ack_aggregate/otg_tests/interface_loopback_aggregate/interface_loopback_aggregate_test.go b/...ack_aggregate/otg_tests/interface_loopback_aggregate/interface_loopback_aggregate_test.go
@@ -267,7 +267,11 @@ func TestInterfaceLoopbackMode(t *testing.T) {
 				t.Errorf("Failed to update interface loopback mode")
 			}
 		} else {
-			gnmi.Update(t, dut, gnmi.OC().Interface(dutPort1.Name()).LoopbackMode().Config(), oc.Interfaces_LoopbackModeType_FACILITY)
+			if deviations.MemberLinkLoopbackUnsupported(dut) {
+				gnmi.Update(t, dut, gnmi.OC().Interface(aggID).LoopbackMode().Config(), oc.Interfaces_LoopbackModeType_FACILITY)
+			} else {
+				gnmi.Update(t, dut, gnmi.OC().Interface(dutPort1.Name()).LoopbackMode().Config(), oc.Interfaces_LoopbackModeType_FACILITY)
+			}
 		}
 	})
 

diff --git a/...ce/interface_loopback_aggregate/otg_tests/interface_loopback_aggregate/metadata.textproto b/...ce/interface_loopback_aggregate/otg_tests/interface_loopback_aggregate/metadata.textproto
@@ -21,6 +21,14 @@ platform_exceptions: {
     interface_loopback_mode_raw_gnmi: true
   }
 }
+platform_exceptions: {
+  platform: {
+    vendor: JUNIPER
+  }
+  deviations: {
+    member_link_loopback_unsupported: true
+  }
+}
 platform_exceptions: {
   platform: {
     vendor: NOKIA

diff --git a/internal/deviations/deviations.go b/internal/deviations/deviations.go
@@ -679,3 +679,9 @@ func InterfaceRefInterfaceIdFormat(dut *ondatra.DUTDevice) bool {
 func ISISLevelEnabled(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetIsisLevelEnabled()
 }
+
+// MemberLinkLoopbackUnsupported returns true for devices that require configuring
+// loopback on aggregated links instead of member links.
+func MemberLinkLoopbackUnsupported(dut *ondatra.DUTDevice) bool {
+	return lookupDUTDeviations(dut).GetMemberLinkLoopbackUnsupported()
+}
diff --git a/proto/metadata.proto b/proto/metadata.proto
@@ -355,12 +355,16 @@ message Metadata {
     // Cisco: Device does not support set weight config under QOS ECN configuration.
     bool qos_set_weight_config_unsupported = 121;
     // Cisco: Device does not support these get state path.
-    bool qos_get_state_path_unsupported = 122; 
+    bool qos_get_state_path_unsupported = 122;
     // Devices requires enabled leaf under isis level
     // Juniper: partnerissuetracker.corp.google.com/302661486
     bool isis_level_enabled = 123;
     // Devices which require to use interface-id format of interface name + .subinterface index with Interface-ref container
     bool interface_ref_interface_id_format = 124;   
+    // Devices does not support member link loopback
+    // Juniper: b/307763669
+    bool member_link_loopback_unsupported = 125;
+
     // Reserved field numbers and identifiers.
     reserved 84, 9, 28, 20, 90, 97;
   }

diff --git a/proto/metadata_go_proto/metadata.pb.go b/proto/metadata_go_proto/metadata.pb.go