Update templates for new new Cloudscale node classes (#64)

bastjan · web-flow · commit e90fc24ab065 · 2022-11-18T13:52:42.000+01:00
diff --git a/description_templates/_compute.gotmpl b/description_templates/_compute.gotmpl
@@ -1,15 +1,18 @@
 {{- template "_compute" . -}}
 {{- define "_compute" -}}
+
 Compute
+{{- if .ComputeClass }} [{{ .ComputeClass }}]
+{{- end }}
 
-Qty: {{ .Quantity | printf "%.2f" }} {{ .Unit }}-Minutes
-Unit Price: CHF {{.PricePerUnit | printf "%.10f" }} / {{ .Unit }} / Minute
+Qty: {{ .Item.Quantity | printf "%.2f" }} {{ .Item.Unit }}-Minutes
+Unit Price: CHF {{ .Item.PricePerUnit | printf "%.10f" }} / {{ .Item.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
+Average Usage: {{ .Item.QuantityAvg | perMinute | printf "%.2f" }} {{ .Item.Unit }} / Minute
+{{ if .Item.SubItems.appuio_cloud_memory_subquery_memory_request -}}
+↳ Memory Requests: {{ .Item.SubItems.appuio_cloud_memory_subquery_memory_request.QuantityAvg | perMinute | printf "%.2f" }} {{ .Item.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
+{{ if .Item.SubItems.appuio_cloud_memory_subquery_cpu_request -}}
+↳ Compensation for excess CPU Requests: {{ .Item.SubItems.appuio_cloud_memory_subquery_cpu_request.QuantityAvg | perMinute | printf "%.2f" }} {{ .Item.Unit }} / Minute
 {{ end -}}
 {{- end -}}
diff --git a/description_templates/appuio_cloud_memory:c-appuio-cloudscale-lpg-2.gotmpl b/description_templates/appuio_cloud_memory:c-appuio-cloudscale-lpg-2.gotmpl
@@ -1 +1,3 @@
-{{template "_compute" . -}}
+{{- $class := "plus" -}}
+
+{{template "_compute" dict "Item" . -}}
diff --git a/description_templates/appuio_cloud_memory:c-appuio-cloudscale-lpg-2:*:*:flex.gotmpl b/description_templates/appuio_cloud_memory:c-appuio-cloudscale-lpg-2:*:*:flex.gotmpl
@@ -0,0 +1,3 @@
+{{- $class := "flex" -}}
+
+{{template "_compute" dict "ComputeClass" $class "Item" . -}}
diff --git a/description_templates/appuio_cloud_memory:c-appuio-cloudscale-lpg-2:*:*:plus.gotmpl b/description_templates/appuio_cloud_memory:c-appuio-cloudscale-lpg-2:*:*:plus.gotmpl
@@ -0,0 +1,3 @@
+{{- $class := "plus" -}}
+
+{{template "_compute" dict "ComputeClass" $class "Item" . -}}
diff --git a/description_templates/appuio_cloud_memory:c-appuio-exoscale-ch-gva-2-0.gotmpl b/description_templates/appuio_cloud_memory:c-appuio-exoscale-ch-gva-2-0.gotmpl
@@ -1 +1 @@
-{{template "_compute" . -}}
+{{template "_compute" dict "Item" . -}}
diff --git a/description_templates/golden/appuio_cloud_memory:c-appuio-cloudscale-lpg-2:*:*:flex.txt b/description_templates/golden/appuio_cloud_memory:c-appuio-cloudscale-lpg-2:*:*:flex.txt
@@ -0,0 +1,8 @@
+Compute [flex]
+
+Qty: 87955674.09 UNIT-Minutes
+Unit Price: CHF 0.0000007460 / UNIT / Minute
+--
+Average Usage: 7.61 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-cloudscale-lpg-2:*:*:plus.txt b/description_templates/golden/appuio_cloud_memory:c-appuio-cloudscale-lpg-2:*:*:plus.txt
@@ -0,0 +1,8 @@
+Compute [plus]
+
+Qty: 87955674.09 UNIT-Minutes
+Unit Price: CHF 0.0000007460 / UNIT / Minute
+--
+Average Usage: 7.61 UNIT / Minute
+↳ Memory Requests: 0.70 UNIT / Minute
+↳ Compensation for excess CPU Requests: 2.23 UNIT / Minute

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{{- $class := "flex" -}}`
	`2`	`+`
	`3`	`+{{template "_compute" dict "ComputeClass" $class "Item" . -}}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{{- $class := "plus" -}}`
	`2`	`+`
	`3`	`+{{template "_compute" dict "ComputeClass" $class "Item" . -}}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{{template "_compute" . -}}`
	`1`	`+{{template "_compute" dict "Item" . -}}`