X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=cmd%2Fappmgr%2Ftypes.go;h=243179d025df0b6276eb2c74f3ed13f6e6146b79;hb=57d2a61e41861321b263fdeff5679671e36143ae;hp=2e0f54780c79eb5447bc360c52882fc0ebb696d4;hpb=10d3c67188dd2db001e0fd196b0acbad7d9bb37d;p=ric-plt%2Fappmgr.git

diff --git a/cmd/appmgr/types.go b/cmd/appmgr/types.go
index 2e0f547..243179d 100755
--- a/cmd/appmgr/types.go
+++ b/cmd/appmgr/types.go
@@ -38,10 +38,12 @@ type Resource struct {
 }
 
 type Xapp struct {
-	Name      string         `json:"name"`
-	Status    string         `json:"status"`
-	Version   string         `json:"version"`
-	Instances []XappInstance `json:"instances"`
+	Name       string         `json:"name"`
+	ConfigName string         `json:"configName, omitempty"`
+	Namespace  string         `json:"namespace, omitempty"`
+	Status     string         `json:"status"`
+	Version    string         `json:"version"`
+	Instances  []XappInstance `json:"instances"`
 }
 
 type XappInstance struct {
@@ -53,40 +55,17 @@ type XappInstance struct {
 	RxMessages []string `json:"rxMessages"`
 }
 
-type XappDeploy struct {
-	Name        string `json:"name"`
-	ConfigName  string `json:"configName, omitempty"`
-	Namespace   string `json:"namespace, omitempty"`
-	ServiceName string `json:"serviceName, omitempty"`
-	ImageRepo   string `json:"imageRepo, omitempty"`
-	Hostname    string `json:"hostname, omitempty"`
-}
-
 type XappManager struct {
 	router *mux.Router
 	helm   Helmer
-	cm     ConfigMapper
 	sd     SubscriptionDispatcher
 	opts   CmdOptions
 	ready  bool
 }
 
-type ConfigMapper interface {
-	UploadConfig() (cfg []XAppConfig)
-	CreateConfigMap(r XAppConfig) (errList []CMError, err error)
-	UpdateConfigMap(r XAppConfig) (errList []CMError, err error)
-	DeleteConfigMap(r XAppConfig) (cm interface{}, err error)
-	PurgeConfigMap(m XappDeploy) (cm interface{}, err error)
-	RestoreConfigMap(m XappDeploy, cm interface{}) (err error)
-	ReadConfigMap(name string, ns string, c *interface{}) (err error)
-	ApplyConfigMap(r XAppConfig, action string) (err error)
-	GetMessages(name string) (msgs MessageTypes)
-}
-
 type Helmer interface {
-	SetCM(ConfigMapper)
 	Initialize()
-	Install(m XappDeploy) (xapp Xapp, err error)
+	Install(m ConfigMetadata) (xapp Xapp, err error)
 	Status(name string) (xapp Xapp, err error)
 	StatusAll() (xapps []Xapp, err error)
 	List() (xapps []string, err error)
@@ -97,7 +76,6 @@ type Helm struct {
 	host      string
 	chartPath string
 	initDone  bool
-	cm        ConfigMapper
 }
 
 type SubscriptionReq struct {