Prepare for SdlInstance usage removal in xapp-frame

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

diff --git a/pkg/xapp/config.go b/pkg/xapp/config.go
index ac60ac5..56986d3 100755 (executable)
--- a/pkg/xapp/config.go
+++ b/pkg/xapp/config.go
@@ -124,13 +124,17 @@ func AddConfigChangeListener(f ConfigChangeCB) {
 
 func PublishConfigChange(appName, eventJson string) error {
        channel := fmt.Sprintf("CM_UPDATE:%s", appName)
-       if err := Sdl.StoreAndPublish(channel, eventJson, appName, eventJson); err != nil {
+       if err := SdlStorage.StoreAndPublish(getCmSdlNs(), channel, eventJson, appName, eventJson); err != nil {
                Logger.Error("Sdl.Store failed: %v", err)
                return err
        }
        return nil
 }
 
+func ReadConfig(appName string) (map[string]interface{}, error) {
+       return SdlStorage.Read(getCmSdlNs(), appName)
+}
+
 func GetPortData(pname string) (d PortData) {
        var getPolicies = func(policies []interface{}) (plist []int) {
                for _, p := range policies {
@@ -178,8 +182,12 @@ func GetPortData(pname string) (d PortData) {
        return
 }
 
+func getCmSdlNs() string {
+       return fmt.Sprintf("cm/%s", viper.GetString("name"))
+}
+
 func (*Configurator) SetSDLNotificationCB(appName string, sdlNotificationCb SDLNotificationCB) error {
-       return Sdl.Subscribe(sdlNotificationCb, fmt.Sprintf("CM_UPDATE:%s", appName))
+       return SdlStorage.Subscribe(getCmSdlNs(), sdlNotificationCb, fmt.Sprintf("CM_UPDATE:%s", appName))
 }
 
 func (*Configurator) GetString(key string) string {