X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fe2ap.go;h=ae8c999ab7b57ce577b4073daceae7f1415abbcd;hb=fc67b036d8944c372715b7306f892d2ddfb4684f;hp=1c1084602f1728483c2689a6c2f55b6e3d2a4131;hpb=56233b081ed5c8620ca6909fb4f13fb31e2d3592;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go index 1c10846..ae8c999 100644 --- a/pkg/control/e2ap.go +++ b/pkg/control/e2ap.go @@ -128,6 +128,12 @@ func (e *E2ap) CheckActionNotAdmittedList(msgType int, actionNotAdmittedList e2a actionNotAdmittedString = "ActionNotAdmittedList: " + string(jsonActionNotAdmittedList) } } + + if msgType == xapp.RIC_SUB_FAILURE { + prefixString = "RICSubscriptionFailure" + err := fmt.Errorf("%s", prefixString) + errorInfo.SetInfo(err.Error(), models.SubscriptionInstanceErrorSourceE2Node, "") + } err := fmt.Errorf("%s %s", prefixString, actionNotAdmittedString) errorInfo.SetInfo(err.Error(), models.SubscriptionInstanceErrorSourceE2Node, "") return errorInfo @@ -260,3 +266,24 @@ func (e *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFai return xapp.RIC_SUB_DEL_FAILURE, packedData, nil } */ + +//----------------------------------------------------------------------------- +// Changes to support "RIC_SUB_DEL_REQUIRED" +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionDeleteRequired(payload []byte) (*e2ap.SubscriptionDeleteRequiredList, error) { + e2SubDelRequ := packerif.NewPackerSubscriptionDeleteRequired() + err, subsToBeRemove := e2SubDelRequ.UnPack(&e2ap.PackedData{payload}) + if err != nil { + return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload)) + } + return subsToBeRemove, nil +} + +func (c *E2ap) PackSubscriptionDeleteRequired(req *e2ap.SubscriptionDeleteRequiredList) (int, *e2ap.PackedData, error) { + e2SubDelRequ := packerif.NewPackerSubscriptionDeleteRequired() + err, packedData := e2SubDelRequ.Pack(req) + if err != nil { + return 0, nil, err + } + return xapp.RIC_SUB_DEL_REQUIRED, packedData, nil +}