Merge lp:~adalbas/ibmcharms/unit-fix into lp:ibmcharms

[Adalberto Medeiros]

Improve gpsfshooklib.py
Improve log and call methods (using check_output)

[Michael Chase-Salerno (mcs-chasal)]

Small spelling error in comment, and opportunity to test reviewing.

review: Needs Fixing

[Adalberto Medeiros (adalbas)]

Going to merge now

[Adalberto Medeiros (adalbas)]

review: Approve

=== modified file 'charms/trusty/gpfs/hooks/gpfshooklib.py'
--- charms/trusty/gpfs/hooks/gpfshooklib.py	2015-02-10 12:24:34 +0000
+++ charms/trusty/gpfs/hooks/gpfshooklib.py	2015-02-19 12:48:32 +0000
@@ -8,7 +8,8 @@
 from shlex import split
 from subprocess import (
     call,
-    check_call
+    check_call,
+    check_output
 )
 
 sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
@@ -18,6 +19,12 @@
 )
 log = hookenv.log
 
+def add_to_path(p, new):
+    return p if new in p.split(':') else p + ':' + new
+
+os.environ['PATH'] = add_to_path(os.environ['PATH'], '/usr/lpp/mmfs/bin')
+
+## ssh key methods ##
 def create_ssh_keys():
     # Generate ssh keys if needed
     log("Configuring ssh keys")
@@ -83,26 +90,34 @@
         idfile.write("StrictHostKeyChecking no\n")
         idfile.close()
 
+## cluster management methods ##
+
 def start():
     # Only manager can start/stop cluster
     if is_manager():
-        call(split('/usr/lpp/mmfs/bin/mmstartup -a'))
+        log(check_output(split('mmstartup -a')))
 
 def stop():
     # stop the server
     if is_manager():
-        call(split('/usr/lpp/mmfs/bin/mmshutdown -a'))
+        check_output(split('mmshutdown -a'))
+
+def node_exists(nodename):
+    # Check if node has already been added to cluster
+    lscluster = check_output('mmlscluster')
+    node = re.search('^.*\d+.*%s.*\n' % nodename, lscluster, re.M)
+    return False if node is None else True
 
 def add_node(nodename, m_designation='client', q_designation='nonquorum'):
     # add new node to the cluster
-    if cluster_exists():
-        call(split('/usr/lpp/mmfs/bin/mmaddnode -N %s:%s-%s' % (nodename, m_designation,
-                                               q_designation)))
+    if cluster_exists() and not node_exists(nodename):
+        log(check_output(split('mmaddnode -N %s:%s-%s' % \
+                    (nodename, m_designation, q_designation))))
     else:
         log('Node %s could not be added. Manager not defined' % nodename)
   
 def apply_license(nodename):
-    call(split('/usr/lpp/mmfs/bin/mmchlicense server --accept -N %s' % nodename))
+    check_output(split('mmchlicense server --accept -N %s' % nodename))
 
 def set_manager_file():
     # define a file that indicates the node is a manager
@@ -115,13 +130,10 @@
 
 def cluster_exists():
     # Check if cluster is already defined
-    if call('/usr/lpp/mmfs/bin/mmlscluster') == 0:
-        return True
-    else:
-        return False
-
+    return True if call('mmlscluster') == 0 else False
+       
 def create_cluster(hostname):
     # create the cluster for the hostname, manager only
     if not is_manager() and not cluster_exists():
-        call(split('/usr/lpp/mmfs/bin/mmcrcluster -N %s:quorum-manager' % hostname +
-                   ' -r /usr/bin/ssh -R /usr/bin/scp'))
+        log(check_output(split('mmcrcluster -N %s:quorum-manager' % \
+                    hostname + ' -r /usr/bin/ssh -R /usr/bin/scp')))