Make sure that portmap is cleared on a failed experiment!

tbsetup/tbswapin.in

@@ -66,8 +66,9 @@ sub cleanup {
     }
     
     print STDERR "Resetting DB.\n";
-    DBQueryWarn("DELETE from delays where pid='$pid' and eid='$eid'");
-    DBQueryWarn("DELETE from vlans  where pid='$pid' and eid='$eid'");
+    DBQueryWarn("DELETE from delays  where pid='$pid' and eid='$eid'");
+    DBQueryWarn("DELETE from vlans   where pid='$pid' and eid='$eid'");
+    DBQueryWarn("DELETE from portmap where pid='$pid' and eid='$eid'");
     SetExpState($pid, $eid, EXPTSTATE_SWAPPED);
 }