Merge lp:~james-page/charms/trusty/swift-storage/upgrade-fixes into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

[James Page]

Fixup upgrades

[Corey Bryant (corey.bryant)]

+1

I tested upgrade-charm after manually removing python-psutil, and it gets installed as part of the upgrade. python-lint and unit_test also pass.

review: Approve

=== modified file 'hooks/swift_storage_hooks.py'
--- hooks/swift_storage_hooks.py	2014-10-01 21:28:39 +0000
+++ hooks/swift_storage_hooks.py	2014-10-07 08:51:19 +0000
@@ -24,7 +24,11 @@
     relation_set,
 )
 
-from charmhelpers.fetch import apt_install, apt_update
+from charmhelpers.fetch import (
+    apt_install,
+    apt_update,
+    filter_installed_packages
+)
 from charmhelpers.core.host import restart_on_change
 from charmhelpers.payload.execd import execd_preinstall
 
@@ -62,6 +66,11 @@
     save_script_rc()
 
 
[e-mail]('upgrade-charm')
+def upgrade_charm():
+    apt_install(filter_installed_packages(PACKAGES), fatal=True)
+
+
 @hooks.hook()
 def swift_storage_relation_joined():
     devs = [os.path.basename(dev) for dev in determine_block_devices()]

=== added symlink 'hooks/upgrade-charm'
=== target is u'swift_storage_hooks.py'
=== modified file 'unit_tests/test_swift_storage_relations.py'
--- unit_tests/test_swift_storage_relations.py	2014-06-19 08:40:58 +0000
+++ unit_tests/test_swift_storage_relations.py	2014-10-07 08:51:19 +0000
@@ -24,6 +24,7 @@
     # charmhelpers.core.host
     'apt_update',
     'apt_install',
+    'filter_installed_packages',
     # charmehelpers.contrib.openstack.utils
     'configure_installation_source',
     'openstack_upgrade_available',
@@ -71,6 +72,11 @@
         self.assertTrue(self.do_openstack_upgrade.called)
         self.assertTrue(self.CONFIGS.write_all.called)
 
+    def test_upgrade_charm(self):
+        self.filter_installed_packages.return_value = ['python-psutil']
+        hooks.upgrade_charm()
+        self.apt_install.assert_called_with(['python-psutil'], fatal=True)
+
     def test_storage_joined_single_device(self):
         self.determine_block_devices.return_value = ['/dev/vdb']
         hooks.swift_storage_relation_joined()