neo oclib

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Package",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${fileDirname}",
+            "env": {
+                "MONITOR_METHOD" : "local"
+            }
+        }
+    ]
+}

Dockerfile

@@ -4,15 +4,22 @@ ENV DOCKER_ENVIRONMENT=true
 WORKDIR /app
 
 COPY . .
-COPY conf/docker_scheduler.json /etc/oc/scheduler.json
 
 RUN go build .
 
-FROM golang:alpine
+FROM oc-monitord:latest AS monitord
+
+FROM argoproj/argocd:latest
+
+ENV MONITORD_PATH = "./oc-monitord"
+
 WORKDIR /app
 
-COPY --from=builder /app/oc-scheduler .
+COPY conf/docker_schedulerd.json /etc/oc/schedulerd.json
-COPY conf/docker_scheduler.json /etc/oc/scheduler.json
 
-ENTRYPOINT ["/app/oc-scheduler"]
+COPY --from=monitord /app/oc-monitord .
+COPY --from=builder /app/oc-schedulerd .
+COPY conf/docker_schedulerd.json /etc/oc/schedulerd.json
+
+ENTRYPOINT ["/app/oc-schedulerd"]
 

conf/conf.go

@@ -8,54 +8,41 @@ import (
 )
 
 type Config struct {
-	OcCatalogUrl 	string
+	MonitorPath string
-	MongoUrl		string
+	MongoUrl    string
-	DBName			string
+	DBName      string
-	Logs 			string
+	Logs        string
-	LokiUrl			string
+	LokiUrl     string
-	NatsUrl			string
+	NatsUrl     string
 }
 
 var instance *Config
 var once sync.Once
 
-const defaultConfigFile = "/etc/oc/scheduler.json"
+const defaultConfigFile = "/etc/oc/schedulerd.json"
-const localConfigFile = "./conf/local_scheduler.json"
 
-
+func init() {
-func init(){
-	
 	configFile := ""
 	var o *onion.Onion
 
-	l3 := onion.NewEnvLayerPrefix("_", "OCSCHEDULER_")
+	l3 := onion.NewEnvLayerPrefix("_", "OCSCHEDULERD_")
 	l2, err := onion.NewFileLayer(defaultConfigFile, nil)
 	if err == nil {
 		logs.Info("Config file found : " + defaultConfigFile)
 		configFile = defaultConfigFile
 	}
-	l1, err := onion.NewFileLayer(localConfigFile, nil)
+	if configFile == "" || l2 == nil {
-	if err == nil {
-		logs.Info("Local config file found " + localConfigFile + ", overriding default file")
-		configFile = localConfigFile
-	}
-	if configFile == "" {
 		logs.Info("No config file found, using env")
 		o = onion.New(l3)
-	} else if l1 == nil && l2 == nil {
+	} else {
-		o = onion.New(l1, l2, l3)
-	} else if l1 == nil {
 		o = onion.New(l2, l3)
-	} else if l2 == nil {
-		o = onion.New(l1, l3)
 	}
-
+	GetConfig().MonitorPath = o.GetStringDefault("MONITORD_PATH", "../oc-monitord/oc-monitord")
-	GetConfig().OcCatalogUrl = o.GetStringDefault("oc-catalog", "https://localhost:49618")
+	GetConfig().Logs = o.GetStringDefault("LOG_LEVEL", "info")
-	GetConfig().Logs = o.GetStringDefault("loglevel", "info")
+	GetConfig().LokiUrl = o.GetStringDefault("LOKI_URL", "http://127.0.0.1:3100")
-	GetConfig().LokiUrl = o.GetStringDefault("loki_url","http://127.0.0.1:3100")
+	GetConfig().NatsUrl = o.GetStringDefault("NATS_URL", "http://127.0.0.1:4222")
-	GetConfig().NatsUrl = o.GetStringDefault("nats_url","http://127.0.0.1:4222")
+	GetConfig().MongoUrl = o.GetStringDefault("MONGO_URL", "mongodb://127.0.0.1:27017")
-	GetConfig().MongoUrl = o.GetStringDefault("mongo_url","mongodb://127.0.0.1:27017")
+	GetConfig().DBName = o.GetStringDefault("MONGO_DATABASE", "DC_myDC")
-	GetConfig().DBName = o.GetStringDefault("database_name","DC_myDC")
 
 }
 

conf/docker_scheduler.json

@@ -1,4 +0,0 @@
-{
-    "oc-catalog" : "http://oc-catalog:49618/",
-    "loki_url" : "http://192.168.1.18:3100"
-}

conf/docker_schedulerd.json

@@ -0,0 +1,6 @@
+{
+    "LOKI_URL" : "http://loki:3100",
+    "MONGO_URL":"mongodb://mongo:27017/", 
+    "MONGO_DATABASE":"DC_myDC",
+    "NATS_URL": "nats://nats:4222"
+}

conf/grafana_data_source.yml

@@ -0,0 +1,8 @@
+datasources:
+  - name: Loki
+    type: loki
+    access: proxy
+    url: http://loki:3100
+    isDefault: true
+    jsonData:
+      httpMethod: POST  

conf/local_scheduler.json

@@ -1,5 +0,0 @@
-{
-    "oc-catalog" : "http://localhost:49618/",
-    "logs" : "",
-    "mongo_url": "mongodb://127.0.0.1:27017"
-}

daemons/execute_monitor_local.go

@@ -1,47 +1,46 @@
 package daemons
 
 import (
-	"oc-scheduler/conf"
+	"fmt"
-	"oc-scheduler/logger"
+	"oc-schedulerd/conf"
 	"os/exec"
+
+	"github.com/rs/zerolog"
 )
 
-type LocalMonitor struct{
+type LocalMonitor struct {
-	LokiURL 		string
+	LokiURL     string
-	KubeURL			string
+	KubeURL     string
-	WorkflowName	string
+	ExecutionID string
+	Duration    int
+	Logger      zerolog.Logger
 }
 
-func (lm *LocalMonitor) LaunchLocalMonitor (){
+func (lm *LocalMonitor) LaunchLocalMonitor() {
-	if (lm.LokiURL == "" || lm.KubeURL == "" || lm.WorkflowName == ""){
+	if lm.LokiURL == "" || lm.KubeURL == "" || lm.ExecutionID == "" {
-		logger.Logger.Error().Msg("Missing parameter in LocalMonitor")
+		lm.Logger.Error().Msg("Missing parameter in LocalMonitor")
 	}
 
 	// For dev purposes, in prod KubeURL must be a kube API's URL
-	if(lm.KubeURL == "localhost"){
+	if lm.KubeURL != "localhost" {
-		lm.execLocalKube()
-	} else{
 		lm.execRemoteKube()
+	} else {
+		lm.execLocalKube()
 	}
 }
 
-func (lm *LocalMonitor) execLocalKube (){
+func (lm *LocalMonitor) execLocalKube() {
-	// kube_url := ""
+	args := []string{"-e", lm.ExecutionID, "-u", lm.LokiURL, "-m", conf.GetConfig().MongoUrl, "-d", conf.GetConfig().DBName}
-	cmd := exec.Command("../oc-monitor/oc-monitor", "-w",lm.WorkflowName, "-u", lm.LokiURL, "-m", conf.GetConfig().MongoUrl,"-d", conf.GetConfig().DBName)
+	if lm.Duration > 0 {
-	// cmd_ls := exec.Command("ls", "../oc-monitor")
+		args = append(args, "-t", fmt.Sprintf("%d", lm.Duration))
+	}
+	cmd := exec.Command(conf.GetConfig().MonitorPath, args...)
+	fmt.Printf("Command : %v\n", cmd)
 	err := cmd.Start()
-	// output, err := cmd_ls.CombinedOutput()
+	if err != nil {
-	if err !=nil {
+		lm.Logger.Error().Msg("Could not start oc-monitor for " + lm.ExecutionID + " : " + err.Error())
-		logger.Logger.Error().Msg("Could not start oc-monitor for " + lm.WorkflowName + " : " + err.Error())
 	}
-
 }
 
-
+// TODO : implement this
-func (lm *LocalMonitor) execRemoteKube (){
+func (lm *LocalMonitor) execRemoteKube() {}
-
-}
-
-func (lm *LocalMonitor) todo (){
-
-}

daemons/execution_manager.go

@@ -1,72 +1,60 @@
 package daemons
 
 import (
-	"oc-scheduler/conf"
+	"oc-schedulerd/conf"
-	"oc-scheduler/logger"
-	"oc-scheduler/models"
 	"os"
 	"time"
+
+	oclib "cloud.o-forge.io/core/oc-lib"
+	workflow_execution "cloud.o-forge.io/core/oc-lib/models/workflow_execution"
 )
 
-type ExecutionManager struct {
+var Bookings = ScheduledBooking{Bookings: []*workflow_execution.WorkflowExecution{}}
-	bookings	*models.ScheduledBooking
-	executions	[]models.Booking	
-}
 
-
+type ExecutionManager struct{}
-
-func (em *ExecutionManager) SetBookings(b *models.ScheduledBooking){
-	em.bookings = b
-}
 
 // Loop every second on the booking's list and move the booking that must start to a new list
 // that will be looped over to start them
-func (em *ExecutionManager) RetrieveNextExecutions(){
+func (em *ExecutionManager) RetrieveNextExecutions() {
-
+	logger := oclib.GetLogger()
-
+	for {
-	if(em.bookings == nil){
+		logger.Debug().Msg("New loop")
-		logger.Logger.Error().Msg("booking has not been set in the exection manager")
+		Bookings.Mu.Lock()
-		return
+		if len(Bookings.Bookings) > 0 {
-	}
+			bookings := Bookings.Bookings
-
+			for i := len(bookings) - 1; i >= 0; i-- {
-	for(true){
+				if bookings[i].ExecDate.Before(time.Now().UTC()) {
-		logger.Logger.Debug().Msg("New loop")
+					logger.Info().Msg("Will execute " + bookings[i].UUID + " soon")
-		em.bookings.Mu.Lock()
-		bookings :=  em.bookings.Bookings
-		if (len(bookings) > 0){	
-			for i := len( bookings) - 1 ; i  >= 0 ; i--{
-				logger.Logger.Debug().Msg("It should start at " + bookings[i].Start.String() + " and it is now " + time.Now().UTC() .String())
-				if (bookings[i].Start.Before(time.Now().UTC())){
-					logger.Logger.Info().Msg("Will execute " + bookings[i].Workflow + " soon")
 					go em.executeBooking(bookings[i])
-					bookings = append(bookings[:i], bookings[i+1:]...)
+					Bookings.Bookings = append(bookings[:i], bookings[i+1:]...)
-					em.bookings.Bookings = bookings
 				}
 			}
-		}	 
+		}
-		em.bookings.Mu.Unlock()
+		Bookings.Mu.Unlock()
 		time.Sleep(time.Second)
 	}
 }
 
-func (em *ExecutionManager) executeBooking(booking models.Booking){
+func (em *ExecutionManager) executeBooking(booking *workflow_execution.WorkflowExecution) {
-
+	// start execution
-
-	// start execution 
 	// create the yaml that describes the pod : filename, path/url to Loki
-
-		
 	exec_method := os.Getenv("MONITOR_METHOD")
-
+	logger := oclib.GetLogger()
-	if exec_method == "local"{
+	if exec_method == "k8s" {
-		logger.Logger.Debug().Msg("Executing oc-monitor localy")
+		logger.Error().Msg("TODO : executing oc-monitor in a k8s")
-		monitor := LocalMonitor{LokiURL: conf.GetConfig().LokiUrl,KubeURL: "localhost",WorkflowName: booking.Workflow,}
+	} else {
+		logger.Debug().Msg("Executing oc-monitor localy")
+		duration := 0
+		if booking.EndDate != nil && booking.ExecDate != nil {
+			duration = int(booking.EndDate.Sub(*booking.ExecDate).Seconds())
+		}
+		monitor := LocalMonitor{
+			Logger:  logger,
+			Duration: duration,
+			LokiURL: conf.GetConfig().LokiUrl, 
+			KubeURL: "localhost",
+			ExecutionID: booking.UUID,
+		}
 		monitor.LaunchLocalMonitor()
-	}else{
-		logger.Logger.Error().Msg("TODO : executing oc-monitor in a k8s")
 	}
-
-
-	
 }
-

daemons/schedule_manager.go

@@ -3,152 +3,147 @@ package daemons
 import (
 	"encoding/json"
 	"fmt"
+	"oc-schedulerd/conf"
+	"sync"
 	"time"
 
-	"oc-scheduler/logger"
-	"oc-scheduler/models"
-
 	oclib "cloud.o-forge.io/core/oc-lib"
 	"cloud.o-forge.io/core/oc-lib/dbs"
 	"cloud.o-forge.io/core/oc-lib/models/workflow_execution"
+	"cloud.o-forge.io/core/oc-lib/tools"
 	"github.com/nats-io/nats.go"
+	"github.com/rs/zerolog"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
+type ScheduledBooking struct {
+	Bookings []*workflow_execution.WorkflowExecution
+	Mu       sync.Mutex
+}
+
+func (sb *ScheduledBooking) DeleteSchedules(workflow_id string) {
+	toNotDelete := []*workflow_execution.WorkflowExecution{}
+	for _, b := range sb.Bookings {
+		if b.WorkflowID != workflow_id {
+			toNotDelete = append(toNotDelete, b)
+		}
+	}
+	Bookings.Mu.Lock()
+	defer Bookings.Mu.Unlock()
+	sb.Bookings = toNotDelete
+}
+
+func (sb *ScheduledBooking) AddSchedules(new_bookings []*workflow_execution.WorkflowExecution, logger zerolog.Logger) {
+	Bookings.Mu.Lock()
+	defer Bookings.Mu.Unlock()
+	for _, exec := range new_bookings {
+		if !sb.execIsSet(exec) {
+			sb.Bookings = append(sb.Bookings, exec)
+		}
+	}
+}
+
+func (sb *ScheduledBooking) execIsSet(exec *workflow_execution.WorkflowExecution) bool {
+	for _, b := range sb.Bookings {
+		if b.Equals(exec) {
+			return true
+		}
+	}
+	return false
+
+}
+
 // NATS daemon listens to subject " workflowsUpdate "
 // workflowsUpdate messages must be formatted following this pattern '{"workflow" : "", "start_date" : "", "stop_date" : "" }'
 
-
 type ScheduleManager struct {
-	Api_url		string
+	Logger zerolog.Logger
-	bookings	*models.ScheduledBooking	
-	ws			models.HttpQuery
-
-}
-
-func (s *ScheduleManager) SetBookings(b *models.ScheduledBooking){
-	s.bookings = b
 }
 
 // Goroutine listening to a NATS server for updates
-// on workflows' scheduling. Messages must contain 
+// on workflows' scheduling. Messages must contain
 // workflow execution ID, to allow retrieval of execution infos
-func (s *ScheduleManager) ListenForWorkflowSubmissions(){
+func (s *ScheduleManager) ListenNATS() {
-	
+	nc, err := nats.Connect(conf.GetConfig().NatsUrl)
-	if(s.bookings == nil){
-		logger.Logger.Error().Msg("booking has not been set in the schedule manager")
-	}
-
-	nc, err := nats.Connect(nats.DefaultURL)
 	if err != nil {
-		logger.Logger.Error().Msg("Could not connect to NATS")
+		s.Logger.Error().Msg("Could not connect to NATS")
 		return
 	}
-
 	defer nc.Close()
+	var wg sync.WaitGroup
+	wg.Add(2)
+	go s.listenForChange(nc, tools.REMOVE.GenerateKey(oclib.WORKFLOW.String()), true, wg)
+	go s.listenForChange(nc, tools.CREATE.GenerateKey(oclib.WORKFLOW.String()), false, wg)
+	wg.Wait()
 
+}
+
+// Goroutine listening to a NATS server for updates
+// on workflows' scheduling. Messages must contain
+// workflow execution ID, to allow retrieval of execution infos
+func (s *ScheduleManager) listenForChange(nc *nats.Conn, chanName string, delete bool, wg sync.WaitGroup) {
+	defer wg.Done()
 	ch := make(chan *nats.Msg, 64)
-
+	fmt.Println("Listening to " + chanName)
-	subs , err := nc.ChanSubscribe("workflowsUpdate", ch)
+	subs, err := nc.ChanSubscribe(chanName, ch)
 	if err != nil {
-		logger.Logger.Error().Msg("Error listening to NATS")
+		s.Logger.Error().Msg("Error listening to NATS : " + err.Error())
 	}
 	defer subs.Unsubscribe()
 
-	for msg := range(ch){
+	for msg := range ch {
-		fmt.Println("Waiting...")
+		map_mess := map[string]string{}
-
+		json.Unmarshal(msg.Data, &map_mess)
-		map_mess := retrieveMapFromSub(msg.Data)
+		str := "new"
-	
+		if delete {
-		s.bookings.Mu.Lock()
+			str = "deleted"
-		
+		}
-		wf_exec := getWorkflowExecution(map_mess["workflow"])
+		fmt.Println("Catching " + str + " workflow... " + map_mess["id"])
-
+		if delete {
-		s.bookings.AddSchedule(models.Booking{Workflow: map_mess["workflow"], Start: *wf_exec.ExecDate, Stop: *wf_exec.EndDate })
+			Bookings.DeleteSchedules(map_mess["id"])
-		s.bookings.Mu.Unlock()
+		} else {
-	
+			s.getNextScheduledWorkflows(1)
+		}
 	}
 }
 
-
-func getWorkflowExecution(exec_id string) *workflow_execution.WorkflowExecution {
-
-	res := oclib.LoadOne(oclib.LibDataEnum(oclib.WORKFLOW_EXECUTION),exec_id)
-
-	if res.Code != 200 {
-		logger.Logger.Error().Msg("Could not retrieve workflow ID from execution ID " + exec_id)
-		return nil
-	}
-
-	wf_exec := res.ToWorkflowExecution()
-
-	return wf_exec
-}
-
-// At the moment very simplistic, but could be useful if we send bigger messages
-func retrieveMapFromSub(message []byte) (result_map map[string]string) {
-	json.Unmarshal(message, &result_map)
-	return
-}
-
 // Used at launch of the component to retrieve the next scheduled workflows
 // and then every X minutes in case some workflows were scheduled before launch
-func (s *ScheduleManager) SchedulePolling (){
+func (s *ScheduleManager) SchedulePolling() {
 	var sleep_time float64 = 1
-	for(true){
+	for {
-		s.getNextScheduledWorkflows(3)
+		s.getNextScheduledWorkflows(1)
-		
+		s.Logger.Info().Msg("Current list of schedules -------> " + fmt.Sprintf("%v", len(Bookings.Bookings)))
-		logger.Logger.Info().Msg("Current list of schedules")
-		fmt.Println(s.bookings.Bookings)
-
 		time.Sleep(time.Minute * time.Duration(sleep_time))
 	}
 }
-func (s *ScheduleManager) getWorfklowExecution(from time.Time, to time.Time) (exec_list []workflow_execution.WorkflowExecution, err error) {
+func (s *ScheduleManager) getExecution(from time.Time, to time.Time) (exec_list []*workflow_execution.WorkflowExecution, err error) {
-	
+	fmt.Printf("Getting workflows execution from %s to %s \n", from.String(), to.String())
 	f := dbs.Filters{
 		And: map[string][]dbs.Filter{
-			"execution_date" : {{Operator : dbs.GTE.String(), Value: primitive.NewDateTimeFromTime(from)}, {Operator: dbs.LTE.String(), Value:  primitive.NewDateTimeFromTime(to)}},
+			"execution_date": {{Operator: dbs.GTE.String(), Value: primitive.NewDateTimeFromTime(from)}, {Operator: dbs.LTE.String(), Value: primitive.NewDateTimeFromTime(to)}},
-			"state": {{Operator: dbs.EQUAL.String(), Value: 1}},
+			"state":          {{Operator: dbs.EQUAL.String(), Value: 1}},
 		},
 	}
- 	res := oclib.Search(&f,"",oclib.LibDataEnum(oclib.WORKFLOW_EXECUTION))
+	res := oclib.Search(&f, "", oclib.LibDataEnum(oclib.WORKFLOW_EXECUTION))
 	if res.Code != 200 {
-		logger.Logger.Error().Msg("Error loading")
+		s.Logger.Error().Msg("Error loading")
-		return nil, nil
-	}
-
-	for _, exec := range(res.Data){
-		lib_data := oclib.LoadOne(oclib.LibDataEnum(oclib.WORKFLOW_EXECUTION),exec.GetID())
-		exec_obj := lib_data.ToWorkflowExecution()
-		exec_list = append(exec_list, *exec_obj)
-	}
-	return exec_list, nil
-}
-
-// TODO : refactor to implement oclib.Search
-func (s *ScheduleManager) getNextScheduledWorkflows(minutes float64)  {
-	start := time.Now().UTC()
-	end := start.Add(time.Minute * time.Duration(minutes)).UTC()
-	
-	fmt.Printf("Getting workflows execution from %s to %s \n", start.String(), end.String())
-
-	next_wf_exec, err := s.getWorfklowExecution(start,end)
-	if err != nil {
-		logger.Logger.Error().Msg("Could not retrieve next schedules")
 		return
 	}
-
+	for _, exec := range res.Data {
-
+		exec_list = append(exec_list, exec.(*workflow_execution.WorkflowExecution))
-	s.bookings.Mu.Lock()
-	defer s.bookings.Mu.Unlock()
-
-	for _, exec := range(next_wf_exec){
-		exec_start := exec.ExecDate
-		exec_stop := exec.EndDate
-
-		s.bookings.AddSchedule(models.Booking{Workflow: exec.UUID, Start: *exec_start, Stop: *exec_stop}) 
 	}
-	
+	return
 }
 
+func (s *ScheduleManager) getNextScheduledWorkflows(minutes float64) {
+	start := time.Now().UTC()
+	if next_wf_exec, err := s.getExecution(
+		start.Add(time.Second*time.Duration(-1)).UTC(),
+		start.Add(time.Minute*time.Duration(minutes)).UTC(),
+	); err != nil {
+		s.Logger.Error().Msg("Could not retrieve next schedules")
+	} else {
+		Bookings.AddSchedules(next_wf_exec, s.Logger)
+	}
+}

docker-compose.tools.yml

@@ -0,0 +1,39 @@
+version: '3.4'
+
+services:
+  nats:
+    image: 'nats:latest'
+    container_name: nats
+    ports:
+      - 4222:4222
+    command:
+      - "--debug"
+    networks: 
+      - scheduler
+      - catalog
+  loki:
+    image: 'grafana/loki'
+    container_name: loki
+    ports : 
+      - "3100:3100"
+    networks:
+      - scheduler
+  grafana:
+    image: 'grafana/grafana'
+    container_name: grafana
+    ports:
+      - '3000:3000'
+    networks:
+      - scheduler
+    volumes:
+      - ./conf/grafana_data_source.yml:/etc/grafana/provisioning/datasources/datasource.yml
+    #environment:
+      #- GF_SECURITY_ADMIN_PASSWORD=pfnirt                   # Change this to anything but admin to not have a password change page at startup
+      #- GF_SECURITY_ADMIN_USER=admin
+      #- GF_SECURITY_DISABLE_INITIAL_ADMIN_PASSWORD_CHANGE=true
+
+networks: 
+  scheduler:
+    external: true
+  catalog:
+    external: true

docker-compose.yml

@@ -1,23 +1,16 @@
 version: '3.4'
 
 services:
-  nats:
+  oc-schedulerd:
-    image: 'nats:latest'
+    environment: 
-    container_name: nats
+      - MONGO_DATABASE=DC_myDC
+    image: 'oc-schedulerd:latest'
     ports:
-      - 4222:4222
+      - 9001:8080
-    command:
+    container_name: oc-schedulerd
-      - "--debug"
     networks: 
-      - scheduler
+      - catalog
-  loki:
-    image: 'grafana/loki'
-    container_name: loki
-    ports : 
-      - "3100:3100"
-    networks:
-      - scheduler
 
 networks: 
-  scheduler:
+  catalog:
     external: true

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

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

execution_manager_test.go

@@ -1,14 +0,0 @@
-package main
-
-import (
-	"oc-scheduler/daemons"
-	"oc-scheduler/models"
-	"testing"
-)
-
-func TestCreateManifest(t *testing.T){
-	em := daemons.ExecutionManager{}
-	em.CreateManifest(models.Booking{},"fessity-chlics_23_07_2024_154326")
-
-	
-}

go.mod

@@ -1,4 +1,4 @@
-module oc-scheduler
+module oc-schedulerd
 
 go 1.22.0
 
@@ -6,9 +6,9 @@ toolchain go1.22.5
 
 require (
 	github.com/beego/beego v1.12.12
-	github.com/beego/beego/v2 v2.2.2
+	github.com/beego/beego/v2 v2.3.1
 	github.com/goraz/onion v0.1.3
-	github.com/nats-io/nats.go v1.9.1
+	github.com/nats-io/nats.go v1.37.0
 	github.com/nwtgck/go-fakelish v0.1.3
 	github.com/rs/zerolog v1.33.0
 	github.com/tidwall/gjson v1.17.1
@@ -17,7 +17,7 @@ require (
 )
 
 require (
-	cloud.o-forge.io/core/oc-lib v0.0.0-20240812075555-6e3069068ce4 // 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
@@ -25,14 +25,14 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.6 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.22.0 // indirect
+	github.com/go-playground/validator/v10 v10.22.1 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
@@ -45,7 +45,7 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -56,7 +56,7 @@ require (
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nats-io/jwt v0.3.2 // indirect
-	github.com/nats-io/nkeys v0.1.3 // indirect
+	github.com/nats-io/nkeys v0.4.7 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.19.0 // indirect
@@ -76,17 +76,17 @@ require (
 	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
 	github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
-	go.mongodb.org/mongo-driver v1.16.1 // indirect
+	go.mongodb.org/mongo-driver v1.17.1 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
 	golang.org/x/oauth2 v0.16.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/term v0.23.0 // indirect
+	golang.org/x/term v0.25.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/api v0.30.3 // indirect

go.sum

@@ -4,6 +4,26 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20240808075405-f45ad91687c4 h1:3xqz2s6r/PONq
 cloud.o-forge.io/core/oc-lib v0.0.0-20240808075405-f45ad91687c4/go.mod h1:V5EL+NV2s9P1/BcFm3/icfLeBYVVMLl1Z0F0eecJZGo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240812075555-6e3069068ce4 h1:fdxRsT4eR4v1DM3FpTPi9AKxB5oIw3XgLu9ByNipj4I=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240812075555-6e3069068ce4/go.mod h1:V5EL+NV2s9P1/BcFm3/icfLeBYVVMLl1Z0F0eecJZGo=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240821093044-f64563c9ff06 h1:sYveE1C/0mpSr+ZmOYxuZ3fTWID7mr5hPiq0jQenv3Q=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240821093044-f64563c9ff06/go.mod h1:1hhYh5QWAbYw9cKplQ0ZD9PMgU8t6gPqiYF8sldv1HU=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240826085916-d0e1474f8f34 h1:40XQgwR9HxXSnouY+ZqE/xYCM4qa+U+RLA5GA5JSNyQ=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240826085916-d0e1474f8f34/go.mod h1:1hhYh5QWAbYw9cKplQ0ZD9PMgU8t6gPqiYF8sldv1HU=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240826094730-73dc43b329d7 h1:WrlURBiciau4p6iU3v0nKcQYjBqW8e9Uc2soDDXll28=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240826094730-73dc43b329d7/go.mod h1:1hhYh5QWAbYw9cKplQ0ZD9PMgU8t6gPqiYF8sldv1HU=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240826103423-aff9304b1a71 h1:GodGMXVFgSdd5R1FoUjFAloOS+zOd3j66Wa+jcEPa4c=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240826103423-aff9304b1a71/go.mod h1:1hhYh5QWAbYw9cKplQ0ZD9PMgU8t6gPqiYF8sldv1HU=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240926135235-3d58416d9ba7 h1:xVGDhiVCRvqV2fkXkpoFtUouriIheks4OtdxsaRlMOM=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240926135235-3d58416d9ba7/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240927065314-0ac55a0ec151 h1:Sjap/XMOz3ludAGHKk1GimzWKb2wFmoo5tdBQ1E8/Ro=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240927065314-0ac55a0ec151/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
+cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e h1:77QHk5JSf0q13B/Ai3xjcsGSS7nX+9AfxcsYz5oDo/A=
+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=
@@ -40,6 +60,9 @@ github.com/beego/beego v1.12.12/go.mod h1:QURFL1HldOcCZAxnc1cZ7wrplsYR5dKPHFjmk6
 github.com/beego/beego/v2 v2.0.1/go.mod h1:8zyHi1FnWO1mZLwTn62aKRIZF/aIKvkCBB2JYs+eqQI=
 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=
@@ -110,6 +133,8 @@ github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy
 github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s=
 github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
 github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4=
+github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc=
+github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -136,6 +161,8 @@ github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
 github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
+github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA=
+github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-redis/redis v6.14.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-redis/redis/v7 v7.4.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
@@ -296,6 +323,10 @@ github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/
 github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0=
+github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -370,9 +401,13 @@ github.com/nats-io/nats-server/v2 v2.1.2 h1:i2Ly0B+1+rzNZHHWtD4ZwKi+OU5l+uQo1iDH
 github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
 github.com/nats-io/nats.go v1.9.1 h1:ik3HbLhZ0YABLto7iX80pZLPw/6dx3T+++MZJwLnMrQ=
 github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
+github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE=
+github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
 github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nkeys v0.1.3 h1:6JrEfig+HzTH85yxzhSVbjHRJv9cn0p6n3IngIcM5/k=
 github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=
+github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
@@ -571,6 +606,10 @@ go.mongodb.org/mongo-driver v1.16.0 h1:tpRsfBJMROVHKpdGyc1BBEzzjDUWjItxbVSZ8Ls4B
 go.mongodb.org/mongo-driver v1.16.0/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
 go.mongodb.org/mongo-driver v1.16.1 h1:rIVLL3q0IHM39dvE+z2ulZLp9ENZKThVfuvN/IiN4l8=
 go.mongodb.org/mongo-driver v1.16.1/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
+go.mongodb.org/mongo-driver v1.17.0 h1:Hp4q2MCjvY19ViwimTs00wHi7G4yzxh4/2+nTx8r40k=
+go.mongodb.org/mongo-driver v1.17.0/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4=
+go.mongodb.org/mongo-driver v1.17.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM=
+go.mongodb.org/mongo-driver v1.17.1/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -604,6 +643,10 @@ golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
 golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
 golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
 golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -648,6 +691,10 @@ golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
 golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
 golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -711,6 +758,10 @@ golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
 golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
 golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -720,6 +771,10 @@ golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
 golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
 golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
 golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -732,6 +787,10 @@ golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
 golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
@@ -803,6 +862,10 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
 google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

logger/logger.go

@@ -1,13 +0,0 @@
-package logger
-
-import (
-	"cloud.o-forge.io/core/oc-lib/logs"
-	"github.com/rs/zerolog"
-)
-
-var Logger zerolog.Logger
-
-func init() {
-	logs.SetAppName("oc-scheduler")
-	Logger = logs.CreateLogger("","")
-}

main.go

@@ -3,54 +3,28 @@ package main
 import (
 	"fmt"
 
-	conf "oc-scheduler/conf"
+	"oc-schedulerd/conf"
-	"oc-scheduler/models"
+	"oc-schedulerd/daemons"
-
-	"oc-scheduler/daemons"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
 )
 
-// var log zerolog.Logger
-
 func main() {
-	var bookings models.ScheduledBooking
+	oclib.InitDaemon("oc-schedulerd")
-	
+	oclib.SetConfig(
-	oclib.SetConfig(conf.GetConfig().MongoUrl,"DC_myDC")
+		conf.GetConfig().MongoUrl,
-	oclib.Init("oc-scheduler") 
+		conf.GetConfig().DBName,
-
+		conf.GetConfig().NatsUrl,
-	app_conf := conf.GetConfig()
+		conf.GetConfig().LokiUrl,
-	apiurl := app_conf.OcCatalogUrl
+		conf.GetConfig().Logs,
-
+	)
-	sch_mngr := daemons.ScheduleManager{Api_url: apiurl}
+	sch_mngr := daemons.ScheduleManager{Logger: oclib.GetLogger()}
-	sch_mngr.SetBookings(&bookings)
 	exe_mngr := daemons.ExecutionManager{}
-	exe_mngr.SetBookings(&bookings)
 
-	go sch_mngr.ListenForWorkflowSubmissions()
+	go sch_mngr.ListenNATS()
-	
 	go sch_mngr.SchedulePolling()
+
 	exe_mngr.RetrieveNextExecutions()
 
-
+	fmt.Print("stop")
-	// method in Schedule manager that checks the first Schedule object for its start date and exe 
-
-	// var g Graph
-
-	// list, err := g.GetGraphList(apiurl)
-	// if err != nil {
-	// 	log.Fatal().Msg("Failed to get the workspaces list, check api url and that api server is up : " + apiurl)
-	// }
-	
-	// println("Available workspaces :")
-	// for workspace, _ := range list {
-	// 	println(workspace)
-	// }
-	
-
-	// g.LoadFrom(list["test-alpr"])
-	// g.ExportToArgo("test-alpr")
-
- 	fmt.Print("stop")
-
 }

manifests/test-log_manifest.yaml

@@ -4,12 +4,12 @@ metadata:
   name: test-monitor
 spec:
   containers:
-  - name: "oc-monitor-quity-anetran"
+  - name: "oc-workflow-prous-skintris"
     image: docker.io/library/oc-monitor         # Currently uses the local contenaird 
     imagePullPolicy: IfNotPresent               # This should be removed once a registry has been set up
     env: 
       - name: "OCMONITOR_ARGOFILE"
-        value: "quity-anetran_29_07_2024_144136.yml"
+        value: "prous-skintris_29_07_2024_164008.yml"
       - name: "OCMONITOR_LOKIURL"
         value: "info"                  # !!!! In dev this must be replaced with the address of one of your interface (wifi, ethernet..)  
   restartPolicy: OnFailure

models/http.go

@@ -1,53 +0,0 @@
-package models
-
-import (
-	"io"
-	"net/http"
-	"net/http/cookiejar"
-	"net/url"
-)
-
-type HttpQuery struct {
-	baseurl string
-	jar     http.CookieJar
-	Cookies map[string]string
-}
-
-func (h *HttpQuery) Init(url string) {
-	h.baseurl = url
-	h.jar, _ = cookiejar.New(nil)
-	h.Cookies = make(map[string]string)
-}
-
-func (h *HttpQuery) Get(url string) ([]byte, error) {
-	client := &http.Client{Jar: h.jar}
-	resp, err := client.Get(h.baseurl + url)
-	if err != nil {
-		return nil, err
-	}
-	// store received cookies
-	for _, cookie := range h.jar.Cookies(resp.Request.URL) {
-		h.Cookies[cookie.Name] = cookie.Value
-	}
-	if err != nil {
-		return nil, err
-	}
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-	return body, nil
-}
-
-func (h *HttpQuery) Post(url string, data url.Values) (*http.Response, error) {
-	client := &http.Client{Jar: h.jar}
-	resp, err := client.PostForm(h.baseurl+url, data)
-	if err != nil {
-		return nil, err
-	}
-	// store received cookies
-	for _, cookie := range h.jar.Cookies(resp.Request.URL) {
-		h.Cookies[cookie.Name] = cookie.Value
-	}
-	return resp, err
-}

models/schedule.go

@@ -1,71 +0,0 @@
-package models
-
-import (
-	"fmt"
-	"oc-scheduler/logger"
-	"sync"
-	"time"
-)
-
-// Is duration really important ?
-
-type Booking struct {
-	Start		time.Time
-	Stop		time.Time
-	Duration	uint
-	Workflow	string
-}
-
-type ScheduledBooking struct {
-	Bookings	[]Booking
-	Mu			sync.Mutex
-}
-
-func (s Booking) Equals(other Booking) bool {
-    return s.Workflow == other.Workflow && s.Start == other.Start && s.Stop == other.Stop
-}
-
-func (sb *ScheduledBooking) AddSchedule(new_booking Booking){
-	if(!sb.scheduleAlreadyExists(new_booking)){
-		sb.Bookings = append(sb.Bookings,new_booking) 
-		logger.Logger.Info().Msg("Updated list schedules : \n " + sb.String())
-	} else {
-		// Debug condition : delete once this feature is ready to be implemented
-		logger.Logger.Debug().Msg("Workflow received not added")
-		logger.Logger.Debug().Msg("current schedule contains")
-		for _, booking := range(sb.Bookings){
-			logger.Logger.Debug().Msg(booking.String())
-		}
-	}
-}
-
-func (sb *ScheduledBooking) GetListNames()(list_names []string ){
-	for _, schedule := range(sb.Bookings){
-		list_names = append(list_names, schedule.Workflow)
-	}
-
-	return
-}
-
-func (sb *ScheduledBooking) scheduleAlreadyExists(new_booking Booking) bool {
-	for _, booking :=  range(sb.Bookings){
-		if booking.Equals(new_booking){
-			return true
-		}
-	}
-	return false
-}
-
-func (b *Booking) String() string {
-	return fmt.Sprintf("{workflow : %s ,  start_date : %s ,  stop_date :  %s }", b.Workflow, b.Start.Format(time.RFC3339), b.Stop.Format(time.RFC3339))
-	
-}
-
-func (sb *ScheduledBooking) String() string {
-	var str string
-	for _, booking := range(sb.Bookings){
-		str += fmt.Sprintf("%s\n", booking.String())
-	}
-
-	return str
-}

models/template_models.go

@@ -1,40 +0,0 @@
-package models
-
-type Parameter struct {
-	Name  string `yaml:"name,omitempty"`
-	Value string `yaml:"value,omitempty"`
-}
-
-type Container struct {
-	Image        string        `yaml:"image"`
-	Command      []string      `yaml:"command,omitempty,flow"`
-	Args         []string      `yaml:"args,omitempty,flow"`
-	VolumeMounts []VolumeMount `yaml:"volumeMounts,omitempty"`
-}
-
-type VolumeMount struct {
-	Name      string `yaml:"name"`
-	MountPath string `yaml:"mountPath"`
-}
-
-type Task struct {
-	Name         string   `yaml:"name"`
-	Template     string   `yaml:"template"`
-	Dependencies []string `yaml:"dependencies,omitempty"`
-	Arguments    struct {
-		Parameters []Parameter `yaml:"parameters,omitempty"`
-	} `yaml:"arguments,omitempty"`
-}
-
-type Dag struct {
-	Tasks []Task `yaml:"tasks,omitempty"`
-}
-
-type Template struct {
-	Name      string    `yaml:"name"`
-	Inputs    struct {
-		Parameters []Parameter `yaml:"parameters"`
-	} `yaml:"inputs,omitempty"`
-	Container Container `yaml:"container,omitempty"`
-	Dag       Dag       `yaml:"dag,omitempty"`
-}

models/volume_models.go

@@ -1,19 +0,0 @@
-package models
-
-
-
-type VolumeClaimTemplate struct {
-    Metadata struct {
-        Name string 	`yaml:"name"`
-    } 					`yaml:"metadata"`
-    Spec	VolumeSpec	`yaml:"spec"`
-}
-
-type VolumeSpec struct {
-	AccessModes []string 	`yaml:"accessModes,flow"`
-	Resources   struct {
-		Requests struct {
-			Storage string 	`yaml:"storage"`
-		} 					`yaml:"requests"`
-	} 						`yaml:"resources"`
-}