x/fuel-plugin-contrail
Code Issues Proposed changes

Merge "update sriov tests"

Browse Source
This commit is contained in:
Jenkins
2016-07-12 08:55:47 +00:00
committed by Gerrit Code Review
parent 6c35b8e818 6c5bbcfe1f
commit 86464e46ba
2 changed files with 78 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
doc/testing/test_suite_sriov.rst
View File

@@ -28,10 +28,12 @@ advanced
Steps
#####
1. Create an environment with "Neutron with tunneling segmentation" as a network configuration
1. Create an environment with "Neutron with tunneling segmentation" as a network configuration and CEPH storage
2. Enable and configure Contrail plugin
3. Deploy cluster with some controller, compute+cinder, compute+sriov and contrail-specified nodes
4. Run OSTF tests
3. Add some controller (at least 3), compute and storage nodes
4. And contrail-control, contrail-config, contrail-db and contrail-analytics nodes
5. Deploy cluster
6. Run OSTF tests
Expected results
@@ -67,9 +69,9 @@ Steps
1. Create an environment with "Neutron with tunneling segmentation" as a network configuration and CEPH storage
2. Enable and configure Contrail plugin
3. Deploy cluster with some controller, compute+cinder, compute+sriov and contrail-specified nodes
3. Deploy cluster with some controller, compute+ceph, compute+sriov and contrail-specified nodes
4. Run OSTF tests
5. Add a node with compute roles
5. Add a node with compute+ceph roles
6. Deploy changes
7. Run OSTF tests
@@ -107,7 +109,7 @@ Steps
1. Create an environment with "Neutron with tunneling segmentation" as a network configuration and Cinder storage
2. Enable and configure Contrail plugin
3. Deploy cluster with some controller, compute+cinder, compute+sriov and contrail-specified nodes
3. Deploy cluster with some controller, compute, compute+cinder, compute+sriov and contrail-specified nodes
4. Run OSTF tests
5. Delete a node with compute role
6. Deploy changes
@@ -146,9 +148,9 @@ advanced
Steps
#####
1. Create an environment with "Neutron with tunneling segmentation" as a network configuration and CEPH storage
1. Create an environment with "Neutron with tunneling segmentation" as a network configuration and CEPH+Cinder storage
2. Enable and configure Contrail plugin
3. Deploy cluster with some controller, compute+cinder, compute+sriov and contrail-specified nodes
3. Deploy cluster with some controller+ceph, compute+ceph, compute+sriov and contrail-specified nodes
4. Run OSTF tests
5. Add a node with compute+sriov role
6. Deploy changes
@@ -186,9 +188,9 @@ advanced
Steps
#####
1. Create an environment with "Neutron with tunneling segmentation" as a network configuration and CEPH storage
1. Create an environment with "Neutron with tunneling segmentation" as a network configuration and Cinder storage
2. Enable and configure Contrail plugin
3. Deploy cluster with some controller, compute+cinder, compute+sriov and contrail-specified nodes
3. Deploy cluster with some controller, controller+cinder, compute+cinder, compute+sriov and contrail-specified nodes
4. Run OSTF tests
5. Delete a node with compute+sriov roles
6. Deploy changes
@@ -264,9 +266,9 @@ Steps
1. Create an environment with "Neutron with tunneling segmentation" as a network configuration and CEPH storage
2. Enable and configure Contrail plugin
3. Deploy cluster with some controller, compute+cinder, compute+sriov and contrail-specified nodes
3. Deploy cluster with some controller, compute+ceph, compute+sriov and contrail-specified nodes
4. Run OSTF tests
5. Add a node with "controller" role
5. Add a node with controller+ceph role
6. Deploy changes
7. Run OSTF tests
@@ -302,7 +304,7 @@ advanced
Steps
#####
1. Create an environment with "Neutron with tunneling segmentation" as a network configuration and CEPH storage
1. Create an environment with "Neutron with tunneling segmentation" as a network configuration and Cinder storage
2. Enable and configure Contrail plugin
3. Deploy cluster with some controller, compute+cinder, compute+sriov and contrail-specified nodes
4. Run OSTF tests

118
plugin_test/tests/test_sriov.py
View File

@@ -34,7 +34,7 @@ from helpers import openstack
from helpers import baremetal
@test(groups=["plugins"])
@test(groups=["contrail_sriov_tests"])
class SRIOVTests(TestBasic):
"""SRIOV Tests."""
@@ -63,9 +63,10 @@ class SRIOVTests(TestBasic):
node-03: 'controller', 'ceph-osd';
node-04: 'compute', 'ceph-osd';
node-05: 'compute', 'ceph-osd';
node-07: 'contrail-db';
node-08: 'contrail-config';
node-09: 'contrail-control';
node-06: 'contrail-db';
node-07: 'contrail-config';
node-08: 'contrail-control';
node-09: 'contrail-analytics';
node-sriov: 'compute', sriov';
4. Run OSTF tests
@@ -101,6 +102,7 @@ class SRIOVTests(TestBasic):
'slave-06': ['contrail-db'],
'slave-07': ['contrail-config'],
'slave-08': ['contrail-control'],
'slave-09': ['contrail-analytics']
}
# Cluster configuration
self.fuel_web.update_nodes(self.cluster_id,
@@ -117,7 +119,7 @@ class SRIOVTests(TestBasic):
should_fail=1,
failed_test_name=['Instance live migration'])
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["contrail_sriov_add_compute"])
@log_snapshot_after_test
def contrail_sriov_add_compute(self):
@@ -129,11 +131,12 @@ class SRIOVTests(TestBasic):
2. Enable and configure Contrail plugin
3. Deploy cluster with following node configuration:
node-1: 'controller', 'ceph-osd';
node-2: 'contrail-config', 'contrail-control', 'contrail-db';
node-2: 'contrail-config', 'contrail-control',
'contrail-db', 'contrail-analytics';
node-3: 'contrail-db';
node-4: 'compute', 'ceph-osd';
node-5: 'compute', 'ceph-osd';
node-7: 'compute', 'sriov';
node-bm: 'compute', 'sriov';
4. Run OSTF tests
5. Add one node with following configuration:
node-6: "compute", "ceph-osd";
@@ -142,7 +145,7 @@ class SRIOVTests(TestBasic):
"""
self.show_step(1)
plugin.prepare_contrail_plugin(self, slaves=9,
plugin.prepare_contrail_plugin(self, slaves=5,
options={'images_ceph': True,
'volumes_ceph': True,
'ephemeral_ceph': True,
@@ -164,10 +167,10 @@ class SRIOVTests(TestBasic):
'slave-01': ['controller', 'ceph-osd'],
'slave-02': ['contrail-config',
'contrail-control',
'contrail-db'],
'slave-03': ['contrail-db'],
'contrail-db',
'contrail-analytics'],
'slave-03': ['compute', 'ceph-osd'],
'slave-04': ['compute', 'ceph-osd'],
'slave-05': ['compute', 'ceph-osd'],
}
conf_compute = {'slave-06': ['compute', 'ceph-osd']}
@@ -216,19 +219,19 @@ class SRIOVTests(TestBasic):
2. Enable and configure Contrail plugin
3. Deploy cluster with following node configuration:
node-01: 'controller';
node-02: 'contrail-control', 'contrail-db';
node-03: 'contrail-config', 'contrail-db';
node-04: 'compute', 'cinder';
node-05: 'compute';
node-02: 'contrail-control', 'contrail-config',
'contrail-db', 'contrail-analytics';
node-03: 'compute', 'cinder';
node-04: 'compute';
node-bm: 'compute', 'sriov';
4. Run OSTF tests
5. Delete node-06 with "compute" role
5. Delete node-04 with "compute" role
6. Deploy changes
7. Run OSTF tests
"""
self.show_step(1)
plugin.prepare_contrail_plugin(self, slaves=9)
plugin.prepare_contrail_plugin(self, slaves=5)
self.bm_drv.host_prepare()
self.show_step(2)
@@ -244,12 +247,12 @@ class SRIOVTests(TestBasic):
conf_no_compute = {
'slave-01': ['controller'],
'slave-02': ['contrail-control',
'contrail-db'],
'slave-03': ['contrail-config',
'contrail-db'],
'slave-04': ['compute', 'cinder'],
'contrail-config',
'contrail-db',
'contrail-analytics'],
'slave-03': ['compute', 'cinder'],
}
conf_compute = {'slave-05': ['compute']}
conf_compute = {'slave-04': ['compute']}
self.fuel_web.update_nodes(
self.cluster_id,
@@ -284,7 +287,7 @@ class SRIOVTests(TestBasic):
'services are running']
)
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["contrail_sriov_add_controller"])
@log_snapshot_after_test
def contrail_sriov_add_controller(self):
@@ -296,20 +299,20 @@ class SRIOVTests(TestBasic):
2. Enable and configure Contrail plugin
3. Deploy cluster with following node configuration:
node-1: 'controller', 'ceph-osd';
node-2: 'contrail-config', 'contrail-control', 'contrail-db';
node-3: 'contrail-db';
node-2: 'contrail-config', 'contrail-control',
'contrail-db', 'contrail-analytics';
node-3: 'compute', 'ceph-osd';
node-4: 'compute', 'ceph-osd';
node-5: 'compute', 'ceph-osd';
node-6: 'compute', 'sriov';
node-bm: 'compute', 'sriov';
4. Run OSTF tests
5. Add one node with following configuration:
node-7: "controller", "ceph-osd";
node-5: "controller", "ceph-osd";
6. Deploy changes
7. Run OSTF tests
"""
self.show_step(1)
plugin.prepare_contrail_plugin(self, slaves=9,
plugin.prepare_contrail_plugin(self, slaves=5,
options={'images_ceph': True,
'volumes_ceph': True,
'ephemeral_ceph': True,
@@ -331,12 +334,12 @@ class SRIOVTests(TestBasic):
'slave-01': ['controller', 'ceph-osd'],
'slave-02': ['contrail-config',
'contrail-control',
'contrail-db'],
'slave-03': ['contrail-db'],
'contrail-db',
'contrail-analytics'],
'slave-03': ['compute', 'ceph-osd'],
'slave-04': ['compute', 'ceph-osd'],
'slave-05': ['compute', 'ceph-osd'],
}
conf_controller = {'slave-06': ['controller', 'ceph-osd']}
conf_controller = {'slave-05': ['controller', 'ceph-osd']}
# Cluster configuration
self.fuel_web.update_nodes(self.cluster_id,
@@ -373,7 +376,7 @@ class SRIOVTests(TestBasic):
failed_test_name=['Instance live migration']
)
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["contrail_sriov_delete_controller"])
@log_snapshot_after_test
def contrail_sriov_delete_controller(self):
@@ -385,19 +388,19 @@ class SRIOVTests(TestBasic):
2. Enable and configure Contrail plugin
3. Deploy cluster with following node configuration:
node-01: 'controller';
node-02: 'controller';
node-03: 'contrail-control', 'contrail-config', 'contrail-db';
node-04: 'contrail-db';
node-05: 'compute', 'cinder';
node-06: 'compute', 'sriov';
node-02: 'contrail-control', 'contrail-config',
'contrail-db', 'contrail-analytics';
node-03: 'compute', 'cinder';
node-04: 'controller';
node-bm: 'compute', 'sriov';
4. Run OSTF tests
5. Delete node-01 with "controller" role
5. Delete node-04 with "controller" role
6. Deploy changes
7. Run OSTF tests
"""
self.show_step(1)
plugin.prepare_contrail_plugin(self, slaves=9)
plugin.prepare_contrail_plugin(self, slaves=5)
self.bm_drv.host_prepare()
self.show_step(2)
@@ -414,11 +417,11 @@ class SRIOVTests(TestBasic):
'slave-01': ['controller'],
'slave-02': ['contrail-control',
'contrail-config',
'contrail-db'],
'slave-03': ['contrail-db'],
'slave-04': ['compute', 'cinder'],
'contrail-db',
'contrail-analytics']
'slave-03': ['compute', 'cinder'],
}
conf_controller = {'slave-05': ['controller']}
conf_controller = {'slave-04': ['controller']}
self.fuel_web.update_nodes(
self.cluster_id,
@@ -463,7 +466,7 @@ class SRIOVTests(TestBasic):
3. Deploy cluster with following node configuration:
node-01: 'controller', 'ceph-osd';
node-02: 'contrail-config', 'contrail-control';
node-03: 'contrail-db';
node-03: 'contrail-db', 'contrail-analytics';
node-04: 'compute', 'ceph-osd';
node-05: 'compute', 'ceph-osd';
4. Run OSTF tests
@@ -487,9 +490,8 @@ class SRIOVTests(TestBasic):
plugin.show_range(self, 3, 5)
conf_nodes = {
'slave-01': ['controller', 'ceph-osd'],
'slave-02': ['contrail-config',
'contrail-control'],
'slave-03': ['contrail-db'],
'slave-02': ['contrail-config', 'contrail-control'],
'slave-03': ['contrail-db', 'contrail-analytics'],
'slave-04': ['compute', 'ceph-osd'],
'slave-05': ['compute', 'ceph-osd'],
}
@@ -529,9 +531,12 @@ class SRIOVTests(TestBasic):
node-01: 'controller';
node-02: 'controller';
node-03: 'controller', 'cinder';
node-04: 'contrail-control', 'contrail-config', 'contrail-db';
node-05: 'contrail-control', 'contrail-config', 'contrail-db';
node-06: 'contrail-control', 'contrail-config', 'contrail-db';
node-04: 'contrail-control', 'contrail-config',
'contrail-db', 'contrail-analytics';
node-05: 'contrail-control', 'contrail-config',
'contrail-db', 'contrail-analytics';
node-06: 'contrail-control', 'contrail-config',
'contrail-db', 'contrail-analytics';
node-07: 'compute';
node-08: 'compute';
node-bm: 'compute', 'sriov';
@@ -561,13 +566,16 @@ class SRIOVTests(TestBasic):
'slave-03': ['controller', 'cinder'],
'slave-04': ['contrail-control',
'contrail-config',
'contrail-db'],
'contrail-db',
'contrail-analytics'],
'slave-05': ['contrail-control',
'contrail-config',
'contrail-db'],
'contrail-db',
'contrail-analytics'],
'slave-06': ['contrail-control',
'contrail-config',
'contrail-db'],
'contrail-db',
'contrail-analytics'],
'slave-07': ['compute'],
'slave-08': ['compute']
}