Automatic merge from release/2.2.0 -> master

* commit 'a61c9056003255c7fd35803d23a3be3ff22ea5aa':
  zhengjiajie modify code
  fmt code
  ftm code
  zhengjiajie submit resource result export

cmd/climc/shell/res_results.go

@@ -0,0 +1,90 @@
+package shell
+
+import (
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+
+	type ResResultsListOptions struct {
+		options.BaseListOptions
+		StatMonth string `help:"stat_month of the query"`
+		StartDate string `help:"start_date of the query"`
+		EndDate   string `help:"end_date of the query"`
+		ProjectId string `help:"project_id of the query"`
+	}
+	R(&ResResultsListOptions{}, "resresult-list", "List all res results ", func(s *mcclient.ClientSession, args *ResResultsListOptions) error {
+		var params *jsonutils.JSONDict
+		{
+			var err error
+			params, err = args.BaseListOptions.Params()
+			if err != nil {
+				return err
+
+			}
+		}
+
+		if len(args.StatMonth) > 0 {
+			params.Add(jsonutils.NewString(args.StatMonth), "stat_month")
+		}
+		if len(args.StartDate) > 0 {
+			params.Add(jsonutils.NewString(args.StartDate), "start_date")
+		}
+		if len(args.EndDate) > 0 {
+			params.Add(jsonutils.NewString(args.EndDate), "end_date")
+		}
+		if len(args.ProjectId) > 0 {
+			params.Add(jsonutils.NewString(args.ProjectId), "project_id")
+		}
+
+		result, err := modules.ResResults.List(s, params)
+		if err != nil {
+			return err
+		}
+
+		printList(result, modules.ResResults.GetColumns(s))
+		return nil
+	})
+
+	type ResResultUpdateOptions struct {
+		ID        string `help:"ID of the query"`
+		StatMonth string `help:"stat_month of the query"`
+		StartDate string `help:"start_date of the query"`
+		EndDate   string `help:"end_date of the query"`
+		ProjectId string `help:"project_id of the query"`
+
+		ItemKey  string `help:"item_key of the query"`
+		ItemText string `help:"item_text of the query"`
+	}
+	R(&ResResultUpdateOptions{}, "resresult-export", "Update a resresult export", func(s *mcclient.ClientSession, args *ResResultUpdateOptions) error {
+		params := jsonutils.NewDict()
+		if len(args.StatMonth) > 0 {
+			params.Add(jsonutils.NewString(args.StatMonth), "stat_month")
+		}
+
+		if len(args.StartDate) > 0 {
+			params.Add(jsonutils.NewString(args.StartDate), "start_date")
+		}
+		if len(args.EndDate) > 0 {
+			params.Add(jsonutils.NewString(args.EndDate), "end_date")
+		}
+		if len(args.ProjectId) > 0 {
+			params.Add(jsonutils.NewString(args.ProjectId), "project_id")
+		}
+		if len(args.ItemKey) > 0 {
+			params.Add(jsonutils.NewString(args.ItemKey), "item_key")
+		}
+		if len(args.ItemText) > 0 {
+			params.Add(jsonutils.NewString(args.ItemText), "item_text")
+		}
+		resResult, err := modules.ResResults.Put(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(resResult)
+		return nil
+	})
+}

pkg/mcclient/modules/mod_res_results.go

@@ -0,0 +1,13 @@
+package modules
+
+var (
+	ResResults ResourceManager
+)
+
+func init() {
+	ResResults = NewMeterManager("res_result", "res_results",
+		[]string{"stat_month", "start_date", "end_date", "filter", "project_id"},
+		[]string{},
+	)
+	register(&ResResults)
+}