Merge branch 'main' into main

openconfig · Oct 30, 2024 · b9179a8 · b9179a8
2 parents 7703ccc + 0e5657a
commit b9179a8
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 43 deletions.
diff --git a/feature/bgp/admin_distance/otg_tests/admin_distance_test/admin_distance_test.go b/feature/bgp/admin_distance/otg_tests/admin_distance_test/admin_distance_test.go
@@ -154,6 +154,8 @@ func TestAdminDistance(t *testing.T) {
 				otgutils.WaitForARP(t, ts.ATE.OTG(), ts.ATETop, "IPv4")
 				otgutils.WaitForARP(t, ts.ATE.OTG(), ts.ATETop, "IPv6")
 
+				// b/374639328 #3 30 sec delay added for bgp and isis to come up
+				time.Sleep(30 * time.Second)
 				ts.ATE.OTG().StartTraffic(t)
 				// added 30 seconds for sleep for traffic flow
 				time.Sleep(30 * time.Second)

diff --git a/feature/bgp/multipath/otg_tests/bgp_multipath_ecmp_test/bgp_multipath_ecmp_test.go b/feature/bgp/multipath/otg_tests/bgp_multipath_ecmp_test/bgp_multipath_ecmp_test.go
@@ -201,7 +201,11 @@ func TestBGPSetup(t *testing.T) {
 				t.Logf("Enable Multipath")
 				pgUseMulitplePaths.Enabled = ygot.Bool(true)
 				t.Logf("Enable Maximum Paths")
-				bgp.GetOrCreateGlobal().GetOrCreateUseMultiplePaths().GetOrCreateEbgp().MaximumPaths = ygot.Uint32(maxPaths)
+				if deviations.EnableMultipathUnderAfiSafi(bs.DUT) {
+					gEBGP.MaximumPaths = ygot.Uint32(maxPaths)
+				} else {
+					bgp.GetOrCreateGlobal().GetOrCreateUseMultiplePaths().GetOrCreateEbgp().MaximumPaths = ygot.Uint32(maxPaths)
+				}
 			}
 			if tc.enableMultiAS && !deviations.SkipSettingAllowMultipleAS(bs.DUT) && deviations.SkipAfiSafiPathForBgpMultipleAs(bs.DUT) {
 				t.Logf("Enable MultiAS ")

diff --git a/feature/bgp/multipath/otg_tests/bgp_multipath_ecmp_test/metadata.textproto b/feature/bgp/multipath/otg_tests/bgp_multipath_ecmp_test/metadata.textproto
@@ -13,6 +13,7 @@ platform_exceptions: {
     ipv4_missing_enabled: true
     skip_setting_allow_multiple_as: true
     skip_afi_safi_path_for_bgp_multiple_as: true
+    enable_multipath_under_afi_safi: true
   }
 }
 platform_exceptions: {
@@ -47,4 +48,4 @@ platform_exceptions: {
     skip_setting_allow_multiple_as: true
   }
 }
-tags: TAGS_DATACENTER_EDGE
+tags: TAGS_DATACENTER_EDGE
diff --git a/internal/deviations/deviations.go b/internal/deviations/deviations.go
@@ -1196,3 +1196,8 @@ func OperationalModeUnsupported(dut *ondatra.DUTDevice) bool {
 func BgpSessionStateIdleInPassiveMode(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetBgpSessionStateIdleInPassiveMode()
 }
+
+// EnableMultipathUnderAfiSafi returns true for devices that do not support multipath under /global path and instead support under global/afi/safi path.
+func EnableMultipathUnderAfiSafi(dut *ondatra.DUTDevice) bool {
+	return lookupDUTDeviations(dut).GetEnableMultipathUnderAfiSafi()
+}
diff --git a/proto/metadata.proto b/proto/metadata.proto
@@ -637,6 +637,10 @@ message Metadata {
     // Cisco: b/376021545
     bool bgp_session_state_idle_in_passive_mode = 229;
 
+    // EnableMultipathUnderAfiSafi returns true for devices that do not support multipath under /global path and instead support under global/afi/safi path
+    // CISCO: b/376241033
+    // CISCO: b/340859662
+    bool enable_multipath_under_afi_safi = 230;
     // Reserved field numbers and identifiers.
     reserved 84, 9, 28, 20, 90, 97, 55, 89, 19, 36, 35, 40, 173;
   }

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