feat: ccontrol show query for multiple specified licenses.

Author: huerni

internal/cbatch/CmdArgParser.go

@@ -75,7 +75,6 @@ var (
 			if err := ParseCbatchScript(args[0], &pArgs, &pSh); err != util.ErrorSuccess {
 				os.Exit(err)
 			}
-			// TODO: 阻止使用module但没申请license的任务
 
 			ok, task := ProcessCbatchArgs(cmd, pArgs)
 			if !ok {

internal/ccontrol/CmdArgParser.go

@@ -28,19 +28,19 @@ import (
 )
 
 var (
-	FlagNodeName       string
-	FlagState          string
-	FlagReason         string
-	FlagPartitionName  string
-	FlagLicenseName    string
-	FlagTaskId         uint32
-	FlagTaskIds        string
-	FlagQueryAll       bool
-	FlagTimeLimit      string
-	FlagPriority       float64
-	FlagHoldTime       string
-	FlagConfigFilePath string
-	FlagJson           bool
+	FlagNodeName        string
+	FlagState           string
+	FlagReason          string
+	FlagPartitionName   string
+	FlagLicenseNameList string
+	FlagTaskId          uint32
+	FlagTaskIds         string
+	FlagQueryAll        bool
+	FlagTimeLimit       string
+	FlagPriority        float64
+	FlagHoldTime        string
+	FlagConfigFilePath  string
+	FlagJson            bool
 
 	RootCmd = &cobra.Command{
 		Use:     "ccontrol",
@@ -101,13 +101,13 @@ var (
 		Args:  cobra.MaximumNArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
 			if len(args) == 0 {
-				FlagLicenseName = ""
+				FlagLicenseNameList = ""
 				FlagQueryAll = true
 			} else {
-				FlagLicenseName = args[0]
+				FlagLicenseNameList = args[0]
 				FlagQueryAll = false
 			}
-			if err := ShowLicenses(FlagLicenseName, FlagQueryAll); err != util.ErrorSuccess {
+			if err := ShowLicenses(FlagLicenseNameList, FlagQueryAll); err != util.ErrorSuccess {
 				os.Exit(err)
 			}
 		},

internal/ccontrol/ccontrol.go

@@ -230,7 +230,8 @@ func ShowPartitions(partitionName string, queryAll bool) util.CraneCmdError {
 }
 
 func ShowLicenses(licenseName string, queryAll bool) util.CraneCmdError {
-	req := &protos.QueryLicensesInfoRequest{LicenseName: licenseName}
+	licenseNameList := strings.Split(licenseName, ",")
+	req := &protos.QueryLicensesInfoRequest{LicenseNameList: licenseNameList}
 	reply, err := stub.QueryLicensesInfo(context.Background(), req)
 	if err != nil {
 		util.GrpcErrorPrintf(err, "Failed to show license")

protos/Crane.proto

@@ -195,7 +195,7 @@ message QueryPartitionInfoReply {
 }
 
 message QueryLicensesInfoRequest {
-  string license_name = 1;
+  repeated string license_name_list = 1;
 }
 
 message QueryLicensesInfoReply {