Merge lp:~gnuoy/openstack-mojo-specs/tempest-stable-spec into lp:openstack-mojo-specs

[Liam Young]

[lp:~gnuoy/openstack-mojo-specs/tempest-stable-spec]

290. By Liam Young on 2017-01-27

Action fixes

[Alex Kavanagh (ajkavanagh)]

Looks great. Just a single comment that might help with readability.

[lp:~gnuoy/openstack-mojo-specs/tempest-stable-spec]

291. By Liam Young on 2017-02-06

Update for readability post-review

[Alex Kavanagh (ajkavanagh)]

LGTM. +1

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-07-21 04:32:11 +0000
+++ Makefile	2017-02-06 14:16:58 +0000
@@ -4,7 +4,7 @@
 lint:
 	@./helper/scripts/check-lint.sh
 	@echo Checking lint...
-	@flake8 -v helper/collect  helper/setup  helper/tests  helper/utils
+	@pep8 -v helper/collect  helper/setup  helper/tests  helper/utils
 
 gen_spec_summary:
 	@./helper/scripts/gen-spec-summary.sh > SPEC_SUMMARY.txt

=== modified file 'helper/bundles/full.yaml'
--- helper/bundles/full.yaml	2016-10-06 08:56:04 +0000
+++ helper/bundles/full.yaml	2017-02-06 14:16:58 +0000
@@ -49,6 +49,7 @@
       constraints: mem=4G
       options:
         instance-mtu: 1300
+        bridge-mappings: physnet1:br-ex
     cinder:
       charm: cinder
       options:
@@ -94,6 +95,9 @@
     mongodb:
       charm: mongodb
       constraints: mem=1G
+    tempest:
+      charm: tempest
+      constraints: mem=1G
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]
@@ -126,6 +130,7 @@
     - [ ceilometer, mongodb ]
     - [ ceilometer-agent, nova-compute ]
     - [ ceilometer-agent, ceilometer ]
+    - [ keystone, tempest ]
 openstack-singlerabbit:
   inherits: openstack-services
   relations:
@@ -280,3 +285,15 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# newton
+xenial-newton:
+  inherits: openstack-icehouse
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-newton
+    source: cloud:xenial-newton
+xenial-newton-proposed:
+  inherits: xenial-newton
+  overrides:
+    openstack-origin: cloud:xenial-newton/proposed
+    source: cloud:xenial-newton/proposed

=== modified file 'helper/collect/collect-stable-xenial'
--- helper/collect/collect-stable-xenial	2016-04-12 08:43:49 +0000
+++ helper/collect/collect-stable-xenial	2017-02-06 14:16:58 +0000
@@ -19,3 +19,5 @@
 rabbitmq-server        git://github.com/openstack/charm-rabbitmq-server
 swift-proxy            git://github.com/openstack/charm-swift-proxy
 swift-storage          git://github.com/openstack/charm-swift-storage
+# There is no promulgated tempest charm atm
+tempest                cs:~openstack-charmers-next/tempest

=== modified file 'helper/scripts/mojo-spec-check.py'
--- helper/scripts/mojo-spec-check.py	2016-09-22 21:25:04 +0000
+++ helper/scripts/mojo-spec-check.py	2017-02-06 14:16:58 +0000
@@ -15,6 +15,7 @@
     'images.yaml': 'image_setup.py',
     'keystone_users.yaml': 'keystone_setup.py',
     'network.yaml': 'network_setup.py',
+    'tempest_expected_results.yaml': 'tempest_test.py',
 }
 
 

=== modified file 'helper/setup/git_checkout_stable.py'
--- helper/setup/git_checkout_stable.py	2016-09-13 14:03:22 +0000
+++ helper/setup/git_checkout_stable.py	2017-02-06 14:16:58 +0000
@@ -7,7 +7,7 @@
 def main(argv):
     log = logging.getLogger()
     log.setLevel(logging.DEBUG)
-    mojo_utils.git_checkout_all('stable/16.07')
+    mojo_utils.git_checkout_all('stable/16.10')
 
 if __name__ == "__main__":
     sys.exit(main(sys.argv))

=== added file 'helper/setup/tempest_expected_results.yaml'
--- helper/setup/tempest_expected_results.yaml	1970-01-01 00:00:00 +0000
+++ helper/setup/tempest_expected_results.yaml	2017-02-06 14:16:58 +0000
@@ -0,0 +1,2 @@
+smoke:
+    failed: 0

=== added file 'helper/setup/tempest_test.py'
--- helper/setup/tempest_test.py	1970-01-01 00:00:00 +0000
+++ helper/setup/tempest_test.py	2017-02-06 14:16:58 +0000
@@ -0,0 +1,90 @@
+#!/usr/bin/python
+import sys
+import utils.mojo_utils as mojo_utils
+import utils.mojo_os_utils as mojo_os_utils
+import logging
+
+
+class TempestRunException(Exception):
+    pass
+
+
+def raise_tempest_fail(msg):
+    logging.error(msg)
+    raise TempestRunException(msg)
+
+
+def report_success(msg):
+    logging.debug(msg)
+
+
+def warn(msg):
+    logging.warning(msg)
+
+
+def keystone_v3_domain_setup():
+    overcloud_novarc = mojo_utils.get_overcloud_auth()
+    if overcloud_novarc.get('API_VERSION', 2) == 3:
+        keystone_session = mojo_os_utils.get_keystone_session(overcloud_novarc)
+        keystone_client = mojo_os_utils.get_keystone_session_client(
+            keystone_session)
+        mojo_os_utils.project_create(keystone_client,
+                                     ['admin'],
+                                     'admin_domain')
+        admin_project_id = mojo_os_utils.get_tenant_id(
+            keystone_client,
+            'admin',
+            api_version=3,
+            domain_name='admin_domain')
+        role = keystone_client.roles.find(name='admin')
+        user = keystone_client.users.find(name='admin')
+        keystone_client.roles.grant(role, user=user, project=admin_project_id)
+
+
+def main(argv):
+    # Tempest expects an admin project in the admin domain that the admin user
+    # has admin role on so make sure that exists (pre-17.02)
+    keystone_v3_domain_setup()
+
+    expected_results = mojo_utils.get_mojo_config(
+        'tempest_expected_results.yaml')['smoke']
+    tempest_unit = mojo_utils.get_juju_units(service='tempest')
+    action_id = mojo_utils.action_run(
+        tempest_unit[0],
+        'run-tempest',
+        timeout=18000)
+    action_output = mojo_utils.action_get_output(action_id)
+    logging.debug(action_output)
+    actual_results = action_output['results']
+
+    result_matrix = {
+        'failed': {
+            'on_more': raise_tempest_fail,
+            'on_less': report_success},
+        'skipped': {
+            'on_more': warn,
+            'on_less': report_success},
+        'expected-fail': {
+            'on_more': raise_tempest_fail,
+            'on_less': report_success},
+        'unexpected-success': {
+            'on_more': report_success,
+            'on_less': warn},
+        'passed': {
+            'on_more': report_success,
+            'on_less': raise_tempest_fail}}
+
+    for result_type, expected in expected_results.items():
+        actual = actual_results[result_type]
+        msg = "Number of tests {} was {} expected {}".format(result_type,
+                                                             actual,
+                                                             expected)
+        if int(actual) > expected:
+            result_matrix[result_type]['on_more'](msg)
+        elif int(actual) == expected:
+            report_success(msg)
+        else:
+            result_matrix[result_type]['on_less'](msg)
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

=== modified file 'helper/utils/mojo_os_utils.py'
--- helper/utils/mojo_os_utils.py	2016-07-22 09:24:59 +0000
+++ helper/utils/mojo_os_utils.py	2017-02-06 14:16:58 +0000
@@ -128,6 +128,7 @@
                                                    endpoint_type='publicURL')
     else:
         keystone_creds = get_ks_creds(novarc_creds, scope='PROJECT')
+        logging.info(keystone_creds)
         kc = keystoneclient_v3.Client(**keystone_creds)
         glance_svc_id = kc.services.find(name='glance').id
         ep = kc.endpoints.find(service_id=glance_svc_id, interface='public')
@@ -262,11 +263,14 @@
                                             tenant_id)
 
 
-def get_tenant_id(ks_client, tenant_name, api_version=2):
+def get_tenant_id(ks_client, tenant_name, api_version=2, domain_name=None):
+    domain_id = None
+    if domain_name:
+        domain_id = ks_client.domains.list(name=domain_name)[0].id
     if api_version == 2:
         all_tenants = ks_client.tenants.list()
     else:
-        all_tenants = ks_client.projects.list()
+        all_tenants = ks_client.projects.list(domain=domain_id)
     for t in all_tenants:
         if t._info['name'] == tenant_name:
             return t._info['id']
@@ -574,8 +578,8 @@
     nics = [{'net-id': net.id}]
     # Obviously time may not produce a unique name
     vm_name = time.strftime("%Y%m%d%H%M%S")
-    logging.info('Creating %s %s '
-                 'instance %s' % (flavor_name, image_name, vm_name))
+    logging.info('Creating %s %s %s'
+                 'instance %s' % (flavor_name, image_name, nics, vm_name))
     instance = nova_client.servers.create(name=vm_name,
                                           image=image,
                                           flavor=flavor,

=== modified file 'helper/utils/mojo_utils.py'
--- helper/utils/mojo_utils.py	2016-04-17 04:45:43 +0000
+++ helper/utils/mojo_utils.py	2017-02-06 14:16:58 +0000
@@ -16,6 +16,12 @@
                      'allocating'],
 }
 
+JUJU_ACTION_STATUSES = {
+    'good': ['completed'],
+    'bad': ['fail'],
+    'transitional': ['pending', 'running'],
+}
+
 
 def get_juju_status(service=None, unit=None):
     cmd = ['juju', 'status', '--format=yaml']
@@ -643,3 +649,34 @@
     consoleHandler = logging.StreamHandler()
     consoleHandler.setFormatter(logFormatter)
     rootLogger.addHandler(consoleHandler)
+
+
+def action_get_output(action_id):
+    cmd = ['juju', 'action', 'fetch', '--format=yaml', action_id]
+    return yaml.load(subprocess.check_output(cmd))
+
+
+def action_get_status(action_id):
+    return action_get_output(action_id)['status']
+
+
+def action_wait(action_id, timeout=600):
+    delay = 10
+    run_time = 0
+    while run_time < timeout:
+        status = action_get_status(action_id)
+        if status not in JUJU_ACTION_STATUSES['transitional']:
+            break
+        time.sleep(delay)
+        run_time = run_time + delay
+
+
+def action_run(unit, action_name, action_args=None, timeout=600):
+    cmd = ['juju', 'action', 'do', '--format=yaml', unit, action_name]
+    if action_args:
+        cmd.extend(action_args)
+    action_out = yaml.load(subprocess.check_output(cmd))
+    action_id = action_out['Action queued with id']
+    if timeout:
+        action_wait(action_id, timeout)
+    return action_id

=== added directory 'specs/full_stack/stable_deploy_tempest'
=== added directory 'specs/full_stack/stable_deploy_tempest/newton'
=== added file 'specs/full_stack/stable_deploy_tempest/newton/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy_tempest/newton/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_tempest/newton/SPEC_INFO.txt	2017-02-06 14:16:58 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the stable charms and then runs tests
+to validate the deployment

=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/collect-stable-xenial'
=== target is u'../../../../helper/collect/collect-stable-xenial'
=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/collect-stable-yakkety'
=== target is u'../../../../helper/collect/collect-stable-yakkety'
=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/git_checkout_stable.py'
=== target is u'../../../../helper/setup/git_checkout_stable.py'
=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy_tempest/newton/manifest'
--- specs/full_stack/stable_deploy_tempest/newton/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_tempest/newton/manifest	2017-02-06 14:16:58 +0000
@@ -0,0 +1,27 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Checkout stable
+script config=git_checkout_stable.py
+
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 wait=True target=${MOJO_SERIES}-newton
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+
+verify config=tempest_test.py
+# Success

=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/tempest_expected_results.yaml'
=== target is u'../../../../helper/setup/tempest_expected_results.yaml'
=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/tempest_test.py'
=== target is u'../../../../helper/setup/tempest_test.py'
=== added symlink 'specs/full_stack/stable_deploy_tempest/newton/utils'
=== target is u'../../../../helper/utils'