Code violation fix and added locks in metriccache manipulation funcs

[ric-plt/xapp-frame.git] / pkg / clientapi / r_i_c_subscription_client.go

diff --git a/pkg/clientapi/r_i_c_subscription_client.go b/pkg/clientapi/r_i_c_subscription_client.go
index 91c32aa..2acd8c0 100644 (file)
--- a/pkg/clientapi/r_i_c_subscription_client.go
+++ b/pkg/clientapi/r_i_c_subscription_client.go
@@ -12,8 +12,8 @@ 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/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"
 )
 
@@ -62,10 +62,10 @@ func New(transport runtime.ClientTransport, formats strfmt.Registry) *RICSubscri
 
        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)
 
        return cli
@@ -114,10 +114,10 @@ func (cfg *TransportConfig) WithSchemes(schemes []string) *TransportConfig {
 type RICSubscription struct {
        Common *common.Client
 
-       Control *control.Client
-
        Policy *policy.Client
 
+       Query *query.Client
+
        Report *report.Client
 
        Transport runtime.ClientTransport
@@ -129,10 +129,10 @@ func (c *RICSubscription) SetTransport(transport runtime.ClientTransport) {
 
        c.Common.SetTransport(transport)
 
-       c.Control.SetTransport(transport)
-
        c.Policy.SetTransport(transport)
 
+       c.Query.SetTransport(transport)
+
        c.Report.SetTransport(transport)
 
 }