Merge lp:~smoser/curtin/trunk.yakkety into lp:~curtin-dev/curtin/trunk

[Scott Moser]

tests/vmtests: add yakkety, remove vivid

Vivid is unsupported now, so remove those tests.
Add Yakkety tests for any test that had a xenial test.

The one thing that is questionable here is the usage of 'linux-generic'
as the fallback, where previously there was none.
The change means that linux-generic kernel would be installed
even if there was a useful kernel installed in the image.

Fix ifconfig output parsing to work for yakkety, And remove the code
duplication by putting the ifconfig parser into helpers.

[Scott Moser (smoser)]

Started jenkins run on this branch at revno 402 at https://server-team-jenkins.canonical.com/job/curtin-vmtest-venonat-devel/26/

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:402
https://server-team-jenkins.canonical.com/job/curtin-ci/260/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/257/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/260/rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:402
https://server-team-jenkins.canonical.com/job/curtin-ci/261/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/258/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/261/rebuild

review: Needs Fixing (continuous-integration)

[lp:~smoser/curtin/trunk.yakkety]

403. By Scott Moser on 2016-06-16

fix flake8

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:403
https://server-team-jenkins.canonical.com/job/curtin-ci/263/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/260/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/263/rebuild

review: Approve (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:
https://server-team-jenkins.canonical.com/job/curtin-ci/264/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/261/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/264/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

Looks good, minor nits.

Also, I don't think that we're installing a kernel if we don't need one. There should be some discussion on the defaults in the code.

Can we control or set that on a per-test basis (ie, supply curtin config to set the default kernel or kernel mapping)? I'd like to not slow down curtin vmtest with unnecessary kernel installs.

review: Needs Fixing

[Scott Moser (smoser)]

So yeah, the one thing questionable is the installation of linux-generic
by default, and that could actually be an issue. See the comment i put in revno 398 here:

| set fallback kernel to 'linux-generic'
|
| this is making yakkety work much nicer, and we should definitely have a
| fallback. I'm just not sure that this is the right way to do this. It seems
| like some more involved kernel package handling might be needed.
|
| For example
| * an image might have a kernel installed already.
| They'd reasonably want to just use that kernel as is.
| * installing 'package' could result in 2 kernels being installed
| and 'package' kernel not even being selected as it is older.
|
| some thought required.

Not sure what the best thing to do here is. I had started on a more
involved patch that would go looking for a kernel. Heres some doc
i started to write:

+# kernel config
+# package: ensure this package is installed
+# fallback-package: kernel-package
+# mapping: {release: {'X.Y.Z': {'package'}}}
+#
+# kernel package selection is done by:
+# if package is provided and not None use it.
+# install 'package' or fail trying.
+# if the booted release/kernel-version is found in 'mapping', use it.
+# if 'package' is avialable in apt:
+# install it or fail trying
+#
+# # At this point either package == None or fallback mapping kernel not
+# # installable.
+# if fallback is set to None
+# do not attempt installation of anything
+# elif there is *any* kernel package installed:
+# let it be, do nothing.
+# else:
+# if fallback package is installed:
+# do nothing (do not upgrade it if it is present)
+# else
+# attempt install 'fallback' or fail trying

I thought we should also possibly add a 'purge-others' option that would
possibly even default to true. Where if a kernel package was installed
then others in the image would be removed. This would be the only
real way to guarantee that the kernel isntalled woudl be the one booted.

[lp:~smoser/curtin/trunk.yakkety]

404. By Scott Moser on 2016-06-16

add example ifconfig output

[Scott Moser (smoser)]

added some example content in the parsers.

[lp:~smoser/curtin/trunk.yakkety]

405. By Scott Moser on 2016-06-16

shrink dictionary vertically in doc string

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:404
https://server-team-jenkins.canonical.com/job/curtin-ci/266/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/263/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/266/rebuild

review: Approve (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:405
https://server-team-jenkins.canonical.com/job/curtin-ci/267/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/264/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/267/rebuild

review: Approve (continuous-integration)

=== modified file 'curtin/commands/curthooks.py'
--- curtin/commands/curthooks.py	2016-05-17 21:14:36 +0000
+++ curtin/commands/curthooks.py	2016-06-16 18:45:24 +0000
@@ -238,7 +238,7 @@
 
 def install_kernel(cfg, target):
     kernel_cfg = cfg.get('kernel', {'package': None,
-                                    'fallback-package': None,
+                                    'fallback-package': "linux-generic",
                                     'mapping': {}})
     if kernel_cfg is not None:
         kernel_package = kernel_cfg.get('package')
@@ -270,7 +270,7 @@
             LOG.warn("Couldn't detect kernel package to install for %s."
                      % kernel)
             if kernel_fallback is not None:
-                util.install_packages([kernel_fallback])
+                util.install_packages([kernel_fallback], target=target)
             return
 
         package = "linux-{flavor}{map_suffix}".format(

=== modified file 'tests/vmtests/__init__.py'
--- tests/vmtests/__init__.py	2016-05-18 01:08:46 +0000
+++ tests/vmtests/__init__.py	2016-06-16 18:45:24 +0000
@@ -510,8 +510,8 @@
         logger.debug('')
         try:
             if os.path.exists(cls.install_log):
-                with open(cls.install_log) as l:
-                    install_log = l.read()
+                with open(cls.install_log, 'rb') as l:
+                    install_log = l.read().decode('utf-8', errors='replace')
                 errmsg, errors = check_install_log(install_log)
                 if errmsg:
                     for e in errors:

=== modified file 'tests/vmtests/helpers.py'
--- tests/vmtests/helpers.py	2016-01-11 16:59:28 +0000
+++ tests/vmtests/helpers.py	2016-06-16 18:45:24 +0000
@@ -117,3 +117,172 @@
                 if getattr(test_case, 'release', ''):
                     releases.add(getattr(test_case, 'release'))
     return sorted(releases)
+
+
+def _parse_ifconfig_xenial(ifconfig_out):
+    """Parse ifconfig output from xenial or earlier and return a dictionary.
+    given content like below, return:
+    {'eth0': {'address': '10.8.1.78', 'broadcast': '10.8.1.255',
+              'inet6': [{'address': 'fe80::216:3eff:fe63:c05d',
+                         'prefixlen': '64', 'scope': 'Link'},
+                        {'address': 'fdec:2922:2f07:0:216:3eff:fe63:c05d',
+                         'prefixlen': '64', 'scope': 'Global'}],
+              'interface': 'eth0', 'link_encap': 'Ethernet',
+              'mac_address': '00:16:3e:63:c0:5d', 'mtu': 1500,
+              'multicast': True, 'netmask': '255.255.255.0',
+              'running': True, 'up': True}}
+
+    eth0  Link encap:Ethernet  HWaddr 00:16:3e:63:c0:5d
+          inet addr:10.8.1.78  Bcast:10.8.1.255  Mask:255.255.255.0
+          inet6 addr: fe80::216:3eff:fe63:c05d/64 Scope:Link
+          inet6 addr: fdec:2922:2f07:0:216:3eff:fe63:c05d/64 Scope:Global
+          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+          RX packets:21503 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:11346 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:1000
+          RX bytes:31556357 (31.5 MB)  TX bytes:870943 (870.9 KB)
+    """
+    ifaces = {}
+    combined_fields = {'addr': 'address', 'Bcast': 'broadcast',
+                       'Mask': 'netmask', 'MTU': 'mtu',
+                       'encap': 'link_encap'}
+    boolmap = {'RUNNING': 'running', 'UP': 'up', 'MULTICAST': 'multicast'}
+
+    for line in ifconfig_out.splitlines():
+        if not line:
+            continue
+        if not line.startswith(" "):
+            cur_iface = line.split()[0].rstrip(":")
+            cur_data = {'inet6': [], 'interface': cur_iface}
+            for t in boolmap.values():
+                cur_data[t] = False
+            ifaces[cur_iface] = cur_data
+
+        toks = line.split()
+
+        if toks[0] == "inet6":
+            cidr = toks[2]
+            address, prefixlen = cidr.split("/")
+            scope = toks[3].split(":")[1]
+            cur_ipv6 = {'address': address, 'scope': scope,
+                        'prefixlen': prefixlen}
+            cur_data['inet6'].append(cur_ipv6)
+            continue
+
+        for i in range(0, len(toks)):
+            cur_tok = toks[i]
+            try:
+                next_tok = toks[i+1]
+            except IndexError:
+                next_tok = None
+
+            if cur_tok == "HWaddr":
+                cur_data['mac_address'] = next_tok
+            elif ":" in cur_tok:
+                key, _colon, val = cur_tok.partition(":")
+                if key in combined_fields:
+                    cur_data[combined_fields[key]] = val
+            elif cur_tok in boolmap:
+                cur_data[boolmap[cur_tok]] = True
+
+        if 'mtu' in cur_data:
+            cur_data['mtu'] = int(cur_data['mtu'])
+
+    return ifaces
+
+
+def _parse_ifconfig_yakkety(ifconfig_out):
+    """Parse ifconfig output from yakkety or later(?) and return a dictionary.
+
+    given ifconfig output like below, return:
+    {'ens2': {'address': '10.5.0.78',
+              'broadcast': '10.5.255.255',
+              'broadcast_flag': True,
+              'inet6': [{'address': 'fe80::f816:3eff:fe05:9673',
+                         'prefixlen': '64', 'scopeid': '0x20<link>'},
+                        {'address': 'fe80::f816:3eff:fe05:9673',
+                         'prefixlen': '64', 'scopeid': '0x20<link>'}],
+              'interface': 'ens2', 'link_encap': 'Ethernet',
+              'mac_address': 'fa:16:3e:05:96:73', 'mtu': 1500,
+              'multicast': True, 'netmask': '255.255.0.0',
+              'running': True, 'up': True}}
+
+    ens2: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
+            inet 10.5.0.78  netmask 255.255.0.0  broadcast 10.5.255.255
+            inet6 fe80::f816:3eff:fe05:9673  prefixlen 64  scopeid 0x20<link>
+            inet6 fe80::f816:3eff:fe05:9673  prefixlen 64  scopeid 0x20<link>
+            ether fa:16:3e:05:96:73  txqueuelen 1000  (Ethernet)
+            RX packets 33196  bytes 48916947 (48.9 MB)
+            RX errors 0  dropped 0  overruns 0  frame 0
+            TX packets 5458  bytes 411486 (411.4 KB)
+            TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
+    """
+    fmap = {'mtu': 'mtu', 'inet': 'address',
+            'netmask': 'netmask', 'broadcast': 'broadcast',
+            'ether': 'mac_address'}
+    boolmap = {'RUNNING': 'running', 'UP': 'up', 'MULTICAST': 'multicast',
+               'BROADCAST': 'broadcast_flag'}
+
+    ifaces = {}
+    for line in ifconfig_out.splitlines():
+        if not line:
+            continue
+        if not line.startswith(" "):
+            cur_iface = line.split()[0].rstrip(":")
+            cur_data = {'inet6': [], 'interface': cur_iface}
+            for t in boolmap.values():
+                cur_data[t] = False
+            ifaces[cur_iface] = cur_data
+
+        toks = line.split()
+        if toks[0] == "inet6":
+            cur_ipv6 = {'address': toks[1]}
+            cur_data['inet6'].append(cur_ipv6)
+
+        for i in range(0, len(toks)):
+            cur_tok = toks[i]
+            try:
+                next_tok = toks[i+1]
+            except IndexError:
+                next_tok = None
+            if cur_tok in fmap:
+                cur_data[fmap[cur_tok]] = next_tok
+            elif cur_tok in ('prefixlen', 'scopeid'):
+                cur_ipv6[cur_tok] = next_tok
+                cur_data['inet6'].append
+            elif cur_tok.startswith("flags="):
+                # flags=4163<UP,BROADCAST,RUNNING,MULTICAST>
+                flags = cur_tok[cur_tok.find("<") + 1:
+                                cur_tok.rfind(">")].split(",")
+                for flag in flags:
+                    if flag in boolmap:
+                        cur_data[boolmap[flag]] = True
+            elif cur_tok == "(Ethernet)":
+                cur_data['link_encap'] = 'Ethernet'
+
+        if 'mtu' in cur_data:
+            cur_data['mtu'] = int(cur_data['mtu'])
+
+    return ifaces
+
+
+def ifconfig_to_dict(ifconfig_a):
+    # if the first token of the first line ends in a ':' then assume yakkety
+    # parse ifconfig output and return a dictionary.
+    #
+    # return a dictionary of network information like:
+    #  {'ens2': {'address': '10.5.0.78', 'broadcast': '10.5.255.255',
+    #         'broadcast_flag': True,
+    #         'inet6': [{'address': 'fe80::f816:3eff:fe05:9673',
+    #                    'prefixlen': '64', 'scopeid': '0x20<link>'},
+    #                   {'address': 'fe80::f816:3eff:fe05:9673',
+    #                    'prefixlen': '64', 'scopeid': '0x20<link>'}],
+    #         'interface': 'ens2', 'link_encap': 'Ethernet',
+    #         'mac_address': 'fa:16:3e:05:96:73', 'mtu': 1500,
+    #         'multicast': True, 'netmask': '255.255.0.0',
+    #         'running': True, 'up': True}}
+    line = ifconfig_a.lstrip().splitlines()[0]
+    if line.split()[0].endswith(":"):
+        return _parse_ifconfig_yakkety(ifconfig_a)
+    else:
+        return _parse_ifconfig_xenial(ifconfig_a)

=== modified file 'tests/vmtests/releases.py'
--- tests/vmtests/releases.py	2016-04-11 20:26:08 +0000
+++ tests/vmtests/releases.py	2016-06-16 18:45:24 +0000
@@ -46,6 +46,10 @@
     release = "xenial"
 
 
+class _YakketyBase(_ReleaseBase):
+    release = "yakkety"
+
+
 class _Releases(object):
     precise = _PreciseBase
     precise_hwe_t = _PreciseHWET
@@ -56,6 +60,7 @@
     vivid = _VividBase
     wily = _WilyBase
     xenial = _XenialBase
+    yakkety = _YakketyBase
 
 base_vm_classes = _Releases
 

=== modified file 'tests/vmtests/test_basic.py'
--- tests/vmtests/test_basic.py	2016-05-17 20:55:46 +0000
+++ tests/vmtests/test_basic.py	2016-06-16 18:45:24 +0000
@@ -223,13 +223,13 @@
     __test__ = False
 
 
-class VividTestBasic(relbase.vivid, TestBasicAbs):
-    __test__ = True
-
-
 class WilyTestBasic(relbase.wily, TestBasicAbs):
     __test__ = True
 
 
 class XenialTestBasic(relbase.xenial, TestBasicAbs):
     __test__ = True
+
+
+class YakketyTestBasic(relbase.yakkety, TestBasicAbs):
+    __test__ = True

=== modified file 'tests/vmtests/test_bcache_basic.py'
--- tests/vmtests/test_bcache_basic.py	2016-05-17 20:55:46 +0000
+++ tests/vmtests/test_bcache_basic.py	2016-06-16 18:45:24 +0000
@@ -50,3 +50,7 @@
 
 class XenialBcacheBasic(relbase.xenial, TestBcacheBasic):
     __test__ = True
+
+
+class YakketyBcacheBasic(relbase.yakkety, TestBcacheBasic):
+    __test__ = True

=== modified file 'tests/vmtests/test_bonding.py'
--- tests/vmtests/test_bonding.py	2016-05-17 20:55:46 +0000
+++ tests/vmtests/test_bonding.py	2016-06-16 18:45:24 +0000
@@ -1,4 +1,4 @@
-from . import VMBaseClass, logger
+from . import VMBaseClass, logger, helpers
 from .releases import base_vm_classes as relbase
 
 import ipaddress
@@ -8,44 +8,6 @@
 import yaml
 
 
-def iface_extract(input):
-    mo = re.search(r'^(?P<interface>\w+|\w+:\d+)\s+' +
-                   r'Link encap:(?P<link_encap>\S+)\s+' +
-                   r'(HWaddr\s+(?P<mac_address>\S+))?' +
-                   r'(\s+inet addr:(?P<address>\S+))?' +
-                   r'(\s+Bcast:(?P<broadcast>\S+)\s+)?' +
-                   r'(Mask:(?P<netmask>\S+)\s+)?',
-                   input, re.MULTILINE)
-
-    mtu = re.search(r'(\s+MTU:(?P<mtu>\d+)\s+)\s+', input, re.MULTILINE)
-    mtu_info = mtu.groupdict('')
-    mtu_info['mtu'] = int(mtu_info['mtu'])
-
-    if mo:
-        info = mo.groupdict('')
-        info['running'] = False
-        info['up'] = False
-        info['multicast'] = False
-        if 'RUNNING' in input:
-            info['running'] = True
-        if 'UP' in input:
-            info['up'] = True
-        if 'MULTICAST' in input:
-            info['multicast'] = True
-        info.update(mtu_info)
-        return info
-    return {}
-
-
-def ifconfig_to_dict(ifconfig):
-    interfaces = {}
-    for iface in [iface_extract(iface) for iface in ifconfig.split('\n\n')
-                  if iface.strip()]:
-        interfaces[iface['interface']] = iface
-
-    return interfaces
-
-
 class TestNetworkAbs(VMBaseClass):
     interactive = False
     conf_file = "examples/tests/bonding_network.yaml"
@@ -96,7 +58,7 @@
             ifconfig_a = fp.read()
             logger.debug('ifconfig -a:\n{}'.format(ifconfig_a))
 
-        ifconfig_dict = ifconfig_to_dict(ifconfig_a)
+        ifconfig_dict = helpers.ifconfig_to_dict(ifconfig_a)
         logger.debug('parsed ifcfg dict:\n{}'.format(
             yaml.dump(ifconfig_dict, default_flow_style=False, indent=4)))
 
@@ -230,13 +192,13 @@
     __test__ = True
 
 
-class VividTestBonding(relbase.vivid, TestNetworkAbs):
-    __test__ = True
-
-
 class WilyTestBonding(relbase.wily, TestNetworkAbs):
     __test__ = True
 
 
 class XenialTestBonding(relbase.xenial, TestNetworkAbs):
     __test__ = True
+
+
+class YakketyTestBonding(relbase.yakkety, TestNetworkAbs):
+    __test__ = True

=== modified file 'tests/vmtests/test_lvm.py'
--- tests/vmtests/test_lvm.py	2016-05-19 20:46:36 +0000
+++ tests/vmtests/test_lvm.py	2016-06-16 18:45:24 +0000
@@ -63,13 +63,13 @@
         print("test_dname does not work for Trusty")
 
 
-class VividTestLvm(relbase.vivid, TestLvmAbs):
-    __test__ = True
-
-
 class WilyTestLvm(relbase.wily, TestLvmAbs):
     __test__ = True
 
 
 class XenialTestLvm(relbase.xenial, TestLvmAbs):
     __test__ = True
+
+
+class YakketyTestLvm(relbase.yakkety, TestLvmAbs):
+    __test__ = True

=== modified file 'tests/vmtests/test_mdadm_bcache.py'
--- tests/vmtests/test_mdadm_bcache.py	2016-05-18 01:08:46 +0000
+++ tests/vmtests/test_mdadm_bcache.py	2016-06-16 18:45:24 +0000
@@ -130,10 +130,6 @@
     __test__ = True
 
 
-class VividTestMdadmBcache(relbase.vivid, TestMdadmBcacheAbs):
-    __test__ = True
-
-
 class WilyTestMdadmBcache(relbase.wily, TestMdadmBcacheAbs):
     __test__ = True
 
@@ -142,6 +138,10 @@
     __test__ = True
 
 
+class YakketyTestMdadmBcache(relbase.yakkety, TestMdadmBcacheAbs):
+    __test__ = True
+
+
 class TestMirrorbootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/mirrorboot.yaml"
@@ -170,10 +170,6 @@
     __test__ = True
 
 
-class VividTestMirrorboot(relbase.vivid, TestMirrorbootAbs):
-    __test__ = True
-
-
 class WilyTestMirrorboot(relbase.wily, TestMirrorbootAbs):
     __test__ = True
 
@@ -182,6 +178,10 @@
     __test__ = True
 
 
+class YakketyTestMirrorboot(relbase.yakkety, TestMirrorbootAbs):
+    __test__ = True
+
+
 class TestRaid5bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid5boot.yaml"
@@ -211,10 +211,6 @@
     __test__ = True
 
 
-class VividTestRaid5boot(relbase.vivid, TestRaid5bootAbs):
-    __test__ = True
-
-
 class WilyTestRaid5boot(relbase.wily, TestRaid5bootAbs):
     __test__ = True
 
@@ -223,6 +219,10 @@
     __test__ = True
 
 
+class YakketyTestRaid5boot(relbase.yakkety, TestRaid5bootAbs):
+    __test__ = True
+
+
 class TestRaid6bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid6boot.yaml"
@@ -264,10 +264,6 @@
     __test__ = True
 
 
-class VividTestRaid6boot(relbase.vivid, TestRaid6bootAbs):
-    __test__ = True
-
-
 class WilyTestRaid6boot(relbase.wily, TestRaid6bootAbs):
     __test__ = True
 
@@ -276,6 +272,10 @@
     __test__ = True
 
 
+class YakketyTestRaid6boot(relbase.yakkety, TestRaid6bootAbs):
+    __test__ = True
+
+
 class TestRaid10bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid10boot.yaml"
@@ -305,10 +305,6 @@
     __test__ = True
 
 
-class VividTestRaid10boot(relbase.vivid, TestRaid10bootAbs):
-    __test__ = True
-
-
 class WilyTestRaid10boot(relbase.wily, TestRaid10bootAbs):
     __test__ = True
 
@@ -317,6 +313,10 @@
     __test__ = True
 
 
+class YakketyTestRaid10boot(relbase.yakkety, TestRaid10bootAbs):
+    __test__ = True
+
+
 class TestAllindataAbs(TestMdadmAbs):
     # more complex, needs more time
     # alternative config for more complex setup
@@ -403,13 +403,13 @@
     __test__ = False  # lukes=no does not disable mounting of device
 
 
-class VividTestAllindata(relbase.vivid, TestAllindataAbs):
-    __test__ = True
-
-
 class WilyTestAllindata(relbase.wily, TestAllindataAbs):
     __test__ = True
 
 
 class XenialTestAllindata(relbase.xenial, TestAllindataAbs):
     __test__ = True
+
+
+class YakketyTestAllindata(relbase.yakkety, TestAllindataAbs):
+    __test__ = True

=== modified file 'tests/vmtests/test_network.py'
--- tests/vmtests/test_network.py	2016-05-17 20:55:46 +0000
+++ tests/vmtests/test_network.py	2016-06-16 18:45:24 +0000
@@ -1,4 +1,4 @@
-from . import VMBaseClass, logger
+from . import VMBaseClass, logger, helpers
 from .releases import base_vm_classes as relbase
 
 import ipaddress
@@ -9,44 +9,6 @@
 import yaml
 
 
-def iface_extract(input):
-    mo = re.search(r'^(?P<interface>\w+|\w+:\d+|\w+\.\d+)\s+' +
-                   r'Link encap:(?P<link_encap>\S+)\s+' +
-                   r'(HWaddr\s+(?P<mac_address>\S+))?' +
-                   r'(\s+inet addr:(?P<address>\S+))?' +
-                   r'(\s+Bcast:(?P<broadcast>\S+)\s+)?' +
-                   r'(Mask:(?P<netmask>\S+)\s+)?',
-                   input, re.MULTILINE)
-
-    mtu = re.search(r'(\s+MTU:(?P<mtu>\d+)\s+)\s+', input, re.MULTILINE)
-    mtu_info = mtu.groupdict('')
-    mtu_info['mtu'] = int(mtu_info['mtu'])
-
-    if mo:
-        info = mo.groupdict('')
-        info['running'] = False
-        info['up'] = False
-        info['multicast'] = False
-        if 'RUNNING' in input:
-            info['running'] = True
-        if 'UP' in input:
-            info['up'] = True
-        if 'MULTICAST' in input:
-            info['multicast'] = True
-        info.update(mtu_info)
-        return info
-    return {}
-
-
-def ifconfig_to_dict(ifconfig):
-    interfaces = {}
-    for iface in [iface_extract(iface) for iface in ifconfig.split('\n\n')
-                  if iface.strip()]:
-        interfaces[iface['interface']] = iface
-
-    return interfaces
-
-
 class TestNetworkAbs(VMBaseClass):
     interactive = False
     conf_file = "examples/tests/basic_network.yaml"
@@ -132,7 +94,7 @@
             ifconfig_a = fp.read()
             logger.debug('ifconfig -a:\n{}'.format(ifconfig_a))
 
-        ifconfig_dict = ifconfig_to_dict(ifconfig_a)
+        ifconfig_dict = helpers.ifconfig_to_dict(ifconfig_a)
         logger.debug('parsed ifcfg dict:\n{}'.format(
             yaml.dump(ifconfig_dict, default_flow_style=False, indent=4)))
 
@@ -340,7 +302,7 @@
             ifconfig_a = fp.read()
             logger.debug('ifconfig -a:\n{}'.format(ifconfig_a))
 
-        ifconfig_dict = ifconfig_to_dict(ifconfig_a)
+        ifconfig_dict = helpers.ifconfig_to_dict(ifconfig_a)
         logger.debug('parsed ifconfig dict:\n{}'.format(
             yaml.dump(ifconfig_dict, default_flow_style=False, indent=4)))
         print('parsed ifconfig dict:\n{}'.format(
@@ -411,14 +373,6 @@
     __test__ = False
 
 
-class VividTestNetwork(relbase.vivid, TestNetworkAbs):
-    __test__ = True
-
-
-class VividTestNetworkStatic(relbase.vivid, TestNetworkStaticAbs):
-    __test__ = True
-
-
 class WilyTestNetwork(relbase.wily, TestNetworkAbs):
     __test__ = True
 
@@ -435,6 +389,14 @@
     __test__ = True
 
 
+class YakketyTestNetwork(relbase.yakkety, TestNetworkAbs):
+    __test__ = True
+
+
+class YakketyTestNetworkStatic(relbase.yakkety, TestNetworkStaticAbs):
+    __test__ = True
+
+
 class PreciseTestNetworkVlan(relbase.precise, TestNetworkVlanAbs):
     __test__ = True
 
@@ -455,10 +417,6 @@
     __test__ = True
 
 
-class VividTestNetworkVlan(relbase.vivid, TestNetworkVlanAbs):
-    __test__ = True
-
-
 class WilyTestNetworkVlan(relbase.wily, TestNetworkVlanAbs):
     __test__ = True
 
@@ -467,6 +425,10 @@
     __test__ = True
 
 
+class YakketyTestNetworkVlan(relbase.yakkety, TestNetworkVlanAbs):
+    __test__ = True
+
+
 class PreciseTestNetworkENISource(relbase.precise, TestNetworkENISource):
     __test__ = False
     # not working, still debugging though; possible older ifupdown doesn't
@@ -477,13 +439,13 @@
     __test__ = True
 
 
-class VividTestNetworkENISource(relbase.vivid, TestNetworkENISource):
-    __test__ = True
-
-
 class WilyTestNetworkENISource(relbase.wily, TestNetworkENISource):
     __test__ = True
 
 
 class XenialTestNetworkENISource(relbase.xenial, TestNetworkENISource):
     __test__ = True
+
+
+class YakketyTestNetworkENISource(relbase.yakkety, TestNetworkENISource):
+    __test__ = True

=== modified file 'tests/vmtests/test_nvme.py'
--- tests/vmtests/test_nvme.py	2016-05-17 20:55:46 +0000
+++ tests/vmtests/test_nvme.py	2016-06-16 18:45:24 +0000
@@ -74,13 +74,13 @@
         print("test_ptable does not work for Trusty")
 
 
-class VividTestNvme(relbase.vivid, TestNvmeAbs):
-    __test__ = True
-
-
 class WilyTestNvme(relbase.wily, TestNvmeAbs):
     __test__ = True
 
 
 class XenialTestNvme(relbase.xenial, TestNvmeAbs):
     __test__ = True
+
+
+class YakketyTestNvme(relbase.yakkety, TestNvmeAbs):
+    __test__ = True

=== modified file 'tests/vmtests/test_raid5_bcache.py'
--- tests/vmtests/test_raid5_bcache.py	2016-05-17 20:55:46 +0000
+++ tests/vmtests/test_raid5_bcache.py	2016-06-16 18:45:24 +0000
@@ -93,9 +93,13 @@
     __test__ = False
 
 
-class VividTestRaid5Bcache(relbase.vivid, TestMdadmBcacheAbs):
-    __test__ = True
-
-
 class WilyTestRaid5Bcache(relbase.wily, TestMdadmBcacheAbs):
     __test__ = True
+
+
+class XenialTestRaid5Bcache(relbase.xenial, TestMdadmBcacheAbs):
+    __test__ = True
+
+
+class YakketyTestRaid5Bcache(relbase.yakkety, TestMdadmBcacheAbs):
+    __test__ = True

=== modified file 'tests/vmtests/test_uefi_basic.py'
--- tests/vmtests/test_uefi_basic.py	2016-05-17 20:55:46 +0000
+++ tests/vmtests/test_uefi_basic.py	2016-06-16 18:45:24 +0000
@@ -108,14 +108,14 @@
     __test__ = True
 
 
-class VividUefiTestBasic(relbase.vivid, TestBasicAbs):
-    __test__ = True
-
-
 class XenialUefiTestBasic(relbase.xenial, TestBasicAbs):
     __test__ = True
 
 
+class YakketyUefiTestBasic(relbase.yakkety, TestBasicAbs):
+    __test__ = True
+
+
 class PreciseUefiTestBasic4k(PreciseUefiTestBasic):
     disk_block_size = 4096
 
@@ -124,13 +124,13 @@
     disk_block_size = 4096
 
 
-class VividUefiTestBasic4k(VividUefiTestBasic):
-    disk_block_size = 4096
-
-
 class WilyUefiTestBasic4k(WilyUefiTestBasic):
     disk_block_size = 4096
 
 
 class XenialUefiTestBasic4k(XenialUefiTestBasic):
     disk_block_size = 4096
+
+
+class YakketyUefiTestBasic4k(YakketyUefiTestBasic):
+    disk_block_size = 4096