From: Yury Kylulin <yury.kylulin@intel.com>
Date: Fri, 24 Jul 2020 16:13:57 +0000 (+0000)
Subject: Fix execution in the Kubernetes environment
X-Git-Tag: opnfv-10.0.0~30
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0973d6613091c8ac51215ed48bfd7cef116d02d8;p=samplevnf.git

Fix execution in the Kubernetes environment

Due to the recent changes in the rapid scripts, Kubernetes environment need to be adjusted.

Ready for test flag file for the runrapid script created during the container start.
TUN device configuration added.

Signed-off-by: Yury Kylulin <yury.kylulin@intel.com>
Change-Id: I097aafbd1d1d102aa61b8b86842afcb2d6a51338
---

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/pod-rapid.yaml b/VNFs/DPPD-PROX/helper-scripts/rapid/pod-rapid.yaml
index 5ce09071..fed57db2 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/pod-rapid.yaml
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/pod-rapid.yaml
@@ -11,7 +11,7 @@ spec:
     imagePullPolicy: Always
     securityContext:
       capabilities:
-        add: ["IPC_LOCK"]
+        add: ["IPC_LOCK", "NET_ADMIN"]
     volumeMounts:
     - mountPath: /dev/hugepages
       name: hugepages
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/pod.py b/VNFs/DPPD-PROX/helper-scripts/rapid/pod.py
index 61af9371..f663c9df 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/pod.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/pod.py
@@ -157,7 +157,7 @@ class Pod:
         Otherwise return -1.
         """
         self._log.info("Checking assigned SRIOV VF for POD %s" % self._name)
-        ret = self._ssh_client.run_cmd("cat /opt/k8s_sriov_device_plugin_envs")
+        ret = self._ssh_client.run_cmd("cat /opt/rapid/k8s_sriov_device_plugin_envs")
         if ret != 0:
             self._log.error("Failed to check assigned SRIOV VF!"
                             "Error %s" % self._ssh_client.get_error())
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/start.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/start.sh
index 742983ec..7fbeedf8 100755
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/start.sh
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/start.sh
@@ -17,10 +17,21 @@
 
 function save_k8s_envs()
 {
-	printenv | grep "PCIDEVICE_INTEL_COM" > /opt/k8s_sriov_device_plugin_envs
+	printenv | grep "PCIDEVICE_INTEL_COM" > /opt/rapid/k8s_sriov_device_plugin_envs
+}
+
+function create_tun()
+{
+	mkdir -p /dev/net
+	mknod /dev/net/tun c 10 200
+	chmod 600 /dev/net/tun
 }
 
 save_k8s_envs
+create_tun
+
+# Ready for testing
+touch /opt/rapid/system_ready_for_rapid
 
 # Start SSH server in background
 /usr/sbin/sshd