From fa70d3f001d9eaf97984bf755a192b700d292b38 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sat, 13 Jan 2018 22:18:29 +0100
Subject: [PDF] zte-pod*: Fix spec deviations

- add dummy address/mac_address for jumpserver remote_management;
- add 'name: nicN' to jumpserver & node interfaces;
- zte-pod{2,9}: Fix disk_rotation out-of-enum: s/10500/10000/;

Change-Id: I9548d48efb95226d888981e00df98db738d62d9d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 labs/zte/pod1.yaml | 31 +++++++++++++++++++++++++++++--
 labs/zte/pod2.yaml | 33 ++++++++++++++++++++++++++++++---
 labs/zte/pod3.yaml | 26 ++++++++++++++++++++++++--
 labs/zte/pod9.yaml | 14 +++++++++++---
 4 files changed, 94 insertions(+), 10 deletions(-)

(limited to 'labs')

diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml
index 700c5d0c..1b4d1ad6 100644
--- a/labs/zte/pod1.yaml
+++ b/labs/zte/pod1.yaml
@@ -71,12 +71,14 @@ jumphost:
       4IoqgBAYdFlBw90sTOBqrhoHmRbr]
   remote_management:
     <<: *remote_params
-    address:
-    mac_address:
+    # Not used, fill in with dummy values
+    address: 0.0.0.0
+    mac_address: "00:00:00:00:00:00"
   interfaces:
     - mac_address: "74:4a:a4:00:91:b3"
       speed: 1gb
       address: 10.20.6.1
+      name: 'nic1'
 nodes:
   - name: pod1-node1
     node: &nodeparas
@@ -107,18 +109,23 @@ nodes:
       - mac_address: "74:4a:a4:00:cf:dc"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:b0:e1"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:b0:e2"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:b0:dd"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:b0:de"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod1-node2
     node: *nodeparas
     disks: *disks
@@ -130,18 +137,23 @@ nodes:
       - mac_address: "74:4a:a4:00:ce:ce"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:ad"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:ae"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d6:a9"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d6:aa"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod1-node3
     node: *nodeparas
     disks: *disks
@@ -153,18 +165,23 @@ nodes:
       - mac_address: "74:4a:a4:00:cf:58"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:ab"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:ac"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d6:af"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d6:b0"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod1-node4
     node: *nodeparas
     disks: *disks
@@ -176,18 +193,23 @@ nodes:
       - mac_address: "74:4a:a4:00:49:84"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:b1:a5"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:b1:a6"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:b1:b1"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:b1:b2"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod1-node5
     node: *nodeparas
     disks: *disks
@@ -199,15 +221,20 @@ nodes:
       - mac_address: "74:4a:a4:00:ce:c2"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:8d"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:8e"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d6:9b"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d6:9c"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml
index 3a7db7c8..f51d7f79 100644
--- a/labs/zte/pod2.yaml
+++ b/labs/zte/pod2.yaml
@@ -33,7 +33,7 @@ jumphost:
       disk_capacity: 600G
       disk_type: hdd
       disk_interface: sas
-      disk_rotation: 10500
+      disk_rotation: 10000
     - name: 'disk2'
       disk_capacity: 4000G
       disk_type: hdd
@@ -72,12 +72,14 @@ jumphost:
       2+PxgBC5OzeXar0HSyATMD/Z7K0x]
   remote_management:
     <<: *remote_params
-    address:
-    mac_address:
+    # Not used, fill in with dummy values
+    address: 0.0.0.0
+    mac_address: "00:00:00:00:00:00"
   interfaces:
     - mac_address: "74:4a:a4:00:91:18"
       speed: 1gb
       address: 10.20.7.1
+      name: 'nic1'
 nodes:
   - name: pod2-node1
     node: &nodeparas
@@ -108,18 +110,23 @@ nodes:
       - mac_address: "74:4a:a4:00:cd:72"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:b0:e9"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:b0:ea"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:b0:eb"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:b0:ec"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod2-node2
     node: *nodeparas
     disks: *disks
@@ -131,18 +138,23 @@ nodes:
       - mac_address: "74:4a:a4:00:ca:cc"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:a3"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:a4"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d6:99"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d6:9a"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod2-node3
     node: *nodeparas
     disks: *disks
@@ -154,18 +166,23 @@ nodes:
       - mac_address: "74:4a:a4:00:cd:12"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:9d"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:9e"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d3:15"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d3:16"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod2-node4
     node: *nodeparas
     disks: *disks
@@ -177,18 +194,23 @@ nodes:
       - mac_address: "74:4a:a4:00:cf:40"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:a5"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:a6"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d6:a7"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d6:a8"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod2-node5
     node: *nodeparas
     disks: *disks
@@ -200,15 +222,20 @@ nodes:
       - mac_address: "74:4a:a4:00:ce:d4"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d2:c3"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d2:c4"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d2:c1"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d2:c2"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
diff --git a/labs/zte/pod3.yaml b/labs/zte/pod3.yaml
index a6aa217f..063b7dfc 100644
--- a/labs/zte/pod3.yaml
+++ b/labs/zte/pod3.yaml
@@ -71,12 +71,14 @@ jumphost:
       ZIpvgBCa0QYVwRsEcqVofk2pmPKq]
   remote_management:
     <<: *remote_params
-    address:
-    mac_address:
+    # Not used, fill in with dummy values
+    address: 0.0.0.0
+    mac_address: "00:00:00:00:00:00"
   interfaces:
     - mac_address: "74:4a:a4:00:21:0c"
       speed: 1gb
       address: 10.20.0.1
+      name: 'nic1'
 nodes:
   - name: pod3-node1
     node: &nodeparas
@@ -107,15 +109,19 @@ nodes:
       - mac_address: "74:4a:a4:00:0b:85"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:0b:86"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:0b:87"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:0b:88"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
   - name: pod3-node2
     node: *nodeparas
     disks: *disks
@@ -127,15 +133,19 @@ nodes:
       - mac_address: "74:4a:a4:00:5c:5d"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:5c:5e"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:5c:5f"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:5c:60"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
   - name: pod3-node3
     node: *nodeparas
     disks: *disks
@@ -147,15 +157,19 @@ nodes:
       - mac_address: "74:4a:a4:00:5c:35"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:5c:36"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:5c:37"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:5c:38"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
   - name: pod3-node4
     node: *nodeparas
     disks: *disks
@@ -167,15 +181,19 @@ nodes:
       - mac_address: "74:4a:a4:00:5c:69"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:5c:6a"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:5c:6b"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:5c:6c"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
   - name: pod3-node5
     node: *nodeparas
     disks: *disks
@@ -187,12 +205,16 @@ nodes:
       - mac_address: "74:4a:a4:00:5c:6d"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:5c:6e"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:5c:6f"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:5c:70"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
diff --git a/labs/zte/pod9.yaml b/labs/zte/pod9.yaml
index 1045fb0e..76d4aa9e 100644
--- a/labs/zte/pod9.yaml
+++ b/labs/zte/pod9.yaml
@@ -32,7 +32,7 @@ jumphost:
       disk_capacity: 107G
       disk_type: hdd
       disk_interface: sas
-      disk_rotation: 10500
+      disk_rotation: 10000
   os: CentOS-7
   remote_params: &remote_params
     type: ipmi
@@ -60,12 +60,14 @@ jumphost:
       WSgUgBDYj5D5l/12XoUNXxGDebYT]
   remote_management:
     <<: *remote_params
-    address:
-    mac_address:
+    # Not used, fill in with dummy values
+    address: 0.0.0.0
+    mac_address: "00:00:00:00:00:00"
   interfaces:
     - mac_address: "00:1b:21:89:30:87"
       speed: 10gb
       address: 10.20.7.1
+      name: 'nic1'
 nodes:
   - name: pod9-node1
     node: &nodeparas
@@ -91,9 +93,11 @@ nodes:
       - mac_address: "74:4a:a4:03:bf:96"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:05:ee:86"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
   - name: pod9-node2
     node: *nodeparas
     disks: &disks
@@ -115,9 +119,11 @@ nodes:
       - mac_address: "74:4a:a4:03:bf:c6"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:05:ee:9a"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
   - name: pod9-node3
     node: *nodeparas
     disks: *disks
@@ -129,6 +135,8 @@ nodes:
       - mac_address: "74:4a:a4:03:bf:fe"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:05:ee:7e"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
-- 
cgit 1.2.3-korg