commit 042445d5ca9bcbeae3d7748f4253635c5104512d
author Jenkins <jenkins@review.openstack.org> Tue Apr 25 21:08:08 2017 +0000
committer Gerrit Code Review <review@openstack.org> Tue Apr 25 21:08:09 2017 +0000
tree 1b836fca02da312c59e96872292ad891d750fabc
parent 56afb6dce2bed156755cb2e6fe76398f03c344ef
parent 200b767b134eeeb59c6bd45a75c0aab2240ff43f

Merge "Tempest: Edited bash commands to work with multiple OSes."

neutron/tests/tempest/scenario/test_trunk.py

diff --git a/neutron/tests/tempest/scenario/test_trunk.py b/neutron/tests/tempest/scenario/test_trunk.py
index 3b49e39..112c17b 100644
--- a/neutron/tests/tempest/scenario/test_trunk.py
+++ b/neutron/tests/tempest/scenario/test_trunk.py
@@ -29,9 +29,10 @@
 CONF = config.CONF
 
 CONFIGURE_VLAN_INTERFACE_COMMANDS = (
-    'IFACE=$(ip l | grep "^[0-9]*: e" | cut -d \: -f 2) && '
+    'IFACE=$(PATH=$PATH:/usr/sbin ip l | grep "^[0-9]*: e" |'
+    'cut -d \: -f 2) && '
     'sudo su -c '
-    '"ip l a link $IFACE name $IFACE.%(tag)d type vlan id %(tag)d && '
+    '"ip l a link $IFACE name $IFACE.%(tag)d type vlan id %(tag)d &&'
     'ip l s up dev $IFACE.%(tag)d && '
     'dhclient $IFACE.%(tag)d"')