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

[James Page]

[Adam Collard (adam-collard)]

Needs tests

review: Needs Fixing

[lp:~james-page/charms/trusty/glance/fixup-allowedunits-migration]

112. By James Page on 2015-04-21

Add unit tests to ensure that acls are setup prior to db migration

113. By James Page on 2015-04-21

Tidy lint

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

charm_lint_check #3688 glance-next for james-page mp256956
    LINT OK: passed

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

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

charm_unit_test #3475 glance-next for james-page mp256956
    UNIT OK: passed

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

[Adam Collard (adam-collard)]

Thanks for adding those. +1

review: Approve

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/glance_relations.py'
--- hooks/glance_relations.py	2015-04-01 16:48:59 +0000
+++ hooks/glance_relations.py	2015-04-21 15:33:22 +0000
@@ -164,18 +164,19 @@
         # 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('allowed_units')
-        if allowed_units and local_unit() not in allowed_units.split():
-            juju_log('Allowed_units list provided and this unit not present')
-            return
-        if rel == "essex":
-            status = call(['glance-manage', 'db_version'])
-            if status != 0:
-                juju_log('Setting version_control to 0')
-                cmd = ["glance-manage", "version_control", "0"]
-                check_call(cmd)
+        if allowed_units and local_unit() in allowed_units.split():
+            if rel == "essex":
+                status = call(['glance-manage', 'db_version'])
+                if status != 0:
+                    juju_log('Setting version_control to 0')
+                    cmd = ["glance-manage", "version_control", "0"]
+                    check_call(cmd)
 
-        juju_log('Cluster leader, performing db sync')
-        migrate_database()
+            juju_log('Cluster leader, performing db sync')
+            migrate_database()
+        else:
+            juju_log('allowed_units either not presented, or local unit '
+                     'not in acl list: %s' % allowed_units)
 
 
 @hooks.hook('pgsql-db-relation-changed')

=== modified file 'unit_tests/test_glance_relations.py'
--- unit_tests/test_glance_relations.py	2015-04-01 16:48:59 +0000
+++ unit_tests/test_glance_relations.py	2015-04-21 15:33:22 +0000
@@ -207,8 +207,9 @@
             'pgsql-db relation incomplete. Peer not ready?'
         )
 
-    def _shared_db_test(self, configs, unit_name):
-        self.relation_get.return_value = 'glance/0 glance/3'
+    def _shared_db_test(self, configs, unit_name,
+                        allowed_units='glance/0 glance/3'):
+        self.relation_get.return_value = allowed_units
         self.local_unit.return_value = unit_name
         configs.complete_contexts = MagicMock()
         configs.complete_contexts.return_value = ['shared-db']
@@ -241,6 +242,14 @@
         self.assertFalse(self.migrate_database.called)
 
     @patch.object(relations, 'CONFIGS')
+    def test_db_changed_no_acls(self, configs):
+        self._shared_db_test(configs, 'glance/2', None)
+        self.assertEquals([call('/etc/glance/glance-registry.conf'),
+                           call('/etc/glance/glance-api.conf')],
+                          configs.write.call_args_list)
+        self.assertFalse(self.migrate_database.called)
+
+    @patch.object(relations, 'CONFIGS')
     def test_postgresql_db_changed_no_essex(self, configs):
         self._postgresql_db_test(configs)
         self.assertEquals([call('/etc/glance/glance-registry.conf'),