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

[Edward Hope-Morley]

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

charm_lint_check #5347 nova-cloud-controller-next for hopem mp261845
    LINT OK: passed

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

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

charm_unit_test #4979 nova-cloud-controller-next for hopem mp261845
    UNIT OK: passed

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

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

charm_amulet_test #4588 nova-cloud-controller-next for hopem mp261845
    AMULET OK: passed

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

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2015-06-10 15:48:34 +0000
+++ hooks/nova_cc_hooks.py	2015-06-12 13:06:16 +0000
@@ -190,9 +190,14 @@
     if console_attributes('protocol'):
         if not git_install_requested():
             apt_update()
-            apt_install(console_attributes('packages'), fatal=True)
+            packages = console_attributes('packages') or []
+            filtered = filter_installed_packages(packages)
+            if filtered:
+                apt_install(filtered, fatal=True)
+
         [compute_joined(rid=rid)
             for rid in relation_ids('cloud-compute')]
+
     for r_id in relation_ids('identity-service'):
         identity_joined(rid=r_id)
     for rid in relation_ids('zeromq-configuration'):

=== modified file 'unit_tests/test_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2015-06-11 13:33:42 +0000
+++ unit_tests/test_nova_cc_hooks.py	2015-06-12 13:06:16 +0000
@@ -145,12 +145,14 @@
         self.disable_services.assert_called()
         self.cmd_all_services.assert_called_with('stop')
 
+    @patch.object(hooks, 'filter_installed_packages')
     @patch.object(hooks, 'configure_https')
-    def test_config_changed_no_upgrade(self, conf_https):
+    def test_config_changed_no_upgrade(self, conf_https, mock_filter_packages):
         self.git_install_requested.return_value = False
         self.openstack_upgrade_available.return_value = False
         hooks.config_changed()
         self.assertTrue(self.save_script_rc.called)
+        mock_filter_packages.assert_called_with([])
 
     @patch.object(hooks, 'config_value_changed')
     @patch.object(hooks, 'configure_https')
@@ -176,6 +178,7 @@
         self.git_install.assert_called_with(projects_yaml)
         self.assertFalse(self.do_openstack_upgrade.called)
 
+    @patch.object(hooks, 'filter_installed_packages')
     @patch('charmhelpers.contrib.openstack.ip.service_name',
            lambda *args: 'nova-cloud-controller')
     @patch.object(hooks, 'cluster_joined')
@@ -183,7 +186,8 @@
     @patch.object(hooks, 'neutron_api_relation_joined')
     @patch.object(hooks, 'configure_https')
     def test_config_changed_with_upgrade(self, conf_https, neutron_api_joined,
-                                         identity_joined, cluster_joined):
+                                         identity_joined, cluster_joined,
+                                         mock_filter_packages):
         self.git_install_requested.return_value = False
         self.openstack_upgrade_available.return_value = True
         self.relation_ids.return_value = ['generic_rid']
@@ -195,6 +199,7 @@
         self.assertTrue(_zmq_joined.called)
         self.assertTrue(cluster_joined.called)
         self.assertTrue(self.save_script_rc.called)
+        mock_filter_packages.assert_called_with([])
 
     def test_compute_changed_ssh_migration(self):
         self.test_relation.set({
@@ -820,9 +825,12 @@
             call(**args),
         ])
 
+    @patch.object(hooks, 'filter_installed_packages')
     @patch('nova_cc_hooks.configure_https')
     @patch('nova_cc_utils.config')
-    def test_config_changed_single_consoleauth(self, config, *args):
+    def test_config_changed_single_consoleauth(self, mock_config,
+                                               mock_configure_https,
+                                               mock_filter_packages):
         self.git_install_requested.return_value = False
         config.return_value = 'novnc'
         rids = {'ha': ['ha:1']}
@@ -846,3 +854,5 @@
         self.relation_set.assert_has_calls([
             call(v, **args) for v in rids['ha']
         ])
+
+        mock_filter_packages.assert_called_with([])