Browse Source

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
ibumarskov 2 years ago
parent
commit
38df137d22

+ 56
- 4
doc/test/source/test_suite_integration.rst View File

@@ -2,8 +2,8 @@ Integration
2 2
 ===========
3 3
 
4 4
 
5
-Deploy cluster with NSX-T plugin and ceilometer.
6
-------------------------------------------------
5
+Deploy dual-HV env with NSX-T plugin and ceilometer.
6
+----------------------------------------------------
7 7
 
8 8
 
9 9
 ID
@@ -28,7 +28,7 @@ Steps
28 28
 #####
29 29
 
30 30
     1. Log in to the Fuel UI with preinstalled NSX-T plugin.
31
-    2. Create a new environment with following parameters:
31
+    2. Create new environment with following parameters:
32 32
         * Compute: KVM/QEMU with vCenter
33 33
         * Networking: Neutron with NSX-T plugin
34 34
         * Storage: default
@@ -51,4 +51,56 @@ Steps
51 51
 Expected result
52 52
 ###############
53 53
 
54
-Cluster should be deployed and all OSTF tests cases should be passed.
54
+Cluster should be deployed and all OSTF test cases should pass.
55
+
56
+
57
+Deploy dual-HV env with NSX-T plugin and ceph
58
+---------------------------------------------
59
+
60
+
61
+ID
62
+##
63
+
64
+nsxt_ceph
65
+
66
+
67
+Description
68
+###########
69
+
70
+Check deployment of environment with Fuel NSX-T plugin and Ceph.
71
+
72
+
73
+Complexity
74
+##########
75
+
76
+core
77
+
78
+
79
+Steps
80
+#####
81
+
82
+    1. Log in to the Fuel UI with preinstalled NSX-T plugin.
83
+    2. Create new environment with following parameters:
84
+        * Compute: KVM/QEMU with vCenter
85
+        * Networking: Neutron with NSX-T plugin
86
+        * Storage: Ceph
87
+        * Additional services: default
88
+    3. Add nodes with following roles:
89
+        * Controller
90
+        * Ceph-OSD
91
+        * Ceph-OSD
92
+        * Ceph-OSD
93
+        * Compute
94
+    4. Configure interfaces on nodes.
95
+    5. Configure network settings.
96
+    6. Enable and configure NSX-T plugin.
97
+    7. Configure VMware vCenter Settings. Add 1 vSphere cluster and configure Nova Compute instance on controller.
98
+    8. Verify networks.
99
+    9. Deploy cluster.
100
+    10. Run OSTF.
101
+
102
+
103
+Expected result
104
+###############
105
+
106
+Cluster should be deployed and all OSTF test cases should pass.

+ 7
- 10
doc/test/source/test_suite_smoke.rst View File

@@ -196,7 +196,7 @@ nsxt_smoke
196 196
 Description
197 197
 ###########
198 198
 
199
-Check deployment of environment with NSX-T plugin and one controller.
199
+Check deployment of non-ha environment with NSX-T plugin and one compute node.
200 200
 
201 201
 
202 202
 Complexity
@@ -216,12 +216,12 @@ Steps
216 216
         * Additional services: default
217 217
     3. Add nodes with following roles:
218 218
         * Controller
219
+        * Compute
219 220
     4. Configure interfaces on nodes.
220 221
     5. Configure network settings.
221 222
     6. Enable and configure NSX-T plugin.
222
-    7. Configure VMware vCenter Settings. Add 1 vSphere cluster and configure Nova Compute instances on controllers.
223
-    8. Deploy cluster.
224
-    9. Run OSTF.
223
+    7. Deploy cluster.
224
+    8. Run OSTF.
225 225
 
226 226
 
227 227
 Expected result
@@ -243,7 +243,7 @@ nsxt_bvt
243 243
 Description
244 244
 ###########
245 245
 
246
-Check deployment of environment with NSX-T plugin, 3 Controllers, 1 Compute, 3 CephOSD, cinder-vware + compute-vmware roles.
246
+Check deployment of ha environment with NSX-T plugin and vCenter.
247 247
 
248 248
 
249 249
 Complexity
@@ -259,17 +259,14 @@ Steps
259 259
     2. Create a new environment with following parameters:
260 260
         * Compute: KVM, QEMU with vCenter
261 261
         * Networking: Neutron with NSX-T plugin
262
-        * Storage: Ceph RBD for images (Glance)
262
+        * Storage: default
263 263
         * Additional services: default
264 264
     3. Add nodes with following roles:
265 265
         * Controller
266 266
         * Controller
267 267
         * Controller
268
-        * CephOSD
269
-        * CephOSD
270
-        * CephOSD
271 268
         * Compute-vmware, cinder-vmware
272
-        * Compute
269
+        * Compute, cinder
273 270
     4. Configure interfaces on nodes.
274 271
     5. Configure network settings.
275 272
     6. Enable and configure NSX-T plugin.

+ 30
- 23
plugin_test/tests/test_plugin_nsxt.py View File

@@ -22,12 +22,12 @@ from fuelweb_test.tests.base_test_case import SetupEnvironment
22 22
 from tests.base_plugin_test import TestNSXtBase
23 23
 
24 24
 
25
-@test(groups=["plugins", "nsxt_plugin", 'nsxt_smoke_scenarios'])
25
+@test(groups=["nsxt_plugin", "nsxt_smoke_scenarios"])
26 26
 class TestNSXtSmoke(TestNSXtBase):
27 27
     """Tests from test plan that have been marked as 'Automated'."""
28 28
 
29
-    @test(depends_on=[SetupEnvironment.prepare_slaves_1],
30
-          groups=["nsxt_install", 'nsxt_smoke'])
29
+    @test(depends_on=[SetupEnvironment.prepare_slaves_3],
30
+          groups=["nsxt_install"])
31 31
     @log_snapshot_after_test
32 32
     def nsxt_install(self):
33 33
         """Check that plugin can be installed.
@@ -42,7 +42,7 @@ class TestNSXtSmoke(TestNSXtBase):
42 42
         Duration 30 min
43 43
 
44 44
         """
45
-        self.env.revert_snapshot('ready_with_1_slaves')
45
+        self.env.revert_snapshot('ready_with_3_slaves')
46 46
 
47 47
         self.show_step(1)
48 48
         self.show_step(2)
@@ -64,7 +64,7 @@ class TestNSXtSmoke(TestNSXtBase):
64 64
         self.env.make_snapshot("nsxt_install", is_make=True)
65 65
 
66 66
     @test(depends_on=[nsxt_install],
67
-          groups=["nsxt_uninstall", 'nsxt_smoke'])
67
+          groups=["nsxt_uninstall"])
68 68
     @log_snapshot_after_test
69 69
     def nsxt_uninstall(self):
70 70
         """Check that NSX-T plugin can be removed.
@@ -93,18 +93,20 @@ class TestNSXtSmoke(TestNSXtBase):
93 93
         self.delete_nsxt_plugin()
94 94
 
95 95
     @test(depends_on=[nsxt_install],
96
-          groups=['nsxt_kvm_smoke', 'nsxt_smoke'])
96
+          groups=["nsxt_smoke"])
97 97
     @log_snapshot_after_test
98
-    def nsxt_kvm_smoke(self):
98
+    def nsxt_smoke(self):
99 99
         """Deploy a cluster with NSXt Plugin.
100 100
 
101 101
         Scenario:
102 102
             1. Upload the plugin to master node.
103 103
             2. Create cluster.
104
-            3. Provision one controller node.
105
-            4. Configure NSXt for that cluster.
104
+            3. Add nodes with the following roles:
105
+                * controller
106
+                * compute
107
+            4. Configure NSX-t for that cluster.
106 108
             5. Deploy cluster with plugin.
107
-            6. Run 'smoke' OSTF.
109
+            6. Run OSTF.
108 110
 
109 111
         Duration 90 min
110 112
 
@@ -120,7 +122,11 @@ class TestNSXtSmoke(TestNSXtBase):
120 122
             configure_ssl=False)
121 123
 
122 124
         self.show_step(3)
123
-        self.fuel_web.update_nodes(cluster_id, {'slave-01': ['controller']})
125
+        self.fuel_web.update_nodes(
126
+            cluster_id,
127
+            {'slave-01': ['controller'],
128
+             'slave-02': ['compute']}
129
+        )
124 130
 
125 131
         self.reconfigure_cluster_interfaces(cluster_id)
126 132
 
@@ -131,10 +137,11 @@ class TestNSXtSmoke(TestNSXtBase):
131 137
         self.fuel_web.deploy_cluster_wait(cluster_id)
132 138
 
133 139
         self.show_step(6)
134
-        self.fuel_web.run_ostf(cluster_id=cluster_id, test_sets=['smoke'])
140
+        self.fuel_web.run_ostf(cluster_id=cluster_id,
141
+                               test_sets=['smoke', 'sanity'])
135 142
 
136 143
 
137
-@test(groups=["plugins", "nsxt_plugin", 'nsxt_bvt_scenarios'])
144
+@test(groups=["nsxt_plugin", "nsxt_bvt_scenarios"])
138 145
 class TestNSXtBVT(TestNSXtBase):
139 146
     """NSX-t BVT scenarios"""
140 147
 
@@ -147,8 +154,12 @@ class TestNSXtBVT(TestNSXtBase):
147 154
         Scenario:
148 155
             1. Upload plugins to the master node.
149 156
             2. Create cluster with vcenter.
150
-            3. Add 3 node with controller role, 3 ceph,
151
-               compute-vmware + cinder-vmware, compute.
157
+            3. Add nodes with the following roles:
158
+                * controller
159
+                * controller
160
+                * controller
161
+                * compute-vmware + cinder-vmware
162
+                * compute
152 163
             4. Configure vcenter.
153 164
             5. Configure NSXt for that cluster.
154 165
             6. Deploy cluster.
@@ -163,9 +174,8 @@ class TestNSXtBVT(TestNSXtBase):
163 174
         self.install_nsxt_plugin()
164 175
 
165 176
         self.show_step(2)
166
-        settings = self.default.cluster_settings
167
-        settings["images_ceph"] = True
168 177
 
178
+        settings = self.default.cluster_settings
169 179
         cluster_id = self.fuel_web.create_cluster(
170 180
             name=self.__class__.__name__,
171 181
             mode=DEPLOYMENT_MODE,
@@ -178,18 +188,15 @@ class TestNSXtBVT(TestNSXtBase):
178 188
             {'slave-01': ['controller'],
179 189
              'slave-02': ['controller'],
180 190
              'slave-03': ['controller'],
181
-             'slave-04': ['ceph-osd'],
182
-             'slave-05': ['ceph-osd'],
183
-             'slave-06': ['ceph-osd'],
184
-             'slave-07': ['compute-vmware', 'cinder-vmware'],
185
-             'slave-08': ['compute']}
191
+             'slave-04': ['compute-vmware', 'cinder-vmware'],
192
+             'slave-05': ['compute', 'cinder']}
186 193
         )
187 194
 
188 195
         self.reconfigure_cluster_interfaces(cluster_id)
189 196
 
190 197
         self.show_step(4)
191 198
         target_node_2 = \
192
-            self.fuel_web.get_nailgun_node_by_name('slave-07')['hostname']
199
+            self.fuel_web.get_nailgun_node_by_name('slave-04')['hostname']
193 200
         self.fuel_web.vcenter_configure(cluster_id,
194 201
                                         multiclusters=True,
195 202
                                         target_node_2=target_node_2)

Loading…
Cancel
Save