X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmodels%2Fe2_setup_response_message.go;h=f689fb61bac205826fb8ab8d8551e44f548f71ce;hb=62ee3b274d4dd072693d9edc032d0b337e46fb3f;hp=654e2af1fde062f010d6fdbc40bd8ead26099967;hpb=0823945d1b5a326844833187a36bea669752be93;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/models/e2_setup_response_message.go b/E2Manager/models/e2_setup_response_message.go
index 654e2af..f689fb6 100644
--- a/E2Manager/models/e2_setup_response_message.go
+++ b/E2Manager/models/e2_setup_response_message.go
@@ -69,14 +69,22 @@ var timeToWaitMap = map[TimeToWait]interface{}{
 
 func NewE2SetupSuccessResponseMessage(plmnId string, ricId string, request *E2SetupRequestMessage) E2SetupResponseMessage {
 	outcome := SuccessfulOutcome{}
-	outcome.Value.E2setupResponse.ProtocolIEs.E2setupResponseIEs = make([]E2setupResponseIEs, 2)
 	outcome.ProcedureCode = "1"
+
+	e2SetupRequestIes := request.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs
+
+	outcome.Value.E2setupResponse.ProtocolIEs.E2setupResponseIEs = make([]E2setupResponseIEs, len(e2SetupRequestIes))
 	outcome.Value.E2setupResponse.ProtocolIEs.E2setupResponseIEs[0].ID = "4"
 	outcome.Value.E2setupResponse.ProtocolIEs.E2setupResponseIEs[0].Value = GlobalRICID{GlobalRICID: struct {
 		Text         string `xml:",chardata"`
 		PLMNIdentity string `xml:"pLMN-Identity"`
 		RicID        string `xml:"ric-ID"`
 	}{PLMNIdentity: plmnId, RicID: ricId}}
+
+	if len(e2SetupRequestIes) < 2 {
+		return E2SetupResponseMessage{E2APPDU: E2APPDU{Outcome: outcome}}
+	}
+
 	outcome.Value.E2setupResponse.ProtocolIEs.E2setupResponseIEs[1].ID = "9"
 	outcome.Value.E2setupResponse.ProtocolIEs.E2setupResponseIEs[1].Value = RANfunctionsIDList{RANfunctionsIDList: struct {
 		Text                      string                      `xml:",chardata"`
@@ -166,8 +174,8 @@ type ProtocolIESingleContainer struct {
 		Text              string `xml:",chardata"`
 		RANfunctionIDItem struct {
 			Text                string `xml:",chardata"`
-			RanFunctionID       string `xml:"ranFunctionID"`
-			RanFunctionRevision string `xml:"ranFunctionRevision"`
+			RanFunctionID       uint32 `xml:"ranFunctionID"`
+			RanFunctionRevision uint32 `xml:"ranFunctionRevision"`
 		} `xml:"RANfunctionID-Item"`
 	} `xml:"value"`
 }