Add some fields validation from my5G-RANTester + support for Identity…

…Request (SUCI) and send ConfigurateUpdateComplete after a ConfigurationUpdateCommand
HewlettPackard · Dec 6, 2023 · b0537f7 · b0537f7
1 parent d4270d3
commit b0537f7
Show file tree

Hide file tree

Showing 17 changed files with 550 additions and 30 deletions.
diff --git a/internal/common/tools/tools.go b/internal/common/tools/tools.go
@@ -117,14 +117,6 @@ func SimulateSingleUE(simConfig UESimulationConfig, wg *sync.WaitGroup) {
 
 	ueCfg.GNodeB.PlmnList.GnbId = gnbIdGenerator(simConfig.UeId%numGnb + 1)
 
-	// If there is currently a coroutine handling current UE
-	// kill it, before creating a new coroutine with same UE
-	// Use case: Registration of N UEs in loop, when loop = true
-	if simConfig.ScenarioChan != nil {
-		simConfig.ScenarioChan <- procedures.UeTesterMessage{Type: procedures.Kill}
-		close(simConfig.ScenarioChan)
-	}
-
 	// Launch a coroutine to handle UE's individual scenario
 	go func(scenarioChan chan procedures.UeTesterMessage, ueId int) {
 		wg.Add(1)
@@ -152,15 +144,20 @@ func SimulateSingleUE(simConfig UESimulationConfig, wg *sync.WaitGroup) {
 		for loop {
 			select {
 			case <-deregistrationChannel:
-				ueRx <- procedures.UeTesterMessage{Type: procedures.Terminate}
-				ueRx = nil
+				if ueRx != nil {
+					ueRx <- procedures.UeTesterMessage{Type: procedures.Terminate}
+					ueRx = nil
+				}
 			case <-handoverChannel:
 				if ueRx != nil {
 					ueRx <- procedures.UeTesterMessage{Type: procedures.Handover, GnbChan: simConfig.Gnbs[gnbIdGenerator((ueId+1)%numGnb+1)].GetInboundChannel()}
 				}
 			case msg := <-scenarioChan:
 				if ueRx != nil {
 					ueRx <- msg
+					if msg.Type == procedures.Terminate || msg.Type == procedures.Kill {
+						ueRx = nil
+					}
 				}
 			case msg := <-ueTx:
 				log.Info("[UE] Switched from state ", state, " to state ", msg.StateChange)

diff --git a/internal/control_test_engine/gnb/context/context.go b/internal/control_test_engine/gnb/context/context.go
@@ -134,8 +134,10 @@ func (gnb *GNBContext) DeleteGnBUe(ue *GNBUe) {
 		}
 	}
 	ue.Lock()
-	close(ue.gnbTx)
-	ue.gnbTx = nil
+	if ue.gnbTx != nil {
+		close(ue.gnbTx)
+		ue.gnbTx = nil
+	}
 	ue.Unlock()
 }
 

diff --git a/internal/control_test_engine/gnb/nas/service/service.go b/internal/control_test_engine/gnb/nas/service/service.go
@@ -65,7 +65,7 @@ func processingConn(ue *context.GNBUe, gnb *context.GNBContext) {
 			gnbUeContext.SetStateDown()
 			gnb.DeleteGnBUe(ue)
 		} else if message.IsNas {
-			go nas.Dispatch(ue, message.Nas, gnb)
+			nas.Dispatch(ue, message.Nas, gnb)
 		} else if message.AmfId >= 0 {
 			log.Info("[GNB] Received incoming handover for UE")
 			gnbUeContext.SetStateReady()

diff --git a/internal/control_test_engine/gnb/ngap/dispatcher.go b/internal/control_test_engine/gnb/ngap/dispatcher.go
@@ -62,7 +62,7 @@ func Dispatch(amf *context.GNBAmf, gnb *context.GNBContext, message []byte) {
 		case ngapType.ProcedureCodeAMFConfigurationUpdate:
 			// handler NGAP AMF Configuration Update
 			log.Info("[GNB][NGAP] Receive AMF Configuration Update")
-			handler.HandlerAmfConfiguratonUpdate(amf, gnb, ngapMsg)
+			handler.HandlerAmfConfigurationUpdate(amf, gnb, ngapMsg)
 
 		case ngapType.ProcedureCodeErrorIndication:
 			// handler Error Indicator

diff --git a/internal/control_test_engine/gnb/ngap/handler/handler.go b/internal/control_test_engine/gnb/ngap/handler/handler.go
@@ -606,7 +606,7 @@ func HandlerUeContextReleaseCommand(gnb *context.GNBContext, message *ngapType.N
 	log.Info("[GNB][NGAP] Releasing UE Context, cause: ", causeToString(cause))
 }
 
-func HandlerAmfConfiguratonUpdate(amf *context.GNBAmf, gnb *context.GNBContext, message *ngapType.NGAPPDU)  {
+func HandlerAmfConfigurationUpdate(amf *context.GNBAmf, gnb *context.GNBContext, message *ngapType.NGAPPDU)  {
 
 	// TODO: Implement update AMF Context from AMFConfigurationUpdate
 	_ = message.InitiatingMessage.Value.AMFConfigurationUpdate

diff --git a/...gine/gnb/ngap/message/ngap_control/pdu_session_management/pdu-session-release-response.go b/...gine/gnb/ngap/message/ngap_control/pdu_session_management/pdu-session-release-response.go
@@ -68,6 +68,7 @@ func buildPDUSessionReleaseResponse(amfUeNgapID, ranUeNgapID int64, pduSessionId
 		pDUSessionResourceReleasedItemRelRes := ngapType.PDUSessionResourceReleasedItemRelRes{}
 
 		pDUSessionResourceReleasedItemRelRes.PDUSessionID = pduSessionId
+		pDUSessionResourceReleasedItemRelRes.PDUSessionResourceReleaseResponseTransfer = []byte{00}
 
 		pDUSessionResourceReleasedListRelRes.List = append(pDUSessionResourceReleasedListRelRes.List, pDUSessionResourceReleasedItemRelRes)
 	}

diff --git a/internal/control_test_engine/ue/context/context.go b/internal/control_test_engine/ue/context/context.go
@@ -1,3 +1,8 @@
+/**
+ * SPDX-License-Identifier: Apache-2.0
+ * © Copyright 2023 Hewlett Packard Enterprise Development LP
+ */
+
 package context
 
 import (
@@ -700,9 +705,11 @@ func (ue *UEContext) Terminate() {
 	}
 
 	ue.Lock()
-	close(ue.gnbRx)
-	ue.gnbRx = nil
-	ue.Unlock()
+	if ue.gnbRx != nil {
+		close(ue.gnbRx)
+		ue.gnbRx = nil
+		ue.Unlock()
+	}
 	close(ue.scenarioChan)
 
 	log.Info("[UE] UE Terminated")

diff --git a/internal/control_test_engine/ue/nas/dispatcher.go b/internal/control_test_engine/ue/nas/dispatcher.go
@@ -142,6 +142,7 @@ func DispatchNas(ue *context.UEContext, message []byte) {
 	case nas.MsgTypeIdentityRequest:
 		log.Info("[UE][NAS] Receive Identify Request")
 		// handler identity request.
+		handler.HandlerIdentityRequest(ue, m)
 
 	case nas.MsgTypeSecurityModeCommand:
 		// handler security mode command.
@@ -155,7 +156,7 @@ func DispatchNas(ue *context.UEContext, message []byte) {
 
 	case nas.MsgTypeConfigurationUpdateCommand:
 		log.Info("[UE][NAS] Receive Configuration Update Command")
-		log.Info("[UE][NAS] ", ue.GetSupi(), " was succesfully registered")
+		handler.HandlerConfigurationUpdateCommand(ue, m)
 
 	case nas.MsgTypeDLNASTransport:
 		// handler DL NAS Transport.