summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Provoost <luc.provoost@intel.com>2020-06-02 16:02:17 +0200
committerLuc Provoost <luc.provoost@intel.com>2020-06-02 17:40:20 +0200
commit7e14b29cb65ef871bbc320e1e35e8f4e0b36a8ed (patch)
treef0b6827b356053c6e6264aa3f3b4f68399586eb8
parente9cc52b379528413b1d87a05baa8ff14f0328b4e (diff)
Using /opt/rapid to run prox
All config files are now copied into /opt/rapid. We are not using the home directory any more. The prox executable is now also copied into the same /opt/rapid. Change-Id: I838636167f370bf8a855a3cfb0796c659e27a3ad Signed-off-by: Luc Provoost <luc.provoost@intel.com>
-rw-r--r--VNFs/DPPD-PROX/helper-scripts/rapid/centos.json18
-rwxr-xr-xVNFs/DPPD-PROX/helper-scripts/rapid/check_prox_system_setup.sh1
-rw-r--r--VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh8
-rw-r--r--VNFs/DPPD-PROX/helper-scripts/rapid/rapid_defaults.py2
4 files changed, 17 insertions, 12 deletions
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/centos.json b/VNFs/DPPD-PROX/helper-scripts/rapid/centos.json
index d7d8f1d..51784c0 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/centos.json
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/centos.json
@@ -17,30 +17,36 @@
],
"provisioners": [
{
+ "type": "shell",
+ "inline": [
+ "sudo mkdir -p /opt/rapid",
+ "sudo chmod 0777 /opt/rapid" ]
+ },
+ {
"type": "file",
"source": "./check_prox_system_setup.sh",
- "destination": "~/"
+ "destination": "/opt/rapid/"
},
{
"type": "file",
"source": "./check-prox-system-setup.service",
- "destination": "~/"
+ "destination": "/opt/rapid/"
},
{
"type": "file",
"source": "./sharkproxlog.sh",
- "destination": "~/"
+ "destination": "/opt/rapid/"
},
{
"type": "file",
"source": "./deploycentostools.sh",
- "destination": "~/"
+ "destination": "/opt/rapid/"
},
{
"type": "shell",
"inline": [
- "chmod a+x ~/deploycentostools.sh",
- "~/deploycentostools.sh -u deploy" ]
+ "chmod a+x /opt/rapid/deploycentostools.sh",
+ "/opt/rapid/deploycentostools.sh -u deploy" ]
}
]
}
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/check_prox_system_setup.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/check_prox_system_setup.sh
index cca7f74..5d8ae1e 100755
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/check_prox_system_setup.sh
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/check_prox_system_setup.sh
@@ -18,7 +18,6 @@ NCPUS="$(lscpu | egrep '^CPU\(s\):' | awk '{ print $2 }')"
MAXCOREID="$((NCPUS-1))"
filename="/etc/tuned/realtime-virtual-guest-variables.conf"
-#logfile="/home/centos/prox_system_setup.log"
logfile="/opt/rapid/prox_system_setup.log"
if [ -f "$filename" ]
then
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
index d19abbe..345b081 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
@@ -82,9 +82,9 @@ function os_cfg()
# Install the check_tuned_params service to make sure that the grub cmd line has the right cpus in isolcpu. The actual number of cpu's
# assigned to this VM depends on the flavor used. We don't know at this time what that will be.
- ${SUDO} chmod +x ${HOME}/check_prox_system_setup.sh
- ${SUDO} mv ${HOME}/check_prox_system_setup.sh /usr/local/libexec/
- ${SUDO} mv ${HOME}/check-prox-system-setup.service /etc/systemd/system/
+ ${SUDO} chmod +x ${BUILD_DIR}/check_prox_system_setup.sh
+ ${SUDO} mv ${BUILD_DIR}/check_prox_system_setup.sh /usr/local/libexec/
+ ${SUDO} mv ${BUILD_DIR}/check-prox-system-setup.service /etc/systemd/system/
${SUDO} systemctl daemon-reload
${SUDO} systemctl enable check-prox-system-setup.service
# Following lines are added to fix the following issue: When the VM gets
@@ -177,7 +177,7 @@ function prox_compile()
# Compile PROX
pushd ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX
make -j`getconf _NPROCESSORS_ONLN`
- ${SUDO} cp ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX/build/app/prox ${HOME}/prox
+ ${SUDO} cp ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX/build/app/prox ${BUILD_DIR}/prox
popd > /dev/null 2>&1
}
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_defaults.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_defaults.py
index 6143a99..2aa1acc 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_defaults.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_defaults.py
@@ -29,6 +29,6 @@ class RapidDefaults(object):
'screenloglevel' : 'INFO', # sets log level for writing to screen
'runtime' : 10, # time in seconds for 1 test run
'configonly' : False, # If True, the system will upload all the necessary config fiels to the VMs, but not start PROX and the actual testing
- 'rundir' : '~', # Directory where to find the tools in the machines running PROX
+ 'rundir' : '/opt/rapid', # Directory where to find the tools in the machines running PROX
'lat_percentile' : 0.99
}