Merge pull request #44 from vshn/compute-template

Tuning the compute usage template
vshn · May 17, 2022 · 7bc4953 · 7bc4953
2 parents 2595f83 + baaeb2c
commit 7bc4953
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/description_templates/_compute.gotmpl b/description_templates/_compute.gotmpl
@@ -1,15 +1,15 @@
 {{- template "_compute" . -}}
 {{- define "_compute" -}}
-{{- $s:="\u2001" -}}{{- /*We need to use unicode whitespaces to make Odoo render them*/ -}}
 Compute
 
-Qty: {{.Quantity | printf "%.2f"}} {{.Unit}}-Minutes
-Average Usage: {{.QuantityAvg | perMinute | printf "%.2f"}} {{.Unit}} / Minute
-{{if .SubItems.appuio_cloud_memory_subquery_memory_request -}}
-{{$s}}Memory Requests: {{.SubItems.appuio_cloud_memory_subquery_memory_request.QuantityAvg | perMinute | printf "%.2f"}} {{.Unit}} / Minute
-{{end -}}
-{{if .SubItems.appuio_cloud_memory_subquery_cpu_request -}}
-{{$s}}CPU Requests: {{.SubItems.appuio_cloud_memory_subquery_cpu_request.QuantityAvg | perMinute | printf "%.2f"}} {{.Unit}} / Minute
-{{end -}}
-Unit Price: CHF {{.PricePerUnit | printf "%.10f"}} / {{.Unit}} / Minute
+Qty: {{ .Quantity | printf "%.2f" }} {{ .Unit }}-Minutes
+Unit Price: CHF {{.PricePerUnit | printf "%.10f" }} / {{ .Unit }} / Minute
+--
+Average Usage: {{ .QuantityAvg | perMinute | printf "%.2f" }} {{ .Unit }} / Minute
+{{ if .SubItems.appuio_cloud_memory_subquery_memory_request -}}
+↳ Memory Requests: {{ .SubItems.appuio_cloud_memory_subquery_memory_request.QuantityAvg | perMinute | printf "%.2f" }} {{ .Unit }} / Minute
+{{ end -}}
+{{ if .SubItems.appuio_cloud_memory_subquery_cpu_request -}}
+↳ Compensation for excess CPU Requests: {{.SubItems.appuio_cloud_memory_subquery_cpu_request.QuantityAvg | perMinute | printf "%.2f" }} {{ .Unit }} / Minute
+{{ end -}}
 {{- end -}}
diff --git a/description_templates/golden/appuio_cloud_memory:c-appuio-cloudscale-lpg-2.txt b/description_templates/golden/appuio_cloud_memory:c-appuio-cloudscale-lpg-2.txt
@@ -1,7 +1,8 @@
 Compute
 
 Qty: 87955674.09 UNIT-Minutes
+Unit Price: CHF 0.0000007460 / UNIT / Minute
+--
 Average Usage: 7.61 UNIT / Minute
- Memory Requests: 0.70 UNIT / Minute
- CPU Requests: 2.23 UNIT / Minute
-Unit Price: CHF 0.0000007460 / UNIT / Minute
+↳ Memory Requests: 0.70 UNIT / Minute
+↳ Compensation for excess CPU Requests: 2.23 UNIT / Minute
diff --git a/description_templates/golden/appuio_cloud_memory:c-appuio-exoscale-ch-gva-2-0.txt b/description_templates/golden/appuio_cloud_memory:c-appuio-exoscale-ch-gva-2-0.txt
@@ -1,7 +1,8 @@
 Compute
 
 Qty: 87955674.09 UNIT-Minutes
+Unit Price: CHF 0.0000007460 / UNIT / Minute
+--
 Average Usage: 7.61 UNIT / Minute
- Memory Requests: 0.70 UNIT / Minute
- CPU Requests: 2.23 UNIT / Minute
-Unit Price: CHF 0.0000007460 / UNIT / Minute
+↳ Memory Requests: 0.70 UNIT / Minute
+↳ Compensation for excess CPU Requests: 2.23 UNIT / Minute