Merge pull request 'scheduler refactor updated2' (#5) from tzwang/pcm-coordinator:master into master

Former-commit-id: 0ef41cdf98fe874119d15c83108676d736f66913

pkg/scheduler/aiScheduler.go

@@ -52,7 +52,3 @@ func (as *AiScheduler) pickOptimalStrategy() (strategies.Strategy, error) {
 func (as *AiScheduler) genTaskAndProviders() (*providerPricing.Task, []*providerPricing.Provider) {
 	return nil, nil
 }
-
-func (as *AiScheduler) assignTask() error {
-	return nil
-}

pkg/scheduler/cloudScheduler.go

@@ -116,7 +116,3 @@ func (cs *CloudScheduler) genTaskAndProviders() (*providerPricing.Task, []*provi
 
 	return nil, providerList, nil
 }
-
-func (cs *CloudScheduler) assignTask() error {
-	return nil
-}

pkg/scheduler/common.go

@@ -24,7 +24,6 @@ import (
 type scheduleService interface {
 	getNewStructForDb(task *response.TaskInfo, resource string, participantId int64) (interface{}, error)
 	pickOptimalStrategy() (strategies.Strategy, error)
-	assignTask() error
 }
 
 // 求交集

pkg/scheduler/database/storage.go

@@ -2,4 +2,10 @@ package database
 
 type Storage interface {
 	GetProviderParams() ([]providerParams, error)
+	FindAvailableCluster()
+}
+
+type NSIDSpecified interface {
+	Storage
+	NSID() error
 }

pkg/scheduler/hpcScheduler.go

@@ -49,7 +49,3 @@ func (h *HpcScheduler) pickOptimalStrategy() (strategies.Strategy, error) {
 func (h *HpcScheduler) genTaskAndProviders(task *response.TaskInfo) (*providerPricing.Task, []*providerPricing.Provider) {
 	return nil, nil
 }
-
-func (h *HpcScheduler) assignTask() error {
-	return nil
-}

pkg/scheduler/scheduler.go

@@ -131,11 +131,15 @@ func (s *scheduler) AssignAndSchedule() error {
 		return nil
 	}
 
-	//生成算法所需参数
+	strategy, err := s.scheduleService.pickOptimalStrategy()
-	//task, providerList, err := s.obtainParamsForStrategy()
+	if err != nil {
-	//if err != nil {
+		return err
-	//	return err
+	}
-	//}
+
+	_, err = strategy.Schedule()
+	if err != nil {
+		return err
+	}
 
 	//集群数量不满足，指定到标签匹配后第一个集群
 	//if len(providerList) < 2 {

pkg/scheduler/strategies/replicationStrategy.go

@@ -0,0 +1,12 @@
+package strategies
+
+type ReplicationStrategy struct {
+}
+
+func (ps *ReplicationStrategy) findAvailableCLuster() error {
+	return nil
+}
+
+func (ps *ReplicationStrategy) Schedule() ([]*AssignedCluster, error) {
+	return nil, nil
+}