fix bgp_session_mode_configuration (#3544)

openconfig · Oct 28, 2024 · 9c7dcd4 · 9c7dcd4
1 parent d339f86
commit 9c7dcd4
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/...mode/otg_tests/bgp_session_mode_configuration_test/bgp_session_mode_configuration_test.go b/...mode/otg_tests/bgp_session_mode_configuration_test/bgp_session_mode_configuration_test.go
@@ -105,18 +105,24 @@ func bgpCreateNbr(bgpParams *bgpTestParams, dut *ondatra.DUTDevice) *oc.NetworkI
 	global := bgp.GetOrCreateGlobal()
 	global.As = ygot.Uint32(bgpParams.localAS)
 	global.RouterId = ygot.String(dutAttrs.IPv4)
+	global.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(true)
 
 	// Note: we have to define the peer group even if we aren't setting any policy because it's
 	// invalid OC for the neighbor to be part of a peer group that doesn't exist.
 	pg := bgp.GetOrCreatePeerGroup(peerGrpName)
 	pg.PeerAs = ygot.Uint32(dutAS)
 	pg.PeerGroupName = ygot.String(peerGrpName)
+	pgT := pg.GetOrCreateTransport()
+	pgT.LocalAddress = ygot.String(dutAttrs.IPv4)
+	pg.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(true)
 
 	nv4 := bgp.GetOrCreateNeighbor(ateAttrs.IPv4)
 	nv4.PeerGroup = ygot.String(peerGrpName)
 	nv4.PeerAs = ygot.Uint32(ateAS)
 	nv4.Enabled = ygot.Bool(true)
-
+	nv4.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(true)
+	nv4T := nv4.GetOrCreateTransport()
+	nv4T.LocalAddress = ygot.String(dutAttrs.IPv4)
 	nv4.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(true)
 
 	switch bgpParams.transportMode {
@@ -174,6 +180,9 @@ func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice, wantState oc.E_Bgp
 
 	nbrTransMode := gnmi.Get(t, dut, nbrPath.Transport().State())
 	pgTransMode := gnmi.Get(t, dut, statePath.PeerGroup(peerGrpName).Transport().State())
+	t.Logf("Neighbor level passive mode is set to %v on DUT", nbrTransMode.GetPassiveMode())
+	t.Logf("Peer group level passive mode is set to %v on DUT", pgTransMode.GetPassiveMode())
+
 	// Check transport mode telemetry.
 	switch transMode {
 	case nbrLvlPassive:
@@ -223,9 +232,11 @@ func configureATE(t *testing.T, ateParams *bgpTestParams) gosnappi.Config {
 
 	switch ateParams.transportMode {
 	case nbrLvlPassive:
+		peerBGP.Advanced().SetPassiveMode(true)
 	case peerLvlPassive:
 		peerBGP.Advanced().SetPassiveMode(true)
 	case peerLvlActive:
+		peerBGP.Advanced().SetPassiveMode(false)
 	case nbrLvlActive:
 		peerBGP.Advanced().SetPassiveMode(false)
 	}
@@ -234,7 +245,7 @@ func configureATE(t *testing.T, ateParams *bgpTestParams) gosnappi.Config {
 }
 
 func verifyOTGBGPTelemetry(t *testing.T, otg *otg.OTG, c gosnappi.Config) {
-	//nbrPath := gnmi.OTG().BgpPeer("ateSrc.BGP4.peer")
+	// nbrPath := gnmi.OTG().BgpPeer("ateSrc.BGP4.peer")
 	t.Log("OTG telemetry does not support checking transport mode.")
 }