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

[Liam Young]

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

UOSCI bot says:
charm_lint_check #1031 nova-cloud-controller-next for gnuoy mp241775
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-admin-network has no default value
  I: config.yaml: option haproxy-client-timeout has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option nvp-l3-uuid has no default value
  I: config.yaml: option os-internal-network has no default value

Full lint test output: http://paste.ubuntu.com/9002939/
Build: http://10.98.191.181:8080/job/charm_lint_check/1031/

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

UOSCI bot says:
charm_unit_test #865 nova-cloud-controller-next for gnuoy mp241775
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/nova_cc_hooks 442 145 67% 132-135, 148-149, 173, 184-185, 189, 221, 226-231, 242, 322-325, 333-336, 342-345, 355-371, 380-382, 392-406, 410-419, 505, 515, 519-520, 573, 579-589, 594-605, 615-625, 630-669, 679-694, 702-706, 731-740, 764, 769-777, 803, 853-856
  hooks/nova_cc_utils 445 112 75% 296-301, 312-315, 325-326, 382, 384, 430-432, 436, 450-458, 465-470, 474-488, 544, 593-595, 600-603, 608, 612, 636-637, 651-653, 674-675, 681-704, 708-714, 718-724, 730, 736, 743, 754-758, 843, 903-909, 913-915, 919-922, 926-938
  TOTAL 1038 366 65%
  Ran 96 tests in 8.937s
  OK

Full unit test output: http://paste.ubuntu.com/9002942/
Build: http://10.98.191.181:8080/job/charm_unit_test/865/

[lp:~gnuoy/charms/trusty/nova-cloud-controller/next-1392645]

125. By Liam Young on 2014-11-14

Remove test_upgrade_havana_icehouse_apirel test as the presence of the neutron api relation no longer effects the upgrade. Add a icehouse -> juno test and ensure the neutron db is stamped and upgraded

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

UOSCI bot says:
charm_amulet_test #410 nova-cloud-controller-next for gnuoy mp241775
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv07 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet test output: http://paste.ubuntu.com/9003316/
Build: http://10.98.191.181:8080/job/charm_amulet_test/410/

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

UOSCI bot says:
charm_lint_check #1032 nova-cloud-controller-next for gnuoy mp241775
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-admin-network has no default value
  I: config.yaml: option haproxy-client-timeout has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option nvp-l3-uuid has no default value
  I: config.yaml: option os-internal-network has no default value

Full lint test output: http://paste.ubuntu.com/9003421/
Build: http://10.98.191.181:8080/job/charm_lint_check/1032/

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

UOSCI bot says:
charm_unit_test #866 nova-cloud-controller-next for gnuoy mp241775
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/nova_cc_hooks 442 145 67% 132-135, 148-149, 173, 184-185, 189, 221, 226-231, 242, 322-325, 333-336, 342-345, 355-371, 380-382, 392-406, 410-419, 505, 515, 519-520, 573, 579-589, 594-605, 615-625, 630-669, 679-694, 702-706, 731-740, 764, 769-777, 803, 853-856
  hooks/nova_cc_utils 445 112 75% 296-301, 312-315, 325-326, 382, 384, 430-432, 436, 450-458, 465-470, 474-488, 544, 593-595, 600-603, 608, 612, 636-637, 651-653, 674-675, 681-704, 708-714, 718-724, 730, 736, 743, 754-758, 843, 903-909, 913-915, 919-922, 926-938
  TOTAL 1038 366 65%
  Ran 96 tests in 9.423s
  OK

Full unit test output: http://paste.ubuntu.com/9003433/
Build: http://10.98.191.181:8080/job/charm_unit_test/866/

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

UOSCI bot says:
charm_amulet_test #411 nova-cloud-controller-next for gnuoy mp241775
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv07 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet test output: http://paste.ubuntu.com/9003781/
Build: http://10.98.191.181:8080/job/charm_amulet_test/411/

[James Page (james-page)]

review: Approve

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2014-10-23 16:39:43 +0000
+++ hooks/nova_cc_utils.py	2014-11-14 10:16:05 +0000
@@ -519,12 +519,8 @@
         # NOTE(jamespage) upgrade with existing config files as the
         # havana->icehouse migration enables new service_plugins which
         # create issues with db upgrades
-        if relation_ids('neutron-api'):
-            log('Not running neutron database migration as neutron-api service'
-                'is present.')
-        else:
-            neutron_db_manage(['stamp', cur_os_rel])
-            migrate_neutron_database()
+        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_utils.py'
--- unit_tests/test_nova_cc_utils.py	2014-10-23 16:39:43 +0000
+++ unit_tests/test_nova_cc_utils.py	2014-11-14 10:16:05 +0000
@@ -664,23 +664,27 @@
     @patch.object(utils, 'get_step_upgrade_source')
     @patch.object(utils, 'migrate_nova_database')
     @patch.object(utils, 'determine_packages')
-    def test_upgrade_havana_icehouse_apirel(self, determine_packages,
-                                            migrate_nova_database,
-                                            get_step_upgrade_source):
-        "Simulate a call to do_openstack_upgrade() for havana->icehouse api"
-        self.test_config.set('openstack-origin', 'cloud:precise-icehouse')
+    def test_upgrade_icehouse_juno(self, determine_packages,
+                                   migrate_nova_database,
+                                   get_step_upgrade_source):
+        "Simulate a call to do_openstack_upgrade() for icehouse->juno"
+        self.test_config.set('openstack-origin', 'cloud:trusty-juno')
         get_step_upgrade_source.return_value = None
-        self.os_release.return_value = 'havana'
-        self.get_os_codename_install_source.return_value = 'icehouse'
+        self.os_release.return_value = 'icehouse'
+        self.get_os_codename_install_source.return_value = 'juno'
         self.eligible_leader.return_value = True
-        self.relation_ids.return_value = ['neutron-api/0']
+        self.relation_ids.return_value = []
         utils.do_openstack_upgrade()
+        neutron_db_calls = [call(['stamp', 'icehouse']),
+                            call(['upgrade', 'head'])]
+        self.neutron_db_manage.assert_has_calls(neutron_db_calls,
+                                                any_order=False)
         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='icehouse')
-        self.assertEquals(self.ml2_migration.call_count, 1)
+        self.register_configs.assert_called_with(release='juno')
+        self.assertEquals(self.ml2_migration.call_count, 0)
         self.assertTrue(migrate_nova_database.call_count, 1)
 
     @patch.object(utils, '_do_openstack_upgrade')