diff options
| author |   Carlos Goncalves <carlos.goncalves@neclab.eu> | 2016-12-12 10:15:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-12 10:15:28 +0000 |
| commit | 71656f65eab87f6d22107a7952cd90224016fda8 (patch) | |
| tree | 0051fb88e4a5b2acb93514d78ab1914b3c790310 /tests | |
| parent | 23f860704776c1be1d71e81580044de4c33d7a93 (diff) | |
| parent | c2c649de21870955b1f79e76126970f0b753bf94 (diff) | |
Merge "remove print_log"
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/run.sh | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/run.sh b/tests/run.sh index ea7ded50..b6bfc0ba 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -299,12 +299,6 @@ create_alarm() { -q "traits.state=string::error; traits.instance_id=string::$vm_id" } -print_log() { - log_file=$1 - echo "$log_file:" - sed -e 's/^/ /' "$log_file" -} - start_monitor() { pgrep -f "python monitor.py" && return 0 sudo -E python monitor.py "$COMPUTE_HOST" "$COMPUTE_IP" "$INSPECTOR_TYPE" \ @@ -314,7 +308,6 @@ start_monitor() { stop_monitor() { pgrep -f "python monitor.py" || return 0 sudo kill $(pgrep -f "python monitor.py") - print_log monitor.log } congress_add_rule() { @@ -381,7 +374,6 @@ stop_inspector() { if [[ "$INSPECTOR_TYPE" == "sample" ]] ; then pgrep -f "python inspector.py" || return 0 kill $(pgrep -f "python inspector.py") - print_log inspector.log elif [[ "$INSPECTOR_TYPE" == "congress" ]] ; then congress_del_rule host_force_down classification congress_del_rule error_vm_states classification @@ -421,7 +413,6 @@ start_consumer() { stop_consumer() { pgrep -f "python consumer.py" || return 0 kill $(pgrep -f "python consumer.py") - print_log consumer.log # NOTE(r-mibu): terminate tunnels to the controller nodes if [[ "$INSTALLER_TYPE" != "local" ]] ; then @@ -430,7 +421,6 @@ stop_consumer() { forward_rule="-R $CONSUMER_PORT:localhost:$CONSUMER_PORT" tunnel_command="sudo ssh $ssh_opts_cpu $COMPUTE_USER@$ip $forward_rule sleep 600" kill $(pgrep -f "$tunnel_command") - print_log "ssh_tunnel.${ip}.log" done fi } @@ -514,7 +504,6 @@ cleanup() { sleep 240 check_host_status "UP" scp $ssh_opts_cpu "$COMPUTE_USER@$COMPUTE_IP:disable_network.log" . - print_log disable_network.log openstack $as_doctor_user server list | grep -q " $VM_NAME " && openstack $as_doctor_user server delete "$VM_NAME" sleep 1 |