From 45ea2b2ad6113eb46ad1545ca022126fbdc51a75 Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Mon, 20 Jun 2011 10:31:53 -0400
Subject: [PATCH] cleanup ebtables rules if vm is manually deleted

---
 scripts/vm/network/security_group.py | 7 +++----
 scripts/vm/pingtest.sh               | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py
index bf9b9b821c1..49af8e87310 100755
--- a/scripts/vm/network/security_group.py
+++ b/scripts/vm/network/security_group.py
@@ -130,9 +130,8 @@ def destroy_network_rules_for_vm(vm_name, vif=None):
     return 'true'
 
 def destroy_ebtables_rules(vm_name, vif):
-    if vif is None:
-        return
-    delcmd = "ebtables -t nat -L PREROUTING | grep " + vif
+
+    delcmd = "ebtables -t nat -L PREROUTING | grep " + vm_name
     delcmds = []
     try:
         delcmds = execute(delcmd).split('\n')
@@ -142,7 +141,7 @@ def destroy_ebtables_rules(vm_name, vif):
         pass
     postcmds = []
     try:
-        postcmd = "ebtables -t nat -L POSTROUTING | grep " + vif
+        postcmd = "ebtables -t nat -L POSTROUTING | grep " + vm_name
         postcmds = execute(postcmd).split('\n')
         postcmds.pop()
         postcmds = ["-D POSTROUTING " + x for x in postcmds]
diff --git a/scripts/vm/pingtest.sh b/scripts/vm/pingtest.sh
index ceb936de3ff..3358d56ea58 100755
--- a/scripts/vm/pingtest.sh
+++ b/scripts/vm/pingtest.sh
@@ -73,7 +73,7 @@ arping_vm() {
 
 # ping the default route
 ping_default_route() {
-  defaultRoute=`grep GATEWAY /etc/sysconfig/network | awk -F"=" '{ print $2 }'`
+  defaultRoute=`route |grep default|awk '{print $2}'`
   ping -c 1 -n -q $defaultRoute > /dev/null
   return $?
 }