OTG Test Update - RT 6.1 - LLDP neighbor verification change

feature/lldp/otg_tests/core_lldp_tlv_population_test/core_lldp_tlv_population_test.go

@@ -36,6 +36,12 @@ import (
 	gpb "github.com/openconfig/gnmi/proto/gnmi"
 )
 
+type stateParams struct {
+	systemName    string
+	chassisId     string
+	chassisIdType oc.E_Lldp_ChassisIdType
+}
+
 type lldpTestParameters struct {
 	systemName string
 	macAddress string
@@ -44,10 +50,10 @@ type lldpTestParameters struct {
 
 type lldpNeighbors struct {
 	systemName    string
-	portId        string
-	portIdType    otgtelemetry.E_LldpNeighbor_PortIdType
 	chassisId     string
 	chassisIdType otgtelemetry.E_LldpNeighbor_ChassisIdType
+	portId        string
+	portIdType    otgtelemetry.E_LldpNeighbor_PortIdType
 }
 
 const (
@@ -82,7 +88,7 @@ func TestLLDPEnabled(t *testing.T) {
 	dut, dutConf := configureDUT(t, "dut", lldpEnabled)
 	disableP4RTLLDP(t, dut)
 	dutPort := dut.Port(t, portName)
-	verifyNodeConfig(t, dut, dutPort, dutConf, lldpEnabled)
+	stateValues := verifyNodeConfig(t, dut, dutPort, dutConf, lldpEnabled)
 
 	// ATE Configuration.
 	t.Log("Configure ATE.")
@@ -102,11 +108,11 @@ func TestLLDPEnabled(t *testing.T) {
 	verifyDUTTelemetry(t, dut, dutPort, dutConf, dutPeerState)
 
 	expOtgLLDPNeighbor := lldpNeighbors{
-		systemName:    dutConf.GetSystemName(),
-		portId:        dutPort.Name(),
+		systemName:    stateValues.systemName,
+		chassisId:     strings.ToUpper(stateValues.chassisId),
+		chassisIdType: otgtelemetry.E_LldpNeighbor_ChassisIdType(stateValues.chassisIdType),
+		portId:        dut.Port(t, portName).Name(),
 		portIdType:    otgtelemetry.LldpNeighbor_PortIdType_INTERFACE_NAME,
-		chassisId:     strings.ToUpper(dutConf.GetChassisId()),
-		chassisIdType: otgtelemetry.E_LldpNeighbor_ChassisIdType(dutConf.GetChassisIdType()),
 	}
 	checkOTGLLDPNeighbor(t, otg, otgConfig, expOtgLLDPNeighbor)
 
@@ -179,27 +185,21 @@ func configureATE(t *testing.T, otg *otg.OTG) gosnappi.Config {
 }
 
 // verifyNodeConfig verifies the config by comparing against the telemetry state object.
-func verifyNodeConfig(t *testing.T, node gnmi.DeviceOrOpts, port *ondatra.Port, conf *oc.Lldp, lldpEnabled bool) {
+func verifyNodeConfig(t *testing.T, node gnmi.DeviceOrOpts, port *ondatra.Port, conf *oc.Lldp, lldpEnabled bool) stateParams {
 	statePath := gnmi.OC().Lldp()
 	state := gnmi.Get(t, node, statePath.State())
 	fptest.LogQuery(t, "Node LLDP", statePath.State(), state)
 
 	if lldpEnabled != state.GetEnabled() {
 		t.Errorf("LLDP enabled got: %t, want: %t.", state.GetEnabled(), lldpEnabled)
 	}
-	if state.GetChassisId() != "" {
-		t.Logf("LLDP ChassisId got: %s", state.GetChassisId())
-	} else {
+	if state.GetChassisId() == "" {
 		t.Errorf("LLDP chassisID is not proper, got %s", state.GetChassisId())
 	}
-	if state.GetChassisIdType() != 0 {
-		t.Logf("LLDP ChassisIdType got: %s", state.GetChassisIdType())
-	} else {
+	if state.GetChassisIdType() == 0 {
 		t.Errorf("LLDP chassisIdType is not proper, got %s", state.GetChassisIdType())
 	}
-	if state.GetSystemName() != "" {
-		t.Logf("LLDP SystemName got: %s", state.GetSystemName())
-	} else {
+	if state.GetSystemName() == "" {
 		t.Errorf("LLDP SystemName is not proper, got %s", state.GetSystemName())
 	}
 
@@ -209,6 +209,7 @@ func verifyNodeConfig(t *testing.T, node gnmi.DeviceOrOpts, port *ondatra.Port,
 	if lldpEnabled && got != want {
 		t.Errorf("LLDP interfaces/interface/state/name = %s, want %s", got, want)
 	}
+	return stateParams{state.GetSystemName(), state.GetChassisId(), state.GetChassisIdType()}
 }
 
 // checkLLDPMetricsOTG verifies OTG side lldp Metrics values based on DUT side lldp is enabled or not
@@ -224,7 +225,8 @@ func checkLLDPMetricsOTG(t *testing.T, otg *otg.OTG, c gosnappi.Config, lldpEnab
 		}
 		framesIn, _ := gnmi.Watch(t, otg, gnmi.OTG().LldpInterface(lldp.Name()).Counters().FrameIn().State(), time.Minute, func(v *ygnmi.Value[uint64]) bool {
 			time.Sleep(1 * time.Second)
-			return v.IsPresent()
+			rxFrames, ok := v.Val()
+			return ok && rxFrames > 0
 		}).Await(t)
 		otgutils.LogLLDPMetrics(t, otg, c)
 		if lldpEnabled {
@@ -289,18 +291,17 @@ func verifyDUTTelemetry(t *testing.T, dut *ondatra.DUTDevice, nodePort *ondatra.
 	wantNbrState := &oc.Lldp_Interface_Neighbor{
 		ChassisId:     &dutPeerState.chassisId,
 		ChassisIdType: oc.E_Lldp_ChassisIdType(dutPeerState.chassisIdType),
+		SystemName:    &dutPeerState.systemName,
 		PortId:        &dutPeerState.portId,
 		PortIdType:    oc.E_Lldp_PortIdType(dutPeerState.portIdType),
-		SystemName:    &dutPeerState.systemName,
 	}
 	confirm.State(t, wantNbrState, gotNbrState)
 }
 
 func (expLldpNeighbor *lldpNeighbors) Equal(neighbour *otgtelemetry.LldpInterface_LldpNeighborDatabase_LldpNeighbor) bool {
+
 	return neighbour.GetChassisId() == expLldpNeighbor.chassisId &&
 		neighbour.GetChassisIdType() == expLldpNeighbor.chassisIdType &&
-		neighbour.GetPortId() == expLldpNeighbor.portId &&
-		neighbour.GetPortIdType() == expLldpNeighbor.portIdType &&
 		neighbour.GetSystemName() == expLldpNeighbor.systemName
 }