Merge lp:~james-page/charms/trusty/nova-cloud-controller/fixup-allowedunits-migration into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[James Page]

[lp:~james-page/charms/trusty/nova-cloud-controller/fixup-allowedunits-migration]

161. By James Page on 2015-04-21

Drop errant log message

[Adam Collard (adam-collard)]

review: Approve

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

charm_lint_check #3689 nova-cloud-controller-next for james-page mp256959
    LINT OK: passed

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

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

charm_unit_test #3476 nova-cloud-controller-next for james-page mp256959
    UNIT OK: passed

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

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

charm_amulet_test #3484 nova-cloud-controller-next for james-page mp256959
    AMULET FAIL: amulet-test failed

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

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

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2015-04-20 10:21:36 +0000
+++ hooks/nova_cc_hooks.py	2015-04-21 15:32:15 +0000
@@ -295,17 +295,18 @@
         # acl entry has been added. So, if the db supports passing a list of
         # permitted units then check if we're in the list.
         allowed_units = relation_get('nova_allowed_units')
-        if allowed_units and local_unit() not in allowed_units.split():
-            log('Allowed_units list provided and this unit not present')
-            return
-        migrate_nova_database()
-        log('Triggering remote cloud-compute restarts.')
-        [compute_joined(rid=rid, remote_restart=True)
-            for rid in relation_ids('cloud-compute')]
-        log('Triggering remote cell restarts.')
-        [nova_cell_relation_joined(rid=rid, remote_restart=True)
-            for rid in relation_ids('cell')]
-        conditional_neutron_migration()
+        if allowed_units and local_unit() in allowed_units.split():
+            migrate_nova_database()
+            log('Triggering remote cloud-compute restarts.')
+            [compute_joined(rid=rid, remote_restart=True)
+                for rid in relation_ids('cloud-compute')]
+            log('Triggering remote cell restarts.')
+            [nova_cell_relation_joined(rid=rid, remote_restart=True)
+                for rid in relation_ids('cell')]
+            conditional_neutron_migration()
+        else:
+            log('allowed_units either not presented, or local unit '
+                'not in acl list: %s' % repr(allowed_units))
 
 
 @hooks.hook('pgsql-nova-db-relation-changed')

=== modified file 'unit_tests/test_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2015-04-20 10:21:36 +0000
+++ unit_tests/test_nova_cc_hooks.py	2015-04-21 15:32:15 +0000
@@ -348,10 +348,11 @@
     @patch.object(hooks, 'conditional_neutron_migration')
     @patch.object(hooks, 'CONFIGS')
     def test_db_changed(self, configs, cond_neutron_mig):
+        'No database migration is attempted when ACL list is not present'
         self._shared_db_test(configs)
         self.assertTrue(configs.write_all.called)
-        self.migrate_nova_database.assert_called_with()
-        cond_neutron_mig.assert_called_with()
+        self.assertFalse(self.migrate_nova_database.called)
+        self.assertFalse(cond_neutron_mig.called)
 
     @patch.object(hooks, 'CONFIGS')
     def test_db_changed_allowed(self, configs):