core/oc-lib
6
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

simplify call to peer

Browse Source
This commit is contained in:
mr
2024-08-23 09:53:37 +02:00
parent 29c2ab0e4c
commit e8acf8a127
6 changed files with 98 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
models/workflow/workflow.go
View File

@@ -4,7 +4,6 @@ import (
"encoding/json"
"errors"
"fmt"
"strings"
"time"
"cloud.o-forge.io/core/oc-lib/models/peer"
@@ -38,16 +37,11 @@ type Workflow struct {
AbstractWorkflow
}
func (wfa *Workflow) CheckBooking(subPath string, caller *tools.HTTPCaller) (bool, error) {
func (wfa *Workflow) CheckBooking(caller *tools.HTTPCaller) (bool, error) {
// check if
if wfa.Schedule == nil || wfa.Schedule.Start == nil || wfa.Graph == nil {
if wfa.Graph == nil {
return false, nil
}
if wfa.Schedule.End == nil {
// if no end... then Book like a savage
return true, nil
}
e := *wfa.Schedule.End
accessor := (&datacenter.DatacenterResource{}).GetAccessor(nil)
for _, link := range wfa.Graph.Links {
if ok, dc_id := wfa.isDCLink(link); ok {
@@ -60,14 +54,7 @@ func (wfa *Workflow) CheckBooking(subPath string, caller *tools.HTTPCaller) (boo
if peerID == "" {
return false, errors.New("no peer id")
}
p, code, err := (&peer.Peer{}).GetAccessor(nil).LoadOne(peerID)
if code != 200 {
return false, err
}
subPath = strings.ReplaceAll(subPath, ":datacenter_id", fmt.Sprintf("%v", dc_id))
subPath = strings.ReplaceAll(subPath, ":start_date", wfa.getFormat(wfa.Schedule.Start))
subPath = strings.ReplaceAll(subPath, ":end_date", wfa.getFormat(&e))
_, err = p.(*peer.Peer).LaunchPeerExecution(peerID, "", p.(*peer.Peer).Url+subPath, utils.BOOKING, tools.GET, nil, caller)
_, err := (&peer.Peer{}).LaunchPeerExecution(peerID, dc_id, utils.BOOKING, tools.GET, nil, caller)
if err != nil {
return false, err
}

8
models/workflow/workflow_mongo_accessor.go
View File

@@ -112,16 +112,10 @@ func (wfa *workflowMongoAccessor) book(id string, realData *Workflow, execs []*w
}
// CHECK BOOKING
peerID := dc.(*datacenter.DatacenterResource).PeerID
fmt.Println("PEER ID", peerID)
if peerID == "" {
continue
}
paccess := (&peer.Peer{})
p, code, _ := paccess.GetAccessor(nil).LoadOne(peerID)
if code != 200 {
continue
}
b, err := paccess.LaunchPeerExecution(p.GetID(), "", p.(*peer.Peer).Url, utils.BOOKING, tools.POST,
b, err := (&peer.Peer{}).LaunchPeerExecution(peerID, "", utils.BOOKING, tools.POST,
(&workflow_execution.WorkflowExecutions{
WorkflowID: id,
ResourceID: dc_id,