x/fuel-plugin-contrail
Code Issues Proposed changes

Change bonding mode

Browse Source 
Change bonding mode, add sleep in contrail_bonding test
and fix some comments

Change-Id: I806c454decee4b40317f0f028021a9ab90c602a4
This commit is contained in:
Oleksandr Kosse
2016-02-10 18:35:14 +02:00
parent d7fc2a84db
commit 71d878fc00
3 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/testing/test_suite_integration.rst
View File

@@ -242,9 +242,9 @@ Steps
3. Add 3 nodes with "controller" role
4. Add 2 nodes with "compute" roles
5. Add 3 nodes with "contrail-config", "contrail-control" and "contrail-db" roles
8. Bond network interfaces with Active Backup mode
9. Deploy cluster with plugin
10. Run OSTF tests
6. Bond network interfaces with balance-rr mode
7. Deploy cluster with plugin
8. Run OSTF tests
Expected results

2
plugin_test/helpers/plugin.py
View File

@@ -27,7 +27,7 @@ import openstack
BOND_CONFIG = [
{
'mac': None,
'mode': 'active-backup',
'mode': 'balance-rr',
'name': 'lnx-bond0',
'slaves': [
{'name': 'eth3'},

36
plugin_test/tests/test_integration.py
View File

@@ -143,14 +143,6 @@ class IntegrationTests(TestBasic):
# deploy cluster
openstack.deploy_cluster(self)
# TODO
# Tests using north-south connectivity are expected to fail because
# they require additional gateway nodes, and specific contrail
# settings. This mark is a workaround until it's verified
# and tested manually.
# When it will be done 'should_fail=2' and
# 'failed_test_name' parameter should be removed.
if vsrx_setup_result:
self.fuel_web.run_ostf(cluster_id=self.cluster_id)
@@ -289,7 +281,8 @@ class IntegrationTests(TestBasic):
'contrail-control'],
})
slave_nodes = self.fuel_web.client.list_cluster_nodes(self.cluster_id)
slave_nodes = \
self.fuel_web.client.list_cluster_nodes(self.cluster_id)
for node in slave_nodes:
self.fuel_web.update_node_networks(
node['id'], interfaces,
@@ -325,9 +318,9 @@ class IntegrationTests(TestBasic):
4. Add 2 nodes with "compute" roles
5. Add 3 nodes with "contrail-config", "contrail-control" and
"contrail-db" roles
8. Bond network interfaces with Active Backup mode
9. Deploy cluster with plugin
10. Run OSTF tests
6. Bond network interfaces with balance-rr mode
7. Deploy cluster with plugin
8. Run OSTF tests
Duration 120 min
@@ -361,8 +354,7 @@ class IntegrationTests(TestBasic):
},
)
cluster_nodes = \
self.fuel_web.client.list_cluster_nodes(self.cluster_id)
cluster_nodes = self.fuel_web.client.list_cluster_nodes(self.cluster_id)
for node in cluster_nodes:
self.fuel_web.update_node_networks(
@@ -372,6 +364,9 @@ class IntegrationTests(TestBasic):
openstack.deploy_cluster(self)
# FIXME: remove next line when bug #1516969 will be fixed
time.sleep(60*25)
# TODO
# Tests using north-south connectivity are expected to fail because
# they require additional gateway nodes, and specific contrail
@@ -382,7 +377,8 @@ class IntegrationTests(TestBasic):
self.fuel_web.run_ostf(
cluster_id=self.cluster_id,
test_sets=['smoke', 'sanity', 'ha', 'tests_platform'],
test_sets=['smoke', 'sanity', 'ha'],
timeout= 45 * 60,
should_fail=2,
failed_test_name=[('Check network connectivity '
'from instance via floating IP'),
@@ -438,18 +434,10 @@ class IntegrationTests(TestBasic):
# deploy cluster
openstack.deploy_cluster(self)
# TODO
# Tests using north-south connectivity are expected to fail because
# they require additional gateway nodes, and specific contrail
# settings. This mark is a workaround until it's verified
# and tested manually.
# When it will be done 'should_fail=2' and
# 'failed_test_name' parameter should be removed.
if vsrx_setup_result:
self.fuel_web.run_ostf(
cluster_id=self.cluster_id,
test_sets=['smoke', 'sanity', 'ha', 'tests_platform'])
test_sets=['smoke', 'sanity', 'ha'])
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["contrail_ceph_multirole"])