Add support for native Kubernetes CPU Manager0.0.1

For Kubernetes environment core ids in the config and test files are relative and
automatically remapped to the allowed cores allocated for container.

There is no change to the baremetal or VM environment.

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

33 files changed, 132 insertions, 21 deletions

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/gen.cfg b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/gen.cfg
index 1827395f..d0ccc13f 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/gen.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/gen.cfg
@@ -41,7 +41,7 @@ mempool size=8K
 name=${name}
 heartbeat timeout=${heartbeat}
 
-[core 0]
+[core $mcore]
 mode=master
 
 [core $gencores]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/gen_gw.cfg b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/gen_gw.cfg
index fc3b6a68..2843d354 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/gen_gw.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/gen_gw.cfg
@@ -40,7 +40,7 @@ mempool size=8K
 name=${name}
 heartbeat timeout=${heartbeat}
 
-[core 0]
+[core $mcore]
 mode=master
 
 [core $gencores]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/genv6.cfg b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/genv6.cfg
index 650e284c..32fadbc7 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/genv6.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/genv6.cfg
@@ -38,7 +38,7 @@ mempool size=8K
 name=${name}
 heartbeat timeout=${heartbeat}
 
-[core 0]
+[core $mcore]
 mode=master
 
 [core $gencores]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/impair.cfg b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/impair.cfg
index 95d6516f..3eaf80e7 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/impair.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/impair.cfg
@@ -31,14 +31,13 @@ vlan=yes
 vdev=impair_tap
 local ipv4=${local_ip1}
 
-
 [defaults]
 mempool size=8K
 
 [global]
 name=${name}
 
-[core 0]
+[core $mcore]
 mode=master
 
 [core $cores]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/irq.cfg b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/irq.cfg
index 4e9af96b..0f26e6eb 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/irq.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/irq.cfg
@@ -34,7 +34,7 @@ mempool size=8K
 [global]
 name=${name}
 
-[core 0]
+[core $mcore]
 mode=master
 
 [core $cores]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/l2gen.cfg b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/l2gen.cfg
index e0942212..3af0ac99 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/l2gen.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/l2gen.cfg
@@ -37,7 +37,7 @@ mempool size=8K
 [global]
 name=${name}
 
-[core 0]
+[core $mcore]
 mode=master
 
 [core $gencores]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/l2gen_bare.cfg b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/l2gen_bare.cfg
index 1a8dddb3..dc988969 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/l2gen_bare.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/l2gen_bare.cfg
@@ -37,7 +37,7 @@ mempool size=8K
 [global]
 name=${name}
 
-[core 0]
+[core $mcore]
 mode=master
 
 [core $gencores]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/l2swap.cfg b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/l2swap.cfg
index 17396381..0ce3a1a3 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/l2swap.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/l2swap.cfg
@@ -35,7 +35,7 @@ mempool size=8K
 [global]
 name=${name}
 
-[core 0]
+[core $mcore]
 mode=master
 
 [core $cores]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/secgw1.cfg b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/secgw1.cfg
index 1897bbdc..d941e5eb 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/secgw1.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/secgw1.cfg
@@ -41,7 +41,7 @@ mempool size=16K
 start time=20
 name=${name}
 
-[core 0]
+[core $mcore]
 mode=master
 
 [core $cores]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/secgw2.cfg b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/secgw2.cfg
index 2fe3291a..9aedc85d 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/secgw2.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/secgw2.cfg
@@ -41,7 +41,7 @@ mempool size=16K
 start time=20
 name=${name}
 
-[core 0]
+[core $mcore]
 mode=master
 
 [core $cores]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/swap.cfg b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/swap.cfg
index 0cca80c6..f66322a9 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/swap.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/swap.cfg
@@ -35,7 +35,7 @@ mempool size=8K
 [global]
 name=${name}
 
-[core 0]
+[core $mcore]
 mode=master
 
 [core $cores]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/swapv6.cfg b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/swapv6.cfg
index e073f8f1..61c8a594 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/configs/swapv6.cfg
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/configs/swapv6.cfg
@@ -33,7 +33,7 @@ mempool size=8K
 [global]
 name=${name}
 
-[core 0]
+[core $mcore]
 mode=master
 
 [core $cores]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/pod-rapid.yaml b/VNFs/DPPD-PROX/helper-scripts/rapid/pod-rapid.yaml
index fed57db2..6d5e8205 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/pod-rapid.yaml
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/pod-rapid.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   containers:
   - name: pod-rapid
-    image: localhost:5000/prox_slim:latest
+    image: opnfv/rapid:latest
     imagePullPolicy: Always
     securityContext:
       capabilities:
@@ -19,9 +19,12 @@ spec:
       requests:
         hugepages-2Mi: 512Mi
         memory: 1Gi
+        cpu: 8
         intel.com/intel_sriov_vfio: '1'
       limits:
         hugepages-2Mi: 512Mi
+        memory: 1Gi
+        cpu: 8
         intel.com/intel_sriov_vfio: '1'
   volumes:
   - name: hugepages
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid.pods b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid.pods
index f6908724..f5681397 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid.pods
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid.pods
@@ -15,7 +15,7 @@
 ##
 
 [DEFAULT]
-total_number_of_pods=3
+total_number_of_pods=2
 
 [POD1]
 nodeSelector_hostname=k8s-node1
@@ -26,8 +26,3 @@ dp_subnet=24
 nodeSelector_hostname=k8s-node2
 dp_ip=192.168.30.12
 dp_subnet=24
-
-[POD3]
-nodeSelector_hostname=k8s-node2
-dp_ip=192.168.30.13
-dp_subnet=24
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py
index eb611bf6..074d4f7e 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py
@@ -81,6 +81,24 @@ class RapidGeneratorMachine(RapidMachine):
         return (self.machine_params['gencores'] +
                 self.machine_params['latcores'])
 
+    def remap_all_cpus(self):
+        """Convert relative cpu ids for different parameters (gencores, latcores)
+        """
+        super().remap_all_cpus()
+
+        if self.cpu_mapping is None:
+            return
+
+        if 'gencores' in self.machine_params.keys():
+            cpus_remapped = super().remap_cpus(self.machine_params['gencores'])
+            RapidLog.debug('{} ({}): gencores {} remapped to {}'.format(self.name, self.ip, self.machine_params['gencores'], cpus_remapped))
+            self.machine_params['gencores'] = cpus_remapped
+
+        if 'latcores' in self.machine_params.keys():
+            cpus_remapped = super().remap_cpus(self.machine_params['latcores'])
+            RapidLog.debug('{} ({}): latcores {} remapped to {}'.format(self.name, self.ip, self.machine_params['latcores'], cpus_remapped))
+            self.machine_params['latcores'] = cpus_remapped
+
     def generate_lua(self, vim, prox_config_file):
         appendix = 'gencores="%s"\n'% ','.join(map(str,
             self.machine_params['gencores']))
@@ -109,6 +127,8 @@ class RapidGeneratorMachine(RapidMachine):
         # Start the generator with the -e option so that the cores don't
         # start automatically
         super().start_prox('-e')
+        if self.vim in ['kubernetes']:
+            self.remap_all_cpus()
 
     def set_generator_speed(self, speed):
         # The assumption is that we only use task 0 for generating
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py
index d9e18b09..fb96760e 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py
@@ -49,6 +49,7 @@ class RapidMachine(object):
                 break
         self.machine_params = machine_params
         self.vim = vim
+        self.cpu_mapping = None
 
     def __del__(self):
         if ((not self.configonly) and self.machine_params['prox_socket']):
@@ -58,6 +59,62 @@ class RapidMachine(object):
     def get_cores(self):
         return (self.machine_params['cores'])
 
+    def expand_cpuset(self, cpuset):
+        """Expand cpuset provided as comma-separated list of CPU numbers and
+        CPU ranges of numbers. For more information please see
+        https://man7.org/linux/man-pages/man7/cpuset.7.html
+        """
+        cpuset_expanded = []
+        for cpu in cpuset.split(','):
+            if '-' in cpu:
+                cpu_range = cpu.split('-')
+                cpuset_expanded += range(int(cpu_range[0]), int(cpu_range[1]) + 1)
+            else:
+                cpuset_expanded.append(int(cpu))
+        return cpuset_expanded
+
+    def read_cpuset(self):
+        """Read list of cpus on which we allowed to execute
+        """
+        cmd = 'cat /sys/fs/cgroup/cpuset/cpuset.cpus'
+        cpuset_cpus = self._client.run_cmd(cmd).decode().rstrip()
+        RapidLog.debug('{} ({}): Allocated cpuset: {}'.format(self.name, self.ip, cpuset_cpus))
+        self.cpu_mapping = self.expand_cpuset(cpuset_cpus)
+        RapidLog.debug('{} ({}): Expanded cpuset: {}'.format(self.name, self.ip, self.cpu_mapping))
+
+        # Log CPU core mapping for user information
+        cpu_mapping_str = ''
+        for i in range(len(self.cpu_mapping)):
+            cpu_mapping_str = cpu_mapping_str + '[' + str(i) + '->' + str(self.cpu_mapping[i]) + '], '
+        cpu_mapping_str = cpu_mapping_str[:-2]
+        RapidLog.debug('{} ({}): CPU mapping: {}'.format(self.name, self.ip, cpu_mapping_str))
+
+    def remap_cpus(self, cpus):
+        """Convert relative cpu ids provided as function parameter to match
+        cpu ids from allocated list
+        """
+        cpus_remapped = []
+        for cpu in cpus:
+            cpus_remapped.append(self.cpu_mapping[cpu])
+        return cpus_remapped
+
+    def remap_all_cpus(self):
+        """Convert relative cpu ids for different parameters (mcore, cores)
+        """
+        if self.cpu_mapping is None:
+            RapidLog.debug('{} ({}): cpu mapping is not defined! Please check the configuration!'.format(self.name, self.ip))
+            return
+
+        if 'mcore' in self.machine_params.keys():
+            cpus_remapped = self.remap_cpus(self.machine_params['mcore'])
+            RapidLog.debug('{} ({}): mcore {} remapped to {}'.format(self.name, self.ip, self.machine_params['mcore'], cpus_remapped))
+            self.machine_params['mcore'] = cpus_remapped
+
+        if 'cores' in self.machine_params.keys():
+            cpus_remapped = self.remap_cpus(self.machine_params['cores'])
+            RapidLog.debug('{} ({}): cores {} remapped to {}'.format(self.name, self.ip, self.machine_params['cores'], cpus_remapped))
+            self.machine_params['cores'] = cpus_remapped
+
     def devbind(self):
         # Script to bind the right network interface to the poll mode driver
         for index, dp_port in enumerate(self.dp_ports, start = 1):
@@ -86,6 +143,8 @@ class RapidMachine(object):
                 LuaFile.write("eal=\"--socket-mem=512,0 --file-prefix %s --pci-whitelist %s\"\n" % (self.name, self.machine_params['dp_pci_dev']))
             else:
                 LuaFile.write("eal=\"\"\n")
+            if 'mcore' in self.machine_params.keys():
+                LuaFile.write('mcore="%s"\n'% ','.join(map(str, self.machine_params['mcore'])))
             if 'cores' in self.machine_params.keys():
                 LuaFile.write('cores="%s"\n'% ','.join(map(str, self.machine_params['cores'])))
             if 'ports' in self.machine_params.keys():
@@ -105,6 +164,9 @@ class RapidMachine(object):
             self._client.connect()
             if self.vim in ['OpenStack']:
                 self.devbind()
+            if self.vim in ['kubernetes']:
+                self.read_cpuset()
+                self.remap_all_cpus()
             _, prox_config_file_name = os.path.split(self.machine_params['config_file'])
             self.generate_lua(self.vim, self.machine_params['config_file'])
             self._client.scp_put(self.machine_params['config_file'], '{}/{}'.format(self.rundir, prox_config_file_name))
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
index 136bc273..c1ab36a0 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
@@ -120,7 +120,7 @@ class RapidConfigParser(object):
             for option in options:
                 if option in ['prox_socket','prox_launch_exit','monitor']:
                     machine[option] = testconfig.getboolean(section, option)
-                elif option in ['cores', 'gencores','latcores']:
+                elif option in ['mcore', 'cores', 'gencores','latcores']:
                     machine[option] = ast.literal_eval(testconfig.get(
                         section, option))
                 elif option in ['bucket_size_exp']:
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput.test
index 2630e5cb..19d62fac 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput.test
@@ -24,6 +24,7 @@ lat_percentile = 99
 name = Generator
 config_file = configs/gen.cfg
 dest_vm = 2
+mcore = [0]
 gencores = [1]
 latcores = [3]
 #bucket_size_exp = 12
@@ -31,6 +32,7 @@ latcores = [3]
 [TestM2]
 name = Swap
 config_file = configs/swap.cfg
+mcore = [0]
 cores = [1]
 
 [test1]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_64B_64F.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_64B_64F.test
index 297eff86..66767a09 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_64B_64F.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_64B_64F.test
@@ -24,6 +24,7 @@ lat_percentile = 99
 name = Generator
 config_file = configs/gen.cfg
 dest_vm = 2
+mcore = [0]
 gencores = [1]
 latcores = [3]
 #bucket_size_exp = 12
@@ -31,6 +32,7 @@ latcores = [3]
 [TestM2]
 name = Swap
 config_file = configs/swap.cfg
+mcore = [0]
 cores = [1]
 
 [test1]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_acaeab_16384F.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_acaeab_16384F.test
index 5d6692c3..31d19bf7 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_acaeab_16384F.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_acaeab_16384F.test
@@ -24,6 +24,7 @@ lat_percentile = 99
 name = Generator
 config_file = configs/gen.cfg
 dest_vm = 2
+mcore = [0]
 gencores = [1]
 latcores = [3]
 #bucket_size_exp = 12
@@ -31,6 +32,7 @@ latcores = [3]
 [TestM2]
 name = Swap
 config_file = configs/swap.cfg
+mcore = [0]
 cores = [1]
 
 [test1]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009ipV6.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009ipV6.test
index 28c4f922..a19289f3 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009ipV6.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009ipV6.test
@@ -24,6 +24,7 @@ lat_percentile = 99
 name = Generator
 config_file = configs/genv6.cfg
 dest_vm = 2
+mcore = [0]
 gencores = [1]
 latcores = [3]
 #bucket_size_exp = 12
@@ -31,6 +32,7 @@ latcores = [3]
 [TestM2]
 name = Swap
 config_file = configs/swapv6.cfg
+mcore = [0]
 cores = [1]
 #prox_socket = true
 #prox_launch_exit = true
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/bare.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/bare.test
index 9cfc490f..9aab3fd0 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/bare.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/bare.test
@@ -23,12 +23,14 @@ total_number_of_test_machines = 2
 name = Generator
 config_file = configs/l2gen_bare.cfg
 dest_vm = 2
+mcore = [0]
 gencores = [1]
 latcores = [3]
 
 [TestM2]
 name = Swap
 config_file = configs/l2swap.cfg
+mcore = [0]
 cores = [1]
 
 [test1]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/basicrapid.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/basicrapid.test
index 6eb56a4d..76c1fa07 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/basicrapid.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/basicrapid.test
@@ -24,6 +24,7 @@ lat_percentile = 99
 name = Generator
 config_file = configs/gen.cfg
 dest_vm = 2
+mcore = [0]
 gencores = [1]
 latcores = [3]
 #bucket_size_exp = 12
@@ -31,6 +32,7 @@ latcores = [3]
 [TestM2]
 name = Swap
 config_file = configs/swap.cfg
+mcore = [0]
 cores = [1]
 #prox_socket = true
 #prox_launch_exit = true
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/corestats.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/corestats.test
index 4e2a4457..1873c386 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/corestats.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/corestats.test
@@ -22,6 +22,7 @@ total_number_of_test_machines = 1
 [TestM1]
 name = Swap
 config_file = configs/swap.cfg
+mcore = [0]
 cores = [1]
 
 [test1]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/impair.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/impair.test
index 88dc5998..865394fb 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/impair.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/impair.test
@@ -24,18 +24,21 @@ name = Generator
 config_file = configs/gen_gw.cfg
 gw_vm = 2
 dest_vm = 3
+mcore = [0]
 gencores = [1]
 latcores = [3]
 
 [TestM2]
 name = ImpairGW
 config_file = configs/impair.cfg
+mcore = [0]
 cores = [1]
 monitor = False
 
 [TestM3]
 name = Swap
 config_file = configs/swap.cfg
+mcore = [0]
 cores = [1]
 
 [test1]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/increment_till_fail.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/increment_till_fail.test
index 31aef911..7cee0a30 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/increment_till_fail.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/increment_till_fail.test
@@ -24,6 +24,7 @@ lat_percentile = 99
 name = Generator
 config_file = configs/gen.cfg
 dest_vm = 2
+mcore = [0]
 gencores = [1]
 latcores = [3]
 #bucket_size_exp = 12
@@ -31,6 +32,7 @@ latcores = [3]
 [TestM2]
 name = Swap
 config_file = configs/swap.cfg
+mcore = [0]
 cores = [1]
 #prox_socket = true
 #prox_launch_exit = true
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/ipv6.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/ipv6.test
index 632aa7b6..e973bc9f 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/ipv6.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/ipv6.test
@@ -25,6 +25,7 @@ ipv6 = True
 name = Generator
 config_file = configs/genv6.cfg
 dest_vm = 2
+mcore = [0]
 gencores = [1]
 latcores = [3]
 #bucket_size_exp = 12
@@ -32,6 +33,7 @@ latcores = [3]
 [TestM2]
 name = Swap
 config_file = configs/swapv6.cfg
+mcore = [0]
 cores = [1]
 #prox_socket = true
 #prox_launch_exit = true
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/irq.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/irq.test
index 7879a098..77c9cbec 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/irq.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/irq.test
@@ -22,12 +22,14 @@ total_number_of_test_machines = 2
 [TestM1]
 name = InterruptTestMachine1
 config_file = configs/irq.cfg
+mcore = [0]
 cores = [1,2,3]
 monitor = False
 
 [TestM2]
 name = InterruptTestMachine2
 config_file = configs/irq.cfg
+mcore = [0]
 cores = [1,2,3]
 monitor = False
 
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l2framerate.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l2framerate.test
index c5d9c25f..062772ff 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l2framerate.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l2framerate.test
@@ -23,12 +23,14 @@ total_number_of_test_machines = 2
 name = Generator
 config_file = configs/l2gen.cfg
 dest_vm = 2
+mcore = [0]
 gencores = [1]
 latcores = [3]
 
 [TestM2]
 name = Swap
 config_file = configs/l2swap.cfg
+mcore = [0]
 cores = [1]
 
 [test1]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l2zeroloss.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l2zeroloss.test
index 4419430d..30b807f2 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l2zeroloss.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l2zeroloss.test
@@ -23,12 +23,14 @@ total_number_of_test_machines = 2
 name = Generator
 config_file = configs/l2gen.cfg
 dest_vm = 2
+mcore = [0]
 gencores = [1]
 latcores = [3]
 
 [TestM2]
 name = Swap
 config_file = configs/l2swap.cfg
+mcore = [0]
 cores = [1]
 
 [test1]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l3framerate.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l3framerate.test
index 4edf4f77..04aa4732 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l3framerate.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l3framerate.test
@@ -23,12 +23,14 @@ total_number_of_test_machines = 2
 name = Generator
 config_file = configs/gen.cfg
 dest_vm = 2
+mcore = [0]
 gencores = [1]
 latcores = [3]
 
 [TestM2]
 name = Swap
 config_file = configs/swap.cfg
+mcore = [0]
 cores = [1]
 
 [test1]
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/portstats.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/portstats.test
index 47567228..fd2e1789 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/portstats.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/portstats.test
@@ -22,6 +22,7 @@ total_number_of_test_machines = 1
 [TestM1]
 name = Swap
 config_file = configs/swap.cfg
+mcore = [0]
 cores = [1]
 ports = [0]
 
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/secgw.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/secgw.test
index 4cd57aa9..509727ad 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/secgw.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/secgw.test
@@ -24,6 +24,7 @@ name = Generator
 config_file = configs/gen_gw.cfg
 dest_vm = 3
 gw_vm = 2
+mcore = [0]
 gencores = [1]
 latcores = [3]
 
@@ -31,11 +32,13 @@ latcores = [3]
 name = GW1
 config_file = configs/secgw1.cfg
 dest_vm = 3
+mcore = [0]
 cores = [1]
 
 [TestM3]
 name = GW2
 config_file = configs/secgw2.cfg
+mcore = [0]
 cores = [1]
 
 [test1]