From 5e2d89256f9894ed794d05b750d9ed0208a2fcd5 Mon Sep 17 00:00:00 2001
From: Roy Tang <roy.s.tang@att.com>
Date: Thu, 29 Aug 2019 18:10:14 +0000
Subject: [PATCH] Updating seaworthy bonding

Reduce bonding from 4 nic to 2.
Rename things for clarity.

Change-Id: I71db565ef39699bfd35d8c4e6fd798b6dafd8536
---
 site/seaworthy/networks/physical/networks.yaml  |  2 +-
 site/seaworthy/profiles/hardware/dell_r720.yaml | 16 ++++++++--------
 site/seaworthy/profiles/host/cp_r720.yaml       | 16 ++++++----------
 site/seaworthy/profiles/host/dp_r720.yaml       |  8 +++-----
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/site/seaworthy/networks/physical/networks.yaml b/site/seaworthy/networks/physical/networks.yaml
index 7a8fbce50..c222eee8f 100644
--- a/site/seaworthy/networks/physical/networks.yaml
+++ b/site/seaworthy/networks/physical/networks.yaml
@@ -148,7 +148,7 @@ data:
 schema: 'drydock/NetworkLink/v1'
 metadata:
   schema: 'metadata/Document/v1'
-  name: data
+  name: bond0
   layeringDefinition:
     abstract: false
     layer: site
diff --git a/site/seaworthy/profiles/hardware/dell_r720.yaml b/site/seaworthy/profiles/hardware/dell_r720.yaml
index 9e078756e..55e134c71 100644
--- a/site/seaworthy/profiles/hardware/dell_r720.yaml
+++ b/site/seaworthy/profiles/hardware/dell_r720.yaml
@@ -32,23 +32,23 @@ data:
       # type could identify expected hardware - used for hardware manifest validation
       dev_type: 'I350 Gigabit Network Connection'
       bus_type: 'pci'
-    # enp67s0f0
-    data_nic01:
+    # enp67s0f0 - for data plane traffic
+    dp_nic01:
       address: '0000:43:00.0'
       dev_type: 'Ethernet 10G 2P X520 Adapter'
       bus_type: 'pci'
-    # enp67s0f1
-    data_nic02:
+    # enp67s0f1 - for control plane traffic
+    cp_nic01:
       address: '0000:43:00.1'
       dev_type: 'Ethernet 10G 2P X520 Adapter'
       bus_type: 'pci'
-    # enp68s0f0
-    data_nic03:
+    # enp68s0f0 - for control plane traffic
+    cp_nic02:
       address: '0000:44:00.0'
       dev_type: 'Ethernet 10G 2P X520 Adapter'
       bus_type: 'pci'
-    # enp68s0f1
-    data_nic04:
+    # enp68s0f1 - for data plane traffic
+    dp_nic02:
       address: '0000:44:00.1'
       dev_type: 'Ethernet 10G 2P X520 Adapter'
       bus_type: 'pci'
diff --git a/site/seaworthy/profiles/host/cp_r720.yaml b/site/seaworthy/profiles/host/cp_r720.yaml
index 38838904c..81806337c 100644
--- a/site/seaworthy/profiles/host/cp_r720.yaml
+++ b/site/seaworthy/profiles/host/cp_r720.yaml
@@ -32,12 +32,10 @@ data:
       networks:
         - pxe
     bond0:
-      device_link: data
+      device_link: bond0
       slaves:
-        - data_nic01
-        - data_nic02
-        - data_nic03
-        - data_nic04
+        - cp_nic01
+        - cp_nic02
       networks:
         - oam
         - storage
@@ -117,12 +115,10 @@ data:
       networks:
         - pxe
     bond0:
-      device_link: data
+      device_link: bond0
       slaves:
-        - data_nic01
-        - data_nic02
-        - data_nic03
-        - data_nic04
+        - cp_nic01
+        - cp_nic02
       networks:
         - oam
         - storage
diff --git a/site/seaworthy/profiles/host/dp_r720.yaml b/site/seaworthy/profiles/host/dp_r720.yaml
index 71587684c..8a6133e57 100644
--- a/site/seaworthy/profiles/host/dp_r720.yaml
+++ b/site/seaworthy/profiles/host/dp_r720.yaml
@@ -31,12 +31,10 @@ data:
       networks:
         - pxe
     bond0:
-      device_link: data
+      device_link: bond0
       slaves:
-        - data_nic01
-        - data_nic02
-        - data_nic03
-        - data_nic04
+        - cp_nic01
+        - cp_nic02
       networks:
         - oam
         - storage