Browse Source

Fixes for tests

Change-Id: I9bb7bd43b0ee73e35a45aece0e3ab68f09254998
ibumarskov 2 years ago
parent
commit
76b7a75d36

+ 2
- 2
plugin_test/helpers/settings.py View File

@@ -45,8 +45,8 @@ NSXT_USER = os.environ.get('NSXT_USER')
45 45
 assigned_networks = {
46 46
     iface_alias('eth0'): ['fuelweb_admin', 'private'],
47 47
     iface_alias('eth1'): ['public'],
48
-    iface_alias('eth2'): ['storage'],
49
-    iface_alias('eth4'): ['management']
48
+    iface_alias('eth2'): ['management'],
49
+    iface_alias('eth4'): ['storage']
50 50
 }
51 51
 
52 52
 cluster_settings = {

+ 3
- 3
plugin_test/tests/test_plugin_nsxt.py View File

@@ -95,7 +95,7 @@ class TestNSXtSmoke(TestNSXtBase):
95 95
           groups=["nsxt_smoke"])
96 96
     @log_snapshot_after_test
97 97
     def nsxt_smoke(self):
98
-        """Deploy a cluster with NSXt Plugin.
98
+        """Deploy cluster with NSXt Plugin and compute node.
99 99
 
100 100
         Scenario:
101 101
             1. Upload the plugin to master node.
@@ -147,7 +147,7 @@ class TestNSXtBVT(TestNSXtBase):
147 147
           groups=["nsxt_bvt"])
148 148
     @log_snapshot_after_test
149 149
     def nsxt_bvt(self):
150
-        """Deploy cluster with plugin and vmware datastore backend.
150
+        """Deploy ha cluster with plugin and KVM + vCenter.
151 151
 
152 152
         Scenario:
153 153
             1. Upload plugins to the master node.
@@ -157,7 +157,7 @@ class TestNSXtBVT(TestNSXtBase):
157 157
                 * controller
158 158
                 * controller
159 159
                 * compute-vmware + cinder-vmware
160
-                * compute
160
+                * compute + cinder
161 161
             4. Configure vcenter.
162 162
             5. Configure NSXt for that cluster.
163 163
             6. Deploy cluster.

+ 1
- 1
plugin_test/tests/test_plugin_scale.py View File

@@ -298,7 +298,7 @@ class TestNSXtScale(TestNSXtBase):
298 298
         self.reconfigure_cluster_interfaces(cluster_id)
299 299
 
300 300
         self.show_step(5)  # Enable plugin and configure network settings
301
-        self.enable_plugin(self.fuel_web, cluster_id)
301
+        self.enable_plugin(cluster_id)
302 302
 
303 303
         # Configure VMware settings. 1 cluster, 1 Nova Compute: compute-vmware
304 304
         self.show_step(6)

+ 2
- 2
plugin_test/tests/test_plugin_system.py View File

@@ -163,8 +163,8 @@ class TestNSXtSystem(TestNSXtBase):
163 163
         default_net = os_conn.nova.networks.find(
164 164
             label=self.default.PRIVATE_NET)
165 165
 
166
-        vm1_fip = os_conn.assign_floating_ip(vm1)
167
-        vm2_fip = os_conn.assign_floating_ip(vm2)
166
+        vm1_fip = os_conn.assign_floating_ip(vm1).ip
167
+        vm2_fip = os_conn.assign_floating_ip(vm2).ip
168 168
 
169 169
         vm1_ip = os_conn.get_nova_instance_ip(vm1, net_name=default_net)
170 170
         vm2_ip = os_conn.get_nova_instance_ip(vm2, net_name=default_net)

Loading…
Cancel
Save