fix for bonding autotest

Closes-Bug: #1538585

Change-Id: Ib0d747b0f5b266d5de2da0f5c879121c3ea88886

plugin_test/helpers/plugin.py

@@ -24,24 +24,26 @@ from settings import VSRX_TEMPLATE_PATH
 import openstack
 
 
-BOND_CONFIG = [{
+BOND_CONFIG = [
+    {
         'mac': None,
         'mode': 'active-backup',
         'name': 'lnx-bond0',
         'slaves': [
+            {'name': 'eth3'},
             {'name': 'eth4'},
-        {'name': 'eth2'},
         ],
         'state': None,
         'type': 'bond',
-    'assigned_networks': []}]
-INTERFACES = {
-    'eth0': ['fuelweb_admin'],
-    'eth1': ['public'],
-    'eth3': ['private'],
-    'lnx-bond0': ['management',
-                  'storage'
+        'assigned_networks': []
+    }
 ]
+
+INTERFACES = {
+    'eth0': ['fuelweb_admin', 'storage'],
+    'eth1': ['public'],
+    'eth2': ['management'],
+    'lnx-bond0': ['private']
 }
 
 

plugin_test/tests/test_integration.py

@@ -338,6 +338,9 @@ class IntegrationTests(TestBasic):
         # enable plugin in contrail settings
         plugin.activate_plugin(self)
 
+        # configure vlan on storage and management interfaces
+        openstack.assign_vlan(self, private=101, storage=102)
+
         self.fuel_web.update_nodes(
             self.cluster_id,
             {
@@ -363,9 +366,9 @@ class IntegrationTests(TestBasic):
 
         for node in cluster_nodes:
             self.fuel_web.update_node_networks(
-                node['id'], interfaces_dict=deepcopy(plugin.INTERFACES),
-                raw_data=deepcopy(plugin.BOND_CONFIG)
-                )
+                node['id'],
+                interfaces_dict=deepcopy(plugin.INTERFACES),
+                raw_data=deepcopy(plugin.BOND_CONFIG))
 
         openstack.deploy_cluster(self)