Cleanup remote command script

Author: dhlaluku

server/src/main/java/org/apache/cloudstack/diagnosis/RemoteDiagnosisServiceImpl.java

@@ -104,7 +104,6 @@ private static String setupRemoteCommand(String diagnosisType, String destinatio
         if (optionalArguments != null){
             return String.format("%s %s", diagnosisType, destinationIpAddress+" "+optionalArguments);
         }
-
         return String.format("%s %s", diagnosisType, destinationIpAddress);
     }
 

systemvm/debian/opt/cloud/bin/execute_icmp_tool_remotely.sh

@@ -17,16 +17,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cmd=$1
-if [ $cmd == "ping" ]
-then
-    $1 $2 -c 5
-
-elif [ $cmd == "traceroute" ]
-then
-    $1 $2
-
+if [[ "$@" = *"ping"* ]]; then
+    if [[ "$@" = *"-c"* ]]; then
+        $@
+    else
+        $@ -c 5
+    fi
 else
-    echo "I am not ping or traceroute"
-
+    $@
 fi