diff --git a/docs/uml/class_new_graph.puml b/docs/uml/class_new_graph.puml index 6848bd4..cd59dc1 100644 --- a/docs/uml/class_new_graph.puml +++ b/docs/uml/class_new_graph.puml @@ -3,7 +3,7 @@ package "main" { class Graph { []DataModel Datas []ComputingModel Computings - []DatacenterModel Datacenters + []ComputeModel Computes []StorageModel Storages map[string, Link] Links HttpQuery ws @@ -13,7 +13,7 @@ package "main" { GetWorkflowComponents(workflow string) GetLinks(workflow string) AddDataModel(id string, user_input gjson.Result, wf_id string) error - AddDatacenterModel(id string, user_input gjson.Result, wf_id string) error + AddComputeModel(id string, user_input gjson.Result, wf_id string) error AddComputingModel(id string, user_input gjson.Result, wf_id string) error AddStorageModel(id string, user_input gjson.Result, wf_id string) error ExportToArgo(id string) error diff --git a/docs/uml/class_old_graph.puml b/docs/uml/class_old_graph.puml index 6d1208a..6d81015 100644 --- a/docs/uml/class_old_graph.puml +++ b/docs/uml/class_old_graph.puml @@ -4,14 +4,14 @@ package "main" { []Link Links []DataModel Datas []ComputingModel Computings - []DatacenterModel Datacenters + []ComputeModel Computes []StorageModel Storages HttpQuery ws GetGraphList(apiurl string) (map[string]string, error) LoadFrom(workspace string) error AddDataModel(id string) error - AddDatacenterModel(id string) error + AddComputeModel(id string) error AddComputingModel(id string) error AddStorageModel(id string) error ExportToArgo(id string) error diff --git a/go.mod b/go.mod index b4837e9..b9900a7 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( ) require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20241015083538-9f5e6d60185a // indirect + cloud.o-forge.io/core/oc-lib v0.0.0-20241107122526-f3df1e42b9ba // indirect github.com/Klathmon/StructToMap v0.0.0-20140724123129-3d0229e2dce7 // indirect github.com/antihax/optional v1.0.0 // indirect github.com/aws/aws-sdk-go v1.36.29 // indirect diff --git a/go.sum b/go.sum index 73babef..62f8d24 100644 --- a/go.sum +++ b/go.sum @@ -20,6 +20,10 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e h1:77QHk5JSf0q13 cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8= cloud.o-forge.io/core/oc-lib v0.0.0-20241015083538-9f5e6d60185a h1:2mBMc36WKh1/Dpomktx9dVXGxK0agFr7RdgvHTtyn2w= cloud.o-forge.io/core/oc-lib v0.0.0-20241015083538-9f5e6d60185a/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8= +cloud.o-forge.io/core/oc-lib v0.0.0-20241107114600-4c0c75be9161 h1:so5V7C6kiJ9tpuxtgK/KcgjXQC2ythInAH8X2gohuaM= +cloud.o-forge.io/core/oc-lib v0.0.0-20241107114600-4c0c75be9161/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo= +cloud.o-forge.io/core/oc-lib v0.0.0-20241107122526-f3df1e42b9ba h1:MGd8N7bY1LWXMhAp7gibDNwMS2hsatLQ3rfayvy5rGs= +cloud.o-forge.io/core/oc-lib v0.0.0-20241107122526-f3df1e42b9ba/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Klathmon/StructToMap v0.0.0-20140724123129-3d0229e2dce7 h1:n0MD6UkwbgGHtXsmfgVzC2+ZbHzIsScpbq9ZGI18074= github.com/Klathmon/StructToMap v0.0.0-20140724123129-3d0229e2dce7/go.mod h1:xdrQDwHlKUmv8yiElMx6W0W10cLkqpeSEUUib8KGtv4= @@ -58,6 +62,7 @@ github.com/beego/beego/v2 v2.2.2 h1:h6TNybAiMPXx9RXxK71Wz+JkPE7rpsL+ctjSZpv5yB0= github.com/beego/beego/v2 v2.2.2/go.mod h1:A3BC73uulBnqW3O1uBEN7q+oykprxipZTYRdZtEuKyY= github.com/beego/beego/v2 v2.3.1 h1:7MUKMpJYzOXtCUsTEoXOxsDV/UcHw6CPbaWMlthVNsc= github.com/beego/beego/v2 v2.3.1/go.mod h1:5cqHsOHJIxkq44tBpRvtDe59GuVRVv/9/tyVDxd5ce4= +github.com/beego/beego/v2 v2.3.2/go.mod h1:5cqHsOHJIxkq44tBpRvtDe59GuVRVv/9/tyVDxd5ce4= github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ= github.com/beego/x2j v0.0.0-20131220205130-a0352aadc542/go.mod h1:kSeGC/p1AbBiEp5kat81+DSQrZenVBZXklMLaELspWU= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/main.go b/main.go index 3d1ed07..52b1e7a 100644 --- a/main.go +++ b/main.go @@ -10,15 +10,14 @@ import ( ) func main() { + oclib.InitDaemon("oc-schedulerd") oclib.SetConfig( conf.GetConfig().MongoUrl, - conf.GetConfig().DBName, - conf.GetConfig().NatsUrl, - conf.GetConfig().LokiUrl, - conf.GetConfig().Logs, + conf.GetConfig().DBName, + conf.GetConfig().NatsUrl, + conf.GetConfig().LokiUrl, + conf.GetConfig().Logs, ) - oclib.Init("oc-schedulerd") - sch_mngr := daemons.ScheduleManager{Logger: oclib.GetLogger()} exe_mngr := daemons.ExecutionManager{} diff --git a/oc-schedulerd b/oc-schedulerd index 2916db6..fe8fc20 100755 Binary files a/oc-schedulerd and b/oc-schedulerd differ