#2701

update

models/resource_specification.go

@@ -341,7 +341,7 @@ func FindSpecs(opts FindSpecsOptions) ([]*Specification, error) {
 	if opts.ComputeResource != "" {
 		cond = cond.And(builder.Eq{"resource_queue.compute_resource": opts.ComputeResource})
 	}
-	if opts.ComputeResource != "" {
+	if opts.Cluster != "" {
 		cond = cond.And(builder.Eq{"resource_queue.cluster": opts.Cluster})
 	}
 	if opts.AiCenterCode != "" {
@@ -531,18 +531,20 @@ var grampusSpecs map[string]*Specification
 
 func GetGrampusSpecs() (map[string]*Specification, error) {
 	if !grampusSpecsInitFlag {
+		specMap := make(map[string]*Specification, 0)
 		r, err := FindSpecs(FindSpecsOptions{
-			Cluster: C2NetCluster,
+			Cluster:    C2NetCluster,
+			RequestAll: true,
 		})
 		if err != nil {
 			return nil, err
 		}
 		for _, spec := range r {
-			grampusSpecs[spec.SourceSpecId] = spec
-			grampusSpecs[spec.SourceSpecId+"_"+spec.AiCenterCode] = spec
+			specMap[spec.SourceSpecId] = spec
+			specMap[spec.SourceSpecId+"_"+spec.AiCenterCode] = spec
 		}
 		grampusSpecsInitFlag = true
-
+		grampusSpecs = specMap
 	}
 	return grampusSpecs, nil
 }

services/cloudbrain/resource/resource_specification.go

@@ -610,7 +610,11 @@ func getGrampusSpec(task *models.Cloudbrain) (*models.Specification, error) {
 		return nil, err
 	}
 	if task.AiCenter != "" {
-		return specMap[task.FlavorCode+"_"+task.AiCenter], nil
+		c := strings.Split(task.AiCenter, "+")
+		spec := specMap[task.FlavorCode+"_"+c[0]]
+		if spec != nil {
+			return spec, nil
+		}
 	}
 	return specMap[task.FlavorCode], nil
 }