Removing restart on license post

This commit is contained in:
Bilal Baqar 2015-11-21 15:44:24 -08:00
parent da05e48642
commit 43492c939e
2 changed files with 5 additions and 19 deletions

View File

@ -66,13 +66,14 @@ def config_changed():
This hook is run when a config parameter is changed.
It also runs on node reboot.
'''
if post_pg_license():
log("PLUMgrid License Posted")
return 1
if add_lcm_key():
log("PLUMgrid LCM Key added")
return 1
charm_config = config()
if charm_config.changed('plumgrid-license-key'):
if post_pg_license():
log("PLUMgrid License Posted")
return 1
if charm_config.changed('fabric-interfaces'):
if not fabric_interface_changed():
log("Fabric interface already set")

View File

@ -9,7 +9,6 @@ _map = utils.restart_map
utils.register_configs = MagicMock()
utils.restart_map = MagicMock()
import pg_dir_hooks as hooks
utils.register_configs = _reg
@ -61,22 +60,8 @@ class PGDirHooksTests(CharmTestCase):
self.add_lcm_key.assert_called_with()
def test_config_changed_hook(self):
_pkgs = ['plumgrid-lxc', 'iovisor-dkms']
self.add_lcm_key.return_value = 0
self.post_pg_license.return_value = 0
self.determine_packages.return_value = [_pkgs]
self.add_lcm_key.return_value = 1
self._call_hook('config-changed')
self.stop_pg.assert_called_with()
self.configure_sources.assert_called_with(update=True)
self.apt_install.assert_has_calls([
call(_pkgs, fatal=True,
options=['--force-yes']),
])
self.load_iovisor.assert_called_with()
self.ensure_mtu.assert_called_with()
self.CONFIGS.write_all.assert_called_with()
self.restart_pg.assert_called_with()
def test_start(self):
self._call_hook('start')