Merge lp:~mbruzek/charms/trusty/kibana/tests into lp:charms/trusty/kibana

[Matt Bruzek]

I replaced the tests with a comprehensive test that passes bundletester.

=== removed file 'tests/10-bundles-test.py'
--- tests/10-bundles-test.py	2016-05-19 15:00:44 +0000
+++ tests/10-bundles-test.py	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-#!/usr/bin/env python3
-
-# This amulet test deploys the bundles.yaml file in this directory.
-
-import os
-import unittest
-import yaml
-import amulet
-import requests
-
-seconds_to_wait = 960
-
-
-class BundleTest(unittest.TestCase):
-    """ Create a class for testing the charm in the unit test framework. """
-    @classmethod
-    def setUpClass(cls):
-        """ Set up an amulet deployment using the bundle. """
-        d = amulet.Deployment()
-        bundle_path = os.path.join(os.path.dirname(__file__), 'bundles.yaml')
-        with open(bundle_path, 'r') as bundle_file:
-            contents = yaml.safe_load(bundle_file)
-            d.load(contents)
-        d.setup(seconds_to_wait, cleanup=False)
-        d.sentry.wait(seconds_to_wait)
-        cls.d = d
-
-    def test_deployed(self):
-        """ Test to see if the bundle deployed successfully. """
-        self.assertTrue(self.d.deployed)
-
-    def test_port_change(self):
-        """ Change kibana port and validate the change happened """
-        self.d.configure('kibana', {'port': 81})
-        self.d.sentry.wait()
-
-        url = 'http://%s:81/' % kibana_unit.info['public-address']
-        r = requests.get(url)
-        assert r.ok
-
-    def test_web_interface():
-
-        elasticsearch_unit.run("""
-            curl -X POST 'http://127.0.0.1:9200/person/1' -d '{
-            "info" : {
-                    "height" : 2,
-                    "width" : 20
-            }
-            }'
-        """)
-
-        time.sleep(3)
-
-        # Ensure the kibana unit can query ES via localhost (it proxies local 9200
-        # queries to ES)
-        url = 'http://127.0.0.1:9200/_all/_search'
-        result = kibana_unit.run(
-            "curl -XGET {url} -d '@11-scale-elastic-query.json'".format(url=url))
-        if not result[1] == 0:
-            amulet.raise_status(
-                amulet.FAIL, msg="Error performing search. Error code: {}. "
-                                 "Result:\n{}".format(result[1], result[0]))
-        try:
-            result = json.loads(result[0])
-            if result['hits']['total'] != 1:
-                amulet.raise_status(amulet.FAIL,
-                                    msg="Error inserting value in elasticsearch.")
-        except ValueError:
-            exc_type, value, traceback = sys.exc_info()
-            exc_text = "Exception: (%s) %s. %s" % (value, exc_type, traceback)
-            amulet.raise_status(
-                amulet.FAIL, msg="Value returned not a valid json.\n{}\n{}".format(
-                    result[0], exc_text))
-
-
-if __name__ == '__main__':
-    unittest.main()

=== added file 'tests/10-deploy.py'
--- tests/10-deploy.py	1970-01-01 00:00:00 +0000
+++ tests/10-deploy.py	2016-07-13 21:06:25 +0000
@@ -0,0 +1,90 @@
+#!/usr/bin/python3
+
+# This is a very basic test for to verify the kibana charm.
+
+import amulet
+import unittest
+
+seconds = 1100
+port = 82
+
+
+class TestDeployment(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        """Perform a one time setup for this class deploying the charms."""
+        cls.deployment = amulet.Deployment(series='trusty')
+
+        cls.deployment.add('kibana')
+        cls.deployment.configure('kibana', {'port': port})
+        cls.deployment.add('elasticsearch', units=3)
+        cls.deployment.relate('kibana:rest', 'elasticsearch:client')
+        cls.deployment.expose('kibana')
+
+        try:
+            cls.deployment.setup(timeout=seconds)
+            cls.deployment.sentry.wait()
+        except amulet.helpers.TimeoutError:
+            message = "The deploy did not setup in {0} seconds".format(seconds)
+            amulet.raise_status(amulet.SKIP, msg=message)
+        except:
+            raise
+        cls.kibana_unit = cls.deployment.sentry['kibana'][0]
+        cls.elasticsearch_units = cls.deployment.sentry['elasticsearch']
+
+    def test_elasticsearch(self):
+        """Make sure elasticsearch is running and get health status."""
+        for unit in self.elasticsearch_units:
+            # Verify the Elasticsearch service is installed and running.
+            status = 'service elasticsearch status'
+            output, code = unit.run(status)
+            print(output)
+            if code != 0:
+                message = 'Elasticsearch is not running.'
+                amulet.raise_status(amulet.FAIL, msg=message)
+            # Get the health from Elasticsearch.
+            get = 'curl -X GET http://127.0.0.1:9200/_cat/health'
+            output, code = unit.run(get)
+            print(output)
+            if 'green' not in output:
+                message = 'Health output is not green:\n{0}'.format(output)
+                amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_kibana(self):
+        """Make sure that kibana is installed and running correctly."""
+        # Verify the service is installed and running.
+        status = 'service kibana status'
+        output, code = self.kibana_unit.run(status)
+        print(output)
+        if code != 0:
+            message = 'Kibana is not running.'
+            amulet.raise_status(amulet.FAIL, msg=message)
+        # Ensure each elasticsearch node address is in the ngnix site file.
+        file = '/etc/nginx/sites-available/es_cluster'
+        es_cluster = self.kibana_unit.file_contents(file)
+        for es_unit in self.elasticsearch_units:
+            address, code = es_unit.run('unit-get private-address')
+            if address in es_cluster:
+                print('Found {0} in the nginx config file.'.format(address))
+            else:
+                message = 'Elasticsearch {0} was not in {0}'.format(address,
+                                                                    file)
+                amulet.raise_status(amulet.FAIL, msg=message)
+        # Test the proxy from Kibana to Elasticsearch is working.
+        get = 'curl -X GET http://localhost:9200/_cat/health/'
+        output, code = self.kibana_unit.run(get)
+        print(output)
+        if 'green' not in output or code != 0:
+            message = 'The proxy to Elasticsearch is not working.'
+            amulet.raise_status(amulet.FAIL, msg=message)
+        # Test that Kibana is running and hosting http on this unit.
+        kibana = 'curl http://localhost:{0}'.format(port)
+        output, code = self.kibana_unit.run(kibana)
+        print(output)
+        if 'kibana' not in output or code != 0:
+            amulet.raise_status(amulet.FAIL,
+                                msg="Error getting kibana page.")
+
+if __name__ == '__main__':
+    unittest.main()

=== removed file 'tests/11-scale-elastic-query.json'
--- tests/11-scale-elastic-query.json	2015-03-12 18:48:08 +0000
+++ tests/11-scale-elastic-query.json	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-{
-  "query": {
-    "filtered": {
-      "query": {
-        "bool": {
-          "should": [
-            {
-            "query_string": {
-              "query": "*"
-            }
-          }
-          ]
-        }
-      },
-      "filter": {
-        "bool": {
-          "must": [
-            {
-            "terms": {
-              "_type": [
-                "1"
-              ]
-            }
-          }
-          ]
-        }
-      }
-    }
-  },
-  "highlight": {
-    "fields": {},
-    "fragment_size": 2147483647,
-    "pre_tags": [
-      "@start-highlight@"
-    ],
-    "post_tags": [
-      "@end-highlight@"
-    ]
-  },
-  "size": 500,
-  "sort": [
-    {
-    "_score": {
-      "order": "desc",
-      "ignore_unmapped": true
-    }
-  }
-  ]
-}

=== removed file 'tests/11-scale-elastic.py'
--- tests/11-scale-elastic.py	2016-05-19 15:00:44 +0000
+++ tests/11-scale-elastic.py	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-#!/usr/bin/python3
-import os
-import sys
-import time
-import json
-
-import amulet
-import requests
-
-seconds = 20000
-
-d = amulet.Deployment(series='trusty')
-
-d.add('kibana')
-d.add('elasticsearch')
-d.add('logstash-indexer', charm='cs:precise/logstash-indexer')
-
-d.add_unit('elasticsearch', 2)
-
-d.relate('logstash-indexer:cluster', 'elasticsearch:client')
-d.relate('kibana:rest', 'elasticsearch:client')
-
-d.expose('kibana')
-
-try:
-    d.setup(timeout=seconds)
-except amulet.helpers.TimeoutError:
-    amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
-except:
-    raise
-
-
-##
-# Set relationship aliases
-##
-kibana_unit = d.sentry['kibana'][0]
-elasticsearch_unit = d.sentry['elasticsearch'][1]
-
-
-def test_web_interface():
-    hits = get_total_hits()
-
-    elasticsearch_unit.run("""
-        curl -X POST 'http://127.0.0.1:9200/person/1' -d '{
-        "info" : {
-                "height" : 2,
-                "width" : 20
-        }
-        }'
-    """)
-
-    iteration = 0
-    newhits = get_total_hits()
-    while iteration < 10 and newhits-hits != 1:
-        time.sleep(3)
-        newhits = get_total_hits()
-        iteration += 1
-
-    if newhits-hits != 1:
-        amulet.raise_status(amulet.FAIL,
-                            msg="Error inserting value in elasticsearch.")
-
-
-def get_total_hits():
-    # Ensure the kibana unit can query ES via localhost (it proxies local 9200
-    # queries to ES)
-    url = 'http://127.0.0.1:9200/_all/_search'
-    result = kibana_unit.run(
-        "curl -XGET {url} -d '@11-scale-elastic-query.json'".format(url=url))
-    if not result[1] == 0:
-        amulet.raise_status(
-            amulet.FAIL, msg="Error performing search. Error code: {}. "
-                             "Result:\n{}".format(result[1], result[0]))
-
-    try:
-        result = json.loads(result[0])
-        return result['hits']['total']
-    except ValueError:
-        exc_type, value, traceback = sys.exc_info()
-        exc_text = "Exception: (%s) %s. %s" % (value, exc_type, traceback)
-        amulet.raise_status(
-            amulet.FAIL, msg="Value returned not a valid json.\n{}\n{}".format(
-                result[0], exc_text))
-
-
-test_web_interface()

=== removed file 'tests/12-port-change.py'
--- tests/12-port-change.py	2015-11-04 21:49:41 +0000
+++ tests/12-port-change.py	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-#!/usr/bin/python3
-
-import amulet
-import requests
-
-seconds = 20000
-
-d = amulet.Deployment(series='trusty')
-
-d.add('kibana')
-d.add('elasticsearch')
-
-d.configure('kibana', {'port': 81})
-
-d.add_unit('elasticsearch', 2)
-
-d.relate('kibana:rest', 'elasticsearch:client')
-
-d.expose('kibana')
-
-try:
-    d.setup(timeout=seconds)
-except amulet.helpers.TimeoutError:
-    amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
-except:
-    raise
-
-
-def test_web_interface():
-    kibana_unit = d.sentry['kibana'][0]
-    url = 'http://%s:81/' % kibana_unit.info['public-address']
-    r = requests.get(url)
-    if not r.ok:
-        amulet.raise_status(amulet.FAIL,
-                            msg="Error getting kibana page.")
-
-
-test_web_interface()

=== removed file 'tests/bundles.yaml'
--- tests/bundles.yaml	2016-05-19 15:00:44 +0000
+++ tests/bundles.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-kibana-bundle:
-  relations: []
-  series: trusty
-  services:
-    kibana:
-      charm: kibana
-      num_units: 1
-  elasticsearch:
-    charm: cs:trusty/elasticsearch
-    num_units: 1