X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fclientapi%2Fr_i_c_subscription_client.go;fp=pkg%2Fclientapi%2Fr_i_c_subscription_client.go;h=d5df71c729b89efda7634c65c9d8b355d5ca4737;hb=3602bf801fef17e317cb35a4c710118ec80908b9;hp=2acd8c0846a1fc605056e8ba35b49fa6245b073b;hpb=060448c051013852d463bc13bfc5f0aa3696ac9c;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 2acd8c0..d5df71c 100644
--- a/pkg/clientapi/r_i_c_subscription_client.go
+++ b/pkg/clientapi/r_i_c_subscription_client.go
@@ -12,9 +12,7 @@ import (
 	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/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.
@@ -62,11 +60,7 @@ func New(transport runtime.ClientTransport, formats strfmt.Registry) *RICSubscri
 
 	cli.Common = common.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
 }
@@ -114,11 +108,7 @@ func (cfg *TransportConfig) WithSchemes(schemes []string) *TransportConfig {
 type RICSubscription struct {
 	Common *common.Client
 
-	Policy *policy.Client
-
-	Query *query.Client
-
-	Report *report.Client
+	Xapp *xapp.Client
 
 	Transport runtime.ClientTransport
 }
@@ -129,10 +119,6 @@ func (c *RICSubscription) SetTransport(transport runtime.ClientTransport) {
 
 	c.Common.SetTransport(transport)
 
-	c.Policy.SetTransport(transport)
-
-	c.Query.SetTransport(transport)
-
-	c.Report.SetTransport(transport)
+	c.Xapp.SetTransport(transport)
 
 }