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

[Junaid Ali]

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

26. By Bilal Baqar on 2016-04-08

Adding status messages in charms - Ticket:[SOL-949]

=== modified file 'hooks/pg_gw_hooks.py'
--- hooks/pg_gw_hooks.py	2016-03-28 14:19:54 +0000
+++ hooks/pg_gw_hooks.py	2016-04-06 19:05:29 +0000
@@ -6,12 +6,13 @@
 # in this file.
 
 import sys
-
+from charmhelpers.core.host import service_running
 from charmhelpers.core.hookenv import (
     Hooks,
     UnregisteredHookError,
     log,
     config,
+    status_set
 )
 
 from charmhelpers.fetch import (
@@ -45,8 +46,10 @@
     '''
     Install hook is run when the charm is first deployed on a node.
     '''
+    status_set('maintenance', 'Executing pre-install')
     load_iptables()
     configure_sources(update=True)
+    status_set('maintenance', 'Installing apt packages')
     pkgs = determine_packages()
     for pkg in pkgs:
         apt_install(pkg, options=['--force-yes'], fatal=True)
@@ -88,6 +91,7 @@
         charm_config.changed('install_keys') or
             charm_config.changed('iovisor-build')):
         stop_pg()
+        status_set('maintenance', 'Upgrading apt packages')
         configure_sources(update=True)
         pkgs = determine_packages()
         for pkg in pkgs:
@@ -113,6 +117,14 @@
     stop_pg()
 
 
[e-mail]('update-status')
+def update_status():
+    if service_running('plumgrid'):
+        status_set('active', 'Unit is ready')
+    else:
+        status_set('blocked', 'plumgrid service not running')
+
+
 def main():
     try:
         hooks.execute(sys.argv)
 
=== modified file 'hooks/pg_gw_utils.py'
--- hooks/pg_gw_utils.py	2016-03-28 18:35:55 +0000
+++ hooks/pg_gw_utils.py	2016-04-06 19:05:29 +0000
@@ -16,7 +16,8 @@
 from charmhelpers.core.hookenv import (
     log,
     config,
-    unit_get
+    unit_get,
+    status_set
 )
 from charmhelpers.contrib.network.ip import (
     get_iface_from_addr,
@@ -160,6 +161,7 @@
                     raise ValueError("plumgrid service couldn't be started")
             else:
                 raise ValueError("libvirt-bin service couldn't be started")
+    status_set('active', 'Unit is ready')
 
 
 def stop_pg():
 
=== added symlink 'hooks/update-status'
=== target is u'pg_gw_hooks.py'
=== modified file 'templates/kilo/00-pg.conf'
--- templates/kilo/00-pg.conf	2016-03-27 15:26:09 +0000
+++ templates/kilo/00-pg.conf	2016-04-06 19:05:29 +0000
@@ -1,1 +1,2 @@
-$template ls_json,"{{'{'}}{{'%'}}timestamp:::date-rfc3339,jsonf:@timestamp%,%source:::jsonf:@source_host%,%msg:::json%}":syslogtag,isequal,"pg:" @{{ opsvm_ip }}:6000;ls_json
+$template ls_json,"{{'{'}}{{'%'}}timestamp:::date-rfc3339,jsonf:@timestamp%,%source:::jsonf:@source_host%,%msg:::json%}"
+:syslogtag,isequal,"pg:" @{{ opsvm_ip }}:6000;ls_json