x/fuel-plugin-contrail
Code Issues Proposed changes

Fix sriv and multiple net tests.

Browse Source 
-change number of node from 6 to 5
 in the contrail_sriov_add_compute
-decrease number of nodes from 7 to 5
 in the contrail_multiple_networks_delete_controller

Change-Id: Ia9bfd0d3bd86f1e42bcd9a32fb7b8b655809d2ae
This commit is contained in:
otsvigun
2016-08-06 16:55:52 +03:00
parent 023d727fed
commit 1697a58c70
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/testing/test_suite_multiple_networks.rst
View File

@@ -96,9 +96,7 @@ Steps
* 2 controller
13. Add following nodes to custom nodegroup:
* 1 compute
* 1 contrail-config
* 1 contrail-control
* 1 contrail-db
* 1 contrail-config+contrail-control+contrail-db
* 1 contrail-analytics
14. Deploy cluster
15. Run health checks (OSTF)

15
plugin_test/tests/test_contrail_multiple_networks.py
View File

@@ -452,9 +452,7 @@ class TestMultipleNets(TestMultipleClusterNets):
* 2 controller
13. Add following nodes to custom nodegroup:
* 1 compute
* 1 contrail-config
* 1 contrail-control
* 1 contrail-db
* 1 contrail-config+contrail-control+contrail-db
* 1 contrail-analytics
14. Deploy cluster
15. Run health checks (OSTF)
@@ -491,7 +489,7 @@ class TestMultipleNets(TestMultipleClusterNets):
self.fuel_web.client.delete_nodegroup(custom_group2['id'])
self.show_step(7)
self.env.bootstrap_nodes(self.env.d_env.nodes().slaves[3:9])
self.env.bootstrap_nodes(self.env.d_env.nodes().slaves[3:6])
self.show_step(8)
updated_storage_default, updated_storage_custom, \
@@ -509,11 +507,10 @@ class TestMultipleNets(TestMultipleClusterNets):
'slave-02': [['controller'], nodegroup_custom1],
'slave-03': [['controller'], nodegroup_custom1],
'slave-04': [['compute', 'cinder'], nodegroup_default],
'slave-05': [['compute'], nodegroup_default],
'slave-06': [['contrail-config'], nodegroup_default],
'slave-07': [['contrail-control'], nodegroup_default],
'slave-08': [['contrail-db'], nodegroup_default],
'slave-09': [['contrail-analytics'], nodegroup_default],
'slave-05': [
['contrail-config', 'contrail-control', 'contrail-db'],
nodegroup_default],
'slave-06': [['contrail-analytics'], nodegroup_default],
}
)
self.show_step(14)

7
plugin_test/tests/test_sriov.py
View File

@@ -132,13 +132,12 @@ class SRIOVTests(TestBasic):
node-1: 'controller', 'ceph-osd';
node-2: 'contrail-config', 'contrail-control',
'contrail-db', 'contrail-analytics';
node-3: 'contrail-db';
node-3: 'compute', 'ceph-osd';
node-4: 'compute', 'ceph-osd';
node-5: 'compute', 'ceph-osd';
node-bm: 'compute', 'sriov';
4. Run OSTF tests
5. Add one node with following configuration:
node-6: "compute", "ceph-osd";
node-5: "compute", "ceph-osd";
6. Deploy changes
7. Run OSTF tests
8. Run contrail health check tests
@@ -172,7 +171,7 @@ class SRIOVTests(TestBasic):
'slave-03': ['compute', 'ceph-osd'],
'slave-04': ['compute', 'ceph-osd'],
}
conf_compute = {'slave-06': ['compute', 'ceph-osd']}
conf_compute = {'slave-05': ['compute', 'ceph-osd']}
# Cluster configuration
self.fuel_web.update_nodes(self.cluster_id,