core/deprecated-oc-catalog
6
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

fixing scheduling process

Browse Source
This commit is contained in:
pb 2024-07-04 15:57:28 +02:00
parent b40879d8aa
commit b87b6c9eeb
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
models/links.go
View File

@ -49,7 +49,5 @@ func NewLink(src ResourceObject, srcId string, dst ResourceObject, dstId string)
return return
} }
// So far only computing components expect the ID of the DC in their attributes
// func (l *Link) AddLinkToDataCenter(component models.ComputingModel) {
// }

2
models/schedule.go
View File

@ -99,7 +99,7 @@ func CheckSchedule(cronString string, duration uint, cronFirstDate, cronLastDate
return errors.New("Bad cron message: " + err.Error()) return errors.New("Bad cron message: " + err.Error())
} }
dcModel := GetDatacenterFromAcronym(services.DC_NAME) dcModel := GetDatacenterFromAcronym(services.DC_NAME)
if dcModel == nil { if dcModel == nil {
return errors.New("The DC " + services.DC_NAME + " doesn't have any DC model with that acronym") return errors.New("The DC " + services.DC_NAME + " doesn't have any DC model with that acronym")
} }

BIN
out/docs/UML/plantuml/diagram_object_models/diagram_object_models.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 345 KiB

6
services/discovery.go
View File

@ -3,6 +3,8 @@ package services
import ( import (
"os" "os"
conf "cloud.o-forge.io/core/oc-catalog/conf"
SelfAPI "cloud.o-forge.io/core/oc-catalog/selfapi" SelfAPI "cloud.o-forge.io/core/oc-catalog/selfapi"
"github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/core/logs"
beego "github.com/beego/beego/v2/server/web" 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"}) return SelfAPI.NewAPIClient(&SelfAPI.Configuration{BasePath: "http://" + host + "/v1"})
} }
// Need to understand why there are so many different DC name
func Discoveryinit() { func Discoveryinit() {
dcNameOS := os.Getenv("DOCKER_DCNAME") dcNameOS := os.Getenv("DOCKER_DCNAME")
@ -32,4 +35,7 @@ func Discoveryinit() {
DC_NAME = "DC_DEFAULT" DC_NAME = "DC_DEFAULT"
logs.Warning("Default DC name is used") logs.Warning("Default DC name is used")
// Quickfix for scheduling
DC_NAME = conf.GetConfig().DCNAME
} }

2
services/init.go
View File

@ -5,7 +5,7 @@ import (
) )
func Init() { func Init() {
// Discoveryinit() //First init DC name Discoveryinit() //First init DC name
// var DBpoint string // var DBpoint string
// var err error // var err error