adjust model
This commit is contained in:
parent
eb1417853a
commit
87b7cda0ce
@ -8,31 +8,9 @@ import (
|
|||||||
|
|
||||||
type DatacenterResource struct {
|
type DatacenterResource struct {
|
||||||
utils.AbstractResource
|
utils.AbstractResource
|
||||||
BookingPrice int `bson:"booking_price,omitempty" json:"booking_price,omitempty"`
|
CPUs []*CPU `bson:"cpus,omitempty" json:"cpus,omitempty"`
|
||||||
|
RAM *RAM `bson:"ram,omitempty" json:"ram,omitempty"`
|
||||||
CPU *DatacenterCpuModel `bson:"cpu,omitempty" json:"cpu,omitempty"`
|
GPUs []*GPU `bson:"gpus,omitempty" json:"gpus,omitempty"`
|
||||||
RAM *DatacenterMemoryModel `bson:"ram,omitempty" json:"ram,omitempty"`
|
|
||||||
GPU []DatacenterGpuModel `bson:"gpu,omitempty" json:"gpu,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type DatacenterCpuModel struct {
|
|
||||||
Cores uint `bson:"cores,omitempty" json:"cores,omitempty"` //TODO: validate
|
|
||||||
Architecture string `bson:"architecture,omitempty" json:"architecture,omitempty"` //TOOD: enum
|
|
||||||
Shared bool `bson:"shared,omitempty" json:"shared,omitempty"`
|
|
||||||
MinimumMemory uint `bson:"minimum_memory,omitempty" json:"minimum_memory,omitempty"`
|
|
||||||
Platform string `bson:"platform,omitempty" json:"platform,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type DatacenterMemoryModel struct {
|
|
||||||
Size uint `bson:"size,omitempty" json:"size,omitempty" description:"Units in MB"`
|
|
||||||
Ecc bool `bson:"ecc,omitempty" json:"ecc,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type DatacenterGpuModel struct {
|
|
||||||
CudaCores uint `bson:"cuda_cores,omitempty" json:"cuda_cores,omitempty"`
|
|
||||||
Model string `bson:"model,omitempty" json:"model,omitempty"`
|
|
||||||
Memory uint `bson:"memory,omitempty" json:"memory,omitempty" description:"Units in MB"`
|
|
||||||
TensorCores uint `bson:"tensor_cores,omitempty" json:"tensor_cores,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dma *DatacenterResource) Deserialize(j map[string]interface{}) utils.DBObject {
|
func (dma *DatacenterResource) Deserialize(j map[string]interface{}) utils.DBObject {
|
||||||
@ -59,3 +37,23 @@ func (d *DatacenterResource) GetAccessor() utils.Accessor {
|
|||||||
data.SetLogger(utils.DATACENTER_RESOURCE)
|
data.SetLogger(utils.DATACENTER_RESOURCE)
|
||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type CPU struct {
|
||||||
|
Cores uint `bson:"cores,omitempty" json:"cores,omitempty"` //TODO: validate
|
||||||
|
Architecture string `bson:"architecture,omitempty" json:"architecture,omitempty"` //TOOD: enum
|
||||||
|
Shared bool `bson:"shared,omitempty" json:"shared,omitempty"`
|
||||||
|
MinimumMemory uint `bson:"minimum_memory,omitempty" json:"minimum_memory,omitempty"`
|
||||||
|
Platform string `bson:"platform,omitempty" json:"platform,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type RAM struct {
|
||||||
|
Size uint `bson:"size,omitempty" json:"size,omitempty" description:"Units in MB"`
|
||||||
|
Ecc bool `bson:"ecc,omitempty" json:"ecc,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GPU struct {
|
||||||
|
CudaCores uint `bson:"cuda_cores,omitempty" json:"cuda_cores,omitempty"`
|
||||||
|
Model string `bson:"model,omitempty" json:"model,omitempty"`
|
||||||
|
Memory uint `bson:"memory,omitempty" json:"memory,omitempty" description:"Units in MB"`
|
||||||
|
TensorCores uint `bson:"tensor_cores,omitempty" json:"tensor_cores,omitempty"`
|
||||||
|
}
|
||||||
|
@ -9,7 +9,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestStoreOneDatacenter(t *testing.T) {
|
func TestStoreOneDatacenter(t *testing.T) {
|
||||||
dc := DatacenterResource{BookingPrice: 123,
|
dc := DatacenterResource{
|
||||||
AbstractResource: utils.AbstractResource{
|
AbstractResource: utils.AbstractResource{
|
||||||
AbstractObject: utils.AbstractObject{Name: "testDatacenter"},
|
AbstractObject: utils.AbstractObject{Name: "testDatacenter"},
|
||||||
Description: "Lorem Ipsum",
|
Description: "Lorem Ipsum",
|
||||||
@ -27,7 +27,7 @@ func TestStoreOneDatacenter(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestLoadOneDatacenter(t *testing.T) {
|
func TestLoadOneDatacenter(t *testing.T) {
|
||||||
dc := DatacenterResource{BookingPrice: 123,
|
dc := DatacenterResource{
|
||||||
AbstractResource: utils.AbstractResource{
|
AbstractResource: utils.AbstractResource{
|
||||||
AbstractObject: utils.AbstractObject{Name: "testDatacenter"},
|
AbstractObject: utils.AbstractObject{Name: "testDatacenter"},
|
||||||
Description: "Lorem Ipsum",
|
Description: "Lorem Ipsum",
|
||||||
|
@ -3,15 +3,16 @@ package processing
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
|
"cloud.o-forge.io/core/oc-lib/models/resources/datacenter"
|
||||||
"cloud.o-forge.io/core/oc-lib/models/utils"
|
"cloud.o-forge.io/core/oc-lib/models/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ProcessingResource struct {
|
type ProcessingResource struct {
|
||||||
utils.AbstractResource
|
utils.AbstractResource
|
||||||
CPUs uint `bson:"cp_us,omitempty" json:"cp_us,omitempty"`
|
CPUs []*datacenter.CPU `bson:"cpus,omitempty" json:"cp_us,omitempty"`
|
||||||
GPUs uint `bson:"gp_us,omitempty" json:"gp_us,omitempty"`
|
GPUs []*datacenter.GPU `bson:"gpus,omitempty" json:"gp_us,omitempty"`
|
||||||
RAM uint `bson:"ram,omitempty" json:"ram,omitempty"`
|
RAM datacenter.RAM `bson:"ram,omitempty" json:"ram,omitempty"`
|
||||||
|
Storage uint `bson:"storage,omitempty" json:"storage,omitempty"`
|
||||||
Parallel bool `bson:"parallel,omitempty" json:"parallel,omitempty"`
|
Parallel bool `bson:"parallel,omitempty" json:"parallel,omitempty"`
|
||||||
ScalingModel uint `bson:"scaling_model,omitempty" json:"scaling_model,omitempty"`
|
ScalingModel uint `bson:"scaling_model,omitempty" json:"scaling_model,omitempty"`
|
||||||
DiskIO string `bson:"disk_io,omitempty" json:"disk_io,omitempty"`
|
DiskIO string `bson:"disk_io,omitempty" json:"disk_io,omitempty"`
|
||||||
|
@ -13,8 +13,9 @@ type URL struct {
|
|||||||
|
|
||||||
type StorageResource struct {
|
type StorageResource struct {
|
||||||
utils.AbstractResource
|
utils.AbstractResource
|
||||||
|
Acronym string `bson:"acronym,omitempty" json:"acronym,omitempty"`
|
||||||
Capacity uint `bson:"capacity,omitempty" json:"capacity,omitempty"`
|
Type string `bson:"type,omitempty" json:"type,omitempty"`
|
||||||
|
Size uint `bson:"size,omitempty" json:"size,omitempty"`
|
||||||
Url *URL `bson:"url,omitempty" json:"url,omitempty"` // Will allow to select between several protocols
|
Url *URL `bson:"url,omitempty" json:"url,omitempty"` // Will allow to select between several protocols
|
||||||
|
|
||||||
Encryption bool `bson:"encryption,omitempty" json:"encryption,omitempty"`
|
Encryption bool `bson:"encryption,omitempty" json:"encryption,omitempty"`
|
||||||
|
@ -9,7 +9,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestStoreOneStorage(t *testing.T) {
|
func TestStoreOneStorage(t *testing.T) {
|
||||||
s := StorageResource{Capacity: 123, Url: &URL{Protocol: "http", Path: "azerty.fr"},
|
s := StorageResource{Size: 123, Url: &URL{Protocol: "http", Path: "azerty.fr"},
|
||||||
AbstractResource: utils.AbstractResource{
|
AbstractResource: utils.AbstractResource{
|
||||||
AbstractObject: utils.AbstractObject{Name: "testData"},
|
AbstractObject: utils.AbstractObject{Name: "testData"},
|
||||||
Description: "Lorem Ipsum",
|
Description: "Lorem Ipsum",
|
||||||
@ -27,7 +27,7 @@ func TestStoreOneStorage(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestLoadOneStorage(t *testing.T) {
|
func TestLoadOneStorage(t *testing.T) {
|
||||||
s := StorageResource{Capacity: 123, Url: &URL{Protocol: "http", Path: "azerty.fr"},
|
s := StorageResource{Size: 123, Url: &URL{Protocol: "http", Path: "azerty.fr"},
|
||||||
AbstractResource: utils.AbstractResource{
|
AbstractResource: utils.AbstractResource{
|
||||||
AbstractObject: utils.AbstractObject{Name: "testData"},
|
AbstractObject: utils.AbstractObject{Name: "testData"},
|
||||||
Description: "Lorem Ipsum",
|
Description: "Lorem Ipsum",
|
||||||
|
@ -96,6 +96,10 @@ type AbstractResource struct {
|
|||||||
Owner string `json:"owner,omitempty" bson:"owner,omitempty" validate:"required"`
|
Owner string `json:"owner,omitempty" bson:"owner,omitempty" validate:"required"`
|
||||||
OwnerLogo string `json:"owner_logo,omitempty" bson:"owner_logo,omitempty"`
|
OwnerLogo string `json:"owner_logo,omitempty" bson:"owner_logo,omitempty"`
|
||||||
SourceUrl string `json:"source_url,omitempty" bson:"source_url,omitempty" validate:"required"`
|
SourceUrl string `json:"source_url,omitempty" bson:"source_url,omitempty" validate:"required"`
|
||||||
|
Price string `json:"price,omitempty" bson:"price,omitempty"`
|
||||||
|
License string `json:"license,omitempty" bson:"license,omitempty"`
|
||||||
|
Inputs []interface{} `json:"inputs,omitempty" bson:"inputs,omitempty"`
|
||||||
|
Outputs []interface{} `json:"outputs,omitempty" bson:"outputs,omitempty"`
|
||||||
Proxy *ResourceProxy `json:"proxy,omitempty" bson:"proxy,omitempty"`
|
Proxy *ResourceProxy `json:"proxy,omitempty" bson:"proxy,omitempty"`
|
||||||
}
|
}
|
||||||
type ResourceProxy struct {
|
type ResourceProxy struct {
|
||||||
|
Loading…
Reference in New Issue
Block a user