Merge lp:~1chb1n/ubuntu-openstack-ci/nova-instances-summarize into lp:ubuntu-openstack-ci

[Ryan Beisner]

* Add nova instance summary collector for deployment and amulet tests, replacing 'nova list' dump.
* Start creating deploy test tempest summary file for SKIPs/FAILs.
* Add tox.ini for flake8, regarding lint checks on uosci itself.
* Lint and misc cleanup.

[Ryan Beisner (1chb1n)]

Testing in osci-staging enviro @ http://10.245.162.96:8080/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #629 lp:ubuntu-openstack-ci for 1chb1n mp245883
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/629/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #600 lp:ubuntu-openstack-ci for 1chb1n mp245883
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  ./common/osci_utils.py:288:80: E501 line too long (80 > 79 characters)
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9693926/
Build: http://10.245.162.77:8080/job/charm_lint_check/600/

[lp:~1chb1n/ubuntu-openstack-ci/nova-instances-summarize]

67. By Ryan Beisner on 2015-01-08

update nova instance summarizer

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #631 lp:ubuntu-openstack-ci for 1chb1n mp245883
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/631/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #602 lp:ubuntu-openstack-ci for 1chb1n mp245883
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  ./common/osci_utils.py:288:80: E501 line too long (80 > 79 characters)
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9695606/
Build: http://10.245.162.77:8080/job/charm_lint_check/602/

[lp:~1chb1n/ubuntu-openstack-ci/nova-instances-summarize]

68. By Ryan Beisner on 2015-01-09

start creating tempest summaries in deploy test

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #608 lp:ubuntu-openstack-ci for 1chb1n mp245883
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  ./common/osci_utils.py:288:80: E501 line too long (80 > 79 characters)
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9699028/
Build: http://10.245.162.77:8080/job/charm_lint_check/608/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #637 lp:ubuntu-openstack-ci for 1chb1n mp245883
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/637/

[lp:~1chb1n/ubuntu-openstack-ci/nova-instances-summarize]

69. By Ryan Beisner on 2015-01-09

cleanup

[Ryan Beisner (1chb1n)]

tests complete, go.

review: Approve

=== modified file 'common/osci_utils.py'
--- common/osci_utils.py	2015-01-07 19:32:26 +0000
+++ common/osci_utils.py	2015-01-09 20:10:09 +0000
@@ -89,6 +89,18 @@
         return False
 
 
+def juju_stat():
+    '''Get juju status, return dict data
+    '''
+    try:
+        j_stat = yaml.load(subprocess.check_output(['juju', 'status']))
+    except subprocess.CalledProcessError:
+        logging.warning(' ! Juju status attempt returned non-zero, '
+                        'most likely no juju enviro bootstrapped.')
+        j_stat = {}
+    return j_stat
+
+
 def get_num_units(yaml_data, outer, service):
     '''Return num_units from service in yaml data from juju bundle file
 
@@ -103,6 +115,22 @@
     return yaml_data[outer]['services'][service]['num_units']
 
 
+def dict_unicode_to_str(ddata):
+    '''Convert elements in a dictionary from unicode to string utf8
+
+    :ddata: dictionary data
+    '''
+    if isinstance(ddata, dict):
+        return {dict_unicode_to_str(key): dict_unicode_to_str(value)
+                for key, value in ddata.iteritems()}
+    elif isinstance(ddata, unicode):
+        return ddata.encode('utf-8')
+    elif isinstance(ddata, list):
+        return [dict_unicode_to_str(element) for element in ddata]
+    else:
+        return ddata
+
+
 def recursive_dict_key_search(data, key):
     '''Recursively look for key match in dictionaries, return value.
 

=== modified file 'job-parts/deploy_with_deployer.sh'
--- job-parts/deploy_with_deployer.sh	2014-12-06 06:51:33 +0000
+++ job-parts/deploy_with_deployer.sh	2015-01-09 20:10:09 +0000
@@ -47,6 +47,9 @@
 
   # Run tempest smoke tests
   f_openstack_run_tempest_smoke
+
+  # Pull summary (fails / skips only)
+  f_openstack_tempest_summarize
 else
   echo " ! Juju deployment failed."
   echo " ! Skipping tempest."

=== added file 'job-parts/nova_instances_summarize.py'
--- job-parts/nova_instances_summarize.py	1970-01-01 00:00:00 +0000
+++ job-parts/nova_instances_summarize.py	2015-01-09 20:10:09 +0000
@@ -0,0 +1,97 @@
+#!/usr/bin/python
+'''Gathers info about nova instances, filtered by instance name based on
+local default juju environment name, and writes a summary yaml text file.
+'''
+
+import os
+import sys
+import yaml
+import logging
+import tempfile
+from novaclient import client as nv_client
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
+from common import osci_utils
+
+# Set default logging level
+logging.basicConfig(level=logging.INFO)
+
+try:
+    WORKSPACE = os.environ['WORKSPACE']
+except KeyError:
+    WORKSPACE = tempfile.mkdtemp()
+
+try:
+    BUILD_NUMBER = os.environ['BUILD_NUMBER']
+except KeyError:
+    BUILD_NUMBER = '000'
+
+
+def summarize_nova_instances(creds, name_substr=''):
+    '''Gather info about nova instances, optionally filtered by
+    instance name substring, and return summary data in a dictionary.
+    '''
+    nova = nv_client.Client('2', **creds[1])
+    servers = nova.servers.list()
+    nova_ddata = {}
+    logging.info('Instance name filter substring: {}'.format(name_substr))
+    inst_count = 0
+    for server in servers:
+        if name_substr in str(server.name):
+            inst_count += 1
+            image = nova.images.get(server.image['id'])
+            nova_ddata[str(server.id)] = {
+                'inst-name': str(server.name),
+                'inst-date': str(server.created),
+                'inst-stat': str(server.status),
+                'inst-flav': str(server.flavor['id']),
+                'img-id': str(server.image['id']),
+                'img-name': str(image.name),
+                'img-date': str(image.created),
+                'net': osci_utils.dict_unicode_to_str(server.addresses)
+            }
+#                'net2': osci_utils.dict_unicode_to_str(server.networks)
+
+    logging.info('Instance count (all): {}'.format(len(servers)))
+    logging.info('Instance count (filtered): {}'.format(inst_count))
+    return nova_ddata
+
+
+def write_instance_summary_file(inst_summs):
+    '''Write out instance summary data to yaml txt file
+    '''
+    out_file = 'nova-instance-summary.{}'.format(BUILD_NUMBER)
+    target = os.path.join(WORKSPACE, out_file)
+    logging.info(' + Creating nova instance summary file: {}'.format(target))
+    osci_utils.write_yaml(inst_summs, target)
+
+    # Quick confirmation of file success
+    test_file = osci_utils.read_yaml(target)
+    if len(inst_summs) != len(test_file):
+        msg = ' ! Instance summary file data may not be complete.'
+        return msg
+
+
+def main():
+    '''Gather nova info about current nova instances, create summary file.
+    '''
+
+    print 'Starting nova_instances_summarize.'
+    logging.info('Workspace dir: {}'.format(WORKSPACE))
+    creds = osci_utils.get_os_creds()
+
+    # get juju environment name, to be used to filter instance names
+    j_data = osci_utils.juju_stat()
+    j_env_name = j_data['environment']
+
+    # get summary of matching nova instances
+    inst_summs = summarize_nova_instances(creds, name_substr=j_env_name)
+    logging.debug('instance summary data: \n{}'.format(
+        yaml.dump(inst_summs, default_flow_style=False)))
+
+    # write summary to file in workspace
+    ret = write_instance_summary_file(inst_summs)
+    if ret:
+        raise ValueError(ret)
+
+if __name__ == '__main__':
+    main()

=== modified file 'job-parts/osci_job_common.sh'
--- job-parts/osci_job_common.sh	2014-12-15 22:21:52 +0000
+++ job-parts/osci_job_common.sh	2015-01-09 20:10:09 +0000
@@ -157,7 +157,8 @@
   . $JENKINS_HOME/novarc
   ${OSCI_ROOT}/job-parts/pull_juju_logs.py || true
   ${OSCI_ROOT}/job-parts/collect_charm_revno_info.sh || true
-  nova list &> $WORKSPACE/nova-list.$BUILD_NUMBER || true
+  ${OSCI_ROOT}/job-parts/nova_instances_summarize.py || true
+#  nova list &> $WORKSPACE/nova-list.$BUILD_NUMBER || true
   juju stat &> $WORKSPACE/juju-stat.$BUILD_NUMBER || true
 }
 
@@ -259,12 +260,12 @@
   else
     # Kick off tempest
     (cd $OPENSTACK_CHARM_TESTING_ROOT/tempest && ./run_tempest.sh -N --smoke) 2>&1 |\
-      tee $WORKSPACE/tempest.$BUILD_NUMBER
-    if [[ -n "$(grep 'failures=' $WORKSPACE/tempest.$BUILD_NUMBER)" ]]; then
+      tee $WORKSPACE/tempest-allresults.$BUILD_NUMBER
+    if [[ -n "$(grep 'failures=' $WORKSPACE/tempest-allresults.$BUILD_NUMBER)" ]]; then
       echo " ! One or more tempest smoke tests failed."
       touch $WORKSPACE/fyi-${test:0:4}.tempest.bad
-    elif [[ -z "$(grep 'failures=' $WORKSPACE/tempest.$BUILD_NUMBER)" ]] &&\
-         [[ -n "$(grep 'tempest.scenario.test' $WORKSPACE/tempest.$BUILD_NUMBER)" ]] ; then
+    elif [[ -z "$(grep 'failures=' $WORKSPACE/tempest-allresults.$BUILD_NUMBER)" ]] &&\
+         [[ -n "$(grep 'tempest.scenario.test' $WORKSPACE/tempest-allresults.$BUILD_NUMBER)" ]] ; then
       echo " . All tempest smoke tests passed!"
       touch $WORKSPACE/fyi-${test:0:4}.tempest.ok
     else
@@ -274,6 +275,13 @@
 }
 
 
+function f_openstack_tempest_summarize() {
+  if [[ -f $WORKSPACE/tempest-allresults.$BUILD_NUMBER ]]; then
+    egrep 'FAIL|^Ran|====|SKIP' $WORKSPACE/tempest-allresults.$BUILD_NUMBER > $WORKSPACE/tempest-summary.$BUILD_NUMBER || true
+  fi
+}
+
+
 function f_openstack_cli_basic_check() {
 # Perform basic command line checks against the cloud
   echo "Confirming basic CLI functionality and authentication..."

=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2015-01-09 20:10:09 +0000
@@ -0,0 +1,6 @@
+[flake8]
+# The following checks should be re-enabled in the future
+# for python3 syntax correctness and sanity.
+#
+ignore = H233,H301,H302,H305,H306,H402,H403,H405,H904
+#show-source = True