From: Konstantinos Archangelof Date: Mon, 7 Jun 2021 17:32:10 +0000 (+0000) Subject: xapp-frame v0.8.3 integration to submgr X-Git-Tag: 0.7.1~8 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=ric-plt%2Fsubmgr.git;a=commitdiff_plain;h=bd9c98e068581cfe38187b3ada774653df26440a xapp-frame v0.8.3 integration to submgr Signed-off-by: Konstantinos Archangelof Change-Id: I5e26a65de5c791067685ca76f310f6a6b0e8d076 --- diff --git a/container-tag.yaml b/container-tag.yaml index 89d69c3..a599df1 100644 --- a/container-tag.yaml +++ b/container-tag.yaml @@ -2,4 +2,4 @@ # By default this file is in the docker build directory, # but the location can configured in the JJB template. --- -tag: "0.6.8" +tag: "0.6.9" diff --git a/go.mod b/go.mod index ab8acfe..d02d8c7 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.12 replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.2 -replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.2 +replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.3 replace gerrit.o-ran-sc.org/r/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.2 diff --git a/go.sum b/go.sum index ddd873a..03eec7c 100644 --- a/go.sum +++ b/go.sum @@ -29,6 +29,8 @@ gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.1 h1:kpeENcE4eaipw62MlS6xUpJ8R gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.1/go.mod h1:MRTeTBLROgTA2t91SXYjTbRsxoOhMMvvkK/ChLVRZUU= gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.2 h1:w1MpFi02iFExXreoyP3Tn/ro/n4PeBlhVzxh9z/7gWo= gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.2/go.mod h1:MRTeTBLROgTA2t91SXYjTbRsxoOhMMvvkK/ChLVRZUU= +gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.3 h1:C5nhnmSZLdysSiQ7vMkpNaKrooPwiBZ79dcXWRVtZTU= +gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.3/go.mod h1:MRTeTBLROgTA2t91SXYjTbRsxoOhMMvvkK/ChLVRZUU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/control/control.go b/pkg/control/control.go index e3a2c06..580c8fc 100755 --- a/pkg/control/control.go +++ b/pkg/control/control.go @@ -1161,17 +1161,13 @@ func (c *Control) PrintRESTSubscriptionRequest(p *models.SubscriptionParams) { fmt.Println(" RANFunctionID = nil") } fmt.Printf(" SubscriptionDetail.XappEventInstanceID = %v\n", *subscriptionDetail.XappEventInstanceID) - fmt.Printf(" SubscriptionDetail.EventTriggers.OctetString = %X\n", subscriptionDetail.EventTriggers.OctetString) + fmt.Printf(" SubscriptionDetail.EventTriggers = %v\n", subscriptionDetail.EventTriggers) for _, actionToBeSetup := range subscriptionDetail.ActionToBeSetupList { fmt.Printf(" SubscriptionDetail.ActionToBeSetup.ActionID = %v\n", *actionToBeSetup.ActionID) fmt.Printf(" SubscriptionDetail.ActionToBeSetup.ActionType = %s\n", *actionToBeSetup.ActionType) - if actionToBeSetup.ActionDefinition != nil { - fmt.Printf(" SubscriptionDetail.ActionToBeSetup.ActionDefinition.OctetString = %X\n", actionToBeSetup.ActionDefinition.OctetString) - } else { - fmt.Println(" SubscriptionDetail.ActionToBeSetup.ActionDefinition = nil") + fmt.Printf(" SubscriptionDetail.ActionToBeSetup.ActionDefinition = %v\n", actionToBeSetup.ActionDefinition) - } if actionToBeSetup.SubsequentAction != nil { fmt.Printf(" SubscriptionDetail.ActionToBeSetup.SubsequentAction.SubsequentActionType = %s\n", *actionToBeSetup.SubsequentAction.SubsequentActionType) fmt.Printf(" SubscriptionDetail.ActionToBeSetup..SubsequentAction.TimeToWait = %s\n", *actionToBeSetup.SubsequentAction.TimeToWait) diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go index 54eba76..7c2826b 100644 --- a/pkg/control/e2ap.go +++ b/pkg/control/e2ap.go @@ -64,9 +64,12 @@ func (c *E2ap) FillSubscriptionReqMsgs(params interface{}, subreqList *e2ap.Subs e2EventInstanceID := restSubscription.GetE2IdFromXappIdToE2Id(*subscriptionDetail.XappEventInstanceID) subReqMsg.RequestId = e2ap.RequestId{uint32(*subscriptionDetail.XappEventInstanceID), uint32(e2EventInstanceID)} - subReqMsg.EventTriggerDefinition.Data.Data = []byte(subscriptionDetail.EventTriggers.OctetString) - subReqMsg.EventTriggerDefinition.Data.Length = uint64(len(subscriptionDetail.EventTriggers.OctetString)) - + if len(subscriptionDetail.EventTriggers) > 0 { + for _, val := range subscriptionDetail.EventTriggers { + subReqMsg.EventTriggerDefinition.Data.Data = append(subReqMsg.EventTriggerDefinition.Data.Data, byte(val)) + } + subReqMsg.EventTriggerDefinition.Data.Length = uint64(len(subscriptionDetail.EventTriggers)) + } for _, actionToBeSetup := range subscriptionDetail.ActionToBeSetupList { actionToBeSetupItem := e2ap.ActionToBeSetupItem{} actionToBeSetupItem.ActionType = e2ap.E2AP_ActionTypeInvalid @@ -75,9 +78,11 @@ func (c *E2ap) FillSubscriptionReqMsgs(params interface{}, subreqList *e2ap.Subs actionToBeSetupItem.ActionType = e2ap.E2AP_ActionTypeStrMap[*actionToBeSetup.ActionType] actionToBeSetupItem.RicActionDefinitionPresent = true - if actionToBeSetup.ActionDefinition != nil { - actionToBeSetupItem.ActionDefinitionChoice.Data.Data = []byte(actionToBeSetup.ActionDefinition.OctetString) - actionToBeSetupItem.ActionDefinitionChoice.Data.Length = uint64(len(actionToBeSetup.ActionDefinition.OctetString)) + if len(actionToBeSetup.ActionDefinition) > 0 { + for _, val := range actionToBeSetup.ActionDefinition { + actionToBeSetupItem.ActionDefinitionChoice.Data.Data = append(actionToBeSetupItem.ActionDefinitionChoice.Data.Data, byte(val)) + } + actionToBeSetupItem.ActionDefinitionChoice.Data.Length = uint64(len(actionToBeSetup.ActionDefinition)) } if actionToBeSetup.SubsequentAction != nil { diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go index f95855e..4f93f20 100644 --- a/pkg/control/ut_messaging_test.go +++ b/pkg/control/ut_messaging_test.go @@ -4772,7 +4772,7 @@ func TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen(t *testing.T) { // Req2 params = xappConn2.GetRESTSubsReqReportParams(subReqCount) params.SetMeid("RAN_NAME_1") - eventTriggerDefinition := "1234" + eventTriggerDefinition := []int64{1234, 1} params.SetSubEventTriggerDefinition(eventTriggerDefinition) restSubId2 := xappConn2.SendRESTSubsReq(t, params) @@ -4822,7 +4822,7 @@ func TestRESTSubReqReportSameActionDiffActionListLen(t *testing.T) { actionId := int64(1) actionType := "report" - actionDefinition := "56781" + actionDefinition := []int64{5678, 1} subsequestActionType := "continue" timeToWait := "w10ms" params.AppendActionToActionToBeSetupList(actionId, actionType, actionDefinition, subsequestActionType, timeToWait) @@ -5007,7 +5007,7 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionLen(t *testing.T) { // Req2 params = xappConn2.GetRESTSubsReqReportParams(subReqCount) params.SetMeid("RAN_NAME_1") - actionDefinition := "5678" + actionDefinition := []int64{5678, 1} params.SetSubActionDefinition(actionDefinition) restSubId2 := xappConn2.SendRESTSubsReq(t, params) @@ -5054,7 +5054,7 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionContents(t *testing.T) { // Req2 params = xappConn2.GetRESTSubsReqReportParams(subReqCount) params.SetMeid("RAN_NAME_1") - actionDefinition := "56782" + actionDefinition := []int64{56782} params.SetSubActionDefinition(actionDefinition) restSubId2 := xappConn2.SendRESTSubsReq(t, params) diff --git a/pkg/teststube2ap/stubE2.go b/pkg/teststube2ap/stubE2.go index 8fbfd44..cb15b35 100644 --- a/pkg/teststube2ap/stubE2.go +++ b/pkg/teststube2ap/stubE2.go @@ -858,15 +858,15 @@ func (p *RESTSubsReqParams) GetRESTSubsReqReportParams(subReqCount int, clientEn reqId := int64(requestCount) + 1 subscriptionDetail := &clientmodel.SubscriptionDetail{ XappEventInstanceID: &reqId, - EventTriggers: &clientmodel.EventTriggerDefinition{ - OctetString: "1234" + strconv.Itoa(requestCount), + EventTriggers: clientmodel.EventTriggerDefinition{ + int64(1234 + requestCount), }, ActionToBeSetupList: clientmodel.ActionsToBeSetup{ &clientmodel.ActionToBeSetup{ ActionID: &actionId, ActionType: &actionType, - ActionDefinition: &clientmodel.ActionDefinition{ - OctetString: "5678" + strconv.Itoa(requestCount), + ActionDefinition: clientmodel.ActionDefinition{ + int64(5678 + requestCount), }, SubsequentAction: &clientmodel.SubsequentAction{ SubsequentActionType: &subsequestActioType, @@ -938,34 +938,32 @@ func (p *RESTSubsReqParams) SetSubActionIDs(actionId int64) { } } -func (p *RESTSubsReqParams) SetSubActionDefinition(actionDefinition string) { +func (p *RESTSubsReqParams) SetSubActionDefinition(actionDefinition []int64) { for _, subDetail := range p.SubsReqParams.SubscriptionDetails { for _, action := range subDetail.ActionToBeSetupList { if action != nil { - action.ActionDefinition.OctetString = actionDefinition + action.ActionDefinition = actionDefinition } } } } -func (p *RESTSubsReqParams) SetSubEventTriggerDefinition(eventTriggerDefinition string) { +func (p *RESTSubsReqParams) SetSubEventTriggerDefinition(eventTriggerDefinition []int64) { for _, subDetail := range p.SubsReqParams.SubscriptionDetails { if subDetail != nil { - subDetail.EventTriggers.OctetString = eventTriggerDefinition + subDetail.EventTriggers = eventTriggerDefinition } } } -func (p *RESTSubsReqParams) AppendActionToActionToBeSetupList(actionId int64, actionType string, actionDefinition string, subsequentActionType string, timeToWait string) { +func (p *RESTSubsReqParams) AppendActionToActionToBeSetupList(actionId int64, actionType string, actionDefinition []int64, subsequentActionType string, timeToWait string) { actionToBeSetup := &clientmodel.ActionToBeSetup{ - ActionID: &actionId, - ActionType: &actionType, - ActionDefinition: &clientmodel.ActionDefinition{ - OctetString: actionDefinition, - }, + ActionID: &actionId, + ActionType: &actionType, + ActionDefinition: clientmodel.ActionDefinition(actionDefinition), SubsequentAction: &clientmodel.SubsequentAction{ SubsequentActionType: &subsequentActionType, TimeToWait: &timeToWait, @@ -1059,15 +1057,15 @@ func (p *RESTSubsReqParams) GetRESTSubsReqPolicyParams(subReqCount int, clientEn reqId := int64(requestCount) + 1 subscriptionDetail := &clientmodel.SubscriptionDetail{ XappEventInstanceID: &reqId, - EventTriggers: &clientmodel.EventTriggerDefinition{ - OctetString: "1234" + strconv.Itoa(requestCount), + EventTriggers: clientmodel.EventTriggerDefinition{ + int64(1234 + requestCount), }, ActionToBeSetupList: clientmodel.ActionsToBeSetup{ &clientmodel.ActionToBeSetup{ ActionID: &actionId, ActionType: &actionType, - ActionDefinition: &clientmodel.ActionDefinition{ - OctetString: "5678" + strconv.Itoa(requestCount), + ActionDefinition: clientmodel.ActionDefinition{ + int64(5678 + requestCount), }, SubsequentAction: &clientmodel.SubsequentAction{ SubsequentActionType: &subsequestActioType,