fixing scheduling process
This commit is contained in:
parent
b40879d8aa
commit
b87b6c9eeb
@ -49,7 +49,5 @@ func NewLink(src ResourceObject, srcId string, dst ResourceObject, dstId string)
|
||||
return
|
||||
}
|
||||
|
||||
// So far only computing components expect the ID of the DC in their attributes
|
||||
// func (l *Link) AddLinkToDataCenter(component models.ComputingModel) {
|
||||
// }
|
||||
|
||||
|
||||
|
@ -99,7 +99,7 @@ func CheckSchedule(cronString string, duration uint, cronFirstDate, cronLastDate
|
||||
return errors.New("Bad cron message: " + err.Error())
|
||||
}
|
||||
|
||||
dcModel := GetDatacenterFromAcronym(services.DC_NAME)
|
||||
dcModel := GetDatacenterFromAcronym(services.DC_NAME)
|
||||
if dcModel == nil {
|
||||
return errors.New("The DC " + services.DC_NAME + " doesn't have any DC model with that acronym")
|
||||
}
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 345 KiB |
@ -3,6 +3,8 @@ package services
|
||||
import (
|
||||
"os"
|
||||
|
||||
conf "cloud.o-forge.io/core/oc-catalog/conf"
|
||||
|
||||
SelfAPI "cloud.o-forge.io/core/oc-catalog/selfapi"
|
||||
"github.com/beego/beego/v2/core/logs"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
@ -14,6 +16,7 @@ func GetSelfAPI(host string) *SelfAPI.APIClient {
|
||||
return SelfAPI.NewAPIClient(&SelfAPI.Configuration{BasePath: "http://" + host + "/v1"})
|
||||
}
|
||||
|
||||
// Need to understand why there are so many different DC name
|
||||
func Discoveryinit() {
|
||||
|
||||
dcNameOS := os.Getenv("DOCKER_DCNAME")
|
||||
@ -32,4 +35,7 @@ func Discoveryinit() {
|
||||
DC_NAME = "DC_DEFAULT"
|
||||
logs.Warning("Default DC name is used")
|
||||
|
||||
// Quickfix for scheduling
|
||||
DC_NAME = conf.GetConfig().DCNAME
|
||||
|
||||
}
|
||||
|
@ -5,7 +5,7 @@ import (
|
||||
)
|
||||
|
||||
func Init() {
|
||||
// Discoveryinit() //First init DC name
|
||||
Discoveryinit() //First init DC name
|
||||
|
||||
// var DBpoint string
|
||||
// var err error
|
||||
|
Loading…
Reference in New Issue
Block a user