Include flavors with larger memory

Signed-off-by: Matthias Büchse <[email protected]>

Author: mbuechse

.github/workflows/create-flavors-spec.yml

@@ -5,8 +5,8 @@ on:
     branches:
     - main
     paths:
-      - 'Tests/iaas/standard-flavors/flavor-manager-input.py'
-      - 'Tests/iaas/scs-0103-v1-flavors.yaml'
+      - 'Tests/iaas/scs_0103_standard_flavors/standard_flavors.py'
+      - 'Tests/iaas/generate_flavors_yaml.py'
   workflow_dispatch:
 
 jobs:
@@ -27,7 +27,7 @@ jobs:
         pip install PyYAML==6.0
     - name: Run flavor-manager-input.py
       run: |
-        python Tests/iaas/standard-flavors/flavor-manager-input.py < Tests/iaas/scs-0103-v1-flavors.yaml > Tests/iaas/SCS-Spec.MandatoryFlavors.verbose.yaml
+        python Tests/iaas/generate_flavors_yaml.py > Tests/iaas/SCS-Spec.MandatoryFlavors.verbose.yaml
     - name: Commit changes
       uses: stefanzweifel/git-auto-commit-action@v4
       with:

Tests/iaas/SCS-Spec.MandatoryFlavors.verbose.yaml

@@ -109,131 +109,187 @@ recommended:
   ram: 4096
   disk: 10
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-1V:4:10
   scs:name-v2: SCS-1V-4-10
 - name: SCS-2V-8-20
   cpus: 2
   ram: 8192
   disk: 20
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-2V:8:20
   scs:name-v2: SCS-2V-8-20
 - name: SCS-4V-16-50
   cpus: 4
   ram: 16384
   disk: 50
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-4V:16:50
   scs:name-v2: SCS-4V-16-50
 - name: SCS-8V-32-100
   cpus: 8
   ram: 32768
   disk: 100
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-8V:32:100
   scs:name-v2: SCS-8V-32-100
-- name: SCS-8V-64-100
-  cpus: 8
-  ram: 65536
-  disk: 100
-  scs:cpu-type: shared-core
-  scs:name-v1: SCS-8V:64:100
-  scs:name-v2: SCS-8V-64-100
-- name: SCS-8V-128-100
-  cpus: 8
-  ram: 131072
-  disk: 100
-  scs:cpu-type: shared-core
-  scs:name-v1: SCS-8V:128:100
-  scs:name-v2: SCS-8V-128-100
 - name: SCS-1V-2-5
   cpus: 1
   ram: 2048
   disk: 5
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-1V:2:5
   scs:name-v2: SCS-1V-2-5
 - name: SCS-2V-4-10
   cpus: 2
   ram: 4096
   disk: 10
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-2V:4:10
   scs:name-v2: SCS-2V-4-10
 - name: SCS-4V-8-20
   cpus: 4
   ram: 8192
   disk: 20
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-4V:8:20
   scs:name-v2: SCS-4V-8-20
 - name: SCS-8V-16-50
   cpus: 8
   ram: 16384
   disk: 50
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-8V:16:50
   scs:name-v2: SCS-8V-16-50
 - name: SCS-16V-32-100
   cpus: 16
   ram: 32768
   disk: 100
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-16V:32:100
   scs:name-v2: SCS-16V-32-100
-- name: SCS-16V-64-100
-  cpus: 16
-  ram: 65536
-  disk: 100
-  scs:cpu-type: shared-core
-  scs:name-v1: SCS-16V:64:100
-  scs:name-v2: SCS-16V-64-100
-- name: SCS-16V-128-100
-  cpus: 16
-  ram: 131072
-  disk: 100
-  scs:cpu-type: shared-core
-  scs:name-v1: SCS-16V:128:100
-  scs:name-v2: SCS-16V-128-100
 - name: SCS-1V-8-20
   cpus: 1
   ram: 8192
   disk: 20
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-1V:8:20
   scs:name-v2: SCS-1V-8-20
 - name: SCS-2V-16-50
   cpus: 2
   ram: 16384
   disk: 50
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-2V:16:50
   scs:name-v2: SCS-2V-16-50
 - name: SCS-4V-32-100
   cpus: 4
   ram: 32768
   disk: 100
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-4V:32:100
   scs:name-v2: SCS-4V-32-100
+- name: SCS-1L-1-5
+  cpus: 1
+  ram: 1024
+  disk: 5
+  scs:cpu-type: crowded-core
+  scs:disk0-type: network
+  scs:name-v1: SCS-1L:1:5
+  scs:name-v2: SCS-1L-1-5
+- name: SCS-16V-64
+  cpus: 16
+  ram: 65536
+  scs:cpu-type: shared-core
+  scs:name-v1: SCS-16V:64
+  scs:name-v2: SCS-16V-64
+- name: SCS-16V-64-100
+  cpus: 16
+  ram: 65536
+  disk: 100
+  scs:cpu-type: shared-core
+  scs:disk0-type: network
+  scs:name-v1: SCS-16V:64:100
+  scs:name-v2: SCS-16V-64-100
+- name: SCS-8V-64
+  cpus: 8
+  ram: 65536
+  scs:cpu-type: shared-core
+  scs:name-v1: SCS-8V:64
+  scs:name-v2: SCS-8V-64
+- name: SCS-16V-128
+  cpus: 16
+  ram: 131072
+  scs:cpu-type: shared-core
+  scs:name-v1: SCS-16V:128
+  scs:name-v2: SCS-16V-128
+- name: SCS-8V-64-100
+  cpus: 8
+  ram: 65536
+  disk: 100
+  scs:cpu-type: shared-core
+  scs:disk0-type: network
+  scs:name-v1: SCS-8V:64:100
+  scs:name-v2: SCS-8V-64-100
+- name: SCS-16V-128-100
+  cpus: 16
+  ram: 131072
+  disk: 100
+  scs:cpu-type: shared-core
+  scs:disk0-type: network
+  scs:name-v1: SCS-16V:128:100
+  scs:name-v2: SCS-16V-128-100
+- name: SCS-4V-64
+  cpus: 4
+  ram: 65536
+  scs:cpu-type: shared-core
+  scs:name-v1: SCS-4V:64
+  scs:name-v2: SCS-4V-64
+- name: SCS-8V-128
+  cpus: 8
+  ram: 131072
+  scs:cpu-type: shared-core
+  scs:name-v1: SCS-8V:128
+  scs:name-v2: SCS-8V-128
 - name: SCS-4V-64-100
   cpus: 4
   ram: 65536
   disk: 100
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-4V:64:100
   scs:name-v2: SCS-4V-64-100
+- name: SCS-8V-128-100
+  cpus: 8
+  ram: 131072
+  disk: 100
+  scs:cpu-type: shared-core
+  scs:disk0-type: network
+  scs:name-v1: SCS-8V:128:100
+  scs:name-v2: SCS-8V-128-100
+- name: SCS-4V-128
+  cpus: 4
+  ram: 131072
+  scs:cpu-type: shared-core
+  scs:name-v1: SCS-4V:128
+  scs:name-v2: SCS-4V-128
 - name: SCS-4V-128-100
   cpus: 4
   ram: 131072
   disk: 100
   scs:cpu-type: shared-core
+  scs:disk0-type: network
   scs:name-v1: SCS-4V:128:100
   scs:name-v2: SCS-4V-128-100
-- name: SCS-1L-1-5
-  cpus: 1
-  ram: 1024
-  disk: 5
-  scs:cpu-type: crowded-core
-  scs:name-v1: SCS-1L:1:5
-  scs:name-v2: SCS-1L-1-5
+

Tests/iaas/SCS-Spec.MandatoryFlavors.yaml

@@ -0,0 +1,72 @@
+#!/usr/bin/env python3
+"""
+Generate flavor specification file for osism's flavor manager,
+cf. https://github.com/osism/openstack-flavor-manager .
+
+The spec file is output to stdout.
+"""
+import logging
+import sys
+
+import yaml
+
+from scs_0100_flavor_naming.flavor_names import compute_flavor_spec
+from scs_0103_standard_flavors.standard_flavors import \
+    SCS_0103_V1_MANDATORY, SCS_0103_V1_RECOMMENDED
+
+logger = logging.getLogger(__name__)
+
+
+def convert_flavor_spec(canonical_name, spec):
+    """convert `spec` into format for openstack-flavor-manager"""
+    converted = {
+        'name': canonical_name,
+        'cpus': spec['cpus'],
+        'ram': int(1024 * spec['ram']),
+    }
+    if 'disk' in spec:
+        converted['disk'] = spec['disk']
+    for k, v in spec.items():
+        if not k.startswith('scs:'):
+            continue
+        converted[k] = v
+    return converted
+
+
+def compute_spec_list(canonical_names):
+    return [
+        convert_flavor_spec(
+            canonical_name,
+            compute_flavor_spec(canonical_name),
+        )
+        for canonical_name in canonical_names
+    ]
+
+
+def main(argv):
+    logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO)
+
+    # boilerplate / scaffolding
+    result = yaml.safe_load("""
+reference:
+  - field: name
+    mandatory_prefix: SCS-
+  - field: public
+    default: true
+  - field: disabled
+    default: false
+  - field: cpus
+  - field: ram
+  - field: disk
+mandatory: []
+recommended: []
+""")
+
+    result['mandatory'] = compute_spec_list(SCS_0103_V1_MANDATORY)
+    result['recommended'] = compute_spec_list(SCS_0103_V1_RECOMMENDED)
+
+    print(yaml.dump(result, sort_keys=False))
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv[1:]))

Tests/iaas/generate_flavors_yaml.py

@@ -14,9 +14,9 @@
 
 import openstack
 
+from scs_0100_flavor_naming.flavor_names import compute_flavor_spec
 from scs_0100_flavor_naming.flavor_names_check import \
-    compute_scs_flavors, compute_scs_0100_syntax_check, compute_scs_0100_semantics_check, \
-    compute_flavor_spec
+    compute_scs_flavors, compute_scs_0100_syntax_check, compute_scs_0100_semantics_check
 from scs_0101_entropy.entropy_check import \
     compute_scs_0101_image_property, compute_scs_0101_flavor_property, compute_canonical_image, \
     compute_collected_vm_output, compute_scs_0101_entropy_avail, compute_scs_0101_rngd, \