Merge remote-tracking branch 'origin/res-manage' into res-manage-v2

models/resource_specification.go

@@ -23,6 +23,7 @@ type ResourceSpecification struct {
 	ShareMemGiB     float32
 	UnitPrice       int
 	Status          int
+	IsAvailable     bool
 	IsAutomaticSync bool
 	CreatedTime     timeutil.TimeStamp `xorm:"created"`
 	CreatedBy       int64
@@ -41,6 +42,7 @@ func (r ResourceSpecification) ConvertToRes() *ResourceSpecificationRes {
 		GPUMemGiB:    r.GPUMemGiB,
 		UnitPrice:    r.UnitPrice,
 		Status:       r.Status,
+		IsAvailable:  r.IsAvailable,
 		UpdatedTime:  r.UpdatedTime,
 	}
 }
@@ -73,14 +75,16 @@ func (r ResourceSpecificationReq) ToDTO() ResourceSpecification {
 		IsAutomaticSync: r.IsAutomaticSync,
 		CreatedBy:       r.CreatorId,
 		UpdatedBy:       r.CreatorId,
+		IsAvailable:     true,
 	}
 }
 
 type SearchResourceSpecificationOptions struct {
 	ListOptions
-	QueueId int64
-	Status  int
-	Cluster string
+	QueueId       int64
+	Status        int
+	Cluster       string
+	AvailableCode int
 }
 
 type SearchResourceBriefSpecificationOptions struct {
@@ -114,6 +118,7 @@ type ResourceSpecificationRes struct {
 	ShareMemGiB  float32
 	UnitPrice    int
 	Status       int
+	IsAvailable  bool
 	UpdatedTime  timeutil.TimeStamp
 }
 
@@ -215,6 +220,11 @@ func SearchResourceSpecification(opts SearchResourceSpecificationOptions) (int64
 	if opts.Cluster != "" {
 		cond = cond.And(builder.Eq{"resource_queue.cluster": opts.Cluster})
 	}
+	if opts.AvailableCode == 1 {
+		cond = cond.And(builder.Eq{"resource_specification.is_available": true})
+	} else if opts.AvailableCode == 2 {
+		cond = cond.And(builder.Eq{"resource_specification.is_available": false})
+	}
 	//cond = cond.And(builder.Or(builder.Eq{"resource_queue.deleted_time": 0}).Or(builder.IsNull{"resource_queue.deleted_time"}))
 	n, err := x.Where(cond).Join("INNER", "resource_queue", "resource_queue.ID = resource_specification.queue_id").
 		Unscoped().Count(&ResourceSpecAndQueue{})
@@ -304,7 +314,7 @@ func SyncGrampusSpecs(updateList []ResourceSpecification, insertList []ResourceS
 		return err
 	}
 	if len(deleteIds) > 0 {
-		if _, err = sess.In("id", deleteIds).Update(&ResourceSpecification{Status: SpecOffShelf}); err != nil {
+		if _, err = sess.Cols("status", "is_available").In("id", deleteIds).Update(&ResourceSpecification{Status: SpecOffShelf, IsAvailable: false}); err != nil {
 			return err
 		}
 		if _, err = sess.In("spec_id", deleteIds).Delete(&ResourceSceneSpec{}); err != nil {
@@ -315,7 +325,7 @@ func SyncGrampusSpecs(updateList []ResourceSpecification, insertList []ResourceS
 	//update exists specs
 	if len(updateList) > 0 {
 		for _, v := range updateList {
-			if _, err = sess.ID(v.ID).Update(&v); err != nil {
+			if _, err = sess.ID(v.ID).UseBool("is_available").Update(&v); err != nil {
 				return err
 			}
 		}

routers/admin/resources.go

@@ -120,11 +120,13 @@ func GetResourceSpecificationList(ctx *context.Context) {
 	queue := ctx.QueryInt64("queue")
 	status := ctx.QueryInt("status")
 	cluster := ctx.Query("cluster")
+	available := ctx.QueryInt("available")
 	list, err := resource.GetResourceSpecificationList(models.SearchResourceSpecificationOptions{
-		ListOptions: models.ListOptions{Page: page, PageSize: 10},
-		QueueId:     queue,
-		Status:      status,
-		Cluster:     cluster,
+		ListOptions:   models.ListOptions{Page: page, PageSize: 10},
+		QueueId:       queue,
+		Status:        status,
+		Cluster:       cluster,
+		AvailableCode: available,
 	})
 	if err != nil {
 		log.Error("GetResourceSpecificationList error.%v", err)

routers/response/response_list.go

@@ -2,3 +2,4 @@ package response
 
 var RESOURCE_QUEUE_NOT_AVAILABLE = &BizError{Code: 1001, Err: "resource queue not available"}
 var SPECIFICATION_NOT_EXIST = &BizError{Code: 1002, Err: "specification not exist"}
+var SPECIFICATION_NOT_AVAILABLE = &BizError{Code: 1003, Err: "specification not available"}

services/cloudbrain/resource/resource_specification.go

@@ -99,6 +99,7 @@ func SyncGrampusSpecs(doerId int64) error {
 					GPUMemGiB:       gpuMemGiB,
 					Status:          models.SpecNotVerified,
 					IsAutomaticSync: true,
+					IsAvailable:     true,
 					CreatedBy:       doerId,
 					UpdatedBy:       doerId,
 				})
@@ -110,6 +111,7 @@ func SyncGrampusSpecs(doerId int64) error {
 					CpuCores:    spec.SpecInfo.CpuCoreNum,
 					MemGiB:      memGiB,
 					GPUMemGiB:   gpuMemGiB,
+					IsAvailable: true,
 					UpdatedBy:   doerId,
 				})
 			}
@@ -149,7 +151,9 @@ func ResourceSpecOnShelf(doerId int64, id int64, unitPrice int) *response.BizErr
 	if q, err := models.GetResourceQueue(&models.ResourceQueue{ID: spec.QueueId}); err != nil || q == nil {
 		return response.RESOURCE_QUEUE_NOT_AVAILABLE
 	}
-
+	if !spec.IsAvailable {
+		return response.SPECIFICATION_NOT_AVAILABLE
+	}
 	err = models.ResourceSpecOnShelf(id, unitPrice)
 	if err != nil {
 		return response.NewBizError(err)