X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fclient.go;h=b62044e60f18cd87333c279a760a061780f4395c;hb=0bb76b8349891790788a622c69591bac5f5930d1;hp=1ef7a69c143cb4b6b8d04d4bd6bda33c96df6b14;hpb=9dc5adc78d459157a42ef8997eeced82a3616f01;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/client.go b/pkg/control/client.go index 1ef7a69..b62044e 100644 --- a/pkg/control/client.go +++ b/pkg/control/client.go @@ -21,13 +21,14 @@ package control import ( "fmt" + "strconv" + "strings" + "time" + rtmgrclient "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/rtmgr_client" rtmgrhandle "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/rtmgr_client/handle" "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/rtmgr_models" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" - "strconv" - "strings" - "time" ) //----------------------------------------------------------------------------- @@ -53,7 +54,7 @@ func (rc *RtmgrClient) SubscriptionRequestCreate(subRouteAction SubRouteInfo) er subID := int32(subRouteAction.SubID) xapp.Logger.Debug("CREATE %s ongoing", subRouteAction.String()) createData := rtmgr_models.XappSubscriptionData{&subRouteAction.EpList.Endpoints[0].Addr, &subRouteAction.EpList.Endpoints[0].Port, &subID} - createHandle := rtmgrhandle.NewProvideXappSubscriptionHandleParamsWithTimeout(10 * time.Second) + createHandle := rtmgrhandle.NewProvideXappSubscriptionHandleParamsWithTimeout(2 * time.Second) createHandle.WithXappSubscriptionData(&createData) _, err := rc.rtClient.Handle.ProvideXappSubscriptionHandle(createHandle) if err != nil && !(strings.Contains(err.Error(), "status 200")) { @@ -69,7 +70,7 @@ func (rc *RtmgrClient) SubscriptionRequestUpdate(subRouteAction SubRouteInfo) er for i := range subRouteAction.EpList.Endpoints { updateData = append(updateData, &rtmgr_models.XappElement{Address: &subRouteAction.EpList.Endpoints[i].Addr, Port: &subRouteAction.EpList.Endpoints[i].Port}) } - updateHandle := rtmgrhandle.NewUpdateXappSubscriptionHandleParamsWithTimeout(10 * time.Second) + updateHandle := rtmgrhandle.NewUpdateXappSubscriptionHandleParamsWithTimeout(2 * time.Second) updateHandle.WithSubscriptionID(subRouteAction.SubID) updateHandle.WithXappList(updateData) _, err := rc.rtClient.Handle.UpdateXappSubscriptionHandle(updateHandle) @@ -85,7 +86,7 @@ func (rc *RtmgrClient) SubscriptionRequestDelete(subRouteAction SubRouteInfo) er subID := int32(subRouteAction.SubID) xapp.Logger.Debug("DELETE %s ongoing", subRouteAction.String()) deleteData := rtmgr_models.XappSubscriptionData{&subRouteAction.EpList.Endpoints[0].Addr, &subRouteAction.EpList.Endpoints[0].Port, &subID} - deleteHandle := rtmgrhandle.NewDeleteXappSubscriptionHandleParamsWithTimeout(10 * time.Second) + deleteHandle := rtmgrhandle.NewDeleteXappSubscriptionHandleParamsWithTimeout(2 * time.Second) deleteHandle.WithXappSubscriptionData(&deleteData) _, _, err := rc.rtClient.Handle.DeleteXappSubscriptionHandle(deleteHandle) if err != nil && !(strings.Contains(err.Error(), "status 200")) {