X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fclientapi%2Fr_i_c_subscription_client.go;h=47b7c1c665e76cf089729618172514511254d2b4;hb=refs%2Fchanges%2F95%2F6795%2F5;hp=7591e49e3ff8dc70329f36ed36fbe415b74dfde2;hpb=9568a2d73b96516b27f54650e309f0d157fb97d9;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/clientapi/r_i_c_subscription_client.go b/pkg/clientapi/r_i_c_subscription_client.go
index 7591e49..47b7c1c 100644
--- a/pkg/clientapi/r_i_c_subscription_client.go
+++ b/pkg/clientapi/r_i_c_subscription_client.go
@@ -8,14 +8,10 @@ package clientapi
 import (
 	"github.com/go-openapi/runtime"
 	httptransport "github.com/go-openapi/runtime/client"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientapi/common"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientapi/control"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientapi/policy"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientapi/query"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientapi/report"
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientapi/xapp"
 )
 
 // Default r i c subscription HTTP client.
@@ -60,17 +56,8 @@ func New(transport runtime.ClientTransport, formats strfmt.Registry) *RICSubscri
 
 	cli := new(RICSubscription)
 	cli.Transport = transport
-
 	cli.Common = common.New(transport, formats)
-
-	cli.Control = control.New(transport, formats)
-
-	cli.Policy = policy.New(transport, formats)
-
-	cli.Query = query.New(transport, formats)
-
-	cli.Report = report.New(transport, formats)
-
+	cli.Xapp = xapp.New(transport, formats)
 	return cli
 }
 
@@ -115,15 +102,9 @@ func (cfg *TransportConfig) WithSchemes(schemes []string) *TransportConfig {
 
 // RICSubscription is a client for r i c subscription
 type RICSubscription struct {
-	Common *common.Client
-
-	Control *control.Client
+	Common common.ClientService
 
-	Policy *policy.Client
-
-	Query *query.Client
-
-	Report *report.Client
+	Xapp xapp.ClientService
 
 	Transport runtime.ClientTransport
 }
@@ -131,15 +112,6 @@ type RICSubscription struct {
 // SetTransport changes the transport on the client and all its subresources
 func (c *RICSubscription) SetTransport(transport runtime.ClientTransport) {
 	c.Transport = transport
-
 	c.Common.SetTransport(transport)
-
-	c.Control.SetTransport(transport)
-
-	c.Policy.SetTransport(transport)
-
-	c.Query.SetTransport(transport)
-
-	c.Report.SetTransport(transport)
-
+	c.Xapp.SetTransport(transport)
 }