X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fsdl_restSubsDb.go;h=23483036f4112326b9ee3d6addae0b3c2969ea38;hb=d00f25ffa52842524e52e161429ec4795574155a;hp=782108f880d51682db3691a1b51507e710813637;hpb=268d715e3bceab8f7955d89945141efdb2c3b368;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/sdl_restSubsDb.go b/pkg/control/sdl_restSubsDb.go index 782108f..2348303 100644 --- a/pkg/control/sdl_restSubsDb.go +++ b/pkg/control/sdl_restSubsDb.go @@ -28,10 +28,10 @@ import ( ) type RESTSubscriptionInfo struct { - xAppRmrEndPoint string + XAppRmrEndPoint string Meid string InstanceIds []uint32 - xAppIdToE2Id map[int64]int64 + XAppIdToE2Id map[int64]int64 SubReqOngoing bool SubDelReqOngoing bool Md5sum string @@ -44,13 +44,13 @@ func CreateRESTSdl() Sdlnterface { func (c *Control) WriteRESTSubscriptionToSdl(restSubId string, restSubs *RESTSubscription) error { var restSubscriptionInfo RESTSubscriptionInfo - restSubscriptionInfo.xAppRmrEndPoint = restSubs.xAppRmrEndPoint + restSubscriptionInfo.XAppRmrEndPoint = restSubs.xAppRmrEndPoint restSubscriptionInfo.Meid = restSubs.Meid restSubscriptionInfo.InstanceIds = restSubs.InstanceIds - restSubscriptionInfo.xAppIdToE2Id = restSubs.xAppIdToE2Id + restSubscriptionInfo.XAppIdToE2Id = restSubs.xAppIdToE2Id restSubscriptionInfo.SubReqOngoing = restSubs.SubReqOngoing restSubscriptionInfo.SubDelReqOngoing = restSubs.SubDelReqOngoing - restSubscriptionInfo.Md5sum = restSubs.Md5sum + restSubscriptionInfo.Md5sum = restSubs.lastReqMd5sum jsonData, err := json.Marshal(restSubscriptionInfo) if err != nil { @@ -93,6 +93,8 @@ func (c *Control) ReadRESTSubscriptionFromSdl(restSubId string) (*RESTSubscripti } restSubs = c.CreateRESTSubscription(restSubscriptionInfo, &jsonSubscriptionInfo) + + c.restDuplicateCtrl.SetMd5sumFromLastOkRequest(restSubId, restSubs.lastReqMd5sum) } return restSubs, nil } @@ -100,13 +102,13 @@ func (c *Control) ReadRESTSubscriptionFromSdl(restSubId string) (*RESTSubscripti func (c *Control) CreateRESTSubscription(restSubscriptionInfo *RESTSubscriptionInfo, jsonSubscriptionInfo *string) *RESTSubscription { restSubs := &RESTSubscription{} - restSubs.xAppRmrEndPoint = restSubscriptionInfo.xAppRmrEndPoint + restSubs.xAppRmrEndPoint = restSubscriptionInfo.XAppRmrEndPoint restSubs.Meid = restSubscriptionInfo.Meid restSubs.InstanceIds = restSubscriptionInfo.InstanceIds - restSubs.xAppIdToE2Id = restSubscriptionInfo.xAppIdToE2Id + restSubs.xAppIdToE2Id = restSubscriptionInfo.XAppIdToE2Id restSubs.SubReqOngoing = restSubscriptionInfo.SubReqOngoing restSubs.SubDelReqOngoing = restSubscriptionInfo.SubDelReqOngoing - restSubs.Md5sum = restSubscriptionInfo.Md5sum + restSubs.lastReqMd5sum = restSubscriptionInfo.Md5sum return restSubs }