1 files changed, 17 insertions, 26 deletions
diff --git a/tests/03_deploy_replicaset.py b/tests/03_deploy_replicaset.py
index 194f5b3..99de44c 100644
--- a/tests/03_deploy_replicaset.py
+++ b/tests/03_deploy_replicaset.py
@@ -41,21 +41,26 @@ def validate_status_interface():
 #############################################################
 # 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)
+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
+#############################################################
 
 
 #############################################################
 # Validate connectivity from $WORLD
 #############################################################
 def validate_world_connectivity():
- client = MongoClient(d.sentry.unit['mongos/0'].info['public-address'])
+ client = MongoClient(d.sentry.unit['mongodb/0'].info['public-address'])
 
 db = client['test']
 # Can we successfully insert?
@@ -68,21 +73,7 @@ def validate_world_connectivity():
 amulet.raise_status(amulet.FAIL, msg="Failed to remove test data")
 
 
-def validate_manual_connection():
- output, code = d.sentry.unit['shard1/0'].run("mongo {}".format(
- d.sentry.unit['mongos/0'].info['public-address']))
- if code != 0:
- message = "Manual Connection failed for unit shard1"
- amulet.raise_status(amulet.SKIP, msg=message)
-
- output, code = d.sentry.unit['shard2/0'].run("mongo {}".format(
- d.sentry.unit['mongos/0'].info['public-address']))
- if code != 0:
- message = "Manual Connection failed for unit shard2"
- amulet.raise_status(amulet.SKIP, msg=message)
-
-
 validate_status_interface()
-validate_running_services()
-validate_manual_connection()
-validate_world_connectivity()
+#validate_running_services()
+#validate_manual_connection()
+#validate_world_connectivity()