RIC-193 - Setup from RAN fixes: Marshal XML Response, trim whitespaces, convert ricId...

[ric-plt/e2mgr.git] / E2Manager / models / e2_setup_success_response_message.go

diff --git a/E2Manager/models/e2_setup_success_response_message.go b/E2Manager/models/e2_setup_success_response_message.go
index 5e58de0..68c97a3 100644 (file)
--- a/E2Manager/models/e2_setup_success_response_message.go
+++ b/E2Manager/models/e2_setup_success_response_message.go
@@ -25,49 +25,107 @@ import (
 type E2SetupSuccessResponseMessage struct {
        XMLName xml.Name `xml:"E2SetupSuccessResponseMessage"`
        Text    string   `xml:",chardata"`
-       E2APPDU struct {
+       E2APPDU E2APPDU  `xml:"E2AP-PDU"`
+}
+
+type E2APPDU struct {
+       XMLName xml.Name `xml:"E2AP-PDU"`
+       Text              string `xml:",chardata"`
+       SuccessfulOutcome struct {
+               Text          string `xml:",chardata"`
+               ProcedureCode string `xml:"procedureCode"`
+               Criticality   struct {
+                       Text   string `xml:",chardata"`
+                       Reject string `xml:"reject"`
+               } `xml:"criticality"`
+               Value struct {
+                       Text            string `xml:",chardata"`
+                       E2setupResponse struct {
+                               Text        string `xml:",chardata"`
+                               ProtocolIEs struct {
+                                       Text               string `xml:",chardata"`
+                                       E2setupResponseIEs []E2setupResponseIEs`xml:"E2setupResponseIEs"`
+                               } `xml:"protocolIEs"`
+                       } `xml:"E2setupResponse"`
+               } `xml:"value"`
+       } `xml:"successfulOutcome"`
+}
+
+type E2setupResponseIEs struct {
+       Text        string `xml:",chardata"`
+       ID          string `xml:"id"`
+       Criticality struct {
+               Text   string `xml:",chardata"`
+               Reject string `xml:"reject"`
+       } `xml:"criticality"`
+       Value interface{}`xml:"value"`
+}
+
+type GlobalRICID struct {
+       Text        string `xml:",chardata"`
+       GlobalRICID struct {
+               Text         string `xml:",chardata"`
+               PLMNIdentity string `xml:"pLMN-Identity"`
+               RicID        string `xml:"ric-ID"`
+       } `xml:"GlobalRIC-ID"`
+}
+
+type RANfunctionsIDList struct {
+       Text        string `xml:",chardata"`
+       RANfunctionsIDList struct {
+               Text                      string `xml:",chardata"`
+               ProtocolIESingleContainer []ProtocolIESingleContainer `xml:"ProtocolIE-SingleContainer"`
+       } `xml:"RANfunctionsID-List"`
+}
+
+type ProtocolIESingleContainer struct {
+       Text        string `xml:",chardata"`
+       ID          string `xml:"id"`
+       Criticality struct {
+               Text   string `xml:",chardata"`
+               Ignore string `xml:"ignore"`
+       } `xml:"criticality"`
+       Value struct {
                Text              string `xml:",chardata"`
-               SuccessfulOutcome struct {
-                       Text          string `xml:",chardata"`
-                       ProcedureCode string `xml:"procedureCode"`
-                       Criticality   struct {
-                               Text   string `xml:",chardata"`
-                               Reject string `xml:"reject"`
-                       } `xml:"criticality"`
-                       Value struct {
-                               Text            string `xml:",chardata"`
-                               E2setupResponse struct {
-                                       Text        string `xml:",chardata"`
-                                       ProtocolIEs struct {
-                                               Text               string `xml:",chardata"`
-                                               E2setupResponseIEs struct {
-                                                       Text        string `xml:",chardata"`
-                                                       ID          string `xml:"id"`
-                                                       Criticality struct {
-                                                               Text   string `xml:",chardata"`
-                                                               Reject string `xml:"reject"`
-                                                       } `xml:"criticality"`
-                                                       Value struct {
-                                                               Text        string `xml:",chardata"`
-                                                               GlobalRICID struct {
-                                                                       Text         string `xml:",chardata"`
-                                                                       PLMNIdentity string `xml:"pLMN-Identity"`
-                                                                       RicID        string `xml:"ric-ID"`
-                                                               } `xml:"GlobalRIC-ID"`
-                                                       } `xml:"value"`
-                                               } `xml:"E2setupResponseIEs"`
-                                       } `xml:"protocolIEs"`
-                               } `xml:"E2setupResponse"`
-                       } `xml:"value"`
-               } `xml:"successfulOutcome"`
-       } `xml:"E2AP-PDU"`
+               RANfunctionIDItem struct {
+                       Text                string `xml:",chardata"`
+                       RanFunctionID       string `xml:"ranFunctionID"`
+                       RanFunctionRevision string `xml:"ranFunctionRevision"`
+               } `xml:"RANfunctionID-Item"`
+       } `xml:"value"`
 }
 
+func NewE2SetupSuccessResponseMessage(plmnId string, ricId string, request *E2SetupRequestMessage) E2SetupSuccessResponseMessage{
+       msg := E2SetupSuccessResponseMessage{}
+       msg.E2APPDU.SuccessfulOutcome.Value.E2setupResponse.ProtocolIEs.E2setupResponseIEs = make([]E2setupResponseIEs, 2)
+       msg.E2APPDU.SuccessfulOutcome.ProcedureCode = "1"
+       msg.E2APPDU.SuccessfulOutcome.Value.E2setupResponse.ProtocolIEs.E2setupResponseIEs[0].ID = "4"
+       msg.E2APPDU.SuccessfulOutcome.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}}
+       msg.E2APPDU.SuccessfulOutcome.Value.E2setupResponse.ProtocolIEs.E2setupResponseIEs[1].ID = "9"
+       msg.E2APPDU.SuccessfulOutcome.Value.E2setupResponse.ProtocolIEs.E2setupResponseIEs[1].Value = RANfunctionsIDList{RANfunctionsIDList: struct {
+               Text                      string `xml:",chardata"`
+               ProtocolIESingleContainer []ProtocolIESingleContainer `xml:"ProtocolIE-SingleContainer"`
+       }{ProtocolIESingleContainer:extractRanFunctionsIDList(request)}}
+       return msg
+}
 
-func (m *E2SetupSuccessResponseMessage) SetPlmnId(plmnId string){
-       m.E2APPDU.SuccessfulOutcome.Value.E2setupResponse.ProtocolIEs.E2setupResponseIEs.Value.GlobalRICID.PLMNIdentity = plmnId
+func extractRanFunctionsIDList(request *E2SetupRequestMessage) []ProtocolIESingleContainer{
+       list := &request.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[1].Value.RANfunctionsList
+       ids := make([]ProtocolIESingleContainer,len(list.ProtocolIESingleContainer))
+       for i := 0; i< len(ids); i++{
+               ids[i] = convertToRANfunctionID(list, i)
+       }
+       return ids
 }
 
-func (m *E2SetupSuccessResponseMessage) SetNbId(ricID string){
-       m.E2APPDU.SuccessfulOutcome.Value.E2setupResponse.ProtocolIEs.E2setupResponseIEs.Value.GlobalRICID.RicID = ricID
+func convertToRANfunctionID(list *RANfunctionsList, i int) ProtocolIESingleContainer{
+       id := ProtocolIESingleContainer{}
+       id.ID = "6"
+       id.Value.RANfunctionIDItem.RanFunctionID = list.ProtocolIESingleContainer[i].Value.RANfunctionItem.RanFunctionID
+       id.Value.RANfunctionIDItem.RanFunctionRevision = list.ProtocolIESingleContainer[i].Value.RANfunctionItem.RanFunctionRevision
+       return id
 }
\ No newline at end of file