X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fsubscription.go;h=6a6983ce4bd208a1cb6e0caf0d24ceb5a8c61643;hb=c79bd0e1a4fe855b06c8f8131f162d0ee4a5f9f5;hp=4ecc2624aec601eebd23c2d587a76c26be728c82;hpb=b8b191fe31602c53414f8086381aef1a48e8be09;p=ric-plt%2Fxapp-frame.git diff --git a/pkg/xapp/subscription.go b/pkg/xapp/subscription.go index 4ecc262..6a6983c 100755 --- a/pkg/xapp/subscription.go +++ b/pkg/xapp/subscription.go @@ -29,27 +29,21 @@ import ( "github.com/go-openapi/strfmt" "github.com/spf13/viper" "io/ioutil" - "net" "net/http" "os" "time" apiclient "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientapi" apicommon "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientapi/common" - apipolicy "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientapi/policy" - apireport "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientapi/report" apimodel "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientmodel" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/restapi" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/restapi/operations" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/restapi/operations/common" - "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/restapi/operations/policy" - "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/restapi/operations/query" - "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/restapi/operations/report" ) -type SubscriptionHandler func(models.SubscriptionType, interface{}) (*models.SubscriptionResponse, error) +type SubscriptionHandler func(interface{}) (*models.SubscriptionResponse, error) type SubscriptionQueryHandler func() (models.SubscriptionList, error) type SubscriptionDeleteHandler func(string) error type SubscriptionResponseCallback func(*apimodel.SubscriptionResponse) @@ -114,35 +108,28 @@ func (r *Subscriber) Listen(createSubscription SubscriptionHandler, getSubscript api := operations.NewXappFrameworkAPI(swaggerSpec) // Subscription: Query - api.QueryGetAllSubscriptionsHandler = query.GetAllSubscriptionsHandlerFunc( - func(p query.GetAllSubscriptionsParams) middleware.Responder { + api.CommonGetAllSubscriptionsHandler = common.GetAllSubscriptionsHandlerFunc( + func(p common.GetAllSubscriptionsParams) middleware.Responder { if resp, err := getSubscription(); err == nil { - return query.NewGetAllSubscriptionsOK().WithPayload(resp) + return common.NewGetAllSubscriptionsOK().WithPayload(resp) } - return query.NewGetAllSubscriptionsInternalServerError() + return common.NewGetAllSubscriptionsInternalServerError() }) - // SubscriptionType: Report - api.ReportSubscribeReportHandler = report.SubscribeReportHandlerFunc( - func(p report.SubscribeReportParams) middleware.Responder { - if resp, err := createSubscription(models.SubscriptionTypeReport, p.ReportParams); err == nil { - return report.NewSubscribeReportCreated().WithPayload(resp) + // Subscription: Subscribe + api.CommonSubscribeHandler = common.SubscribeHandlerFunc( + func(params common.SubscribeParams) middleware.Responder { + Logger.Error("Subscribe: Params=%+v", params.SubscriptionParams) + if resp, err := createSubscription(params.SubscriptionParams); err == nil { + return common.NewSubscribeCreated().WithPayload(resp) } - return report.NewSubscribeReportInternalServerError() + return common.NewSubscribeInternalServerError() }) - // SubscriptionType: Policy - api.PolicySubscribePolicyHandler = policy.SubscribePolicyHandlerFunc( - func(p policy.SubscribePolicyParams) middleware.Responder { - if resp, err := createSubscription(models.SubscriptionTypePolicy, p.PolicyParams); err == nil { - return policy.NewSubscribePolicyCreated().WithPayload(resp) - } - return policy.NewSubscribePolicyInternalServerError() - }) - - // SubscriptionType: Delete + // Subscription: Unsubscribe api.CommonUnsubscribeHandler = common.UnsubscribeHandlerFunc( func(p common.UnsubscribeParams) middleware.Responder { + Logger.Error("Unsubscribe: SubscriptionID=%+v", p.SubscriptionID) if err := delSubscription(p.SubscriptionID); err == nil { return common.NewUnsubscribeNoContent() } @@ -162,16 +149,14 @@ func (r *Subscriber) Listen(createSubscription SubscriptionHandler, getSubscript } // Server interface: send notification to client -func (r *Subscriber) Notify(resp *models.SubscriptionResponse, clientEndpoint string) (err error) { +func (r *Subscriber) Notify(resp *models.SubscriptionResponse, ep models.SubscriptionParamsClientEndpoint) (err error) { respData, err := json.Marshal(resp) if err != nil { Logger.Error("json.Marshal failed: %v", err) return err } - ep, _, _ := net.SplitHostPort(clientEndpoint) - _, port, _ := net.SplitHostPort(fmt.Sprintf(":%d", GetPortData("http").Port)) - clientUrl := fmt.Sprintf("http://%s:%s%s", ep, port, r.clientUrl) + clientUrl := fmt.Sprintf("http://%s:%d%s", ep.Host, *ep.HTTPPort, r.clientUrl) retries := viper.GetInt("subscription.retryCount") if retries == 0 { @@ -206,21 +191,10 @@ func (r *Subscriber) SetResponseCB(c SubscriptionResponseCallback) { r.clientCB = c } -// Subscription interface for xApp: REPORT -func (r *Subscriber) SubscribeReport(p *apimodel.ReportParams) (*apimodel.SubscriptionResponse, error) { - params := apireport.NewSubscribeReportParamsWithTimeout(r.timeout).WithReportParams(p) - result, err := r.CreateTransport().Report.SubscribeReport(params) - if err != nil { - return &apimodel.SubscriptionResponse{}, err - } - - return result.Payload, err -} - -// Subscription interface for xApp: POLICY -func (r *Subscriber) SubscribePolicy(p *apimodel.PolicyParams) (*apimodel.SubscriptionResponse, error) { - params := apipolicy.NewSubscribePolicyParamsWithTimeout(r.timeout).WithPolicyParams(p) - result, err := r.CreateTransport().Policy.SubscribePolicy(params) +// Subscription interface for xApp +func (r *Subscriber) Subscribe(p *apimodel.SubscriptionParams) (*apimodel.SubscriptionResponse, error) { + params := apicommon.NewSubscribeParamsWithTimeout(r.timeout).WithSubscriptionParams(p) + result, err := r.CreateTransport().Common.Subscribe(params) if err != nil { return &apimodel.SubscriptionResponse{}, err } @@ -229,7 +203,7 @@ func (r *Subscriber) SubscribePolicy(p *apimodel.PolicyParams) (*apimodel.Subscr } // Subscription interface for xApp: DELETE -func (r *Subscriber) UnSubscribe(subId string) error { +func (r *Subscriber) Unsubscribe(subId string) error { params := apicommon.NewUnsubscribeParamsWithTimeout(r.timeout).WithSubscriptionID(subId) _, err := r.CreateTransport().Common.Unsubscribe(params) @@ -262,3 +236,32 @@ func (r *Subscriber) QuerySubscriptions() (models.SubscriptionList, error) { func (r *Subscriber) CreateTransport() *apiclient.RICSubscription { return apiclient.New(httptransport.New(r.remoteHost, r.remoteUrl, r.remoteProt), strfmt.Default) } + +/*func (r *Subscriber) getXappConfig() (appconfig models.XappConfigList, err error) { + + Logger.Error("Inside getXappConfig") + + var metadata models.ConfigMetadata + var xappconfig models.XAppConfig + name := viper.GetString("name") + configtype := "json" + metadata.XappName = &name + metadata.ConfigType = &configtype + + configFile, err := os.Open("/opt/ric/config/config-file.json") + if err != nil { + Logger.Error("Cannot open config file: %v", err) + return nil,errors.New("Could Not parse the config file") + } + + body, err := ioutil.ReadAll(configFile) + + defer configFile.Close() + + xappconfig.Metadata = &metadata + xappconfig.Config = body + + appconfig = append(appconfig,&xappconfig) + + return appconfig,nil +}*/