Skip to content

Commit b9e9738

Browse files
committed
Simplify scs-0100-v3 to remove gratuitous regulation
Moreover, fix uneven number test to check on advertised RAM instead of actual RAM Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>
1 parent 7ee3b16 commit b9e9738

2 files changed

Lines changed: 7 additions & 11 deletions

File tree

Standards/scs-0100-v3-flavor-naming.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,6 @@ If memory is oversubscribed, you must expose this with the `o` suffix.
171171

172172
### [OPTIONAL] Disk sizes and types
173173

174-
Disk sizes (in GB) should use sizes 5, 10, 20, 50, 100, 200, 500, 1000.
175-
176174
| Disk type | Meaning |
177175
| --------- | ------------------------------------ |
178176
| n | Network shared storage (ceph/cinder) |

Tests/iaas/scs_0100_flavor_naming/flavor_names_check.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,18 @@ def compute_scs_0100_semantics_check(scs_flavors: list) -> bool:
6565
elif flv.vcpus > cpuram.cpus:
6666
logger.info(f"Flavor {flv.name} CPU underpromise: {flv.vcpus} > {cpuram.cpus}")
6767
# RAM
68+
advram = cpuram.ram # advertised RAM
6869
flvram = int((flv.ram + 51) / 102.4) / 10
6970
# Warn for strange sizes (want integer numbers, half allowed for < 10GiB)
70-
if flvram >= 10 and flvram != int(flvram) or flvram * 2 != int(flvram * 2):
71-
logger.info(f"Flavor {flv.name} uses discouraged uneven size of memory {flvram:.1f} GiB")
72-
if flvram < cpuram.ram:
73-
logger.error(f"Flavor {flv.name} RAM overpromise {flvram:.1f} < {cpuram.ram:.1f}")
71+
if advram >= 10 and advram != int(advram) or advram * 2 != int(advram * 2):
72+
logger.info(f"Flavor {flv.name} uses discouraged uneven size of memory {advram:.1f} GiB")
73+
if flvram < advram:
74+
logger.error(f"Flavor {flv.name} RAM overpromise {flvram:.1f} < {advram:.1f}")
7475
problems.add(flv.name)
75-
elif flvram > cpuram.ram:
76-
logger.info(f"Flavor {flv.name} RAM underpromise {flvram:.1f} > {cpuram.ram:.1f}")
76+
elif flvram > advram:
77+
logger.info(f"Flavor {flv.name} RAM underpromise {flvram:.1f} > {advram:.1f}")
7778
# Disk could have been omitted
7879
disksize = flavorname.disk.disksize if flavorname.disk else 0
79-
# We have a recommendation for disk size steps
80-
if disksize not in ACC_DISK:
81-
logger.info(f"Flavor {flv.name} non-standard disk size {disksize}, should have (5, 10, 20, 50, 100, 200, ...)")
8280
if flv.disk < disksize:
8381
logger.error(f"Flavor {flv.name} disk overpromise {flv.disk} < {disksize}")
8482
problems.add(flv.name)

0 commit comments

Comments
 (0)