diff options
| -rw-r--r-- | conf/10_custom.conf | 12 | ||||
| -rwxr-xr-x | vsperf | 22 |
2 files changed, 32 insertions, 2 deletions
diff --git a/conf/10_custom.conf b/conf/10_custom.conf index 95118753..eafa06bb 100644 --- a/conf/10_custom.conf +++ b/conf/10_custom.conf @@ -13,8 +13,16 @@ # limitations under the License. # traffic generator to use in tests -RTE_SDK = '' # full path to DPDK src dir -OVS_DIR = '' # full path to Open vSwitch src dir +OVS_DIR_VANILLA = '~/src_vanilla/ovs/' +QEMU_DIR_VANILLA = '~/src_vanilla/qemu/' + +RTE_SDK_CUSE = '~/src_cuse/dpdk/' +OVS_DIR_CUSE = '~/src_cuse/ovs/' +QEMU_DIR_CUSE = '~/src_cuse/qemu/' + +RTE_SDK_USER = '~/src/dpdk/' +OVS_DIR_USER = '~/src/ovs/' +QEMU_DIR_USER = '~/src/qemu/' RTE_TARGET = '' # the relevant DPDK build target # traffic generator to use in tests @@ -388,6 +388,28 @@ def main(): logger.error("No tests matched --test option or positional args. Done.") sys.exit(1) + # set dpdk, ovs and qemu paths accorfing to VNF and VSWITCH + if settings.getValue('VSWITCH').endswith('Vanilla'): + # settings paths for Vanilla + settings.setValue('OVS_DIR', (settings.getValue('OVS_DIR_VANILLA'))) + settings.setValue('QEMU_DIR', (settings.getValue('QEMU_DIR_VANILLA'))) + elif settings.getValue('VSWITCH').endswith('Vhost'): + if settings.getValue('VNF').endswith('Cuse'): + # settings paths for Cuse + settings.setValue('RTE_SDK', (settings.getValue('RTE_SDK_CUSE'))) + settings.setValue('OVS_DIR', (settings.getValue('OVS_DIR_CUSE'))) + settings.setValue('QEMU_DIR', (settings.getValue('QEMU_DIR_CUSE'))) + else: + # settings paths for VhostUser + settings.setValue('RTE_SDK', (settings.getValue('RTE_SDK_USER'))) + settings.setValue('OVS_DIR', (settings.getValue('OVS_DIR_USER'))) + settings.setValue('QEMU_DIR', (settings.getValue('QEMU_DIR_USER'))) + else: + # default - set to VHOST USER but can be changed during enhancement + settings.setValue('RTE_SDK', (settings.getValue('RTE_SDK_USER'))) + settings.setValue('OVS_DIR', (settings.getValue('OVS_DIR_USER'))) + settings.setValue('QEMU_DIR', (settings.getValue('QEMU_DIR_USER'))) + # create results directory if not os.path.exists(results_path): logger.info("Creating result directory: " + results_path) |