X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=cmd%2Fappmgr%2Fdesc.go;h=8cc39a59f80c478bd5a471bcc8a6e9ec5c460cd5;hb=4703b1a7457cf072640adbc0f5487a0675f5b6d3;hp=ac1d0c832c65d7af976d93072b1181735285cc52;hpb=059775ccd9e7c5482747729890800f7a7d507a94;p=ric-plt%2Fappmgr.git

diff --git a/cmd/appmgr/desc.go b/cmd/appmgr/desc.go
index ac1d0c8..8cc39a5 100755
--- a/cmd/appmgr/desc.go
+++ b/cmd/appmgr/desc.go
@@ -65,13 +65,14 @@ type CMError struct {
 }
 
 func (cm *ConfigMap) UploadConfig() (cfg []XAppConfig) {
+	ns := cm.GetNamespace("")
 	for _, name := range cm.GetNamesFromHelmRepo() {
 		if name == "appmgr" {
 			continue
 		}
 
 		c := XAppConfig{
-			Metadata: ConfigMetadata{Name: name, Namespace: "ricxapp", ConfigName: name + "-appconfig"},
+			Metadata: ConfigMetadata{Name: name, Namespace: ns, ConfigName: cm.GetConfigMapName(name, ns)},
 		}
 
 		err := cm.ReadSchema(name, &c)
@@ -79,7 +80,7 @@ func (cm *ConfigMap) UploadConfig() (cfg []XAppConfig) {
 			continue
 		}
 
-		err = cm.ReadConfigMap(c.Metadata.ConfigName, "ricxapp", &c.Configuration)
+		err = cm.ReadConfigMap(c.Metadata.ConfigName, ns, &c.Configuration)
 		if err != nil {
 			log.Println("No active configMap found, using default!")
 		}
@@ -161,7 +162,7 @@ func (cm *ConfigMap) ApplyConfigMap(r XAppConfig, action string) (err error) {
 
 func (cm *ConfigMap) GetConfigMap(m XappDeploy, c *interface{}) (err error) {
 	if m.ConfigName == "" {
-		m.ConfigName = m.Name + "-appconfig"
+		m.ConfigName = cm.GetConfigMapName(m.Name, m.Namespace)
 	}
 	return cm.ReadConfigMap(m.ConfigName, m.Namespace, c)
 }
@@ -195,7 +196,7 @@ func (cm *ConfigMap) DeleteConfigMap(r XAppConfig) (c interface{}, err error) {
 
 func (cm *ConfigMap) PurgeConfigMap(m XappDeploy) (c interface{}, err error) {
 	if m.ConfigName == "" {
-		m.ConfigName = m.Name + "-appconfig"
+		m.ConfigName = cm.GetConfigMapName(m.Name, m.Namespace)
 	}
 	md := ConfigMetadata{Name: m.Name, Namespace: m.Namespace, ConfigName: m.ConfigName}
 
@@ -204,7 +205,7 @@ func (cm *ConfigMap) PurgeConfigMap(m XappDeploy) (c interface{}, err error) {
 
 func (cm *ConfigMap) RestoreConfigMap(m XappDeploy, c interface{}) (err error) {
 	if m.ConfigName == "" {
-		m.ConfigName = m.Name + "-appconfig"
+		m.ConfigName = cm.GetConfigMapName(m.Name, m.Namespace)
 	}
 	md := ConfigMetadata{Name: m.Name, Namespace: m.Namespace, ConfigName: m.ConfigName}
 	time.Sleep(time.Duration(10 * time.Second))
@@ -291,7 +292,8 @@ func (cm *ConfigMap) FetchChart(name string) (err error) {
 func (cm *ConfigMap) GetMessages(name string) (msgs MessageTypes) {
 	log.Println("Fetching tx/rx messages for: ", name)
 
-	args := fmt.Sprintf("get configmap -o jsonpath='{.data.config-file\\.json}' -n ricxapp %s-appconfig", name)
+	ns := cm.GetNamespace("")
+	args := fmt.Sprintf("get configmap -o jsonpath='{.data.config-file\\.json}' -n %s %s", ns, cm.GetConfigMapName(name, ns))
 	out, err := KubectlExec(args)
 	if err != nil {
 		return
@@ -313,3 +315,19 @@ func (cm *ConfigMap) GetMessages(name string) (msgs MessageTypes) {
 
 	return
 }
+
+func (cm *ConfigMap) GetConfigMapName(xappName, namespace string) string {
+	return " configmap-" + namespace + "-" + xappName + "-appconfig"
+}
+
+func (cm *ConfigMap) GetNamespace(ns string) string {
+	if ns != "" {
+		return ns
+	}
+
+	ns = viper.GetString("xapp.namespace")
+	if ns == "" {
+		ns = "ricxapp"
+	}
+	return ns
+}