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/tools/virl/topologies/double-ring-nested.xenial.yaml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'resources/tools/virl/topologies/double-ring-nested.xenial.yaml') diff --git a/resources/tools/virl/topologies/double-ring-nested.xenial.yaml b/resources/tools/virl/topologies/double-ring-nested.xenial.yaml index 00b297c7f1..d35e24b777 100644 --- a/resources/tools/virl/topologies/double-ring-nested.xenial.yaml +++ b/resources/tools/virl/topologies/double-ring-nested.xenial.yaml @@ -10,6 +10,7 @@ nodes: TG: type: TG host: "{topology[tg1][nic-management][ip-addr]}" + arch: x86_64 port: 22 username: cisco priv_key: | @@ -38,6 +39,7 @@ nodes: DUT1: type: DUT host: "{topology[sut1][nic-management][ip-addr]}" + arch: x86_64 port: 22 username: cisco honeycomb: @@ -67,6 +69,7 @@ nodes: DUT2: type: DUT host: "{topology[sut2][nic-management][ip-addr]}" + arch: x86_64 port: 22 username: cisco honeycomb: -- cgit 1.2.3-korg