commit e6e189ee308df5ef174cf1b5628286681dc8c6ca
author Zuul <zuul@review.openstack.org> Fri May 11 22:00:56 2018 +0000
committer Gerrit Code Review <review@openstack.org> Fri May 11 22:00:56 2018 +0000
tree 74b82451c69c5d32189289739d23375d170202dd
parent 98f20ecf56133f32d90186eb41c3391916eda972
parent 2944dd87cb4898f6a8d6a78f99508171a8c8850f

Merge "trunk: Start dhclient only if it's not running"

neutron_tempest_plugin/scenario/test_trunk.py

diff --git a/neutron_tempest_plugin/scenario/test_trunk.py b/neutron_tempest_plugin/scenario/test_trunk.py
index b5e8cda..2ff7e5d 100644
--- a/neutron_tempest_plugin/scenario/test_trunk.py
+++ b/neutron_tempest_plugin/scenario/test_trunk.py
@@ -34,7 +34,8 @@
     'sudo su -c '
     '"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"')
+    '{ ps -ef | grep -q "dhclient .*$IFACE.%(tag)d" || '
+    'dhclient $IFACE.%(tag)d"; }')
 
 
 class TrunkTest(base.BaseTempestTestCase):