diff options
Diffstat (limited to 'VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py')
| -rw-r--r-- | VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py index b95f4ff8..048895c1 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py @@ -121,21 +121,12 @@ class RapidMachine(object): 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 - - if 'altcores' in self.machine_params.keys(): - cpus_remapped = self.remap_cpus(self.machine_params['altcores']) - RapidLog.debug('{} ({}): altcores {} remapped to {}'.format(self.name, self.ip, self.machine_params['altcores'], cpus_remapped)) - self.machine_params['altcores'] = cpus_remapped + for key in self.machine_params.keys(): + if 'core' in key: + cpus_remapped = self.remap_cpus(self.machine_params[key]) + RapidLog.debug('{} ({}): {} {} remapped to {}'.format(self.name, self.ip, key, self.machine_params[key], cpus_remapped)) + self.machine_params[key] = cpus_remapped + return def devbind(self): # Script to bind the right network interface to the poll mode driver @@ -180,15 +171,11 @@ class RapidMachine(object): LuaFile.write(eal_line) 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 'altcores' in self.machine_params.keys(): - LuaFile.write('altcores="%s"\n'% ','.join(map(str, - self.machine_params['altcores']))) + for key in self.machine_params.keys(): + if 'core' in key: + cores = ','.join(map(str,self.machine_params[key])) + cores = (f'"{cores}"') + LuaFile.write('{}={}\n'.format(key,cores)) if 'ports' in self.machine_params.keys(): LuaFile.write('ports="%s"\n'% ','.join(map(str, self.machine_params['ports']))) |