x/fuel-plugin-contrail
Code Issues Proposed changes

Merge "Update DPDK tests with analytics role"

Browse Source
This commit is contained in:
Jenkins
2016-07-18 08:08:28 +00:00
committed by Gerrit Code Review
parent 2e8dcdb583 74dac34e1d
commit 69c8e43a0d
2 changed files with 169 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
plugin_test/tests/test_dpdk.py
View File

@@ -49,7 +49,7 @@ class DPDKTests(TestBasic):
bm_drv = baremetal.BMDriver()
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["contrail_ha_dpdk"])
groups=["contrail_ha_dpdk", "contrail_dpdk_tests"])
@log_snapshot_after_test
def contrail_ha_dpdk(self):
"""Check Contrail deploy on HA environment.
@@ -121,7 +121,7 @@ class DPDKTests(TestBasic):
)
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["contrail_dpdk_add_compute"])
groups=["contrail_dpdk_add_compute", "contrail_dpdk_tests"])
@log_snapshot_after_test
def contrail_dpdk_add_compute(self):
"""Verify that Contrail compute role can be added after deploying.
@@ -132,14 +132,14 @@ class DPDKTests(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', 'dpdk';
node-dpdk: 'compute', 'dpdk';
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
@@ -167,8 +167,9 @@ class DPDKTests(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'],
}
@@ -210,7 +211,7 @@ class DPDKTests(TestBasic):
)
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["contrail_dpdk_delete_compute"])
groups=["contrail_dpdk_delete_compute", "contrail_dpdk_tests"])
@log_snapshot_after_test
def contrail_dpdk_delete_compute(self):
"""Verify that Contrail compute role can be deleted after deploying.
@@ -221,13 +222,14 @@ class DPDKTests(TestBasic):
2. Enable and configure Contrail plugin
3. Deploy cluster with following node configuration:
node-01: 'controller';
node-02: 'contrail-control', 'contrail-config', 'contrail-db';
node-02: 'contrail-control', 'contrail-config',
'contrail-db', 'contrail-analytics';
node-03: 'contrail-db';
node-04: 'compute', 'dpdk';
node-05: 'compute', 'cinder';
node-06: 'compute';
node-04: 'compute', 'cinder';
node-05: 'compute';
node-06: 'contrail-db';
4. Run OSTF tests
5. Delete node-06 with "compute" role
5. Delete node-05 with "compute" role
6. Deploy changes
7. Run OSTF tests
@@ -250,9 +252,12 @@ class DPDKTests(TestBasic):
'slave-01': ['controller'],
'slave-02': ['contrail-control',
'contrail-config',
'contrail-db'],
'contrail-db',
'contrail-analytics'],
'slave-03': ['contrail-db'],
'slave-04': ['compute', 'cinder'],
# node-05
'slave-06': ['contrail-db'],
}
conf_compute = {'slave-05': ['compute']}
@@ -290,7 +295,7 @@ class DPDKTests(TestBasic):
)
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["contrail_dpdk_add_dpdk"])
groups=["contrail_dpdk_add_dpdk", "contrail_dpdk_tests"])
@log_snapshot_after_test
def contrail_dpdk_add_dpdk(self):
"""Verify that DPDK role can be added after deploying.
@@ -301,13 +306,15 @@ class DPDKTests(TestBasic):
2. Enable and configure Contrail plugin
3. Deploy cluster with following node configuration:
node-01: 'controller', 'ceph-osd';
node-02: 'contrail-config', 'contrail-control', 'contrail-db';
node-03: 'contrail-db';
node-02: 'contrail-config', 'contrail-control',
'contrail-db', 'contrail-analytics';
node-03: 'compute', 'ceph-osd';
node-04: 'compute', 'ceph-osd';
node-05: 'compute', 'ceph-osd';
node-05: 'controller', 'cinder';
node-06: 'controller', 'cinder';
4. Run OSTF tests
6. Add one node with following configuration:
node-6: "compute", "dpdk";
node-dpdk: "compute", "dpdk";
7. Deploy changes
8. Run OSTF tests
@@ -328,10 +335,12 @@ class DPDKTests(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'],
'slave-05': ['controller', 'cinder'],
'slave-06': ['controller', 'cinder'],
}
self.fuel_web.update_nodes(
self.cluster_id,
@@ -342,7 +351,8 @@ class DPDKTests(TestBasic):
openstack.deploy_cluster(self)
# Run OSTF tests
if vsrx_setup_result:
self.fuel_web.run_ostf(cluster_id=self.cluster_id)
self.fuel_web.run_ostf(cluster_id=self.cluster_id,
test_sets=['smoke', 'sanity', 'ha'])
self.show_step(6)
self.bm_drv.setup_fuel_node(self,
@@ -356,7 +366,7 @@ class DPDKTests(TestBasic):
self.fuel_web.run_ostf(cluster_id=self.cluster_id)
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["contrail_dpdk_delete_dpdk"])
groups=["contrail_dpdk_delete_dpdk", "contrail_dpdk_tests"])
@log_snapshot_after_test
def contrail_dpdk_delete_dpdk(self):
"""Verify that DPDK role can be deleted after deploying.
@@ -366,14 +376,14 @@ class DPDKTests(TestBasic):
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Deploy cluster with following node configuration:
node-01: 'controller', 'ceph-osd';
node-02: 'contrail-control', 'contrail-config', 'contrail-db';
node-03: 'contrail-db';
node-01: 'controller', 'ceph-osd', 'cinder';
node-02: 'contrail-control', 'contrail-config',
'contrail-db', 'contrail-analytics';
node-03: 'compute', 'ceph-osd';
node-04: 'compute', 'ceph-osd';
node-05: 'ceph-osd', 'cinder';
node-06: 'compute', 'dpdk';
node-dpdk: 'compute', 'dpdk';
4. Run OSTF tests
5. Delete node-06 with "dpdk" and "compute" roles
5. Delete node "node-dpdk" with "dpdk" and "compute" roles
6. Deploy changes
7. Run OSTF tests
@@ -394,13 +404,13 @@ class DPDKTests(TestBasic):
cluster_id=self.cluster_id,
roles=['compute', 'dpdk'])
conf_no_dpdk = {
'slave-01': ['controller', 'ceph-osd'],
'slave-01': ['controller', 'ceph-osd', 'cinder'],
'slave-02': ['contrail-control',
'contrail-config',
'contrail-db'],
'slave-03': ['contrail-db'],
'contrail-db',
'contrail-analytics'],
'slave-03': ['compute', 'ceph-osd'],
'slave-04': ['compute', 'ceph-osd'],
'slave-05': ['ceph-osd', 'cinder'],
}
self.fuel_web.update_nodes(
@@ -433,7 +443,7 @@ class DPDKTests(TestBasic):
)
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["contrail_dpdk_add_controller"])
groups=["contrail_dpdk_add_controller", "contrail_dpdk_tests"])
@log_snapshot_after_test
def contrail_dpdk_add_controller(self):
"""Verify that Contrail controller role can be added after deploying.
@@ -444,20 +454,19 @@ class DPDKTests(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', 'dpdk';
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,
@@ -479,12 +488,12 @@ class DPDKTests(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,
@@ -522,7 +531,7 @@ class DPDKTests(TestBasic):
)
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["contrail_dpdk_delete_controller"])
groups=["contrail_dpdk_delete_controller", "contrail_dpdk_tests"])
@log_snapshot_after_test
def contrail_dpdk_delete_controller(self):
"""Verify that Contrail controller role can be deleted after deploying.
@@ -532,12 +541,12 @@ class DPDKTests(TestBasic):
segmentation" as a network configuration
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', 'dpdk';
node-01: 'controller';
node-02: 'contrail-control', 'contrail-config',
'contrail-db', 'contrail-analytics';
node-03: 'controller';
node-04: 'compute', 'cinder';
node-05: 'controller';
4. Run OSTF tests
5. Delete node-01 with "controller" role
6. Deploy changes
@@ -545,7 +554,7 @@ class DPDKTests(TestBasic):
"""
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)
@@ -562,11 +571,13 @@ class DPDKTests(TestBasic):
'slave-01': ['controller'],
'slave-02': ['contrail-control',
'contrail-config',
'contrail-db'],
'slave-03': ['contrail-db'],
'contrail-db',
'contrail-analytics'],
'slave-03': ['controller'],
'slave-04': ['compute', 'cinder'],
'slave-05': ['controller'],
}
conf_controller = {'slave-05': ['controller']}
conf_controller = {'slave-01': ['controller']}
self.fuel_web.update_nodes(
self.cluster_id,
@@ -599,7 +610,7 @@ class DPDKTests(TestBasic):
)
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["contrail_add_to_dpdk_sriov"])
groups=["contrail_add_to_dpdk_sriov", "contrail_dpdk_tests"])
@log_snapshot_after_test
def contrail_add_to_dpdk_sriov(self):
"""Verify that Contrail controller role can be added after deploying.
@@ -609,14 +620,18 @@ class DPDKTests(TestBasic):
as a network configuration
2. Enable and configure Contrail plugin
3. Enable dpdk and sriov
4. Deploy cluster with following node configuration:
node-1: 'controller';
node-2: 'contrail-config', 'contrail-control', 'contrail-db';
4. Add dpdk and sriov nodes
5. Deploy cluster with following node configuration:
node-2: 'contrail-config', 'contrail-control',
'contrail-db', 'contrail-analytics';
node-3: 'compute', 'cinder';
node-4: 'compute', 'dpdk', 'sriov';
5. Deploy cluster
node-4: 'contrail-config', 'contrail-control',
'contrail-db', 'contrail-analytics';
node-5: 'contrail-config', 'contrail-control',
'contrail-db', 'contrail-analytics';
6. Run OSTF
7. Add "contrail-config", "contrail-control", "contrail-db" roles
7. Add one node with following configuration:
node-1: 'controller';
8. Deploy changes
9. Run OSTF
"""
@@ -637,15 +652,16 @@ class DPDKTests(TestBasic):
cluster_id=self.cluster_id,
roles=['compute', 'dpdk', 'sriov'])
conf_nodes = {
'slave-01': ['controller'],
'slave-02': ['contrail-config',
'contrail-control',
'contrail-db'],
# node-01
'slave-02': ['contrail-config', 'contrail-control',
'contrail-db', 'contrail-analytics'],
'slave-03': ['compute', 'cinder'],
'slave-04': ['contrail-config', 'contrail-control',
'contrail-db', 'contrail-analytics'],
'slave-05': ['contrail-config', 'contrail-control',
'contrail-db', 'contrail-analytics'],
}
conf_controller = {'slave-04': ['contrail-config',
'contrail-control',
'contrail-db']}
conf_controller = {'slave-01': ['controller']}
# Cluster configuration
self.fuel_web.update_nodes(self.cluster_id,
@@ -676,7 +692,7 @@ class DPDKTests(TestBasic):
self.fuel_web.run_ostf(cluster_id=self.cluster_id)
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["contrail_dpdk_setup"])
groups=["contrail_dpdk_setup", "contrail_dpdk_tests"])
@log_snapshot_after_test
def contrail_dpdk_setup(self):
"""Contrail DPDK setup.
@@ -741,7 +757,7 @@ class DPDKTests(TestBasic):
failed_test_name=['Instance live migration'])
@test(depends_on=[contrail_dpdk_setup],
groups=["contrail_dpdk_boot_snapshot_vm"])
groups=["contrail_dpdk_boot_snapshot_vm", "contrail_dpdk_tests"])
@log_snapshot_after_test
def contrail_dpdk_boot_snapshot_vm(self):
"""Launch instance, create snapshot, launch instance from snapshot.
@@ -815,7 +831,7 @@ class DPDKTests(TestBasic):
"Instance was not deleted.")
@test(depends_on=[contrail_dpdk_setup],
groups=["contrail_dpdk_volume"])
groups=["contrail_dpdk_volume", "contrail_dpdk_tests"])
@log_snapshot_after_test
def contrail_dpdk_volume(self):
"""Create volume and boot instance from it.
@@ -883,7 +899,8 @@ class DPDKTests(TestBasic):
os_conn.delete_volume_and_wait(volume)
@test(depends_on=[contrail_dpdk_setup],
groups=["contrail_dpdk_check_public_connectivity_from_instance"])
groups=["contrail_dpdk_check_public_connectivity_from_instance",
"contrail_dpdk_tests"])
@log_snapshot_after_test
def contrail_dpdk_check_public_connectivity_from_instance(self):
"""Check network connectivity from instance via floating IP.