X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmodels%2Fe2_setup_request_message.go;h=f7088b8e0143ada30ec38b7fa5e7cc0e65b8bda9;hb=76709204dfd7968156b5fa81190f146a8991812d;hp=41aea8128c6b441f3e3ac555b8a135dd455510f8;hpb=05340a9f7394586874990c10574b792f8e535858;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/models/e2_setup_request_message.go b/E2Manager/models/e2_setup_request_message.go index 41aea81..f7088b8 100644 --- a/E2Manager/models/e2_setup_request_message.go +++ b/E2Manager/models/e2_setup_request_message.go @@ -21,12 +21,95 @@ package models import ( "encoding/xml" - "errors" - "fmt" "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities" - "strconv" + "strings" ) +type Gnb struct { + Text string `xml:",chardata"` + GlobalGNBID struct { + Text string `xml:",chardata"` + PlmnID string `xml:"plmn-id"` + GnbID struct { + Text string `xml:",chardata"` + GnbID string `xml:"gnb-ID"` + } `xml:"gnb-id"` + } `xml:"global-gNB-ID"` +} + +type EnGnb struct { + Text string `xml:",chardata"` + GlobalGNBID struct { + Text string `xml:",chardata"` + PlmnID string `xml:"pLMN-Identity"` + GnbID struct { + Text string `xml:",chardata"` + GnbID string `xml:"gNB-ID"` + } `xml:"gNB-ID"` + } `xml:"global-gNB-ID"` +} + +type NgEnbId struct { + Text string `xml:",chardata"` + EnbIdMacro string `xml:"enb-ID-macro"` + EnbIdShortMacro string `xml:"enb-ID-shortmacro"` + EnbIdLongMacro string `xml:"enb-ID-longmacro"` +} + +type NgEnb struct { + Text string `xml:",chardata"` + GlobalNgENBID struct { + Text string `xml:",chardata"` + PlmnID string `xml:"plmn-id"` + EnbID NgEnbId `xml:"enb-id"` + } `xml:"global-ng-eNB-ID"` +} + +type EnbId struct { + Text string `xml:",chardata"` + MacroEnbId string `xml:"macro-eNB-ID"` + HomeEnbId string `xml:"home-eNB-ID"` + ShortMacroEnbId string `xml:"short-Macro-eNB-ID"` + LongMacroEnbId string `xml:"long-Macro-eNB-ID"` +} + +type Enb struct { + Text string `xml:",chardata"` + GlobalENBID struct { + Text string `xml:",chardata"` + PlmnID string `xml:"pLMN-Identity"` + EnbID EnbId `xml:"eNB-ID"` + } `xml:"global-eNB-ID"` +} + +type GlobalE2NodeId struct { + Text string `xml:",chardata"` + GNB Gnb `xml:"gNB"` + EnGNB EnGnb `xml:"en-gNB"` + NgENB NgEnb `xml:"ng-eNB"` + ENB Enb `xml:"eNB"` +} + +type E2SetupRequest struct { + Text string `xml:",chardata"` + ProtocolIEs struct { + Text string `xml:",chardata"` + E2setupRequestIEs []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"` + GlobalE2nodeID GlobalE2NodeId `xml:"GlobalE2node-ID"` + RANfunctionsList RANfunctionsList `xml:"RANfunctions-List"` + } `xml:"value"` + } `xml:"E2setupRequestIEs"` + } `xml:"protocolIEs"` +} + type E2SetupRequestMessage struct { XMLName xml.Name `xml:"E2SetupRequestMessage"` Text string `xml:",chardata"` @@ -40,80 +123,23 @@ type E2SetupRequestMessage struct { Reject string `xml:"reject"` } `xml:"criticality"` Value struct { - Text string `xml:",chardata"` - E2setupRequest struct { - Text string `xml:",chardata"` - ProtocolIEs struct { - Text string `xml:",chardata"` - E2setupRequestIEs []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"` - GlobalE2nodeID struct { - Text string `xml:",chardata"` - GNB struct { - Text string `xml:",chardata"` - GlobalGNBID struct { - Text string `xml:",chardata"` - PlmnID string `xml:"plmn-id"` - GnbID struct { - Text string `xml:",chardata"` - GnbID string `xml:"gnb-ID"` - } `xml:"gnb-id"` - } `xml:"global-gNB-ID"` - } `xml:"gNB"` - EnGNB struct { - Text string `xml:",chardata"` - GlobalGNBID struct { - Text string `xml:",chardata"` - PlmnID string `xml:"plmn-id"` - GnbID struct { - Text string `xml:",chardata"` - GnbID string `xml:"gnb-ID"` - } `xml:"gnb-id"` - } `xml:"global-gNB-ID"` - } `xml:"en-gNB"` - NgENB struct { - Text string `xml:",chardata"` - GlobalNgENBID struct { - Text string `xml:",chardata"` - PlmnID string `xml:"plmn-id"` - GnbID struct { - Text string `xml:",chardata"` - GnbID string `xml:"gnb-ID"` - } `xml:"gnb-id"` - } `xml:"global-ng-eNB-ID"` - } `xml:"ng-eNB"` - ENB struct { - Text string `xml:",chardata"` - GlobalENBID struct { - Text string `xml:",chardata"` - PlmnID string `xml:"plmn-id"` - GnbID struct { - Text string `xml:",chardata"` - GnbID string `xml:"gnb-ID"` - } `xml:"gnb-id"` - } `xml:"global-eNB-ID"` - } `xml:"eNB"` - } `xml:"GlobalE2node-ID"` - RANfunctionsList RANfunctionsList `xml:"RANfunctions-List"` - } `xml:"value"` - } `xml:"E2setupRequestIEs"` - } `xml:"protocolIEs"` - } `xml:"E2setupRequest"` + Text string `xml:",chardata"` + E2setupRequest E2SetupRequest `xml:"E2setupRequest"` } `xml:"value"` } `xml:"initiatingMessage"` } `xml:"E2AP-PDU"` } +type RanFunctionItem struct { + Text string `xml:",chardata"` + RanFunctionID uint32 `xml:"ranFunctionID"` + RanFunctionDefinition string `xml:"ranFunctionDefinition"` + RanFunctionRevision uint32 `xml:"ranFunctionRevision"` +} + type RANfunctionsList struct { - Text string `xml:",chardata"` - ProtocolIESingleContainer []struct { + Text string `xml:",chardata"` + ProtocolIESingleContainer []struct { Text string `xml:",chardata"` ID string `xml:"id"` Criticality struct { @@ -121,81 +147,113 @@ type RANfunctionsList struct { Reject string `xml:"reject"` } `xml:"criticality"` Value struct { - Text string `xml:",chardata"` - RANfunctionItem struct { - Text string `xml:",chardata"` - RanFunctionID string `xml:"ranFunctionID"` - RanFunctionDefinition string `xml:"ranFunctionDefinition"` - RanFunctionRevision string `xml:"ranFunctionRevision"` - } `xml:"RANfunction-Item"` + Text string `xml:",chardata"` + RANfunctionItem RanFunctionItem `xml:"RANfunction-Item"` } `xml:"value"` - } `xml:"ProtocolIE-SingleContainer"` + } `xml:"ProtocolIE-SingleContainer"` } -func (m *E2SetupRequestMessage) GetExtractRanFunctionsList()([]*entities.RanFunction, error){ - list :=m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[1].Value.RANfunctionsList.ProtocolIESingleContainer - funcs := make([]*entities.RanFunction, len(list)) - for i:=0; i < len(funcs); i++{ - funcs[i] = &entities.RanFunction{} - id, err := strconv.ParseUint(list[i].Value.RANfunctionItem.RanFunctionID, 10, 32) - if err != nil { - return nil, errors.New(fmt.Sprintf("#e2_setup_request_message.GetExtractRanFunctionsList - Failed parse uint RanFunctionID from %s", list[i].Value.RANfunctionItem.RanFunctionID)) - } - funcs[i].RanFunctionId = uint32(id) - rev, err := strconv.ParseUint(list[i].Value.RANfunctionItem.RanFunctionRevision, 10, 32) - if err != nil { - return nil, errors.New(fmt.Sprintf("#e2_setup_request_message.GetExtractRanFunctionsList - Failed parse uint RanFunctionRevision from %s", list[i].Value.RANfunctionItem.RanFunctionRevision)) +func (m *E2SetupRequestMessage) ExtractRanFunctionsList() []*entities.RanFunction { + // TODO: verify e2SetupRequestIEs structure with Adi + e2SetupRequestIes := m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs + if len(e2SetupRequestIes) < 2 { + return nil + } + + ranFunctionsListContainer := e2SetupRequestIes[1].Value.RANfunctionsList.ProtocolIESingleContainer + funcs := make([]*entities.RanFunction, len(ranFunctionsListContainer)) + for i := 0; i < len(funcs); i++ { + ranFunctionItem := ranFunctionsListContainer[i].Value.RANfunctionItem + + funcs[i] = &entities.RanFunction{ + RanFunctionId: ranFunctionItem.RanFunctionID, + RanFunctionDefinition: ranFunctionItem.RanFunctionDefinition, + RanFunctionRevision: ranFunctionItem.RanFunctionRevision, } - funcs[i].RanFunctionDefinition = list[i].Value.RANfunctionItem.RanFunctionDefinition - funcs[i].RanFunctionRevision = uint32(rev) } - return funcs, nil + return funcs +} + +func (m *E2SetupRequestMessage) getGlobalE2NodeId() GlobalE2NodeId { + return m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[0].Value.GlobalE2nodeID } -func (m *E2SetupRequestMessage) GetNodeType() entities.Node_Type{ - if id := m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[0].Value.GlobalE2nodeID.GNB.GlobalGNBID.PlmnID; id!= ""{ - return entities.Node_GNB +func (m *E2SetupRequestMessage) GetPlmnId() string { + globalE2NodeId := m.getGlobalE2NodeId() + if id := globalE2NodeId.GNB.GlobalGNBID.PlmnID; id != "" { + return m.trimSpaces(id) } - if id := m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[0].Value.GlobalE2nodeID.EnGNB.GlobalGNBID.PlmnID; id!= ""{ - return entities.Node_GNB + if id := globalE2NodeId.EnGNB.GlobalGNBID.PlmnID; id != "" { + return m.trimSpaces(id) } - if id := m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[0].Value.GlobalE2nodeID.ENB.GlobalENBID.PlmnID; id!= ""{ - return entities.Node_ENB + if id := globalE2NodeId.ENB.GlobalENBID.PlmnID; id != "" { + return m.trimSpaces(id) } - if id := m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[0].Value.GlobalE2nodeID.NgENB.GlobalNgENBID.PlmnID; id!= ""{ - return entities.Node_GNB + if id := globalE2NodeId.NgENB.GlobalNgENBID.PlmnID; id != "" { + return m.trimSpaces(id) } - return entities.Node_UNKNOWN + return "" } -func (m *E2SetupRequestMessage) GetPlmnId() string{ - if id := m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[0].Value.GlobalE2nodeID.GNB.GlobalGNBID.PlmnID; id!= ""{ +func (m *E2SetupRequestMessage) getInnerEnbId(enbId EnbId) string { + + if id := enbId.HomeEnbId; id != "" { return id } - if id := m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[0].Value.GlobalE2nodeID.EnGNB.GlobalGNBID.PlmnID; id!= ""{ + + if id := enbId.LongMacroEnbId; id != "" { return id } - if id := m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[0].Value.GlobalE2nodeID.ENB.GlobalENBID.PlmnID; id!= ""{ + + if id := enbId.MacroEnbId; id != "" { return id } - if id := m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[0].Value.GlobalE2nodeID.NgENB.GlobalNgENBID.PlmnID; id!= ""{ + + if id := enbId.ShortMacroEnbId; id != "" { return id } + return "" } -func (m *E2SetupRequestMessage) GetNbId() string{ - if id := m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[0].Value.GlobalE2nodeID.GNB.GlobalGNBID.GnbID.GnbID; id!= ""{ +func (m *E2SetupRequestMessage) getInnerNgEnbId(enbId NgEnbId) string { + if id := enbId.EnbIdLongMacro; id != "" { return id } - if id := m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[0].Value.GlobalE2nodeID.EnGNB.GlobalGNBID.GnbID.GnbID; id!= ""{ + + if id := enbId.EnbIdMacro; id != "" { return id } - if id := m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[0].Value.GlobalE2nodeID.ENB.GlobalENBID.GnbID.GnbID; id!= ""{ + + if id := enbId.EnbIdShortMacro; id != "" { return id } - if id := m.E2APPDU.InitiatingMessage.Value.E2setupRequest.ProtocolIEs.E2setupRequestIEs[0].Value.GlobalE2nodeID.NgENB.GlobalNgENBID.GnbID.GnbID; id!= ""{ - return id + + return "" +} + +func (m *E2SetupRequestMessage) GetNbId() string { + globalE2NodeId := m.getGlobalE2NodeId() + + if id := globalE2NodeId.GNB.GlobalGNBID.GnbID.GnbID; id != "" { + return m.trimSpaces(id) + } + + if id := globalE2NodeId.EnGNB.GlobalGNBID.GnbID.GnbID; id != "" { + return m.trimSpaces(id) + } + + if id := m.getInnerEnbId(globalE2NodeId.ENB.GlobalENBID.EnbID); id != "" { + return m.trimSpaces(id) } + + if id := m.getInnerNgEnbId(globalE2NodeId.NgENB.GlobalNgENBID.EnbID); id != "" { + return m.trimSpaces(id) + } + return "" -} \ No newline at end of file +} + +func (m *E2SetupRequestMessage) trimSpaces(str string) string { + return strings.NewReplacer(" ", "", "\n", "").Replace(str) +}