diff --git a/cmd/climc/shell/compute/hosts.go b/cmd/climc/shell/compute/hosts.go index b169ee6221..c44399277f 100644 --- a/cmd/climc/shell/compute/hosts.go +++ b/cmd/climc/shell/compute/hosts.go @@ -259,10 +259,10 @@ func init() { params.Add(jsonutils.NewString(args.Desc), "description") } if args.CpuCommitBound > 0.0 { - params.Add(jsonutils.NewFloat(args.CpuCommitBound), "cpu_cmtbound") + params.Add(jsonutils.NewFloat64(args.CpuCommitBound), "cpu_cmtbound") } if args.MemoryCommitBound > 0.0 { - params.Add(jsonutils.NewFloat(args.MemoryCommitBound), "mem_cmtbound") + params.Add(jsonutils.NewFloat64(args.MemoryCommitBound), "mem_cmtbound") } if len(args.MemoryReserved) > 0 { params.Add(jsonutils.NewString(args.MemoryReserved), "mem_reserved") diff --git a/pkg/appsrv/stats.go b/pkg/appsrv/stats.go index 4f958bacbb..aed5496d16 100644 --- a/pkg/appsrv/stats.go +++ b/pkg/appsrv/stats.go @@ -28,11 +28,11 @@ func doStatsHandler(stats *jsonutils.JSONArray, method, path string, hi, total * s.Add(jsonutils.NewString(path), "path") s.Add(jsonutils.NewString(hi.GetName(nil)), "name") s.Add(jsonutils.NewInt(hi.counter2XX.hit), "hit.2XX") - s.Add(jsonutils.NewFloat(hi.counter2XX.duration), "duration.2XX") + s.Add(jsonutils.NewFloat64(hi.counter2XX.duration), "duration.2XX") s.Add(jsonutils.NewInt(hi.counter4XX.hit), "hit.4XX") - s.Add(jsonutils.NewFloat(hi.counter4XX.duration), "duration.4XX") + s.Add(jsonutils.NewFloat64(hi.counter4XX.duration), "duration.4XX") s.Add(jsonutils.NewInt(hi.counter5XX.hit), "hit.5XX") - s.Add(jsonutils.NewFloat(hi.counter5XX.duration), "duration.5XX") + s.Add(jsonutils.NewFloat64(hi.counter5XX.duration), "duration.5XX") total.counter2XX.hit += hi.counter2XX.hit total.counter2XX.duration += hi.counter2XX.duration total.counter4XX.hit += hi.counter4XX.hit @@ -56,10 +56,10 @@ func StatisticHandler(ctx context.Context, w http.ResponseWriter, r *http.Reques result := jsonutils.NewDict() result.Add(stats, "paths") result.Add(jsonutils.NewInt(total.counter2XX.hit), "hit.2XX") - result.Add(jsonutils.NewFloat(total.counter2XX.duration), "duration.2XX") + result.Add(jsonutils.NewFloat64(total.counter2XX.duration), "duration.2XX") result.Add(jsonutils.NewInt(total.counter4XX.hit), "hit.4XX") - result.Add(jsonutils.NewFloat(total.counter4XX.duration), "duration.4XX") + result.Add(jsonutils.NewFloat64(total.counter4XX.duration), "duration.4XX") result.Add(jsonutils.NewInt(total.counter5XX.hit), "hit.5XX") - result.Add(jsonutils.NewFloat(total.counter5XX.duration), "duration.5XX") + result.Add(jsonutils.NewFloat64(total.counter5XX.duration), "duration.5XX") fmt.Fprintf(w, result.String()) } diff --git a/pkg/compute/models/cloudaccounts.go b/pkg/compute/models/cloudaccounts.go index 114ea0def0..97345d7856 100644 --- a/pkg/compute/models/cloudaccounts.go +++ b/pkg/compute/models/cloudaccounts.go @@ -1970,7 +1970,7 @@ func (self *SCloudaccount) GetDetailsBalance(ctx context.Context, userCred mccli return nil, httperrors.NewGeneralError(err) } ret := jsonutils.NewDict() - ret.Add(jsonutils.NewFloat(balance), "balance") + ret.Add(jsonutils.NewFloat64(balance), "balance") return ret, nil } diff --git a/pkg/hostman/hostmetrics/hostmetrics.go b/pkg/hostman/hostmetrics/hostmetrics.go index 518fb04e23..22c9829f85 100644 --- a/pkg/hostman/hostmetrics/hostmetrics.go +++ b/pkg/hostman/hostmetrics/hostmetrics.go @@ -386,7 +386,7 @@ func (s *SGuestMonitorCollector) reportIo(curInfo, prevInfo jsonutils.JSONObject prev, _ := prevInfo.GetString(field) fcur, _ := strconv.ParseFloat(cur, 64) fprev, _ := strconv.ParseFloat(prev, 64) - ioInfo.Set(s.GetIoFiledName(field), jsonutils.NewFloat((fcur-fprev)/float64(diffTime))) + ioInfo.Set(s.GetIoFiledName(field), jsonutils.NewFloat64((fcur-fprev)/float64(diffTime))) } } return ioInfo @@ -515,11 +515,11 @@ func (m *SGuestMonitor) Cpu() jsonutils.JSONObject { cpuTimes, _ := m.Process.Times() ret := jsonutils.NewDict() percent, _ = strconv.ParseFloat(fmt.Sprintf("%0.4f", percent/float64(m.CpuCnt)), 64) - ret.Set("usage_active", jsonutils.NewFloat(percent)) - ret.Set("cpu_usage_idle_pcore", jsonutils.NewFloat(100-percent/float64(m.CpuCnt))) - ret.Set("cpu_usage_pcore", jsonutils.NewFloat(percent/float64(m.CpuCnt))) - ret.Set("cpu_time_user", jsonutils.NewFloat(cpuTimes.User)) - ret.Set("cpu_time_system", jsonutils.NewFloat(cpuTimes.System)) + ret.Set("usage_active", jsonutils.NewFloat64(percent)) + ret.Set("cpu_usage_idle_pcore", jsonutils.NewFloat64(100-percent/float64(m.CpuCnt))) + ret.Set("cpu_usage_pcore", jsonutils.NewFloat64(percent/float64(m.CpuCnt))) + ret.Set("cpu_time_user", jsonutils.NewFloat64(cpuTimes.User)) + ret.Set("cpu_time_system", jsonutils.NewFloat64(cpuTimes.System)) ret.Set("cpu_count", jsonutils.NewInt(int64(m.CpuCnt))) threadCnt, _ := m.Process.NumThreads() @@ -558,6 +558,6 @@ func (m *SGuestMonitor) Mem() jsonutils.JSONObject { ret := jsonutils.NewDict() ret.Set("rss", jsonutils.NewInt(int64(mem.RSS))) ret.Set("vms", jsonutils.NewInt(int64(mem.VMS))) - ret.Set("used_percent", jsonutils.NewFloat(float64(used_percent))) + ret.Set("used_percent", jsonutils.NewFloat64(float64(used_percent))) return ret } diff --git a/pkg/mcclient/options/base.go b/pkg/mcclient/options/base.go index 9a1e7ac87e..2523de038b 100644 --- a/pkg/mcclient/options/base.go +++ b/pkg/mcclient/options/base.go @@ -116,7 +116,7 @@ func optionsStructRvToParams(rv reflect.Value) (*jsonutils.JSONDict, error) { rv64 := f.Convert(gotypes.Float64Type) f64 := rv64.Interface().(float64) if f64 != 0 || !jsonInfo.OmitZero { - p.Set(name, jsonutils.NewFloat(f64)) + p.Set(name, jsonutils.NewFloat64(f64)) } case reflect.String: s := f.Interface().(string) diff --git a/pkg/monitor/suggestsysdrivers/influxdbbasedriver.go b/pkg/monitor/suggestsysdrivers/influxdbbasedriver.go index 67868d312b..5c6d8ff634 100644 --- a/pkg/monitor/suggestsysdrivers/influxdbbasedriver.go +++ b/pkg/monitor/suggestsysdrivers/influxdbbasedriver.go @@ -230,7 +230,7 @@ func describeEvalResultTojson(evalMatchsMap map[string][]*monitor.EvalMatch, map idTag := getMetricIdTag(evalMatch.Tags) if val, ok := idTag[mappingId]; ok { if val == mappingVal { - problem.Add(jsonutils.NewFloat(*evalMatch.Value), evalMatch.Metric) + problem.Add(jsonutils.NewFloat64(*evalMatch.Value), evalMatch.Metric) } } } diff --git a/pkg/multicloud/ucloud/client.go b/pkg/multicloud/ucloud/client.go index 9308527854..f4536067d1 100644 --- a/pkg/multicloud/ucloud/client.go +++ b/pkg/multicloud/ucloud/client.go @@ -82,9 +82,9 @@ func (self *SParams) Set(key string, value interface{}) { case bool: self.data.Set(key, jsonutils.NewBool(v)) case float64: - self.data.Set(key, jsonutils.NewFloat(v)) + self.data.Set(key, jsonutils.NewFloat64(v)) case float32: - self.data.Set(key, jsonutils.NewFloat(float64(v))) + self.data.Set(key, jsonutils.NewFloat32(v)) case []string: self.data.Set(key, jsonutils.NewStringArray(v)) default: