Merge lp:~ibmcharmers/charms/trusty/gpfs/devel into lp:~ibmcharmers/charms/trusty/gpfs/trunk

[Adalberto Medeiros]

Tests changes

------------------------------------------------------------
revno: 36
committer: Adalberto Medeiros <email address hidden>
branch nick: devel
timestamp: Fri 2015-03-20 13:51:29 +0000
message:
  Defined tests (remove print only)
------------------------------------------------------------
revno: 35
committer: Adalberto Medeiros <email address hidden>
branch nick: devel
timestamp: Fri 2015-03-20 13:51:02 +0000
message:
  Fix regex to check if node exists
------------------------------------------------------------
revno: 34
committer: Adalberto Medeiros <email address hidden>
branch nick: devel
timestamp: Sat 2015-03-14 23:38:23 +0000
message:
  Check if the GFPS packages repository url is set for tests.

  Verify if the url is set and if you can access it.
  Removed the hardcode url.
------------------------------------------------------------
revno: 33
committer: Adalberto Medeiros <email address hidden>
branch nick: devel
timestamp: Wed 2015-03-11 19:35:43 +0000
message:
  small pep8 fixes

[Michael Chase-Salerno (mcs-chasal)]

review: Approve

[lp:~ibmcharmers/charms/trusty/gpfs/devel]

34. By Adalberto Medeiros on 2015-03-23

Merge devel

=== modified file 'hooks/gpfshooklib.py'
--- hooks/gpfshooklib.py	2015-03-11 19:35:43 +0000
+++ hooks/gpfshooklib.py	2015-03-20 14:11:44 +0000
@@ -178,7 +178,7 @@
 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)
+    node = re.search('^ *\d+.*%s.*$' % nodename, lscluster, re.M)
     return False if node is None else True
 
 
 
=== modified file 'tests/00-setup'
--- tests/00-setup	2015-03-09 15:28:29 +0000
+++ tests/00-setup	2015-03-20 14:11:44 +0000
@@ -1,21 +1,23 @@
 #!/bin/bash
 
+# ATTENTION: gpfs_url must contain the repository with
+#            your GPFS packages
+GPFS_URL=${GPFS_URL?Error: GPFS repository must be defined in tests/00-setup}
+
 sudo add-apt-repository ppa:juju/stable -y
 sudo apt-get update
 sudo apt-get install amulet python-requests -y
 
 # Add a local configuration file
-# ATTENTION: gpfs_url must contain the repository with
-#            your GPFS packages
-if [ ! -f '../local.yaml' ]; then
-    cat << EOF > ../local.yaml
+cat << EOF > local.yaml
 gpfs:
-    gpfs_url: "http://9.114.111.40/debs/gpfs4.1"
+    gpfs_url: "$GPFS_URL"
     update: true
     version: "4.1"
+    quorum: "quorum"
 gpfs-client:
-    gpfs_url: "http://9.114.111.40/debs/gpfs4.1"
+    gpfs_url: "$GPFS_URL"
     update: true
     version: "4.1"
+    quorum: "non-quorum"
 EOF
-fi
 
=== modified file 'tests/10-deploy'
--- tests/10-deploy	2015-03-09 15:28:29 +0000
+++ tests/10-deploy	2015-03-20 14:11:44 +0000
@@ -3,17 +3,48 @@
 import amulet
 import requests
 import os
-
-#os.environ['JUJU_REPOSITORY'] = os.path.dirname(os.getcwd())
+import re
+import yaml
+import urllib
+import sys
+from urllib.request import urlopen
+from amulet.helpers import (
+    timeout,
+    TimeoutError
+)
+
+
+def test_url(url):
+# Test if a gpfs url for the repository is defined
+    if not url:
+        print("You need to define a url for the GPFS packages repository.\n"
+              "Edit local.yaml or tests/00-setup and run it again.")
+        sys.exit(1)
+    #check if url is accessible
+    try:
+        resp = urlopen(url)
+    except urllib.error.HTTPError as HTTPerr:
+        print(HTTPerr.geturl(), HTTPerr.getcode(), HTTPerr.reason)
+        sys.exit(1)
+
+
+def get_config():
+    # get config from local.yaml
+    with open("local.yaml", "r") as fd:
+        return yaml.load(fd)
+
+
+config = get_config()
+test_url(config.get('gpfs').get('gpfs_url'))
 d = amulet.Deployment(juju_env='local', series='trusty')
 
 d.add('gpfs')
 d.add('gpfs-client', charm='gpfs')
-config = {'gpfs_url': "http://9.114.111.40/debs/gpfs4.1", 'update':True, 'version':"4.1", 'quorum': 'non-quorum'}
-d.configure('gpfs-client', config)
-d.configure('gpfs', config)
+d.configure('gpfs-client', config.get('gpfs-client'))
+d.configure('gpfs', config.get('gpfs'))
 d.relate('gpfs:manager', 'gpfs-client:client')
-#d.expose('gpfs')
+d.expose('gpfs')
+d.expose('gpfs-client')
 
 try:
     d.setup(timeout=900)
@@ -25,24 +56,49 @@
 
 unit_manager_0 = d.sentry.unit['gpfs/0']
 unit_client_0 = d.sentry.unit['gpfs-client/0']
-print(unit_manager_0.info)
-
+
+
+## Tests ###
+def test_manager_is_set():
 # verify unit_manager is manager
-print(unit_manager_0.file('/var/mmfs/.manager'))
-
-# test cluster is configured
-print(unit_manager_0.run('/usr/lpp/mmfs/bin/mmlscluster'))
-
-# test break relation
-d.unrelate('gpfs:manager','gpfs-client:client')
-d.sentry.wait()
-print(unit_manager_0.run('/usr/lpp/mmfs/bin/mmlscluster')) 
-
-# test add and remove unit
-#d.add_unit('gpfs-client')
-#d.sentry.wait()
-#unit_client_1 = d.sentry.unit['gpfs-client/1']
-#print(unit_manager_0.run('/usr/lpp/mmfs/bin/mmlscluster'))
+    mgr_file = '/var/mmfs/.manager'
+    try:
+        is_manager = unit_manager_0.file(mgr_file)
+    except IOError:
+        amulet.raise_status(amulet.SKIP, msg="Node is not manager")
+    try:
+        is_client = unit_client_0.file(mgr_file)
+        amulet.raise_status(amulet.SKIP, msg="Node is not client")
+    except IOError:
+        pass
+
+
+def test_unit_deployed():
+    # verify unit
+    state_mgr = unit_manager_0.info['agent-state']
+    state_clt = unit_client_0.info['agent-state']
+    assert state_mgr == 'started', "Manager not started"
+    assert state_clt == 'started', "Client not started"
+
+
+def _node_exists(nodename):
+    # Check if node has already been added to cluster
+    lscluster = unit_manager_0.run('/usr/lpp/mmfs/bin/mmlscluster')
+    assert lscluster[1] == 0, "Cluster not initialized"
+    node = re.search('^ *\d+.*%s.*$' % nodename, lscluster[0], re.M)
+    return False if node is None else True
+
+
+def test_cluster_configured():
+    mgr_ip = unit_manager_0.info['public-address']
+    clt_ip = unit_client_0.info['public-address']
+    assert _node_exists(mgr_ip), "Manager not found in cluster"
+    assert _node_exists(clt_ip), "Client not found in cluster"
+
+
+test_manager_is_set()
+test_unit_deployed()
+test_cluster_configured()
 
 
 # Now you can use d.sentry.unit[UNIT] to address each of the units and perform