X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Frestapi%2Foperations%2Fxapp_framework_api.go;h=e16707ee46df38843d3d9b122d3b41b0449a361b;hb=3602bf801fef17e317cb35a4c710118ec80908b9;hp=10da0397f3dd2d8963e3e8572421b7d7d2218f33;hpb=429da19d53224135082f8b6f65470ae3ee8df176;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/restapi/operations/xapp_framework_api.go b/pkg/restapi/operations/xapp_framework_api.go
index 10da039..e16707e 100644
--- a/pkg/restapi/operations/xapp_framework_api.go
+++ b/pkg/restapi/operations/xapp_framework_api.go
@@ -20,9 +20,7 @@ import (
 	"github.com/go-openapi/swag"
 
 	"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"
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/restapi/operations/xapp"
 )
 
 // NewXappFrameworkAPI creates a new XappFramework instance
@@ -42,17 +40,18 @@ func NewXappFrameworkAPI(spec *loads.Document) *XappFrameworkAPI {
 		BearerAuthenticator: security.BearerAuth,
 		JSONConsumer:        runtime.JSONConsumer(),
 		JSONProducer:        runtime.JSONProducer(),
+		XMLProducer:         runtime.XMLProducer(),
+		CommonSubscribeHandler: common.SubscribeHandlerFunc(func(params common.SubscribeParams) middleware.Responder {
+			return middleware.NotImplemented("operation CommonSubscribe has not yet been implemented")
+		}),
 		CommonUnsubscribeHandler: common.UnsubscribeHandlerFunc(func(params common.UnsubscribeParams) middleware.Responder {
 			return middleware.NotImplemented("operation CommonUnsubscribe has not yet been implemented")
 		}),
-		QueryGetAllSubscriptionsHandler: query.GetAllSubscriptionsHandlerFunc(func(params query.GetAllSubscriptionsParams) middleware.Responder {
-			return middleware.NotImplemented("operation QueryGetAllSubscriptions has not yet been implemented")
-		}),
-		PolicySubscribePolicyHandler: policy.SubscribePolicyHandlerFunc(func(params policy.SubscribePolicyParams) middleware.Responder {
-			return middleware.NotImplemented("operation PolicySubscribePolicy has not yet been implemented")
+		CommonGetAllSubscriptionsHandler: common.GetAllSubscriptionsHandlerFunc(func(params common.GetAllSubscriptionsParams) middleware.Responder {
+			return middleware.NotImplemented("operation CommonGetAllSubscriptions has not yet been implemented")
 		}),
-		ReportSubscribeReportHandler: report.SubscribeReportHandlerFunc(func(params report.SubscribeReportParams) middleware.Responder {
-			return middleware.NotImplemented("operation ReportSubscribeReport has not yet been implemented")
+		XappGetXappConfigListHandler: xapp.GetXappConfigListHandlerFunc(func(params xapp.GetXappConfigListParams) middleware.Responder {
+			return middleware.NotImplemented("operation XappGetXappConfigList has not yet been implemented")
 		}),
 	}
 }
@@ -84,15 +83,17 @@ type XappFrameworkAPI struct {
 
 	// JSONProducer registers a producer for a "application/json" mime type
 	JSONProducer runtime.Producer
+	// XMLProducer registers a producer for a "application/xml" mime type
+	XMLProducer runtime.Producer
 
+	// CommonSubscribeHandler sets the operation handler for the subscribe operation
+	CommonSubscribeHandler common.SubscribeHandler
 	// CommonUnsubscribeHandler sets the operation handler for the unsubscribe operation
 	CommonUnsubscribeHandler common.UnsubscribeHandler
-	// QueryGetAllSubscriptionsHandler sets the operation handler for the get all subscriptions operation
-	QueryGetAllSubscriptionsHandler query.GetAllSubscriptionsHandler
-	// PolicySubscribePolicyHandler sets the operation handler for the subscribe policy operation
-	PolicySubscribePolicyHandler policy.SubscribePolicyHandler
-	// ReportSubscribeReportHandler sets the operation handler for the subscribe report operation
-	ReportSubscribeReportHandler report.SubscribeReportHandler
+	// CommonGetAllSubscriptionsHandler sets the operation handler for the get all subscriptions operation
+	CommonGetAllSubscriptionsHandler common.GetAllSubscriptionsHandler
+	// XappGetXappConfigListHandler sets the operation handler for the get xapp config list operation
+	XappGetXappConfigListHandler xapp.GetXappConfigListHandler
 
 	// ServeError is called when an error is received, there is a default handler
 	// but you can set your own with this
@@ -156,20 +157,24 @@ func (o *XappFrameworkAPI) Validate() error {
 		unregistered = append(unregistered, "JSONProducer")
 	}
 
-	if o.CommonUnsubscribeHandler == nil {
-		unregistered = append(unregistered, "common.UnsubscribeHandler")
+	if o.XMLProducer == nil {
+		unregistered = append(unregistered, "XMLProducer")
 	}
 
-	if o.QueryGetAllSubscriptionsHandler == nil {
-		unregistered = append(unregistered, "query.GetAllSubscriptionsHandler")
+	if o.CommonSubscribeHandler == nil {
+		unregistered = append(unregistered, "common.SubscribeHandler")
 	}
 
-	if o.PolicySubscribePolicyHandler == nil {
-		unregistered = append(unregistered, "policy.SubscribePolicyHandler")
+	if o.CommonUnsubscribeHandler == nil {
+		unregistered = append(unregistered, "common.UnsubscribeHandler")
 	}
 
-	if o.ReportSubscribeReportHandler == nil {
-		unregistered = append(unregistered, "report.SubscribeReportHandler")
+	if o.CommonGetAllSubscriptionsHandler == nil {
+		unregistered = append(unregistered, "common.GetAllSubscriptionsHandler")
+	}
+
+	if o.XappGetXappConfigListHandler == nil {
+		unregistered = append(unregistered, "xapp.GetXappConfigListHandler")
 	}
 
 	if len(unregistered) > 0 {
@@ -228,6 +233,9 @@ func (o *XappFrameworkAPI) ProducersFor(mediaTypes []string) map[string]runtime.
 		case "application/json":
 			result["application/json"] = o.JSONProducer
 
+		case "application/xml":
+			result["application/xml"] = o.XMLProducer
+
 		}
 
 		if p, ok := o.customProducers[mt]; ok {
@@ -270,6 +278,11 @@ func (o *XappFrameworkAPI) initHandlerCache() {
 		o.handlers = make(map[string]map[string]http.Handler)
 	}
 
+	if o.handlers["POST"] == nil {
+		o.handlers["POST"] = make(map[string]http.Handler)
+	}
+	o.handlers["POST"]["/subscriptions"] = common.NewSubscribe(o.context, o.CommonSubscribeHandler)
+
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
@@ -278,17 +291,12 @@ func (o *XappFrameworkAPI) initHandlerCache() {
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
-	o.handlers["GET"]["/subscriptions"] = query.NewGetAllSubscriptions(o.context, o.QueryGetAllSubscriptionsHandler)
-
-	if o.handlers["POST"] == nil {
-		o.handlers["POST"] = make(map[string]http.Handler)
-	}
-	o.handlers["POST"]["/subscriptions/policy"] = policy.NewSubscribePolicy(o.context, o.PolicySubscribePolicyHandler)
+	o.handlers["GET"]["/subscriptions"] = common.NewGetAllSubscriptions(o.context, o.CommonGetAllSubscriptionsHandler)
 
-	if o.handlers["POST"] == nil {
-		o.handlers["POST"] = make(map[string]http.Handler)
+	if o.handlers["GET"] == nil {
+		o.handlers["GET"] = make(map[string]http.Handler)
 	}
-	o.handlers["POST"]["/subscriptions/report"] = report.NewSubscribeReport(o.context, o.ReportSubscribeReportHandler)
+	o.handlers["GET"]["/config"] = xapp.NewGetXappConfigList(o.context, o.XappGetXappConfigListHandler)
 
 }