From 7d897046268f9be1409ace222648a0d81a8e0c1a Mon Sep 17 00:00:00 2001 From: Bala Sankaran Date: Fri, 14 Sep 2018 10:12:01 -0400 Subject: [PATCH] system-dpdk: Convert /tmp to use OVS_RUNDIR When multiple users run the DPDK testsuite their dependence on /tmp will cause conflicts. Use the RUNDIR as a dynamic path to overcome this. NOTE: This still doesn't solve the dependency on /var/run that DPDK requires. Signed-off-by: Bala Sankaran Co-authored-by: Aaron Conole Signed-off-by: Aaron Conole Signed-off-by: Ian Stokes --- tests/system-dpdk.at | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at index 834ba06fb54..58dc8aaae92 100644 --- a/tests/system-dpdk.at +++ b/tests/system-dpdk.at @@ -54,20 +54,20 @@ OVS_DPDK_START() dnl Add userspace bridge and attach it to OVS AT_CHECK([ovs-vsctl add-br br10 -- set bridge br10 datapath_type=netdev]) -AT_CHECK([ovs-vsctl add-port br10 dpdkvhostuserclient0 -- set Interface dpdkvhostuserclient0 type=dpdkvhostuserclient options:vhost-server-path=/tmp/dpdkvhostclient0], [], [stdout], [stderr]) +AT_CHECK([ovs-vsctl add-port br10 dpdkvhostuserclient0 -- set Interface dpdkvhostuserclient0 type=dpdkvhostuserclient options:vhost-server-path=$OVS_RUNDIR/dpdkvhostclient0], [], [stdout], [stderr]) AT_CHECK([ovs-vsctl show], [], [stdout]) sleep 2 dnl Parse log file AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout]) AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout]) -AT_CHECK([grep "VHOST_CONFIG: /tmp/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout]) +AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout]) dnl Clean up AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr]) OVS_VSWITCHD_STOP(["\@does not exist. The Open vSwitch kernel module is probably not loaded.@d \@Failed to enable flow control@d -\@VHOST_CONFIG: failed to connect to /tmp/dpdkvhostclient0: No such file or directory@d +\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d \@Global register is changed during@d \@EAL: Invalid NUMA socket, default to 0@d \@EAL: WARNING: cpu flags constant_tsc=yes nonstop_tsc=no -> using unreliable clock cycles !@d