RT-1.51: BGP multipath ECMP changes incorporated (openconfig#3571)

* RT-1.51: BGP multipath ECMP changes incorporated

Updated metadata.textproto

  Added deviation enable_multipath_under_afi_safi
  Removed deviation explicit_port_speed

Updated bgp_multipath_ecmp_test.go

  Added the vendor switch for Nokia, to skipped multipath configuration under peer-group.

"This code is a Contribution to the OpenConfig Feature Profiles project ("Work") made under the Google Software Grant and Corporate Contributor License Agreement ("CLA") and governed by the Apache License 2.0. No other rights or licenses in or to any of Nokia's intellectual property are granted for any other purpose. This code is provided on an "as is" basis without any warranties of any kind."

* Log & comment massage updated.

"This code is a Contribution to the OpenConfig Feature Profiles project ("Work") made under the Google Software Grant and Corporate Contributor License Agreement ("CLA") and governed by the Apache License 2.0. No other rights or licenses in or to any of Nokia's intellectual property are granted for any other purpose. This code is provided on an "as is" basis without any warranties of any kind."

feature/bgp/multipath/otg_tests/bgp_multipath_ecmp_test/bgp_multipath_ecmp_test.go

@@ -197,10 +197,15 @@ func TestBGPSetup(t *testing.T) {
 			dni := deviations.DefaultNetworkInstance(bs.DUT)
 			bgp := bs.DUTConf.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp()
 			gEBGP := bgp.GetOrCreateGlobal().GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateUseMultiplePaths().GetOrCreateEbgp()
-			pgUseMulitplePaths := bgp.GetOrCreatePeerGroup(cfgplugins.BGPPeerGroup1).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateUseMultiplePaths()
 			if tc.enableMultipath {
 				t.Logf("Enable Multipath")
-				pgUseMulitplePaths.Enabled = ygot.Bool(true)
+				switch bs.DUT.Vendor() {
+				case ondatra.NOKIA:
+					//BGP multipath enable/disable at the peer-group level not required b/376799583
+					t.Logf("BGP Multipath enable/disable not required under Peer-group by %s hence skipping", bs.DUT.Vendor())
+				default:
+					bgp.GetOrCreatePeerGroup(cfgplugins.BGPPeerGroup1).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateUseMultiplePaths().Enabled = ygot.Bool(true)
+				}
 				t.Logf("Enable Maximum Paths")
 				if deviations.EnableMultipathUnderAfiSafi(bs.DUT) {
 					gEBGP.MaximumPaths = ygot.Uint32(maxPaths)

feature/bgp/multipath/otg_tests/bgp_multipath_ecmp_test/metadata.textproto

@@ -29,7 +29,7 @@ platform_exceptions: {
     vendor: NOKIA
   }
   deviations: {
-    explicit_port_speed: true
+    enable_multipath_under_afi_safi: true
     explicit_interface_in_default_vrf: true
     interface_enabled: true
   }