Merge lp:~corey.bryant/charms/precise/nova-cloud-controller/havana-db-stamp into lp:~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk

[James Page]

[James Page (james-page)]

Corey

I think this looks good - please can you update the failing unit test as well:

======================================================================
FAIL: Simulate a call to do_openstack_upgrade() for grizzly->icehouse
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1210, in patched
    return func(*args, **keywargs)
  File "/home/jamespage/src/charms/landing/nova-cloud-controller/unit_tests/test_nova_cc_utils.py", line 502, in test_upgrade_grizzly_icehouse
    self.assertEquals(self.neutron_db_manage.call_args_list, expected)
AssertionError: [call(['stamp', 'grizzly']),
 call(['upgrade', 'head']),
 call(['stamp', 'havana']),
 call(['upgrade', 'head'])] != [call(['stamp', 'grizzly']), call(['upgrade', 'head']), call(['upgrade', 'head'])]

review: Needs Fixing

[lp:~corey.bryant/charms/precise/nova-cloud-controller/havana-db-stamp]

72. By James Page on 2014-04-28

[trivial] Fixup broken unit test for ssh key management

73. By Corey Bryant on 2014-04-28

Stamp neutron database before upgrade from non-grizzly releases

[Corey Bryant (corey.bryant)]

Hi James,

I've updated my branch to fix the test. Thanks.

Corey

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2014-04-16 09:25:57 +0000
+++ hooks/nova_cc_utils.py	2014-04-28 12:16:14 +0000
@@ -441,6 +441,7 @@
         # NOTE(jamespage) upgrade with existing config files as the
         # havana->icehouse migration enables new service_plugins which
         # create issues with db upgrades
+        neutron_db_manage(['stamp', cur_os_rel])
         neutron_db_manage(['upgrade', 'head'])
         reset_os_release()
         configs = register_configs(release=new_os_rel)

=== modified file 'unit_tests/test_nova_cc_utils.py'
--- unit_tests/test_nova_cc_utils.py	2014-04-28 08:07:27 +0000
+++ unit_tests/test_nova_cc_utils.py	2014-04-28 12:16:14 +0000
@@ -498,7 +498,7 @@
         self.eligible_leader.return_value = True
         utils.do_openstack_upgrade()
         expected = [call(['stamp', 'grizzly']), call(['upgrade', 'head']),
-                    call(['upgrade', 'head'])]
+                    call(['stamp', 'havana']), call(['upgrade', 'head'])]
         self.assertEquals(self.neutron_db_manage.call_args_list, expected)
         self.apt_update.assert_called_with(fatal=True)
         self.apt_upgrade.assert_called_with(options=DPKG_OPTS, fatal=True,