From 682675c33e08377c1333fb33c80875865121c694 Mon Sep 17 00:00:00 2001
From: ibumarskov <ibumarskov@mirantis.com>
Date: Tue, 14 Mar 2017 14:49:23 +0400
Subject: [PATCH] Fix vlan assignment for bond interface

Change-Id: I44eac0c8a3ff9db3fb97d1f02de34cf9deb889e0
Closes-bug: #1670360
---
 fuelweb_test/models/fuel_web_client.py     |  5 +++++
 fuelweb_test/tests/test_bond_offloading.py |  6 ++++--
 fuelweb_test/tests/test_bonding.py         | 18 ++++++++++++------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/fuelweb_test/models/fuel_web_client.py b/fuelweb_test/models/fuel_web_client.py
index 9de5a15f9..630ca6f03 100644
--- a/fuelweb_test/models/fuel_web_client.py
+++ b/fuelweb_test/models/fuel_web_client.py
@@ -3333,6 +3333,11 @@ class FuelWebClient30(FuelWebClient29):
                     networks['baremetal']['vlan_start'] = (
                         pool.vlan_start if pool.vlan_start else None)
 
+                if BONDING:
+                    # leave defaults for mgmt, storage and private if
+                    # BONDING is enabled
+                    continue
+
                 for pool in default_node_group.get_network_pools(
                         name__in=['storage', 'management']):
                     networks[pool.name]['cidr'] = str(pool.net)
diff --git a/fuelweb_test/tests/test_bond_offloading.py b/fuelweb_test/tests/test_bond_offloading.py
index 82abc9826..d7ce5ab1b 100644
--- a/fuelweb_test/tests/test_bond_offloading.py
+++ b/fuelweb_test/tests/test_bond_offloading.py
@@ -79,7 +79,8 @@ class TestOffloading(BondingTestOffloading):
                 'slave-01': ['controller'],
                 'slave-02': ['compute'],
                 'slave-03': ['cinder']
-            }
+            },
+            update_interfaces=False
         )
 
         nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
@@ -189,7 +190,8 @@ class TestOffloading(BondingTestOffloading):
                 'slave-01': ['controller'],
                 'slave-02': ['compute'],
                 'slave-03': ['cinder']
-            }
+            },
+            update_interfaces=False
         )
 
         nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
diff --git a/fuelweb_test/tests/test_bonding.py b/fuelweb_test/tests/test_bonding.py
index a70a7dc44..aa60e1ed0 100644
--- a/fuelweb_test/tests/test_bonding.py
+++ b/fuelweb_test/tests/test_bonding.py
@@ -72,7 +72,8 @@ class BondingHAOneController(BondingTest):
                 'slave-01': ['controller'],
                 'slave-02': ['compute'],
                 'slave-03': ['cinder']
-            }
+            },
+            update_interfaces=False
         )
 
         self.show_step(4)
@@ -139,7 +140,8 @@ class BondingHAOneController(BondingTest):
                 'slave-01': ['controller'],
                 'slave-02': ['compute'],
                 'slave-03': ['cinder']
-            }
+            },
+            update_interfaces=False
         )
 
         self.show_step(4)
@@ -200,7 +202,8 @@ class BondingHAOneController(BondingTest):
                 'slave-01': ['controller'],
                 'slave-02': ['compute'],
                 'slave-03': ['cinder']
-            }
+            },
+            update_interfaces=False
         )
 
         self.show_step(4)
@@ -296,7 +299,8 @@ class BondingHA(BondingTest):
                 'slave-03': ['controller'],
                 'slave-04': ['compute'],
                 'slave-05': ['cinder']
-            }
+            },
+            update_interfaces=False
         )
 
         net_params = self.fuel_web.client.get_networks(cluster_id)
@@ -389,7 +393,8 @@ class BondingHA(BondingTest):
                 'slave-03': ['controller'],
                 'slave-04': ['compute'],
                 'slave-05': ['cinder']
-            }
+            },
+            update_interfaces=False
         )
 
         net_params = self.fuel_web.client.get_networks(cluster_id)
@@ -479,7 +484,8 @@ class BondingHA(BondingTest):
                 'slave-02': ['controller'],
                 'slave-03': ['controller'],
                 'slave-04': ['compute'],
-            }
+            },
+            update_interfaces=False
         )
 
         self.show_step(4)