summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Herrero <guillermo.herrero@enea.com>2018-10-18 07:00:20 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-18 07:00:20 +0000
commit9c0e6d81d2302cbbfa5860a846211ee5807a6d98 (patch)
treeacd69f38a9c9d1c1ff0859964f37e8c2c58b5b15
parent504ca267fc2c17326ea31a280c4d6d91e2914e11 (diff)
parentc1b4668572c9586f46a151aa0ff44513986a16d1 (diff)
Merge "[arm pod5] Added new NIC info"
-rw-r--r--labs/arm/idf-pod5.yaml18
-rw-r--r--labs/arm/pod5.yaml16
2 files changed, 29 insertions, 5 deletions
diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml
index 6aaefb7..c7016aa 100644
--- a/labs/arm/idf-pod5.yaml
+++ b/labs/arm/idf-pod5.yaml
@@ -35,7 +35,7 @@ idf:
network: 10.2.0.0
mask: 24
private:
- interface: 1
+ interface: 2
vlan: 2185-2200
network: 10.1.0.0
mask: 24
@@ -77,10 +77,18 @@ idf:
busaddr: *busaddr
- interfaces: *interfaces
busaddr: *busaddr
- - interfaces: *interfaces
- busaddr: *busaddr
- - interfaces: *interfaces
- busaddr: *busaddr
+ - interfaces: &interfaces_dual
+ - 'eth0'
+ - 'eth1'
+ - 'enp1s0f0'
+ - 'enp1s0f1'
+ busaddr: &busaddr_dual
+ - 'e0700000.xgmac'
+ - 'e0900000.xgmac'
+ - '0000:01:00.0'
+ - '0000:01:00.1'
+ - interfaces: *interfaces_dual
+ busaddr: *busaddr_dual
reclass:
node:
- compute_params: &compute_params
diff --git a/labs/arm/pod5.yaml b/labs/arm/pod5.yaml
index 3a55678..35d4601 100644
--- a/labs/arm/pod5.yaml
+++ b/labs/arm/pod5.yaml
@@ -156,6 +156,14 @@ nodes:
speed: 10gb
features: ''
name: 'nic2'
+ - mac_address: "ac:1f:6b:8a:82:84"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic3'
+ - mac_address: "ac:1f:6b:8a:82:85"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic4'
############################################################################
- name: softiron-7
node: *nodeparams
@@ -173,3 +181,11 @@ nodes:
speed: 10gb
features: ''
name: 'nic2'
+ - mac_address: "ac:1f:6b:8a:82:a0"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic3'
+ - mac_address: "ac:1f:6b:8a:82:a1"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic4'