From 64a7f72dc05d0c2e76f50945fca68d6ce5d9bef4 Mon Sep 17 00:00:00 2001
From: David Nalley <david@gnsa.us>
Date: Tue, 3 May 2011 14:12:37 -0400
Subject: [PATCH] bug:9702 removing duplicate
 scripts/vm/hypervisor/kvm/pingtest.sh correcting path for sshkey for in
 scripts/pingtest.sh

---
 scripts/vm/hypervisor/kvm/pingtest.sh | 162 --------------------------
 scripts/vm/pingtest.sh                |   4 +-
 2 files changed, 2 insertions(+), 164 deletions(-)
 delete mode 100755 scripts/vm/hypervisor/kvm/pingtest.sh

diff --git a/scripts/vm/hypervisor/kvm/pingtest.sh b/scripts/vm/hypervisor/kvm/pingtest.sh
deleted file mode 100755
index eb6c378593d..00000000000
--- a/scripts/vm/hypervisor/kvm/pingtest.sh
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/usr/bin/env bash
-# $Id: pingtest.sh 9132 2010-06-04 20:17:43Z manuel $ $HeadURL: svn://svn.lab.vmops.com/repos/vmdev/java/scripts/vm/pingtest.sh $
-# pingtest.sh -- ping 
-#
-#
-usage() {
-  printf "Usage:\n %s -i <domR eth1 ip>  -p <private-ip-address> \n" $(basename $0) >&2
-  printf " %s -h <computing-agent-host-ip>  \n" $(basename $0) >&2
-  printf " %s -g \n" $(basename $0) >&2
-}
-
-# check if gateway domain is up and running
-check_gw() {
-  ping -c 1 -n -q $1 > /dev/null
-  if [ $? -gt 0 ]
-  then
-    sleep 1
-    ping -c 1 -n -q $1 > /dev/null
-  fi
-  return $?;
-}
-
-# ping the vm's private IP from the domR
-ping_vm() {
-  local routerIp=$1
-  local vmIp=$2
-  ssh -o StrictHostKeyChecking=no -p 3922 -i ./id_rsa root@$routerIp "ping -c 1 -n -q $vmIp"
-
-  # if return code of ping is > 0, the ping failed, return a result
-  if [ $? -gt 0 ]
-  then
-     arping_vm $routerIp $vmIp
-     return $?
-  fi
-
-  return $?;
-}
-
-arping_vm() {
-  local routerIp=$1
-  local vmIp=$2
-  ssh -o StrictHostKeyChecking=no -p 3922 -i ./id_rsa root@$routerIp "arping -c 1 -q $vmIp"
-
-  # if return code of ping is > 0, the ping failed, return a result
-  if [ $? -gt 0 ]
-  then
-     return 1
-  fi
-
-  return $?;
-}
-
-# ping the default route
-ping_default_route() {
-  defaultRoute=`ip route|grep default| awk '{ print $3 }'`
-  if [ $? -gt 0 ]
-  then
-     return $?
-  fi
-  if [ -z "$defaultRoute" ]
-  then 
-     return 1
-  fi
-  ping -c 1 -n -q $defaultRoute > /dev/null
-  return $?
-}
-
-# ping the computing host
-ping_host() {
-  ping -c 1 -n -q $1 > /dev/null
-
-  if [ $? -gt 0  ]
-  then
-     return 1
-  fi
-
-  return $?;
-}
-
-iflag=
-pflag=
-hflag=
-gflag=
-
-while getopts 'i:p:h:g' OPTION
-do
-  case $OPTION in
-  i)	iflag=1
-		domRIp="$OPTARG"
-		;;
-  p)	pflag=1
-		privateIp="$OPTARG"
-		;;
-  h)    hflag=1
-        hostIp="$OPTARG"
-        ;;
-  g)    gflag=1
-        ;;
-  ?)	usage
-		exit 2
-		;;
-  esac
-done
-
-# make sure both domRIp and vm private ip are set
-if [ "$iflag$hflag$gflag" != "1" ]
-then
- usage
- exit 2
-fi
-
-if [ "$iflag" == "1" ]
-then
-  if [ "$pflag" != "1" ]
-  then
-    usage
-    exit 3
-  fi
-fi
-
-if [ "$iflag" == "1" ]
-then
-  # check if gateway domain is up and running
-  if ! check_gw "$domRIp"
-  then
-    printf "Unable to ping the routing domain, exiting\n" >&2
-    exit 4
-  fi
-
-  if ! ping_vm $domRIp $privateIp
-  then
-    printf "Unable to ping the vm, exiting\n" >&2
-    exit 5
-  fi
-fi
-
-if [ "$hflag" == "1" ]
-then
-  if ! ping_host "$hostIp"
-  then
-    # first ping default route to make sure we can get out successfully before returning error
-    if ! ping_default_route
-    then
-      printf "Unable to ping default route, exiting\n" >&2
-      exit 7
-    fi
-
-    printf "Unable to ping computing host, exiting\n" >&2
-    exit 6
-  fi
-fi
-
-if [ "$gflag" == "1" ]
-then
-  if ! ping_default_route
-  then
-    printf "Unable to ping default route\n" >&2
-    exit 8
-  fi
-fi
-
-exit 0
diff --git a/scripts/vm/pingtest.sh b/scripts/vm/pingtest.sh
index 02f61eb06cd..a2a07374ddc 100755
--- a/scripts/vm/pingtest.sh
+++ b/scripts/vm/pingtest.sh
@@ -24,7 +24,7 @@ check_gw() {
 ping_vm() {
   local routerIp=$1
   local vmIp=$2
-  ssh -o StrictHostKeyChecking=no -p 3922 -i ./id_rsa root@$routerIp "ping -c 1 -n -q $vmIp"
+  ssh -o StrictHostKeyChecking=no -p 3922 -i /root/.ssh/id_rsa.cloud root@$routerIp "ping -c 1 -n -q $vmIp"
 
   # if return code of ping is > 0, the ping failed, return a result
   if [ $? -gt 0 ]
@@ -39,7 +39,7 @@ ping_vm() {
 arping_vm() {
   local routerIp=$1
   local vmIp=$2
-  ssh -o StrictHostKeyChecking=no -p 3922 -i ./id_rsa root@$routerIp "arping -c 1 -q $vmIp"
+  ssh -o StrictHostKeyChecking=no -p 3922 -i /root/.ssh/id_rsa.cloud root@$routerIp "arping -c 1 -q $vmIp"
 
   # if return code of ping is > 0, the ping failed, return a result
   if [ $? -gt 0 ]