Commit fa433e75 authored by Simon Pastor's avatar Simon Pastor
Browse files

pr review

parent a0eb351c

go-apps/meep-rnis/sbi/rnis-sbi.go

+27 −33
Original line number Diff line number Diff line
@@ -366,10 +366,7 @@ func processActiveScenarioUpdate() { 
	}



	// Update POA Cellular and Wifi info

	poaTypeList := [4]string{mod.NodeTypePoa4G, mod.NodeTypePoa5G, mod.NodeTypePoaWifi, mod.NodeTypePoa}

	for _, poaType := range poaTypeList {



		poaNameList := sbi.activeModel.GetNodeNames(poaType)

	poaNameList := sbi.activeModel.GetNodeNames(mod.NodeTypePoa4G, mod.NodeTypePoa5G, mod.NodeTypePoaWifi, mod.NodeTypePoa)

	for _, name := range poaNameList {

		node := sbi.activeModel.GetNode(name)

		if node != nil {
@@ -379,7 +376,7 @@ func processActiveScenarioUpdate() { 
			mcc := ""

			cellId := ""



				switch poaType {

			switch nl.Type_ {

			case mod.NodeTypePoa4G, mod.NodeTypePoa5G:

				poaParent := sbi.activeModel.GetNodeParent(name)

				if zone, ok := poaParent.(*dataModel.Zone); ok {
@@ -394,14 +391,11 @@ func processActiveScenarioUpdate() { 
				}

				if nl.Poa4GConfig != nil {

					cellId = nl.Poa4GConfig.CellId

					} else {

						if nl.Poa5GConfig != nil {

				} else if nl.Poa5GConfig != nil {

					cellId = nl.Poa5GConfig.CellId

				}

					}



					sbi.updatePoaInfoCB(name, poaType, mnc, mcc, cellId)

				}

				sbi.updatePoaInfoCB(name, nl.Type_, mnc, mcc, cellId)

			}

		}

	}

test/system/rnis_test.go

+325 −329
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ func Test_RNIS_periodic_4g_5gNei(t *testing.T) { 
	testTrgNrNCellInfoArray := []rnisClient.MeasRepUeNotificationNrNCellInfo{testTrgNrNCellInfo}

	testTrgNewRadioMeasNeiInfo := rnisClient.MeasRepUeNotificationNewRadioMeasNeiInfo{NrNCellInfo: testTrgNrNCellInfoArray, NrNCellRsrp: 24, NrNCellRsrq: 24}





	//moving to initial position

	geMoveAssetCoordinates(testAddress, 7.413917, 43.733505)

	time.Sleep(2000 * time.Millisecond)
@@ -1929,7 +1928,6 @@ func validateMeasRepUeNotification(notification *rnisClient.MeasRepUeNotificatio 
	return ""

}





func validateNrMeasRepUeNotification(notification *rnisClient.NrMeasRepUeNotification, expectedAssocId *rnisClient.AssociateId, expectedServCellMeasInfo *rnisClient.NrMeasRepUeNotificationServCellMeasInfo, expectedNrNeighCellMeasInfo *rnisClient.NrMeasRepUeNotificationNrNeighCellMeasInfo, expectedEutraNeighCellMeasInfo *rnisClient.NrMeasRepUeNotificationEutraNeighCellMeasInfo) string {



	if notification.NotificationType != "NrMeasRepUeNotification" {
@@ -2025,5 +2023,3 @@ func validateNrMeasRepUeNotification(notification *rnisClient.NrMeasRepUeNotific 


	return ""

}