x
/
fuel-plugin-nsx-t
Code Issues Proposed changes

Fix for smoke/bvt tests 

* add a compute node in smoke test
* remove ceph backend from bvt test
* add a separate integration test with ceph

Change-Id: Ibccc9d93707a933c1002509c1c0be61093900265
This commit is contained in:
ibumarskov 2016-10-10 16:55:55 +03:00 committed by Ilya Bumarskov
parent c3447a069a
commit 38df137d22
3 changed files with 93 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
doc/test/source/test_suite_integration.rst
View File

@ -2,8 +2,8 @@ Integration
===========
Deploy cluster with NSX-T plugin and ceilometer.
------------------------------------------------
Deploy dual-HV env with NSX-T plugin and ceilometer.
----------------------------------------------------
ID
@ -28,7 +28,7 @@ Steps
#####
1. Log in to the Fuel UI with preinstalled NSX-T plugin.
2. Create a new environment with following parameters:
2. Create new environment with following parameters:
* Compute: KVM/QEMU with vCenter
* Networking: Neutron with NSX-T plugin
* Storage: default
@ -51,4 +51,56 @@ Steps
Expected result
###############
Cluster should be deployed and all OSTF tests cases should be passed.
Cluster should be deployed and all OSTF test cases should pass.
Deploy dual-HV env with NSX-T plugin and ceph
---------------------------------------------
ID
##
nsxt_ceph
Description
###########
Check deployment of environment with Fuel NSX-T plugin and Ceph.
Complexity
##########
core
Steps
#####
1. Log in to the Fuel UI with preinstalled NSX-T plugin.
2. Create new environment with following parameters:
* Compute: KVM/QEMU with vCenter
* Networking: Neutron with NSX-T plugin
* Storage: Ceph
* Additional services: default
3. Add nodes with following roles:
* Controller
* Ceph-OSD
* Ceph-OSD
* Ceph-OSD
* Compute
4. Configure interfaces on nodes.
5. Configure network settings.
6. Enable and configure NSX-T plugin.
7. Configure VMware vCenter Settings. Add 1 vSphere cluster and configure Nova Compute instance on controller.
8. Verify networks.
9. Deploy cluster.
10. Run OSTF.
Expected result
###############
Cluster should be deployed and all OSTF test cases should pass.

17
doc/test/source/test_suite_smoke.rst
View File

@ -196,7 +196,7 @@ nsxt_smoke
Description
###########
Check deployment of environment with NSX-T plugin and one controller.
Check deployment of non-ha environment with NSX-T plugin and one compute node.
Complexity
@ -216,12 +216,12 @@ Steps
* Additional services: default
3. Add nodes with following roles:
* Controller
* Compute
4. Configure interfaces on nodes.
5. Configure network settings.
6. Enable and configure NSX-T plugin.
7. Configure VMware vCenter Settings. Add 1 vSphere cluster and configure Nova Compute instances on controllers.
8. Deploy cluster.
9. Run OSTF.
7. Deploy cluster.
8. Run OSTF.
Expected result
@ -243,7 +243,7 @@ nsxt_bvt
Description
###########
Check deployment of environment with NSX-T plugin, 3 Controllers, 1 Compute, 3 CephOSD, cinder-vware + compute-vmware roles.
Check deployment of ha environment with NSX-T plugin and vCenter.
Complexity
@ -259,17 +259,14 @@ Steps
2. Create a new environment with following parameters:
* Compute: KVM, QEMU with vCenter
* Networking: Neutron with NSX-T plugin
* Storage: Ceph RBD for images (Glance)
* Storage: default
* Additional services: default
3. Add nodes with following roles:
* Controller
* Controller
* Controller
* CephOSD
* CephOSD
* CephOSD
* Compute-vmware, cinder-vmware
* Compute
* Compute, cinder
4. Configure interfaces on nodes.
5. Configure network settings.
6. Enable and configure NSX-T plugin.

53
plugin_test/tests/test_plugin_nsxt.py
View File

@ -22,12 +22,12 @@ from fuelweb_test.tests.base_test_case import SetupEnvironment
from tests.base_plugin_test import TestNSXtBase
@test(groups=["plugins", "nsxt_plugin", 'nsxt_smoke_scenarios'])
@test(groups=["nsxt_plugin", "nsxt_smoke_scenarios"])
class TestNSXtSmoke(TestNSXtBase):
"""Tests from test plan that have been marked as 'Automated'."""
@test(depends_on=[SetupEnvironment.prepare_slaves_1],
groups=["nsxt_install", 'nsxt_smoke'])
@test(depends_on=[SetupEnvironment.prepare_slaves_3],
groups=["nsxt_install"])
@log_snapshot_after_test
def nsxt_install(self):
"""Check that plugin can be installed.
@ -42,7 +42,7 @@ class TestNSXtSmoke(TestNSXtBase):
Duration 30 min
"""
self.env.revert_snapshot('ready_with_1_slaves')
self.env.revert_snapshot('ready_with_3_slaves')
self.show_step(1)
self.show_step(2)
@ -64,7 +64,7 @@ class TestNSXtSmoke(TestNSXtBase):
self.env.make_snapshot("nsxt_install", is_make=True)
@test(depends_on=[nsxt_install],
groups=["nsxt_uninstall", 'nsxt_smoke'])
groups=["nsxt_uninstall"])
@log_snapshot_after_test
def nsxt_uninstall(self):
"""Check that NSX-T plugin can be removed.
@ -93,18 +93,20 @@ class TestNSXtSmoke(TestNSXtBase):
self.delete_nsxt_plugin()
@test(depends_on=[nsxt_install],
groups=['nsxt_kvm_smoke', 'nsxt_smoke'])
groups=["nsxt_smoke"])
@log_snapshot_after_test
def nsxt_kvm_smoke(self):
def nsxt_smoke(self):
"""Deploy a cluster with NSXt Plugin.
Scenario:
1. Upload the plugin to master node.
2. Create cluster.
3. Provision one controller node.
4. Configure NSXt for that cluster.
3. Add nodes with the following roles:
* controller
* compute
4. Configure NSX-t for that cluster.
5. Deploy cluster with plugin.
6. Run 'smoke' OSTF.
6. Run OSTF.
Duration 90 min
@ -120,7 +122,11 @@ class TestNSXtSmoke(TestNSXtBase):
configure_ssl=False)
self.show_step(3)
self.fuel_web.update_nodes(cluster_id, {'slave-01': ['controller']})
self.fuel_web.update_nodes(
cluster_id,
{'slave-01': ['controller'],
'slave-02': ['compute']}
)
self.reconfigure_cluster_interfaces(cluster_id)
@ -131,10 +137,11 @@ class TestNSXtSmoke(TestNSXtBase):
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(6)
self.fuel_web.run_ostf(cluster_id=cluster_id, test_sets=['smoke'])
self.fuel_web.run_ostf(cluster_id=cluster_id,
test_sets=['smoke', 'sanity'])
@test(groups=["plugins", "nsxt_plugin", 'nsxt_bvt_scenarios'])
@test(groups=["nsxt_plugin", "nsxt_bvt_scenarios"])
class TestNSXtBVT(TestNSXtBase):
"""NSX-t BVT scenarios"""
@ -147,8 +154,12 @@ class TestNSXtBVT(TestNSXtBase):
Scenario:
1. Upload plugins to the master node.
2. Create cluster with vcenter.
3. Add 3 node with controller role, 3 ceph,
compute-vmware + cinder-vmware, compute.
3. Add nodes with the following roles:
* controller
* controller
* controller
* compute-vmware + cinder-vmware
* compute
4. Configure vcenter.
5. Configure NSXt for that cluster.
6. Deploy cluster.
@ -163,9 +174,8 @@ class TestNSXtBVT(TestNSXtBase):
self.install_nsxt_plugin()
self.show_step(2)
settings = self.default.cluster_settings
settings["images_ceph"] = True
settings = self.default.cluster_settings
cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__,
mode=DEPLOYMENT_MODE,
@ -178,18 +188,15 @@ class TestNSXtBVT(TestNSXtBase):
{'slave-01': ['controller'],
'slave-02': ['controller'],
'slave-03': ['controller'],
'slave-04': ['ceph-osd'],
'slave-05': ['ceph-osd'],
'slave-06': ['ceph-osd'],
'slave-07': ['compute-vmware', 'cinder-vmware'],
'slave-08': ['compute']}
'slave-04': ['compute-vmware', 'cinder-vmware'],
'slave-05': ['compute', 'cinder']}
)
self.reconfigure_cluster_interfaces(cluster_id)
self.show_step(4)
target_node_2 = \
self.fuel_web.get_nailgun_node_by_name('slave-07')['hostname']
self.fuel_web.get_nailgun_node_by_name('slave-04')['hostname']
self.fuel_web.vcenter_configure(cluster_id,
multiclusters=True,
target_node_2=target_node_2)