X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fsfc%2FFull_Deploy%2Fdocker-ovs.sh;h=e94aa41e59c629ae054b2712dc212cdca5f8082b;hb=57c7a9f1f1836106b181fe93d2cfc41c6553e50b;hp=981f3cd9e982c76860fe335f00413187112ffa82;hpb=42e2183c83a939313b2663f5763e11db55c44697;p=integration%2Ftest.git diff --git a/csit/suites/sfc/Full_Deploy/docker-ovs.sh b/csit/suites/sfc/Full_Deploy/docker-ovs.sh index 981f3cd9e9..e94aa41e59 100755 --- a/csit/suites/sfc/Full_Deploy/docker-ovs.sh +++ b/csit/suites/sfc/Full_Deploy/docker-ovs.sh @@ -34,6 +34,11 @@ search_path () { exit 1 } +clean_iptables () { + sudo iptables -F + sudo iptables -t nat -F +} + ovs_vsctl () { sudo ovs-vsctl --timeout=60 "$@" } @@ -185,8 +190,6 @@ spawn_node () { if [ -z "$ODL" ]; then :; else d_ovs_vsctl "$CONTAINER" set-manager "tcp:${ODL}:6640" - d_ovs_vsctl "$CONTAINER" set-controller br-tun "tcp:${ODL}:6633" - d_ovs_vsctl "$CONTAINER" set-controller br-int "tcp:${ODL}:6633" fi DO_GUEST="$GUESTS" @@ -313,6 +316,7 @@ EOF UTIL=$(basename $0) search_path ovs-vsctl search_path docker +clean_iptables #if [[ $EUID -ne 0 ]]; then # echo "This script must be run as root" 1>&2