X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Frestapi.go;h=205f5f6f8a6c50120ba29d90bdf2a5548b4f8cdb;hb=refs%2Fchanges%2F40%2F6340%2F1;hp=24755fae8109afb97c1e19444ff0797416a5859e;hpb=060448c051013852d463bc13bfc5f0aa3696ac9c;p=ric-plt%2Fxapp-frame.git diff --git a/pkg/xapp/restapi.go b/pkg/xapp/restapi.go index 24755fa..205f5f6 100755 --- a/pkg/xapp/restapi.go +++ b/pkg/xapp/restapi.go @@ -22,12 +22,13 @@ package xapp import ( "encoding/json" "fmt" - "github.com/gorilla/mux" - "github.com/spf13/viper" "io/ioutil" "net/http" "os" + "github.com/gorilla/mux" + "github.com/spf13/viper" + "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models" ) @@ -103,9 +104,13 @@ func (r *Router) CheckStatus() (status bool) { } func (r *Router) GetSymptomDataParams(w http.ResponseWriter, req *http.Request) SymptomDataParams { + Logger.Info("GetSymptomDataParams ...") + params := SymptomDataParams{} queryParams := req.URL.Query() + Logger.Info("GetSymptomDataParams: %+v", queryParams) + for p := range queryParams { if p == "timeout" { fmt.Sscanf(p, "%d", ¶ms.Timeout) @@ -120,12 +125,50 @@ func (r *Router) GetSymptomDataParams(w http.ResponseWriter, req *http.Request) return params } +func (r *Router) CollectDefaultSymptomData(fileName string, data interface{}) string { + baseDir := Config.GetString("controls.symptomdata.baseDir") + if baseDir == "" { + baseDir = "/tmp/xapp/" + } + + if err := Util.CreateDir(baseDir); err != nil { + Logger.Error("CreateDir failed: %v", err) + return "" + } + + if metrics, err := r.GetLocalMetrics(GetPortData("http").Port); err == nil { + if err := Util.WriteToFile(baseDir+"metrics.json", metrics); err != nil { + Logger.Error("writeToFile failed for metrics.json: %v", err) + } + } + + if data != nil { + if b, err := json.MarshalIndent(data, "", " "); err == nil { + Util.WriteToFile(baseDir+fileName, string(b)) + } + } + + rtPath := os.Getenv("RMR_STASH_RT") + if rtPath == "" { + return baseDir + } + + input, err := ioutil.ReadFile(rtPath) + if err != nil { + Logger.Error("ioutil.ReadFile failed: %v", err) + return baseDir + } + + Util.WriteToFile(baseDir+"rttable.txt", string(input)) + return baseDir +} + func (r *Router) SendSymptomDataJson(w http.ResponseWriter, req *http.Request, data interface{}, n string) { w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Disposition", "attachment; filename="+n) w.WriteHeader(http.StatusOK) if data != nil { - response, _ := json.Marshal(data) + response, _ := json.MarshalIndent(data, "", " ") w.Write(response) } }