From c7eb2002bcd007520309feb3e11a26ff847a4e05 Mon Sep 17 00:00:00 2001 From: Gabriel Ganne Date: Mon, 27 Nov 2017 15:38:53 +0100 Subject: add new topology parameter: arch if unset, arch variable will default to "x86_64" * Note on "arm64" vs "aarch64" debian-based uses arm64 rhel-based uses aarch64 qemu binaries of both distribs uses aarch64 dpdk uses arm64 vpp uses aarch64 python machine modules uses aarch64 => prefer aarch64 to use the same nomenclature as vpp * add ARCH argument to: init_dpdk.sh, install_dpdk.sh, run_l2fwd.sh, install_tldk.sh, run_tldk.sh. default to x86_64 converts "aarch64" if needed for dpdk naming convention * fixed terminal end detection to allow "~]# " add dut node arch as param to all robot set bin calls * add --target-list flag to qemu_build.sh defaults to x86_64-softmmu * add arch flag to all the topology files * topologies/available/ (and example file) * resources/tools/virl/topologies/ * set _qemu_bin path using node['arch'] in qemu_set_node() Change-Id: If46d88d064d213d3e4c6fc584bb8e0d4b6428cb8 Signed-off-by: Gabriel Ganne --- resources/libraries/python/VatExecutor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources/libraries/python/VatExecutor.py') diff --git a/resources/libraries/python/VatExecutor.py b/resources/libraries/python/VatExecutor.py index de6baababe..c50fdbaf9a 100644 --- a/resources/libraries/python/VatExecutor.py +++ b/resources/libraries/python/VatExecutor.py @@ -304,7 +304,7 @@ class VatTerminal(object): """ __VAT_PROMPT = ("vat# ", ) - __LINUX_PROMPT = (":~$ ", "~]$ ") + __LINUX_PROMPT = (":~$ ", "~]$ ", "~]# ") def __init__(self, node, json_param=True): json_text = ' json' if json_param else '' -- cgit 1.2.3-korg