Merge branch 'main' of https://cloud.o-forge.io/core/oc-lib
Merged Main OCLIB
This commit is contained in:
@@ -367,13 +367,11 @@ func (w *Workflow) GetByRelatedProcessing(processingID string, g func(item graph
|
||||
_, node = item.GetResource() // we are looking for the storage as destination
|
||||
}
|
||||
if processingID == nodeID && node != nil { // if the storage is linked to the processing
|
||||
if _, ok := related[processingID]; !ok {
|
||||
related[processingID] = Related{}
|
||||
}
|
||||
rel := related[node.GetID()]
|
||||
relID := node.GetID()
|
||||
rel := Related{}
|
||||
rel.Node = node
|
||||
rel.Links = append(rel.Links, link)
|
||||
related[processingID] = rel
|
||||
related[relID] = rel
|
||||
}
|
||||
}
|
||||
return related
|
||||
@@ -484,6 +482,33 @@ func (wf *Workflow) Planify(start time.Time, end *time.Time, request *tools.APIR
|
||||
return longest, priceds, wf, nil
|
||||
}
|
||||
|
||||
// Returns a map of DataType (processing,computing,data,storage,worfklow) where each resource (identified by its UUID)
|
||||
// is mapped to the list of its items (different appearance) in the graph
|
||||
// ex: if the same Minio storage is represented by several nodes in the graph, in [tools.STORAGE_RESSOURCE] its UUID will be mapped to
|
||||
// the list of GraphItem ID that correspond to the ID of each node
|
||||
func (w *Workflow) GetItemsByResources() (map[tools.DataType]map[string][]string) {
|
||||
res := make(map[tools.DataType]map[string][]string)
|
||||
dtMethodMap := map[tools.DataType]func() []graph.GraphItem{
|
||||
tools.STORAGE_RESOURCE: func() []graph.GraphItem { return w.GetGraphItems(w.Graph.IsStorage) },
|
||||
tools.DATA_RESOURCE: func() []graph.GraphItem { return w.GetGraphItems(w.Graph.IsData) },
|
||||
tools.COMPUTE_RESOURCE: func() []graph.GraphItem { return w.GetGraphItems(w.Graph.IsCompute) },
|
||||
tools.PROCESSING_RESOURCE: func() []graph.GraphItem { return w.GetGraphItems(w.Graph.IsProcessing) },
|
||||
tools.WORKFLOW_RESOURCE: func() []graph.GraphItem { return w.GetGraphItems(w.Graph.IsWorkflow) },
|
||||
}
|
||||
|
||||
for dt, meth := range dtMethodMap {
|
||||
res[dt] = make(map[string][]string)
|
||||
items := meth()
|
||||
for _, i := range items {
|
||||
_, r := i.GetResource()
|
||||
rId := r.GetID()
|
||||
res[dt][rId] = append(res[dt][rId],i.ID)
|
||||
}
|
||||
}
|
||||
|
||||
return res
|
||||
}
|
||||
|
||||
func plan[T resources.ResourceInterface](
|
||||
dt tools.DataType, wf *Workflow, priceds map[tools.DataType]map[string]pricing.PricedItemITF, request *tools.APIRequest,
|
||||
f func(graph.GraphItem) bool, start func(resources.ResourceInterface, pricing.PricedItemITF) (time.Time, float64), end func(time.Time, float64) *time.Time) ([]T, map[tools.DataType]map[string]pricing.PricedItemITF, error) {
|
||||
|
||||
Reference in New Issue
Block a user