PMM-5740 Adding socket support for mongodb in bats and framework (per…

…cona#336) * Remove UI tests * PMM-5740 Adding socket support bats for mongodb
meet59patel · Aug 5, 2020 · 96b8304 · 96b8304
1 parent 6fea252
commit 96b8304
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 15 deletions.
diff --git a/pmm-tests/pmm-2-0-bats-tests/mongodb-tests.bats b/pmm-tests/pmm-2-0-bats-tests/mongodb-tests.bats
@@ -47,6 +47,21 @@ echo "$output"
 	done
 }
 
+@test "PMM-T160 User can't use both socket and address while using pmm-admin add mongodb" {
+    COUNTER=0
+    IFS=$'\n'
+    for i in $(pmm-admin list | grep "MongoDB" | awk -F" " '{print $3}') ; do
+        echo "$i"
+        let COUNTER=COUNTER+1
+		MONGO_IP_PORT=${i}
+		export MONGO_PORT=$(cut -d':' -f2 <<< $MONGO_IP_PORT)
+		run pmm-admin add mongodb --socket=/tmp/mongodb-${MONGO_PORT}.sock mongo_inst_${COUNTER} ${MONGO_IP_PORT}
+        echo "$output"
+        [ "$status" -eq 1 ]
+        echo "${lines[0]}" | grep "Socket and address cannot be specified together."
+    done
+}
+
 @test "run pmm-admin remove mongodb" {
 	COUNTER=0
 	IFS=$'\n'
@@ -61,17 +76,55 @@ echo "$output"
 }
 
 @test "run pmm-admin remove mongodb again" {
-        COUNTER=0
-        IFS=$'\n'
-        for i in $(pmm-admin list | grep "MongoDB" | awk -F" " '{print $3}') ; do
-                let COUNTER=COUNTER+1
-                run pmm-admin remove mongodb mongo_inst_$COUNTER
-                echo "$output"
-                        [ "$status" -eq 1 ]
-                        echo "${output}" | grep "not found."
-        done
+    COUNTER=0
+    IFS=$'\n'
+    for i in $(pmm-admin list | grep "MongoDB" | awk -F" " '{print $3}') ; do
+        let COUNTER=COUNTER+1
+        run pmm-admin remove mongodb mongo_inst_$COUNTER
+        echo "$output"
+        [ "$status" -eq 1 ]
+        echo "${output}" | grep "not found."
+    done
+}
+
+@test "PMM-T157 PMM-T161 Adding MongoDB with specified socket" {
+    COUNTER=0
+    IFS=$'\n'
+    for i in $(pmm-admin list | grep "MongoDB" | awk -F" " '{print $3}') ; do
+        echo "$i"
+        let COUNTER=COUNTER+1
+        MONGO_IP_PORT=${i}
+        export MONGO_IP=$(cut -d':' -f1 <<< $MONGO_IP_PORT)
+        export MONGO_PORT=$(cut -d':' -f2 <<< $MONGO_IP_PORT)
+        run pmm-admin add mongodb --socket=/tmp/mongodb-${MONGO_PORT}.sock mongo_inst_${COUNTER}
+        echo "$output"
+        [ "$status" -eq 0 ]
+        echo "${lines[0]}" | grep "MongoDB Service added"
+    done
+}
+
+@test "run pmm-admin remove mongodb" {
+	COUNTER=0
+	IFS=$'\n'
+	for i in $(pmm-admin list | grep "MongoDB" | grep "mongo_inst_" | awk -F" " '{print $3}') ; do
+		let COUNTER=COUNTER+1
+		MONGO_IP_PORT=${i}
+		run pmm-admin remove mongodb mongo_inst_${COUNTER}
+	  [ "$status" -eq 0 ]
+	  echo "${lines[0]}"
+	  echo "${lines[0]}" | grep "Service removed."
+	done
 }
 
+@test "run pmm-admin mongodb --help check for socket" {
+    run pmm-admin add mongodb --help
+    echo "$output"
+    [ "$status" -eq 0 ]
+    [[ ${lines[0]} =~ "usage: pmm-admin add mongodb [<flags>] [<name>] [<address>]" ]]
+    echo "${output}" | grep "--socket=SOCKET"
+}
+
+
 @test "run pmm-admin add mongodb --help to check host" {
     run pmm-admin add mongodb --help
     echo "$output"

diff --git a/pmm-tests/pmm-framework.sh b/pmm-tests/pmm-framework.sh
@@ -1136,7 +1136,11 @@ add_clients(){
           n=$(( $p - 1 ))
           for r in `seq 1  ${ADDCLIENTS_COUNT}`;do
             PORT=$(( ${PSMDB_PORTS[$n]} + $r - 1 ))
-            pmm-admin add mongodb --debug --cluster mongodb_cluster mongodb_inst_rpl${p}_${r}_$IP_ADDRESS localhost:$PORT
+            if [[ -z $use_socket ]]; then
+              pmm-admin add mongodb --debug --cluster mongodb_cluster mongodb_inst_rpl${p}_${r}_$IP_ADDRESS localhost:$PORT
+            else
+              pmm-admin add mongodb --debug --cluster --socket=/tmp/mongodb-$PORT.sock mongodb_cluster mongodb_inst_rpl${p}_${r}_$IP_ADDRESS
+            fi
           done
         done
       fi
@@ -1154,7 +1158,11 @@ add_clients(){
             check_disable_ssl mongodb_inst_rpl${k}_${j}
           else
             if [ ! -z $PMM2 ]; then
-              pmm-admin add mongodb --debug mongodb_inst_config_rpl${m}_$IP_ADDRESS localhost:$PORT
+              if [[ -z $use_socket ]]; then
+                pmm-admin add mongodb --debug mongodb_inst_config_rpl${m}_$IP_ADDRESS localhost:$PORT
+              else
+                pmm-admin add mongodb --debug --socket=/tmp/mongodb-$PORT.sock mongodb_inst_config_rpl${m}_$IP_ADDRESS
+              fi
             else
               sudo pmm-admin add mongodb --cluster mongodb_cluster --uri mongodb_inst_config_rpl${m} localhost:$PORT
             fi
@@ -1386,13 +1394,21 @@ add_clients(){
       for j in `seq 1  ${ADDCLIENTS_COUNT}`;do
         check_port $MODB_PORT mongodb
         MODB_PORT_NEXT=$((MODB_PORT+2))
-        docker run -d -p $MODB_PORT-$MODB_PORT_NEXT:27017-27019 --name mongodb_node_$j mongo:${modb_version}
+        docker run -d -p $MODB_PORT-$MODB_PORT_NEXT:27017-27019 -v /tmp/:/tmp/ --name -e UMASK=0777 mongodb_node_$j mongo:${modb_version}
         sleep 20
         docker exec mongodb_node_$j mongo --eval 'db.setProfilingLevel(2)'
-        if [ $(( ${j} % 2 )) -eq 0 ]; then
-          pmm-admin add mongodb --cluster mongodb_node_$j --environment=modb-prod mongodb_node_$j --debug localhost:$MODB_PORT
+        if [[ -z $use_socket ]]; then
+          if [ $(( ${j} % 2 )) -eq 0 ]; then
+            pmm-admin add mongodb --cluster mongodb_node_$j --environment=modb-prod mongodb_node_$j --debug localhost:$MODB_PORT
+          else
+            pmm-admin add mongodb --cluster mongodb_node_$j --environment=modb-dev mongodb_node_$j --debug localhost:$MODB_PORT
+          fi
         else
-          pmm-admin add mongodb --cluster mongodb_node_$j --environment=modb-dev mongodb_node_$j --debug localhost:$MODB_PORT
+          if [ $(( ${j} % 2 )) -eq 0 ]; then
+            pmm-admin add mongodb --cluster mongodb_node_$j --environment=modb-prod mongodb_node_$j --socket=/tmp/mongodb-$MODB_PORT.sock --debug
+          else
+            pmm-admin add mongodb --cluster mongodb_node_$j --environment=modb-dev mongodb_node_$j --socket=/tmp/mongodb-$MODB_PORT.sock --debug 
+          fi
         fi
         MODB_PORT=$((MODB_PORT+j+3))
       done