X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fcharts%2Fchart_manager.go;h=e78238dbabb5477f7a23b9d5d36a261fb5326919;hb=f95c1d3a137db6a4dd4ff7d8c3a8f5a2a7a55c2f;hp=c0308dd740f5198984892720dcc43241a4d722dd;hpb=d8d204f3ca9ebfd256043f6a0de526887fdcace9;p=ric-plt%2Fricdms.git diff --git a/pkg/charts/chart_manager.go b/pkg/charts/chart_manager.go index c0308dd..e78238d 100644 --- a/pkg/charts/chart_manager.go +++ b/pkg/charts/chart_manager.go @@ -34,8 +34,8 @@ type ChartMgr struct { } type IChartMgr interface { - GetCharts() (string, error) - DownloadChart(string, string) (io.ReadCloser, error) + GetCharts() (map[string]interface{}, error) + DownloadChart(chartName string, version string) (io.ReadCloser, error) GetChartsByName(name string) ([]map[string]interface{}, error) GetChartsByNameAndVersion(name, version string) (map[string]interface{}, error) } @@ -44,13 +44,13 @@ func NewChartmgr() IChartMgr { return &ChartMgr{} } -func (c *ChartMgr) GetCharts() (string, error) { +func (c *ChartMgr) GetCharts() (map[string]interface{}, error) { ricdms.Logger.Debug("GetCharts invoked") resp, err := http.Get(ricdms.Config.GetChartsURL) if err != nil { ricdms.Logger.Debug("Error in getting charts : %+v", err) - return "", err + return make(map[string]interface{}, 0), err } defer resp.Body.Close() @@ -58,11 +58,14 @@ func (c *ChartMgr) GetCharts() (string, error) { if err != nil { ricdms.Logger.Debug("error in response: %+v", respByte) - return "", err + return make(map[string]interface{}, 0), err } ricdms.Logger.Debug("response : %+v", string(respByte)) - return string(respByte), nil + + v := make(map[string]interface{}, 0) + json.Unmarshal(respByte, &v) + return v, nil } func (c *ChartMgr) DownloadChart(chartName string, version string) (io.ReadCloser, error) { @@ -79,7 +82,7 @@ func (c *ChartMgr) DownloadChart(chartName string, version string) (io.ReadClose return nil, err } - return resp.Request.Body, nil + return resp.Body, nil } func (c *ChartMgr) GetChartsByName(name string) ([]map[string]interface{}, error) {