feat: add is_default to scheduler_cluster table (#458)

Signed-off-by: Gaius <gaius.qi@gmail.com>
dragonflyoss · Jul 13, 2021 · 6386cae · 6386cae
1 parent 2c5fc97
commit 6386cae
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/manager/database/database.go b/manager/database/database.go
@@ -91,6 +91,7 @@ func seed(db *gorm.DB) error {
 			Name:         "scheduler-cluster-1",
 			Config:       map[string]interface{}{},
 			ClientConfig: map[string]interface{}{},
+			IsDefault:    true,
 		}).Error; err != nil {
 			return err
 		}

diff --git a/manager/model/scheduler_cluster.go b/manager/model/scheduler_cluster.go
@@ -10,6 +10,7 @@ type SchedulerCluster struct {
 	BIO             string            `gorm:"column:bio;size:1024" json:"bio"`
 	Config          datatypes.JSONMap `gorm:"column:config;not null" json:"config"`
 	ClientConfig    datatypes.JSONMap `gorm:"column:client_config;not null" json:"client_config"`
+	IsDefault       bool              `gorm:"column:is_default;not null;default:false" json:"is_default"`
 	CDNClusters     []CDNCluster      `gorm:"many2many:cdn_cluster_scheduler_cluster;" json:"-"`
 	Schedulers      []Scheduler       `json:"-"`
 	SecurityGroupID *uint

diff --git a/manager/service/scheduler_cluster.go b/manager/service/scheduler_cluster.go
@@ -11,6 +11,7 @@ func (s *rest) CreateSchedulerCluster(json types.CreateSchedulerClusterRequest)
 		BIO:          json.BIO,
 		Config:       json.Config,
 		ClientConfig: json.ClientConfig,
+		IsDefault:    json.IsDefault,
 	}
 
 	if err := s.db.Create(&schedulerCluster).Error; err != nil {
@@ -33,6 +34,7 @@ func (s *rest) CreateSchedulerClusterWithSecurityGroupDomain(json types.CreateSc
 		BIO:          json.BIO,
 		Config:       json.Config,
 		ClientConfig: json.ClientConfig,
+		IsDefault:    json.IsDefault,
 	}
 
 	if err := s.db.Model(&securityGroup).Association("SchedulerClusters").Append(&schedulerCluster); err != nil {
@@ -57,6 +59,7 @@ func (s *rest) UpdateSchedulerCluster(id uint, json types.UpdateSchedulerCluster
 		BIO:          json.BIO,
 		Config:       json.Config,
 		ClientConfig: json.ClientConfig,
+		IsDefault:    json.IsDefault,
 	}).Error; err != nil {
 		return nil, err
 	}
@@ -77,6 +80,7 @@ func (s *rest) UpdateSchedulerClusterWithSecurityGroupDomain(id uint, json types
 		BIO:          json.BIO,
 		Config:       json.Config,
 		ClientConfig: json.ClientConfig,
+		IsDefault:    json.IsDefault,
 	}
 
 	if err := s.db.Model(&securityGroup).Association("SchedulerClusters").Append(&schedulerCluster); err != nil {

diff --git a/manager/types/scheduler_cluster.go b/manager/types/scheduler_cluster.go
@@ -14,6 +14,7 @@ type CreateSchedulerClusterRequest struct {
 	BIO                 string                 `json:"bio" binding:"omitempty"`
 	Config              map[string]interface{} `json:"config" binding:"required"`
 	ClientConfig        map[string]interface{} `json:"client_config" binding:"required"`
+	IsDefault           bool                   `json:"is_default" binding:"omitempty"`
 	SecurityGroupDomain string                 `json:"security_group_domain" binding:"omitempty"`
 }
 
@@ -22,6 +23,7 @@ type UpdateSchedulerClusterRequest struct {
 	BIO                 string                 `json:"bio" binding:"omitempty"`
 	Config              map[string]interface{} `json:"config" binding:"omitempty"`
 	ClientConfig        map[string]interface{} `json:"client_config" binding:"omitempty"`
+	IsDefault           bool                   `json:"is_default" binding:"omitempty"`
 	SecurityGroupDomain string                 `json:"security_group_domain" binding:"omitempty"`
 }