From: Carlos Goncalves <carlos.goncalves@neclab.eu>
Date: Wed, 7 Jun 2017 09:23:49 +0000 (+0000)
Subject: Merge "Fix run.sh bug for dynamic interfaces"
X-Git-Tag: opnfv-5.0.RC1~47
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d182b8a69eeef01f37b123e7d331972b7c57911d;hp=-c;p=doctor.git

Merge "Fix run.sh bug for dynamic interfaces"
---

d182b8a69eeef01f37b123e7d331972b7c57911d
diff --combined tests/run.sh
index daf23946,34a52878..fda1e753
--- a/tests/run.sh
+++ b/tests/run.sh
@@@ -30,7 -30,6 +30,7 @@@ DOCTOR_PW=docto
  DOCTOR_PROJECT=doctor
  DOCTOR_ROLE=_member_
  PROFILER_TYPE=${PROFILER_TYPE:-none}
 +PYTHON_ENABLE=${PYTHON_ENABLE:-false}
  
  TOP_DIR=$(cd $(dirname "$0") && pwd)
  
@@@ -294,8 -293,7 +294,7 @@@ inject_failure() 
      echo "disabling network of compute host [$COMPUTE_HOST] for 3 mins..."
      cat > disable_network.sh << 'END_TXT'
  #!/bin/bash -x
- dev=$(sudo ip a | awk '/ @COMPUTE_IP@\//{print $7}')
- [[ -n "$dev" ]] || dev=$(sudo ip a | awk '/ @COMPUTE_IP@\//{print $5}')
+ dev=$(sudo ip a | awk '/ @COMPUTE_IP@\//{print $NF}')
  sleep 1
  sudo ip link set $dev down
  echo "doctor set link down at" $(date "+%s.%N")
@@@ -481,13 -479,6 +480,13 @@@ cleanup() 
  
  # Main process
  
 +if $PYTHON_ENABLE; then
 +    cd $TOP_DIR
 +    echo "executing tox..."
 +    tox
 +    exit $?
 +fi
 +
  echo "Note: doctor/tests/run.sh has been executed."
  git log --oneline -1 || true   # ignore even you don't have git installed