aboutsummaryrefslogtreecommitdiffstats
path: root/topologies
diff options
context:
space:
mode:
authorGabriel Ganne <gabriel.ganne@enea.com>2017-11-27 15:38:53 +0100
committerJan Gelety <jgelety@cisco.com>2018-01-10 15:42:43 +0100
commitc7eb2002bcd007520309feb3e11a26ff847a4e05 (patch)
tree84ea1d5513da1bb0f4e078aec87b44cf653a7e7c /topologies
parenta95c54b7821596402e0aa7136cd7d1de71a5b187 (diff)
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 <gabriel.ganne@enea.com>
Diffstat (limited to 'topologies')
-rw-r--r--topologies/available/3_node_hw_topo1.yaml.example3
-rw-r--r--topologies/available/lf_testbed1.yaml3
-rw-r--r--topologies/available/lf_testbed2.yaml3
-rw-r--r--topologies/available/lf_testbed3.yaml3
-rw-r--r--topologies/available/vagrant.yaml3
-rw-r--r--topologies/available/virl.yaml3
6 files changed, 18 insertions, 0 deletions
diff --git a/topologies/available/3_node_hw_topo1.yaml.example b/topologies/available/3_node_hw_topo1.yaml.example
index 01fc9aae31..ed817ffb4f 100644
--- a/topologies/available/3_node_hw_topo1.yaml.example
+++ b/topologies/available/3_node_hw_topo1.yaml.example
@@ -25,6 +25,7 @@ nodes:
TG:
type: TG
host: 10.0.0.3
+ arch: x86_64
port: 22
username: lab
password: lab
@@ -40,6 +41,7 @@ nodes:
DUT1:
type: DUT
host: 10.0.0.1
+ arch: x86_64
port: 22
username: lab
password: lab
@@ -55,6 +57,7 @@ nodes:
DUT2:
type: DUT
host: 10.0.0.2
+ arch: x86_64
port: 22
username: lab
password: lab
diff --git a/topologies/available/lf_testbed1.yaml b/topologies/available/lf_testbed1.yaml
index 571a76481b..fcd9208a38 100644
--- a/topologies/available/lf_testbed1.yaml
+++ b/topologies/available/lf_testbed1.yaml
@@ -11,6 +11,7 @@ nodes:
type: TG
subtype: TREX
host: "10.30.51.16"
+ arch: x86_64
port: 22
username: testuser
password: Csit1234
@@ -114,6 +115,7 @@ nodes:
DUT1:
type: DUT
host: "10.30.51.17"
+ arch: x86_64
port: 22
username: testuser
password: Csit1234
@@ -198,6 +200,7 @@ nodes:
DUT2:
type: DUT
host: "10.30.51.18"
+ arch: x86_64
port: 22
username: testuser
password: Csit1234
diff --git a/topologies/available/lf_testbed2.yaml b/topologies/available/lf_testbed2.yaml
index c86cc8b477..d69f861969 100644
--- a/topologies/available/lf_testbed2.yaml
+++ b/topologies/available/lf_testbed2.yaml
@@ -11,6 +11,7 @@ nodes:
type: TG
subtype: TREX
host: "10.30.51.20"
+ arch: x86_64
port: 22
username: testuser
password: Csit1234
@@ -114,6 +115,7 @@ nodes:
DUT1:
type: DUT
host: "10.30.51.21"
+ arch: x86_64
port: 22
username: testuser
password: Csit1234
@@ -198,6 +200,7 @@ nodes:
DUT2:
type: DUT
host: "10.30.51.22"
+ arch: x86_64
port: 22
username: testuser
password: Csit1234
diff --git a/topologies/available/lf_testbed3.yaml b/topologies/available/lf_testbed3.yaml
index 8de90ff53b..e678c87d64 100644
--- a/topologies/available/lf_testbed3.yaml
+++ b/topologies/available/lf_testbed3.yaml
@@ -11,6 +11,7 @@ nodes:
type: TG
subtype: TREX
host: "10.30.51.24"
+ arch: x86_64
port: 22
username: testuser
password: Csit1234
@@ -114,6 +115,7 @@ nodes:
DUT1:
type: DUT
host: "10.30.51.25"
+ arch: x86_64
port: 22
username: testuser
password: Csit1234
@@ -198,6 +200,7 @@ nodes:
DUT2:
type: DUT
host: "10.30.51.26"
+ arch: x86_64
port: 22
username: testuser
password: Csit1234
diff --git a/topologies/available/vagrant.yaml b/topologies/available/vagrant.yaml
index a5a5ed511e..b2a444efc9 100644
--- a/topologies/available/vagrant.yaml
+++ b/topologies/available/vagrant.yaml
@@ -10,6 +10,7 @@ nodes:
TG:
type: TG
host: "192.168.255.100"
+ arch: x86_64
port: 22
username: csit
password: csit
@@ -47,6 +48,7 @@ nodes:
DUT1:
type: DUT
host: "192.168.255.101"
+ arch: x86_64
port: 22
username: csit
password: csit
@@ -74,6 +76,7 @@ nodes:
DUT2:
type: DUT
host: "192.168.255.102"
+ arch: x86_64
port: 22
username: csit
password: csit
diff --git a/topologies/available/virl.yaml b/topologies/available/virl.yaml
index 36d45fe754..32e929a38f 100644
--- a/topologies/available/virl.yaml
+++ b/topologies/available/virl.yaml
@@ -10,6 +10,7 @@ nodes:
TG:
type: TG
host: "10.30.51.73"
+ arch: x86_64
port: 22
username: cisco
priv_key: |
@@ -54,6 +55,7 @@ nodes:
DUT1:
type: DUT
host: "10.30.51.72"
+ arch: x86_64
port: 22
username: cisco
priv_key: |
@@ -96,6 +98,7 @@ nodes:
DUT2:
type: DUT
host: "10.30.51.71"
+ arch: x86_64
port: 22
username: cisco
priv_key: |