Merge lp:~billy-olsen/charms/trusty/nova-compute/lp1512908-backport into lp:~openstack-charmers-archive/charms/trusty/nova-compute/trunk

[Billy Olsen]

This is a backport of gnuoy's change for bug #1512908

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

charm_lint_check #13429 nova-compute for billy-olsen mp277205
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/13429/

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

charm_unit_test #12563 nova-compute for billy-olsen mp277205
    UNIT OK: passed

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

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

charm_amulet_test #7840 nova-compute for billy-olsen mp277205
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/13236803/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7840/

[Liam Young (gnuoy)]

Approved.

Ran amulet tests by hand:

juju-test INFO : Results: 10 passed, 1 failed, 0 errored

The failed one was trusty-kilo-git which seemed to be an undercloud issue which I don't think should block this.

review: Approve

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2015-10-22 13:23:10 +0000
+++ hooks/nova_compute_context.py	2015-11-11 00:24:06 +0000
@@ -2,6 +2,7 @@
 import os
 import platform
 
+from charmhelpers.core.unitdata import kv
 from charmhelpers.contrib.openstack import context
 from charmhelpers.core.host import service_running, service_start
 from charmhelpers.fetch import apt_install, filter_installed_packages
@@ -134,7 +135,15 @@
         if config('hugepages'):
             ctxt['hugepages'] = True
 
-        ctxt['host_uuid'] = '%s' % uuid.uuid4()
+        db = kv()
+        if db.get('host_uuid'):
+            ctxt['host_uuid'] = db.get('host_uuid')
+        else:
+            host_uuid = str(uuid.uuid4())
+            db.set('host_uuid', host_uuid)
+            db.flush()
+            ctxt['host_uuid'] = host_uuid
+
         return ctxt
 
 
 
=== modified file 'unit_tests/test_nova_compute_contexts.py'
--- unit_tests/test_nova_compute_contexts.py	2015-10-22 13:23:10 +0000
+++ unit_tests/test_nova_compute_contexts.py	2015-11-11 00:24:06 +0000
@@ -10,6 +10,7 @@
 TO_PATCH = [
     'apt_install',
     'filter_installed_packages',
+    'kv',
     'relation_ids',
     'relation_get',
     'related_units',
@@ -58,6 +59,23 @@
     print '[juju test log (%s)] %s' % (level, msg)
 
 
+class FakeUnitdata(object):
+
+    def __init__(self, **kwargs):
+        self.unit_data = {}
+        for name, value in kwargs.items():
+            self.unit_data[name] = value
+
+    def get(self, key, default=None, record=False):
+        return self.unit_data.get(key)
+
+    def set(self, key, value):
+        self.unit_data[key] = value
+
+    def flush(self):
+        pass
+
+
 class NovaComputeContextTests(CharmTestCase):
 
     def setUp(self):
@@ -65,6 +83,7 @@
         self.relation_get.side_effect = self.test_relation.get
         self.config.side_effect = self.test_config.get
         self.log.side_effect = fake_log
+        self.host_uuid = 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'
 
     def test_cloud_compute_context_no_relation(self):
         self.relation_ids.return_value = []
@@ -173,34 +192,31 @@
         with patch.object(qplugin, '_ensure_packages'):
             self.assertEquals({}, qplugin())
 
-    @patch.object(context.uuid, 'uuid4')
-    def test_libvirt_bin_context_no_migration(self, mock_uuid):
+    def test_libvirt_bin_context_no_migration(self):
+        self.kv.return_value = FakeUnitdata(**{'host_uuid': self.host_uuid})
         self.test_config.set('enable-live-migration', False)
-        mock_uuid.return_value = 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'
         libvirt = context.NovaComputeLibvirtContext()
 
         self.assertEqual(
             {'libvirtd_opts': '-d',
              'arch': platform.machine(),
              'listen_tls': 0,
-             'host_uuid': 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'}, libvirt())
+             'host_uuid': self.host_uuid}, libvirt())
 
-    @patch.object(context.uuid, 'uuid4')
-    def test_libvirt_bin_context_migration_tcp_listen(self, mock_uuid):
+    def test_libvirt_bin_context_migration_tcp_listen(self):
+        self.kv.return_value = FakeUnitdata(**{'host_uuid': self.host_uuid})
         self.test_config.set('enable-live-migration', True)
-        mock_uuid.return_value = 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'
         libvirt = context.NovaComputeLibvirtContext()
 
         self.assertEqual(
             {'libvirtd_opts': '-d -l',
              'arch': platform.machine(),
              'listen_tls': 0,
-             'host_uuid': 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'}, libvirt())
+             'host_uuid': self.host_uuid}, libvirt())
 
-    @patch.object(context.uuid, 'uuid4')
-    def test_libvirt_disk_cachemodes(self, mock_uuid):
+    def test_libvirt_disk_cachemodes(self):
+        self.kv.return_value = FakeUnitdata(**{'host_uuid': self.host_uuid})
         self.test_config.set('disk-cachemodes', 'file=unsafe,block=none')
-        mock_uuid.return_value = 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'
         libvirt = context.NovaComputeLibvirtContext()
 
         self.assertEqual(
@@ -208,7 +224,15 @@
              'disk_cachemodes': 'file=unsafe,block=none',
              'arch': platform.machine(),
              'listen_tls': 0,
-             'host_uuid': 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'}, libvirt())
+             'host_uuid': self.host_uuid}, libvirt())
+
+    @patch.object(context.uuid, 'uuid4')
+    def test_libvirt_new_uuid(self, mock_uuid):
+        self.kv.return_value = FakeUnitdata()
+        mock_uuid.return_value = '73874c1c-ba48-406d-8d99-ac185d83b9bc'
+        libvirt = context.NovaComputeLibvirtContext()
+        self.assertEqual(libvirt()['host_uuid'],
+                         '73874c1c-ba48-406d-8d99-ac185d83b9bc')
 
     @patch.object(context.NeutronComputeContext, 'network_manager')
     @patch.object(context.NeutronComputeContext, 'plugin')