Merge lp:~junaidali/charms/trusty/plumgrid-edge/trunk into lp:~plumgrid-team/charms/trusty/plumgrid-edge/trunk

[Junaid Ali]

[Bilal Baqar (bbaqar)]

review: Approve

[lp:~junaidali/charms/trusty/plumgrid-edge/trunk]

24. By Bilal Baqar on 2016-03-25

Improved config-changed hook to perform steps according to the config changed

=== modified file 'hooks/pg_edge_hooks.py'
--- hooks/pg_edge_hooks.py	2016-03-14 06:33:46 +0000
+++ hooks/pg_edge_hooks.py	2016-03-24 12:36:47 +0000
@@ -6,7 +6,7 @@
 # in this file.
 
 import sys
-
+from charmhelpers.core.host import service_running
 from charmhelpers.core.hookenv import (
     Hooks,
     UnregisteredHookError,
@@ -89,33 +89,36 @@
     This hook is run when a config parameter is changed.
     It also runs on node reboot.
     '''
-    if add_lcm_key():
-        log("PLUMgrid LCM Key added")
-        return 1
     charm_config = config()
+    if charm_config.changed('lcm-ssh-key'):
+        if add_lcm_key():
+            log("PLUMgrid LCM Key added")
     if charm_config.changed('fabric-interfaces'):
         if not fabric_interface_changed():
             log("Fabric interface already set")
-            return 1
-    if charm_config.changed('os-data-network'):
-        if charm_config['fabric-interfaces'] == 'MANAGEMENT':
-            log('Fabric running on managment network')
-            return 1
-    stop_pg()
-    configure_sources(update=True)
-    pkgs = determine_packages()
-    for pkg in pkgs:
-        apt_install(pkg, options=['--force-yes'], fatal=True)
-    remove_iovisor()
-    load_iovisor()
-    ensure_mtu()
-    for rid in relation_ids('neutron-plugin'):
-        neutron_plugin_joined(rid)
-    for rid in relation_ids('plumgrid-plugin'):
-        neutron_plugin_joined(rid)
-    ensure_files()
+        else:
+            stop_pg()
+    if (charm_config.changed('install_sources') or
+        charm_config.changed('plumgrid-build') or
+        charm_config.changed('install_keys') or
+            charm_config.changed('iovisor-build')):
+        ensure_files()
+        stop_pg()
+        configure_sources(update=True)
+        pkgs = determine_packages()
+        for pkg in pkgs:
+            apt_install(pkg, options=['--force-yes'], fatal=True)
+            remove_iovisor()
+            load_iovisor()
+    if charm_config.changed('metadata-shared-key'):
+        stop_pg()
+        for rid in relation_ids('neutron-plugin'):
+            neutron_plugin_joined(rid)
+        for rid in relation_ids('plumgrid-plugin'):
+            neutron_plugin_joined(rid)
     CONFIGS.write_all()
-    restart_pg()
+    if not service_running('plumgrid'):
+        restart_pg()
 
 
 @hooks.hook('upgrade-charm')

=== modified file 'hooks/pg_edge_utils.py'
--- hooks/pg_edge_utils.py	2016-03-12 21:32:55 +0000
+++ hooks/pg_edge_utils.py	2016-03-24 12:36:47 +0000
@@ -31,6 +31,7 @@
     service_restart,
     service_start,
     service_stop,
+    service_running,
 )
 from charmhelpers.fetch import (
     apt_cache,
@@ -156,7 +157,17 @@
     '''
     stop_pg()
     service_start('plumgrid')
-    time.sleep(5)
+    time.sleep(3)
+    if not service_running('plumgrid'):
+        if service_running('libvirt-bin'):
+            raise ValueError("plumgrid service couldn't be started")
+        else:
+            if service_start('libvirt-bin'):
+                time.sleep(3)
+                if not service_running('plumgrid'):
+                    raise ValueError("plumgrid service couldn't be started")
+            else:
+                raise ValueError("libvirt-bin service couldn't be started")
 
 
 def stop_pg():

=== modified file 'unit_tests/test_pg_edge_hooks.py'
--- unit_tests/test_pg_edge_hooks.py	2016-03-10 22:20:47 +0000
+++ unit_tests/test_pg_edge_hooks.py	2016-03-24 12:36:47 +0000
@@ -83,10 +83,6 @@
             **rel_data
         )
 
-    def test_config_changed_hook(self):
-        self.add_lcm_key.return_value = 1
-        self._call_hook('config-changed')
-
     def test_stop(self):
         _pkgs = ['plumgrid-lxc', 'iovisor-dkms']
         self._call_hook('stop')