Switch from /tmp to /run to DP_CONF default path

On modern debian-based systems files may be cleared from /tmp after some
time. The recommended location for files which should be kept as long as
the system is running is the /run directory.

This commit changes the relevant references to load the config file from
/run/dpservice/dpservice.conf by default instead of /tmp/dp_service.conf.
The old behavior can be restored by setting DP_CONF to
/tmp/dp_service.conf.

The hack/prepare.sh was updated to respect the DP_CONF environemnt
variable as well.

Resolves: #717

Author: maxmoehl

docs/deployment/commandline.md

@@ -8,5 +8,5 @@ For more information on EAL options, please see [the official docs](https://doc.
 All options are described in `dpservice-bin --help`, see [the markdown version of it](help_dpservice-bin.md)
 
 ## Configuration file
-Unless an environment variable `DP_CONF` is set to override the path, `dpservice-bin` uses `/tmp/dp_service.conf` to read configuration before processing any arguments.
+Unless an environment variable `DP_CONF` is set to override the path, `dpservice-bin` uses `/run/dpservice/dpservice.conf` to read configuration before processing any arguments.
 This way you can provide any arguments via such file and simplify the commandline use. The helper script `prepare.sh` generates such a file for Mellanox users.

docs/testing/README.md

@@ -32,7 +32,7 @@ When running `pytest` directly in the `test/` directory, only a specific set of
 If one should want to instead run your own `dpservice-bin` instance (e.g. for running under a debugger), the `--attach` argument connects to an already running service instead of starting its own (which in turn can be started via a helper `dp_service.py` script). This comes with the caveat of ensuring the right arguments are passed to the service at startup.
 
 #### Pytest on Mellanox
-By default, `pytest` runs using virtual intefaces (TAPs). By providing `--hw` command-line option, it can instead use real NIC based on the contents of `/tmp/dp_service.conf`. For more information [see Mellanox testing guide](mellanox.md#two-machine-setup).
+By default, `pytest` runs using virtual intefaces (TAPs). By providing `--hw` command-line option, it can instead use real NIC based on the contents of `/run/dpservice/dpservice.conf`. For more information [see Mellanox testing guide](mellanox.md#two-machine-setup).
 
 ## Docker
 There is a tester image provided by this repo, simply build it using this repo's `Dockerfile` and use `--target tester`. For fully working images a GitHub PAT is needed: `docker build --secret=id=github_token,src=<path/to/github_token> --target tester .`

docs/testing/automated_benchmark_test.md

@@ -80,7 +80,7 @@ The most commonly used commands to run the provision script are as follows.
 It is possible to login into the provisioned VMs with the user name `root` and password `test123`, using the libvirt's console.
 
 # Execution of test script
-This test suite is invoked by executing the script `runtest.py` under the repository `/test/benchmark_test`. In oder to run dpservice either natively or via container, please make sure that a valid dp_service.conf file is created under `/tmp`.
+This test suite is invoked by executing the script `runtest.py` under the repository `/test/benchmark_test`. In oder to run dpservice either natively or via container, please make sure that a valid dpservice.conf file is created under `/run/dpservice`.
 
 ## dpservice-cli
 The testing script assumes that dpservice-cli exists under '/tmp' on hypervisors. If you have never run this test suite before, please first compile your local dpservice project by using `meson` and `ninja` commands. Because dpservice-cli is already included in the dpservice repository, the compiled dpservice-cli binary will be transferred to hypervisors automatically.

docs/testing/mellanox.md

@@ -4,7 +4,7 @@ As dp-service is intended as a virtual router for hosting VMs, testing on real h
 It is also possible to run the whole set of tests that `runtest.py` runs using `pytest`. See below for details.
 
 ## Hardware setup
-To simplify starting `dpservice-bin`, it accepts a configuration file (currently hardcoded `/tmp/dp_service.conf`) so that most command-line arguments concerning hardware options are not needed.
+To simplify starting `dpservice-bin`, it accepts a configuration file (currently hardcoded `/run/dpservice/dpservice.conf`) so that most command-line arguments concerning hardware options are not needed.
 
 This file is generated for you by calling a shell script, `hack/prepare.sh`.
 

hack/prepare.sh

@@ -14,7 +14,7 @@ OPT_MULTIPORT=false
 BLUEFIELD_IDENTIFIERS=("MT_0000000543" "MT_0000000541")
 MAX_NUMVFS_POSSIBLE=126
 NUMVFS_DESIRED=126
-CONFIG="/tmp/dp_service.conf"
+CONFIG="${DP_CONF:-/run/dpservice/dpservice.conf}"
 IS_X86_WITH_BLUEFIELD=false
 IS_ARM_WITH_BLUEFIELD=false
 IS_X86_WITH_MLX=false
@@ -330,6 +330,7 @@ function make_config() {
 	conf_vf_pattern="$(get_pattern "${devs[0]}")"
 	conf_ipv6="$(get_ipv6)"
 
+	mkdir -p "$(dirname "$CONFIG")"
 	{ echo "# This has been generated by prepare.sh"
 	echo "no-stats"
 	echo "pf0 $conf_pf0"

src/dp_conf.c

@@ -18,7 +18,7 @@
 #include "nodes/common_node.h"  // graphtrace level limit
 #include "dpdk_layer.h"  // underlay conf struct
 
-#define DP_CONF_DEFAULT_CONF_FILE "/tmp/dp_service.conf"
+#define DP_CONF_DEFAULT_CONF_FILE "/run/dpservice/dpservice.conf"
 
 // magic number, hopefully large enough to hold the full '-a' EAL argument
 #define DP_EAL_A_MAXLEN 128

test/local/dp_service.py

@@ -15,7 +15,7 @@
 
 class DpService:
 
-	DP_SERVICE_CONF = "/tmp/dp_service.conf"
+	DP_SERVICE_CONF = "/run/dpservice/dpservice.conf"
 
 	def __init__(self, build_path, port_redundancy, fast_flow_timeout,
 				 gdb=False, test_virtsvc=False, hardware=False, offloading=False, graphtrace=False):