Merge lp:~gnuoy/charms/trusty/nova-cloud-controller/kilo-neutron-dbmig into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Liam Young]

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

charm_lint_check #3854 nova-cloud-controller-next for gnuoy mp257224
    LINT OK: passed

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

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

charm_unit_test #3641 nova-cloud-controller-next for gnuoy mp257224
    UNIT OK: passed

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

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

charm_amulet_test #3642 nova-cloud-controller-next for gnuoy mp257224
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/3642/

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2015-04-21 15:32:08 +0000
+++ hooks/nova_cc_hooks.py	2015-04-23 07:24:11 +0000
@@ -207,8 +207,11 @@
 
 def conditional_neutron_migration():
     if os_release('nova-common') <= 'icehouse':
-        log('Not running neutron database migration as migrations are handled'
+        log('Not running neutron database migration as migrations are handled '
             'by the neutron-server process.')
+    elif os_release('nova-common') >= 'kilo':
+        log('Not running neutron database migration as migrations are by '
+            'the neutron-api charm.')
     else:
         migrate_neutron_database()
         # neutron-api service may have appeared while the migration was

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2015-04-20 10:21:36 +0000
+++ hooks/nova_cc_utils.py	2015-04-23 07:24:11 +0000
@@ -530,11 +530,12 @@
         configs.write_all()
         neutron_db_manage(['upgrade', 'head'])
     else:
+        if new_os_rel < 'kilo':
+            neutron_db_manage(['stamp', cur_os_rel])
+            migrate_neutron_database()
         # 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])
-        migrate_neutron_database()
         reset_os_release()
         configs = register_configs(release=new_os_rel)
         configs.write_all()

=== modified file 'unit_tests/test_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2015-04-21 15:28:53 +0000
+++ unit_tests/test_nova_cc_hooks.py	2015-04-23 07:24:11 +0000
@@ -598,21 +598,28 @@
         }
         self.assertEqual(_con_sets, console_settings)
 
-    def test_conditional_neutron_migration_noapi_rel(self):
+    def test_conditional_neutron_migration(self):
         self.os_release.return_value = 'juno'
-        self.relation_ids.return_value = []
         self.services.return_value = ['neutron-server']
         hooks.conditional_neutron_migration()
         self.migrate_neutron_database.assert_called_with()
         self.service_restart.assert_called_with('neutron-server')
 
-    def test_conditional_neutron_migration_noapi_rel_juno(self):
+    def test_conditional_neutron_migration_juno(self):
         self.os_release.return_value = 'icehouse'
-        self.relation_ids.return_value = []
         hooks.conditional_neutron_migration()
         self.log.assert_called_with(
             'Not running neutron database migration as migrations are handled'
-            'by the neutron-server process.'
+            ' by the neutron-server process.'
+        )
+
+    def test_conditional_neutron_migration_kilo(self):
+        self.os_release.return_value = 'kilo'
+        self.relation_ids.return_value = []
+        hooks.conditional_neutron_migration()
+        self.log.assert_called_with(
+            'Not running neutron database migration as migrations are by the '
+            'neutron-api charm.'
         )
 
     def test_ha_relation_joined_no_bound_ip(self):

=== modified file 'unit_tests/test_nova_cc_utils.py'
--- unit_tests/test_nova_cc_utils.py	2015-04-20 10:21:36 +0000
+++ unit_tests/test_nova_cc_utils.py	2015-04-23 07:24:11 +0000
@@ -687,6 +687,29 @@
         self.assertEquals(self.ml2_migration.call_count, 0)
         self.assertTrue(migrate_nova_database.call_count, 1)
 
+    @patch.object(utils, 'get_step_upgrade_source')
+    @patch.object(utils, 'migrate_nova_database')
+    @patch.object(utils, 'determine_packages')
+    def test_upgrade_juno_kilo(self, determine_packages,
+                               migrate_nova_database,
+                               get_step_upgrade_source):
+        "Simulate a call to do_openstack_upgrade() for juno->kilo"
+        self.test_config.set('openstack-origin', 'cloud:trusty-kilo')
+        get_step_upgrade_source.return_value = None
+        self.os_release.return_value = 'juno'
+        self.get_os_codename_install_source.return_value = 'kilo'
+        self.eligible_leader.return_value = True
+        self.relation_ids.return_value = []
+        utils.do_openstack_upgrade()
+        self.assertEquals(self.neutron_db_manage.call_count, 0)
+        self.apt_update.assert_called_with(fatal=True)
+        self.apt_upgrade.assert_called_with(options=DPKG_OPTS, fatal=True,
+                                            dist=True)
+        self.apt_install.assert_called_with(determine_packages(), fatal=True)
+        self.register_configs.assert_called_with(release='kilo')
+        self.assertEquals(self.ml2_migration.call_count, 0)
+        self.assertTrue(migrate_nova_database.call_count, 1)
+
     @patch.object(utils, '_do_openstack_upgrade')
     def test_upgrade_grizzly_icehouse_source(self, _do_openstack_upgrade):
         "Verify get_step_upgrade_source() for grizzly->icehouse"