Merge lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-fix-flavors into lp:openstack-mojo-specs

[Liam Young]

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-fix-flavors]

276. By Liam Young on 2016-10-03

Create flavors if they are absent (Newton+ deploys)

[Ryan Beisner (1chb1n)]

FYI - It looks good. I'm exercising this in OSCI mojo spec runners and will merge ASAP if all goes well. Thank you :)

review: Needs Information

[Ryan Beisner (1chb1n)]

Merging. I'll add a trivial debug log addition ahead of nova_client.flavors.create() for observability and retro-analysis. Thanks again!

review: Approve

[Ryan Beisner (1chb1n)]

review: Approve

=== modified file 'helper/tests/simple_os_checks.py'
--- helper/tests/simple_os_checks.py	2016-09-22 21:25:04 +0000
+++ helper/tests/simple_os_checks.py	2016-10-03 10:22:24 +0000
@@ -4,6 +4,41 @@
 import utils.mojo_os_utils as mojo_os_utils
 import argparse
 
+FLAVORS = {
+    'm1.tiny': {
+        'flavorid': 1,
+        'ram': 512,
+        'disk': 1,
+        'vcpus': 1},
+    'm1.small': {
+        'flavorid': 2,
+        'ram': 2048,
+        'disk': 20,
+        'vcpus': 1},
+    'm1.medium': {
+        'flavorid': 3,
+        'ram': 4096,
+        'disk': 40,
+        'vcpus': 2},
+    'm1.large': {
+        'flavorid': 4,
+        'ram': 8192,
+        'disk': 40,
+        'vcpus': 4},
+}
+
+
+def init_flavors(nova_client):
+    names = [flavor.name for flavor in nova_client.flavors.list()]
+    for flavor in FLAVORS.keys():
+        if flavor not in names:
+            nova_client.flavors.create(
+                name=flavor,
+                ram=FLAVORS[flavor]['ram'],
+                vcpus=FLAVORS[flavor]['vcpus'],
+                disk=FLAVORS[flavor]['disk'],
+                flavorid=FLAVORS[flavor]['flavorid'])
+
 
 def main(argv):
     mojo_utils.setup_logging()
@@ -25,6 +60,7 @@
         keystone_session = mojo_os_utils.get_keystone_session(overcloud_novarc,
                                                               scope='PROJECT')
         novac = mojo_os_utils.get_nova_session_client(keystone_session)
+    init_flavors(novac)
 
     priv_key = mojo_os_utils.create_keypair(novac, 'mojo')
     mojo_os_utils.add_secgroup_rules(novac)