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

[Junaid Ali]

[Bilal Baqar (bbaqar)]

Made a few comments.

review: Needs Fixing

[Bilal Baqar (bbaqar)]

review: Needs Fixing

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

27. By Bilal Baqar on 2016-03-14

Made the following changes:
1. Reordered file and module imports
2. Sorted director IPs
3. Added unit fqdn in /etc/hosts of plumgrid-lxc
4. Loading plumgrid specific iptables on install
5. Added temporary upgrade hook to load iptables
6. stop_pg() is being used in restart_pg()
7. persistant iptables

28. By Bilal Baqar on 2016-03-25

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

[Bilal Baqar (bbaqar)]

review: Approve

[Bilal Baqar (bbaqar)]

review: Approve

=== modified file 'hooks/pg_dir_context.py'
--- hooks/pg_dir_context.py	2016-03-12 20:38:52 +0000
+++ hooks/pg_dir_context.py	2016-03-25 13:15:20 +0000
@@ -6,7 +6,6 @@
 import re
 from charmhelpers.contrib.openstack import context
 from charmhelpers.contrib.openstack.utils import get_host_ip
-from charmhelpers.contrib.network.ip import get_address_in_network
 from charmhelpers.core.hookenv import (
     config,
     unit_get,
@@ -16,6 +15,11 @@
     related_units,
     relation_get,
 )
+from charmhelpers.contrib.network.ip import (
+    is_ip,
+    get_address_in_network,
+)
+
 from socket import (
     gethostname,
     getfqdn
@@ -84,6 +88,11 @@
             else:
                 pg_dir_ips_string = pg_dir_ips_string + ',' + str(ip)
         pg_ctxt['director_ips_string'] = pg_dir_ips_string
+        PG_VIP = config('plumgrid-virtual-ip')
+        if is_ip(PG_VIP):
+            pg_ctxt['virtual_ip'] = conf['plumgrid-virtual-ip']
+        else:
+            raise ValueError('Invalid IP Provided')
         pg_ctxt['virtual_ip'] = conf['plumgrid-virtual-ip']
         unit_hostname = gethostname()
         pg_ctxt['pg_hostname'] = unit_hostname

=== modified file 'hooks/pg_dir_hooks.py'
--- hooks/pg_dir_hooks.py	2016-03-13 03:50:51 +0000
+++ hooks/pg_dir_hooks.py	2016-03-25 13:15:20 +0000
@@ -7,6 +7,7 @@
 
 import sys
 import time
+from charmhelpers.core.host import service_running
 
 from charmhelpers.core.hookenv import (
     Hooks,
@@ -69,33 +70,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('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")
-            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()
+        else:
+            stop_pg()
+    if charm_config.changed('plumgrid-virtual-ip'):
+        CONFIGS.write_all()
+        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')):
+        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()
-    add_lcm_key()
     CONFIGS.write_all()
-    restart_pg()
+    if not service_running('plumgrid'):
+        restart_pg()
 
 
 @hooks.hook('start')

=== modified file 'hooks/pg_dir_utils.py'
--- hooks/pg_dir_utils.py	2016-03-12 21:34:47 +0000
+++ hooks/pg_dir_utils.py	2016-03-25 13:15:20 +0000
@@ -30,6 +30,7 @@
 from charmhelpers.core.host import (
     service_start,
     service_stop,
+    service_running
 )
 from charmhelpers.fetch import (
     apt_cache,
@@ -142,7 +143,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_dir_hooks.py'
--- unit_tests/test_pg_dir_hooks.py	2016-03-10 19:38:25 +0000
+++ unit_tests/test_pg_dir_hooks.py	2016-03-25 13:15:20 +0000
@@ -62,10 +62,6 @@
         self.load_iovisor.assert_called_with()
         self.ensure_mtu.assert_called_with()
 
-    def test_config_changed_hook(self):
-        self.add_lcm_key.return_value = 1
-        self._call_hook('config-changed')
-
     def test_start(self):
         self._call_hook('start')
         self.test_config.set('plumgrid-license-key', None)