Merge lp:~james-agentultra/charms/precise/mongodb/join-replicaset-test into lp:charms/trusty/mongodb

[j_king]

This patch adds an amulet test to verify joining multiple units to a replica set after setup.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2790 mongodb for james-agentultra mp296497
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2790/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2134 mongodb for james-agentultra mp296497
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/2134/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #768 mongodb for james-agentultra mp296497
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/768/

[James Page (james-page)]

review: Approve

[James Page (james-page)]

Hi James

Thanks for your contribution - looks good and passes amulet tests from the OpenStack CI testing bot so merged and landed!

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/4605/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/4585/

review: Needs Fixing (automated testing)

=== modified file 'tests/03_deploy_replicaset.py'
--- tests/03_deploy_replicaset.py	2015-12-02 22:50:09 +0000
+++ tests/03_deploy_replicaset.py	2016-06-05 00:56:08 +0000
@@ -46,39 +46,12 @@
 
 
 #############################################################
-# Check presence of MongoDB GUI HEALTH Status
-#############################################################
-def validate_status_interface():
-    pubaddy = d.sentry['mongodb'][0].info['public-address']
-    fmt = "http://{}:28017"
-    if ":" in pubaddy:
-        fmt = "http://[{}]:28017"
-    r = requests.get(fmt.format(pubaddy), verify=False)
-    r.raise_for_status
-
-
-#############################################################
-# Validate that each unit has an active mongo service
-#############################################################
-def validate_running_services():
-    for service in sentry_dict:
-        output = sentry_dict[service].run('service mongodb status')
-        service_active = str(output).find('mongodb start/running')
-        if service_active == -1:
-            message = "Failed to find running MongoDB on host {}".format(
-                service)
-            amulet.raise_status(amulet.SKIP, msg=message)
-
-
-#############################################################
-# Validate proper replicaset setup
-#############################################################
-def validate_replicaset_setup():
-
-    d.sentry.wait(seconds)
-
+# Test Utilities
+#############################################################
+def _expect_replicaset_counts(primaries_count,
+                              secondaries_count,
+                              time_between=10):
     unit_status = []
-    time_between = 10
     tries = wait_for_replicaset / time_between
 
     for service in sentry_dict:
@@ -107,19 +80,65 @@
         client.close()
 
     primaries = Counter(unit_status)[1]
-    if primaries != 1:
-        message = "Only one PRIMARY unit allowed! Found: %s %s" % (primaries,
-                                                                   unit_status)
+    if primaries != primaries_count:
+        message = "Expected %d PRIMARY unit(s)! Found: %s %s" % (
+            primaries_count,
+            primaries,
+            unit_status)
         amulet.raise_status(amulet.FAIL, message)
 
     secondrs = Counter(unit_status)[2]
-    if secondrs != 2:
-        message = ("Only two SECONDARY units allowed! (Found %s) %s" %
-                   (secondrs, unit_status))
+    if secondrs != secondaries_count:
+        message = ("Expected %d secondary units! (Found %s) %s" %
+                   (secondaries_count, secondrs, unit_status))
         amulet.raise_status(amulet.FAIL, message)
 
 
 #############################################################
+# Check presence of MongoDB GUI HEALTH Status
+#############################################################
+def validate_status_interface():
+    pubaddy = d.sentry['mongodb'][0].info['public-address']
+    fmt = "http://{}:28017"
+    if ":" in pubaddy:
+        fmt = "http://[{}]:28017"
+    r = requests.get(fmt.format(pubaddy), verify=False)
+    r.raise_for_status
+
+
+#############################################################
+# Validate that each unit has an active mongo service
+#############################################################
+def validate_running_services():
+    for service in sentry_dict:
+        output = sentry_dict[service].run('service mongodb status')
+        service_active = str(output).find('mongodb start/running')
+        if service_active == -1:
+            message = "Failed to find running MongoDB on host {}".format(
+                service)
+            amulet.raise_status(amulet.SKIP, msg=message)
+
+
+#############################################################
+# Validate proper replicaset setup
+#############################################################
+def validate_replicaset_setup():
+    d.sentry.wait(seconds)
+    _expect_replicaset_counts(1, 2)
+
+
+#############################################################
+# Validate replicaset joined
+#############################################################
+def validate_replicaset_relation_joined():
+    d.add_unit('mongodb', units=2)
+    d.sentry.wait(wait_for_replicaset)
+    sentry_dict.update({'mongodb3-sentry': d.sentry['mongodb'][3],
+                        'mongodb4-sentry': d.sentry['mongodb'][4]})
+    _expect_replicaset_counts(1, 4)
+
+
+#############################################################
 # Validate connectivity from $WORLD
 #############################################################
 def validate_world_connectivity():
@@ -165,4 +184,5 @@
 validate_status_interface()
 validate_running_services()
 validate_replicaset_setup()
+validate_replicaset_relation_joined()
 validate_world_connectivity()