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

add purchase resource in model catalog

Browse Source
This commit is contained in:
mr 2025-02-10 10:42:37 +01:00
parent 4a178d01e3
commit e55727d9e2
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/resources/compute.go
View File

@ -2,6 +2,7 @@ package resources
import ( import (
"errors" "errors"
"fmt"
"strings" "strings"
"time" "time"
@ -138,6 +139,7 @@ func (r *PricedComputeResource) GetType() tools.DataType {
} }
func (r *PricedComputeResource) GetPrice() (float64, error) { func (r *PricedComputeResource) GetPrice() (float64, error) {
fmt.Println("GetPrice", r.UsageStart, r.UsageEnd)
if r.UsageStart == nil || r.UsageEnd == nil { if r.UsageStart == nil || r.UsageEnd == nil {
return 0, errors.New("usage start and end must be set") return 0, errors.New("usage start and end must be set")
} }

6
models/resources/priced_resource.go
View File

@ -71,9 +71,13 @@ func (abs *PricedResource) SetLocationEnd(end time.Time) {
func (abs *PricedResource) GetExplicitDurationInS() float64 { func (abs *PricedResource) GetExplicitDurationInS() float64 {
if abs.ExplicitBookingDurationS == 0 { if abs.ExplicitBookingDurationS == 0 {
if abs.UsageEnd == nil || abs.UsageStart == nil { if abs.UsageEnd == nil && abs.UsageStart == nil {
return time.Duration(1 * time.Hour).Seconds() return time.Duration(1 * time.Hour).Seconds()
} }
if abs.UsageEnd == nil {
add := abs.UsageStart.Add(time.Duration(1 * time.Hour))
abs.UsageEnd = &add
}
return abs.UsageEnd.Sub(*abs.UsageStart).Seconds() return abs.UsageEnd.Sub(*abs.UsageStart).Seconds()
} }
return abs.ExplicitBookingDurationS return abs.ExplicitBookingDurationS

2
models/resources/storage.go
View File

@ -2,6 +2,7 @@ package resources
import ( import (
"errors" "errors"
"fmt"
"time" "time"
"cloud.o-forge.io/core/oc-lib/models/common/enum" "cloud.o-forge.io/core/oc-lib/models/common/enum"
@ -161,6 +162,7 @@ func (r *PricedStorageResource) GetType() tools.DataType {
} }
func (r *PricedStorageResource) GetPrice() (float64, error) { func (r *PricedStorageResource) GetPrice() (float64, error) {
fmt.Println("GetPrice", r.UsageStart, r.UsageEnd)
if r.UsageStart == nil || r.UsageEnd == nil { if r.UsageStart == nil || r.UsageEnd == nil {
return 0, errors.New("usage start and end must be set") return 0, errors.New("usage start and end must be set")
} }