|
|
@@ -1535,19 +1535,31 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
|
|
|
Cluster: "cluster1",
|
|
|
Node: "c1nodes",
|
|
|
ProviderID: "c1nodes",
|
|
|
- CPUPercentage: 0.5,
|
|
|
- GPUPercentage: 0.5,
|
|
|
- RAMPercentage: 0.8125,
|
|
|
- NodeResourceCostPercentage: 0.6785714285714285,
|
|
|
+ CPUPercentage: 0.16666666666666666,
|
|
|
+ GPUPercentage: 0.16666666666666666,
|
|
|
+ RAMPercentage: 0.2708333333333333,
|
|
|
+ NodeResourceCostPercentage: 0.22619047619047614,
|
|
|
+ GPUTotalCost: 18,
|
|
|
+ GPUProportionalCost: 3,
|
|
|
+ CPUTotalCost: 18,
|
|
|
+ CPUProportionalCost: 3,
|
|
|
+ RAMTotalCost: 48,
|
|
|
+ RAMProportionalCost: 13,
|
|
|
},
|
|
|
"cluster2,node2": ProportionalAssetResourceCost{
|
|
|
Cluster: "cluster2",
|
|
|
Node: "node2",
|
|
|
ProviderID: "node2",
|
|
|
- CPUPercentage: 0.5,
|
|
|
- GPUPercentage: 0.5,
|
|
|
- RAMPercentage: 0.5,
|
|
|
- NodeResourceCostPercentage: 0.5,
|
|
|
+ CPUPercentage: 0.16666666666666666,
|
|
|
+ GPUPercentage: 0.16666666666666666,
|
|
|
+ RAMPercentage: 0.0625,
|
|
|
+ NodeResourceCostPercentage: 0.10714285714285714,
|
|
|
+ GPUTotalCost: 18,
|
|
|
+ GPUProportionalCost: 3,
|
|
|
+ CPUTotalCost: 18,
|
|
|
+ CPUProportionalCost: 3,
|
|
|
+ RAMTotalCost: 48,
|
|
|
+ RAMProportionalCost: 3,
|
|
|
},
|
|
|
},
|
|
|
"namespace2": {
|
|
|
@@ -1555,19 +1567,31 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
|
|
|
Cluster: "cluster1",
|
|
|
Node: "c1nodes",
|
|
|
ProviderID: "c1nodes",
|
|
|
- CPUPercentage: 0.5,
|
|
|
- GPUPercentage: 0.5,
|
|
|
- RAMPercentage: 0.1875,
|
|
|
- NodeResourceCostPercentage: 0.3214285714285714,
|
|
|
+ CPUPercentage: 0.16666666666666666,
|
|
|
+ GPUPercentage: 0.16666666666666666,
|
|
|
+ RAMPercentage: 0.0625,
|
|
|
+ NodeResourceCostPercentage: 0.10714285714285714,
|
|
|
+ GPUTotalCost: 18,
|
|
|
+ GPUProportionalCost: 3,
|
|
|
+ CPUTotalCost: 18,
|
|
|
+ CPUProportionalCost: 3,
|
|
|
+ RAMTotalCost: 48,
|
|
|
+ RAMProportionalCost: 3,
|
|
|
},
|
|
|
"cluster2,node1": ProportionalAssetResourceCost{
|
|
|
Cluster: "cluster2",
|
|
|
Node: "node1",
|
|
|
ProviderID: "node1",
|
|
|
- CPUPercentage: 1,
|
|
|
- GPUPercentage: 1,
|
|
|
- RAMPercentage: 1,
|
|
|
- NodeResourceCostPercentage: 1,
|
|
|
+ CPUPercentage: 0.5,
|
|
|
+ GPUPercentage: 0.5,
|
|
|
+ RAMPercentage: 0.5,
|
|
|
+ NodeResourceCostPercentage: 0.5,
|
|
|
+ GPUTotalCost: 4,
|
|
|
+ GPUProportionalCost: 2,
|
|
|
+ CPUTotalCost: 4,
|
|
|
+ CPUProportionalCost: 2,
|
|
|
+ RAMTotalCost: 4,
|
|
|
+ RAMProportionalCost: 2,
|
|
|
},
|
|
|
"cluster2,node2": ProportionalAssetResourceCost{
|
|
|
Cluster: "cluster2",
|
|
|
@@ -1577,6 +1601,12 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
|
|
|
GPUPercentage: 0.5,
|
|
|
RAMPercentage: 0.5,
|
|
|
NodeResourceCostPercentage: 0.5,
|
|
|
+ GPUTotalCost: 2,
|
|
|
+ GPUProportionalCost: 1,
|
|
|
+ CPUTotalCost: 2,
|
|
|
+ CPUProportionalCost: 1,
|
|
|
+ RAMTotalCost: 2,
|
|
|
+ RAMProportionalCost: 1,
|
|
|
},
|
|
|
},
|
|
|
"namespace3": {
|
|
|
@@ -1584,10 +1614,16 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
|
|
|
Cluster: "cluster2",
|
|
|
Node: "node3",
|
|
|
ProviderID: "node3",
|
|
|
- CPUPercentage: 1,
|
|
|
- GPUPercentage: 1,
|
|
|
- RAMPercentage: 1,
|
|
|
- NodeResourceCostPercentage: 1,
|
|
|
+ CPUPercentage: 0.5,
|
|
|
+ GPUPercentage: 0.5,
|
|
|
+ RAMPercentage: 0.5,
|
|
|
+ NodeResourceCostPercentage: 0.5,
|
|
|
+ GPUTotalCost: 4,
|
|
|
+ GPUProportionalCost: 2,
|
|
|
+ CPUTotalCost: 4,
|
|
|
+ CPUProportionalCost: 2,
|
|
|
+ RAMTotalCost: 4,
|
|
|
+ RAMProportionalCost: 2,
|
|
|
},
|
|
|
"cluster2,node2": ProportionalAssetResourceCost{
|
|
|
Cluster: "cluster2",
|