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

copy resource in workflow

Browse Source
This commit is contained in:
mr
2024-07-30 12:08:13 +02:00
parent 250fefd0d8
commit 5405e91167
20 changed files with 194 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
models/resources/data/data.go
View File

@@ -3,11 +3,12 @@ package data
import (
"encoding/json"
"cloud.o-forge.io/core/oc-lib/models/resource_model"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
type DataResource struct {
utils.AbstractResource
resource_model.AbstractResource
Protocols []string `json:"protocol,omitempty" bson:"protocol,omitempty"` //TODO Enum type
DataType string `json:"datatype,omitempty" bson:"datatype,omitempty"`
Example string `json:"example,omitempty" bson:"example,omitempty" description:"base64 encoded data"`

2
models/resources/data/data_mongo_accessor.go
View File

@@ -14,10 +14,12 @@ func (dma *DataMongoAccessor) DeleteOne(id string) (utils.DBObject, int, error)
}
func (dma *DataMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
set.(*DataResource).ResourceModel = nil
return dma.GenericUpdateOne(set, id, dma, &DataResource{})
}
func (dma *DataMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {
data.(*DataResource).ResourceModel = nil
return dma.GenericStoreOne(data, dma)
}

5
models/resources/data/data_test.go
View File

@@ -3,6 +3,7 @@ package data
import (
"testing"
"cloud.o-forge.io/core/oc-lib/models/resource_model"
"cloud.o-forge.io/core/oc-lib/models/utils"
"github.com/stretchr/testify/assert"
@@ -10,7 +11,7 @@ import (
func TestStoreOneData(t *testing.T) {
d := DataResource{DataType: "jpeg", Example: "123456",
AbstractResource: utils.AbstractResource{
AbstractResource: resource_model.AbstractResource{
AbstractObject: utils.AbstractObject{Name: "testData"},
Description: "Lorem Ipsum",
Logo: "azerty.com",
@@ -28,7 +29,7 @@ func TestStoreOneData(t *testing.T) {
func TestLoadOneDate(t *testing.T) {
d := DataResource{DataType: "jpeg", Example: "123456",
AbstractResource: utils.AbstractResource{
AbstractResource: resource_model.AbstractResource{
AbstractObject: utils.AbstractObject{Name: "testData"},
Description: "Lorem Ipsum",
Logo: "azerty.com",

3
models/resources/datacenter/datacenter.go
View File

@@ -3,11 +3,12 @@ package datacenter
import (
"encoding/json"
"cloud.o-forge.io/core/oc-lib/models/resource_model"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
type DatacenterResource struct {
utils.AbstractResource
resource_model.AbstractResource
CPUs []*CPU `bson:"cpus,omitempty" json:"cpus,omitempty"`
RAM *RAM `bson:"ram,omitempty" json:"ram,omitempty"`
GPUs []*GPU `bson:"gpus,omitempty" json:"gpus,omitempty"`

2
models/resources/datacenter/datacenter_mongo_accessor.go
View File

@@ -14,10 +14,12 @@ func (dca *DatacenterMongoAccessor) DeleteOne(id string) (utils.DBObject, int, e
}
func (dca *DatacenterMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
set.(*DatacenterResource).ResourceModel = nil
return dca.GenericUpdateOne(set, id, dca, &DatacenterResource{})
}
func (dca *DatacenterMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {
data.(*DatacenterResource).ResourceModel = nil
return dca.GenericStoreOne(data, dca)
}

5
models/resources/datacenter/datacenter_test.go
View File

@@ -3,6 +3,7 @@ package datacenter
import (
"testing"
"cloud.o-forge.io/core/oc-lib/models/resource_model"
"cloud.o-forge.io/core/oc-lib/models/utils"
"github.com/stretchr/testify/assert"
@@ -10,7 +11,7 @@ import (
func TestStoreOneDatacenter(t *testing.T) {
dc := DatacenterResource{
AbstractResource: utils.AbstractResource{
AbstractResource: resource_model.AbstractResource{
AbstractObject: utils.AbstractObject{Name: "testDatacenter"},
Description: "Lorem Ipsum",
Logo: "azerty.com",
@@ -28,7 +29,7 @@ func TestStoreOneDatacenter(t *testing.T) {
func TestLoadOneDatacenter(t *testing.T) {
dc := DatacenterResource{
AbstractResource: utils.AbstractResource{
AbstractResource: resource_model.AbstractResource{
AbstractObject: utils.AbstractObject{Name: "testDatacenter"},
Description: "Lorem Ipsum",
Logo: "azerty.com",

3
models/resources/processing/processing.go
View File

@@ -3,12 +3,13 @@ package processing
import (
"encoding/json"
"cloud.o-forge.io/core/oc-lib/models/resource_model"
"cloud.o-forge.io/core/oc-lib/models/resources/datacenter"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
type ProcessingResource struct {
utils.AbstractResource
resource_model.AbstractResource
CPUs []*datacenter.CPU `bson:"cpus,omitempty" json:"cp_us,omitempty"`
GPUs []*datacenter.GPU `bson:"gpus,omitempty" json:"gp_us,omitempty"`
RAM datacenter.RAM `bson:"ram,omitempty" json:"ram,omitempty"`

2
models/resources/processing/processing_mongo_accessor.go
View File

@@ -14,10 +14,12 @@ func (pma *ProcessingMongoAccessor) DeleteOne(id string) (utils.DBObject, int, e
}
func (pma *ProcessingMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
set.(*ProcessingResource).ResourceModel = nil
return pma.GenericUpdateOne(set, id, pma, &ProcessingResource{})
}
func (pma *ProcessingMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {
data.(*ProcessingResource).ResourceModel = nil
return pma.GenericStoreOne(data, pma)
}

10
models/resources/resource.go
View File

@@ -16,7 +16,7 @@ import (
type ResourceSet struct {
Datas []string `bson:"datas,omitempty" json:"datas,omitempty"`
Storages []string `bson:"storages,omitempty" json:"storages,omitempty"`
Processings []string `bson:"processing,omitempty" json:"processing,omitempty"`
Processings []string `bson:"processings,omitempty" json:"processings,omitempty"`
Datacenters []string `bson:"datacenters,omitempty" json:"datacenters,omitempty"`
Workflows []string `bson:"workflows,omitempty" json:"workflows,omitempty"`
@@ -26,3 +26,11 @@ type ResourceSet struct {
DatacenterResources []*datacenter.DatacenterResource `bson:"-" json:"datacenter_resources,omitempty"`
WorkflowResources []*w.WorkflowResource `bson:"-" json:"workflow_resources,omitempty"`
}
type ItemResource struct {
Data data.DataResource `bson:"data,omitempty" json:"data,omitempty"`
Processing processing.ProcessingResource `bson:"processing,omitempty" json:"processing,omitempty"`
Storage storage.StorageResource `bson:"storage,omitempty" json:"storage,omitempty"`
Datacenter datacenter.DatacenterResource `bson:"datacenter,omitempty" json:"datacenter,omitempty"`
Workflow w.WorkflowResource `bson:"workflow,omitempty" json:"workflow,omitempty"`
}

3
models/resources/storage/storage.go
View File

@@ -3,6 +3,7 @@ package storage
import (
"encoding/json"
"cloud.o-forge.io/core/oc-lib/models/resource_model"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
@@ -12,7 +13,7 @@ type URL struct {
}
type StorageResource struct {
utils.AbstractResource
resource_model.AbstractResource
Acronym string `bson:"acronym,omitempty" json:"acronym,omitempty"`
Type string `bson:"type,omitempty" json:"type,omitempty"`
Size uint `bson:"size,omitempty" json:"size,omitempty"`

2
models/resources/storage/storage_mongo_accessor.go
View File

@@ -14,10 +14,12 @@ func (sma *StorageMongoAccessor) DeleteOne(id string) (utils.DBObject, int, erro
}
func (sma *StorageMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
set.(*StorageResource).ResourceModel = nil
return sma.GenericUpdateOne(set, id, sma, &StorageResource{})
}
func (sma *StorageMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {
data.(*StorageResource).ResourceModel = nil
return sma.GenericStoreOne(data, sma)
}

5
models/resources/storage/storage_test.go
View File

@@ -3,6 +3,7 @@ package storage
import (
"testing"
"cloud.o-forge.io/core/oc-lib/models/resource_model"
"cloud.o-forge.io/core/oc-lib/models/utils"
"github.com/stretchr/testify/assert"
@@ -10,7 +11,7 @@ import (
func TestStoreOneStorage(t *testing.T) {
s := StorageResource{Size: 123, Url: &URL{Protocol: "http", Path: "azerty.fr"},
AbstractResource: utils.AbstractResource{
AbstractResource: resource_model.AbstractResource{
AbstractObject: utils.AbstractObject{Name: "testData"},
Description: "Lorem Ipsum",
Logo: "azerty.com",
@@ -28,7 +29,7 @@ func TestStoreOneStorage(t *testing.T) {
func TestLoadOneStorage(t *testing.T) {
s := StorageResource{Size: 123, Url: &URL{Protocol: "http", Path: "azerty.fr"},
AbstractResource: utils.AbstractResource{
AbstractResource: resource_model.AbstractResource{
AbstractObject: utils.AbstractObject{Name: "testData"},
Description: "Lorem Ipsum",
Logo: "azerty.com",

12
models/resources/workflow/graph/graph.go
View File

@@ -1,16 +1,18 @@
package graph
import "cloud.o-forge.io/core/oc-lib/models/resources"
type Graph struct {
Items map[string]GraphItem `bson:"items" json:"items" default:"{}" validate:"required"`
Links []GraphLink `bson:"links" json:"links" default:"{}" validate:"required"`
}
type GraphItem struct {
ID string `bson:"id" json:"id" validate:"required"`
Width float64 `bson:"width" json:"width" validate:"required"`
Height float64 `bson:"height" json:"height" validate:"required"`
Position Position `bson:"position" json:"position" validate:"required"`
ResourceID string `bson:"resource_id" json:"resource_id" validate:"required"`
ID string `bson:"id" json:"id" validate:"required"`
Width float64 `bson:"width" json:"width" validate:"required"`
Height float64 `bson:"height" json:"height" validate:"required"`
Position Position `bson:"position" json:"position" validate:"required"`
resources.ItemResource
}
type GraphLink struct {

3
models/resources/workflow/workflow.go
View File

@@ -3,11 +3,12 @@ package oclib
import (
"encoding/json"
"cloud.o-forge.io/core/oc-lib/models/resource_model"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
type WorkflowResource struct {
utils.AbstractResource
resource_model.AbstractResource
WorkflowID string `bson:"workflow_id,omitempty" json:"workflow_id,omitempty"`
}

2
models/resources/workflow/workflow_mongo_accessor.go
View File

@@ -14,10 +14,12 @@ func (wfa *WorkflowResourceMongoAccessor) DeleteOne(id string) (utils.DBObject,
}
func (wfa *WorkflowResourceMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
set.(*WorkflowResource).ResourceModel = nil
return wfa.GenericUpdateOne(set, id, wfa, &WorkflowResource{})
}
func (wfa *WorkflowResourceMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {
data.(*WorkflowResource).ResourceModel = nil
return wfa.GenericStoreOne(data, wfa)
}

5
models/resources/workflow/workflow_test.go
View File

@@ -3,13 +3,14 @@ package oclib
import (
"testing"
"cloud.o-forge.io/core/oc-lib/models/resource_model"
"cloud.o-forge.io/core/oc-lib/models/utils"
"github.com/stretchr/testify/assert"
)
func TestStoreOneWorkflow(t *testing.T) {
w := WorkflowResource{AbstractResource: utils.AbstractResource{
w := WorkflowResource{AbstractResource: resource_model.AbstractResource{
AbstractObject: utils.AbstractObject{Name: "testWorkflow"},
Description: "Lorem Ipsum",
Logo: "azerty.com",
@@ -26,7 +27,7 @@ func TestStoreOneWorkflow(t *testing.T) {
}
func TestLoadOneWorkflow(t *testing.T) {
w := WorkflowResource{AbstractResource: utils.AbstractResource{
w := WorkflowResource{AbstractResource: resource_model.AbstractResource{
AbstractObject: utils.AbstractObject{Name: "testWorkflow"},
Description: "Lorem Ipsum",
Logo: "azerty.com",