|
@@ -1074,30 +1074,33 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
|
|
|
expectedParcResults: map[string]ProportionalAssetResourceCosts{
|
|
expectedParcResults: map[string]ProportionalAssetResourceCosts{
|
|
|
"namespace1": ProportionalAssetResourceCosts{
|
|
"namespace1": ProportionalAssetResourceCosts{
|
|
|
"cluster1": ProportionalAssetResourceCost{
|
|
"cluster1": ProportionalAssetResourceCost{
|
|
|
- Cluster: "cluster1",
|
|
|
|
|
- Node: "",
|
|
|
|
|
- ProviderID: "",
|
|
|
|
|
- CPUPercentage: 0.5,
|
|
|
|
|
- GPUPercentage: 0.5,
|
|
|
|
|
- RAMPercentage: 0.8125,
|
|
|
|
|
|
|
+ Cluster: "cluster1",
|
|
|
|
|
+ Node: "",
|
|
|
|
|
+ ProviderID: "",
|
|
|
|
|
+ CPUPercentage: 0.5,
|
|
|
|
|
+ GPUPercentage: 0.5,
|
|
|
|
|
+ RAMPercentage: 0.8125,
|
|
|
|
|
+ ResourcePercentage: 0.6785714285714285,
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
"namespace2": ProportionalAssetResourceCosts{
|
|
"namespace2": ProportionalAssetResourceCosts{
|
|
|
"cluster1": ProportionalAssetResourceCost{
|
|
"cluster1": ProportionalAssetResourceCost{
|
|
|
- Cluster: "cluster1",
|
|
|
|
|
- Node: "",
|
|
|
|
|
- ProviderID: "",
|
|
|
|
|
- CPUPercentage: 0.5,
|
|
|
|
|
- GPUPercentage: 0.5,
|
|
|
|
|
- RAMPercentage: 0.1875,
|
|
|
|
|
|
|
+ Cluster: "cluster1",
|
|
|
|
|
+ Node: "",
|
|
|
|
|
+ ProviderID: "",
|
|
|
|
|
+ CPUPercentage: 0.5,
|
|
|
|
|
+ GPUPercentage: 0.5,
|
|
|
|
|
+ RAMPercentage: 0.1875,
|
|
|
|
|
+ ResourcePercentage: 0.3214285714285714,
|
|
|
},
|
|
},
|
|
|
"cluster2": ProportionalAssetResourceCost{
|
|
"cluster2": ProportionalAssetResourceCost{
|
|
|
- Cluster: "cluster2",
|
|
|
|
|
- Node: "",
|
|
|
|
|
- ProviderID: "",
|
|
|
|
|
- CPUPercentage: 0.5,
|
|
|
|
|
- GPUPercentage: 0.5,
|
|
|
|
|
- RAMPercentage: 0.5,
|
|
|
|
|
|
|
+ Cluster: "cluster2",
|
|
|
|
|
+ Node: "",
|
|
|
|
|
+ ProviderID: "",
|
|
|
|
|
+ CPUPercentage: 0.5,
|
|
|
|
|
+ GPUPercentage: 0.5,
|
|
|
|
|
+ RAMPercentage: 0.5,
|
|
|
|
|
+ ResourcePercentage: 0.5,
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
@@ -1509,64 +1512,71 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
|
|
|
expectedParcResults: map[string]ProportionalAssetResourceCosts{
|
|
expectedParcResults: map[string]ProportionalAssetResourceCosts{
|
|
|
"namespace1": {
|
|
"namespace1": {
|
|
|
"cluster1,c1nodes": ProportionalAssetResourceCost{
|
|
"cluster1,c1nodes": ProportionalAssetResourceCost{
|
|
|
- Cluster: "cluster1",
|
|
|
|
|
- Node: "c1nodes",
|
|
|
|
|
- ProviderID: "c1nodes",
|
|
|
|
|
- CPUPercentage: 0.5,
|
|
|
|
|
- GPUPercentage: 0.5,
|
|
|
|
|
- RAMPercentage: 0.8125,
|
|
|
|
|
|
|
+ Cluster: "cluster1",
|
|
|
|
|
+ Node: "c1nodes",
|
|
|
|
|
+ ProviderID: "c1nodes",
|
|
|
|
|
+ CPUPercentage: 0.5,
|
|
|
|
|
+ GPUPercentage: 0.5,
|
|
|
|
|
+ RAMPercentage: 0.8125,
|
|
|
|
|
+ ResourcePercentage: 0.6785714285714285,
|
|
|
},
|
|
},
|
|
|
"cluster2,node2": ProportionalAssetResourceCost{
|
|
"cluster2,node2": ProportionalAssetResourceCost{
|
|
|
- Cluster: "cluster2",
|
|
|
|
|
- Node: "node2",
|
|
|
|
|
- ProviderID: "node2",
|
|
|
|
|
- CPUPercentage: 0.5,
|
|
|
|
|
- GPUPercentage: 0.5,
|
|
|
|
|
- RAMPercentage: 0.5,
|
|
|
|
|
|
|
+ Cluster: "cluster2",
|
|
|
|
|
+ Node: "node2",
|
|
|
|
|
+ ProviderID: "node2",
|
|
|
|
|
+ CPUPercentage: 0.5,
|
|
|
|
|
+ GPUPercentage: 0.5,
|
|
|
|
|
+ RAMPercentage: 0.5,
|
|
|
|
|
+ ResourcePercentage: 0.5,
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
"namespace2": {
|
|
"namespace2": {
|
|
|
"cluster1,c1nodes": ProportionalAssetResourceCost{
|
|
"cluster1,c1nodes": ProportionalAssetResourceCost{
|
|
|
- Cluster: "cluster1",
|
|
|
|
|
- Node: "c1nodes",
|
|
|
|
|
- ProviderID: "c1nodes",
|
|
|
|
|
- CPUPercentage: 0.5,
|
|
|
|
|
- GPUPercentage: 0.5,
|
|
|
|
|
- RAMPercentage: 0.1875,
|
|
|
|
|
|
|
+ Cluster: "cluster1",
|
|
|
|
|
+ Node: "c1nodes",
|
|
|
|
|
+ ProviderID: "c1nodes",
|
|
|
|
|
+ CPUPercentage: 0.5,
|
|
|
|
|
+ GPUPercentage: 0.5,
|
|
|
|
|
+ RAMPercentage: 0.1875,
|
|
|
|
|
+ ResourcePercentage: 0.3214285714285714,
|
|
|
},
|
|
},
|
|
|
"cluster2,node1": ProportionalAssetResourceCost{
|
|
"cluster2,node1": ProportionalAssetResourceCost{
|
|
|
- Cluster: "cluster2",
|
|
|
|
|
- Node: "node1",
|
|
|
|
|
- ProviderID: "node1",
|
|
|
|
|
- CPUPercentage: 1,
|
|
|
|
|
- GPUPercentage: 1,
|
|
|
|
|
- RAMPercentage: 1,
|
|
|
|
|
|
|
+ Cluster: "cluster2",
|
|
|
|
|
+ Node: "node1",
|
|
|
|
|
+ ProviderID: "node1",
|
|
|
|
|
+ CPUPercentage: 1,
|
|
|
|
|
+ GPUPercentage: 1,
|
|
|
|
|
+ RAMPercentage: 1,
|
|
|
|
|
+ ResourcePercentage: 1,
|
|
|
},
|
|
},
|
|
|
"cluster2,node2": ProportionalAssetResourceCost{
|
|
"cluster2,node2": ProportionalAssetResourceCost{
|
|
|
- Cluster: "cluster2",
|
|
|
|
|
- Node: "node2",
|
|
|
|
|
- ProviderID: "node2",
|
|
|
|
|
- CPUPercentage: 0.5,
|
|
|
|
|
- GPUPercentage: 0.5,
|
|
|
|
|
- RAMPercentage: 0.5,
|
|
|
|
|
|
|
+ Cluster: "cluster2",
|
|
|
|
|
+ Node: "node2",
|
|
|
|
|
+ ProviderID: "node2",
|
|
|
|
|
+ CPUPercentage: 0.5,
|
|
|
|
|
+ GPUPercentage: 0.5,
|
|
|
|
|
+ RAMPercentage: 0.5,
|
|
|
|
|
+ ResourcePercentage: 0.5,
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
"namespace3": {
|
|
"namespace3": {
|
|
|
"cluster2,node3": ProportionalAssetResourceCost{
|
|
"cluster2,node3": ProportionalAssetResourceCost{
|
|
|
- Cluster: "cluster2",
|
|
|
|
|
- Node: "node3",
|
|
|
|
|
- ProviderID: "node3",
|
|
|
|
|
- CPUPercentage: 1,
|
|
|
|
|
- GPUPercentage: 1,
|
|
|
|
|
- RAMPercentage: 1,
|
|
|
|
|
|
|
+ Cluster: "cluster2",
|
|
|
|
|
+ Node: "node3",
|
|
|
|
|
+ ProviderID: "node3",
|
|
|
|
|
+ CPUPercentage: 1,
|
|
|
|
|
+ GPUPercentage: 1,
|
|
|
|
|
+ RAMPercentage: 1,
|
|
|
|
|
+ ResourcePercentage: 1,
|
|
|
},
|
|
},
|
|
|
"cluster2,node2": ProportionalAssetResourceCost{
|
|
"cluster2,node2": ProportionalAssetResourceCost{
|
|
|
- Cluster: "cluster2",
|
|
|
|
|
- Node: "node2",
|
|
|
|
|
- ProviderID: "node2",
|
|
|
|
|
- CPUPercentage: 0.5,
|
|
|
|
|
- GPUPercentage: 0.5,
|
|
|
|
|
- RAMPercentage: 0.5,
|
|
|
|
|
|
|
+ Cluster: "cluster2",
|
|
|
|
|
+ Node: "node2",
|
|
|
|
|
+ ProviderID: "node2",
|
|
|
|
|
+ CPUPercentage: 0.5,
|
|
|
|
|
+ GPUPercentage: 0.5,
|
|
|
|
|
+ RAMPercentage: 0.5,
|
|
|
|
|
+ ResourcePercentage: 0.5,
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|