Browse Source

Merge "Fix for missing show_step"

stable/9.1
Jenkins 2 years ago
parent
commit
dadf0267b4

+ 4
- 4
docs/test_plan/source/test_suite_system.rst View File

@@ -715,14 +715,14 @@ Steps
715 715
         * Networking: Neutron with VLAN segmentation
716 716
         * Storage: default
717 717
         * Additional services: default
718
-    3. Add nodes with following roles:
718
+    3. Enable and configure DVS plugin.
719
+    4. Add nodes with following roles:
719 720
         * Controller
720 721
         * Compute
721 722
         * Cinder
722 723
         * CinderVMware
723
-    4. Configure interfaces on nodes.
724
-    5. Configure network settings.
725
-    6. Enable and configure DVS plugin.
724
+    5. Configure interfaces on nodes.
725
+    6. Configure network settings.
726 726
     7. Configure VMware vCenter Settings. Add 1 vSphere clusters and configure Nova Compute instances on controllers.
727 727
     8. Verify networks.
728 728
     9. Deploy cluster.

+ 1
- 0
plugin_test/tests/test_plugin_vmware_dvs_smoke.py View File

@@ -56,6 +56,7 @@ class TestDVSSmoke(TestBasic):
56 56
         self.show_step(2)
57 57
         plugin.install_dvs_plugin(self.ssh_manager.admin_ip)
58 58
 
59
+        self.show_step(3)
59 60
         cmd = 'fuel plugins list'
60 61
 
61 62
         output = self.ssh_manager.execute_on_remote(

+ 15
- 7
plugin_test/tests/test_plugin_vmware_dvs_system.py View File

@@ -283,6 +283,7 @@ class TestDVSSystem(TestBasic):
283 283
             security_groups=[security_group.name])
284 284
         openstack.verify_instance_state(os_conn)
285 285
 
286
+        self.show_step(7)
286 287
         # Get floating ip of instances
287 288
         fip = openstack.create_and_assign_floating_ips(os_conn, instances)
288 289
         ip_pair = dict.fromkeys(fip)
@@ -471,6 +472,7 @@ class TestDVSSystem(TestBasic):
471 472
         for key in ip_pair:
472 473
             ip_pair[key] = [value for value in fip if key != value]
473 474
         openstack.check_connection_vms(ip_pair)
475
+        self.show_step(10)
474 476
         openstack.check_connection_vms(ip_pair, command='ssh')
475 477
 
476 478
         self.show_step(11)
@@ -516,6 +518,10 @@ class TestDVSSystem(TestBasic):
516 518
         openstack.check_connection_vms(
517 519
             ip_pair, timeout=wait_to_update_rules_on_dvs_ports)
518 520
 
521
+        self.show_step(18)
522
+        self.show_step(19)
523
+        self.show_step(20)
524
+
519 525
         self.show_step(21)
520 526
         srv_list = os_conn.get_servers()
521 527
         for srv in srv_list:
@@ -780,15 +786,15 @@ class TestDVSSystem(TestBasic):
780 786
                     * Networking: Neutron with VLAN segmentation
781 787
                     * Storage: default
782 788
                     * Additional services: default
783
-            4. Add nodes with following roles:
789
+            4. Enable and configure DVS plugin.
790
+            5. Add nodes with following roles:
784 791
                     * Controller
785 792
                     * Compute
786 793
                     * Cinder
787 794
                     * CinderVMware
788 795
                     * Compute-VMware
789
-            5. Configure interfaces on nodes.
790
-            6. Configure network settings.
791
-            7. Enable and configure DVS plugin.
796
+            6. Configure interfaces on nodes.
797
+            7. Configure network settings.
792 798
             8. Configure VMware vCenter Settings. Add 2 vSphere clusters
793 799
                and configure Nova Compute instances on conroller
794 800
                and compute-vmware.
@@ -816,11 +822,12 @@ class TestDVSSystem(TestBasic):
816 822
                 "net_segment_type": NEUTRON_SEGMENT_TYPE
817 823
             }
818 824
         )
825
+        self.show_step(4)
819 826
         plugin.enable_plugin(cluster_id, self.fuel_web)
820 827
 
821
-        self.show_step(4)
822 828
         self.show_step(5)
823 829
         self.show_step(6)
830
+        self.show_step(7)
824 831
         self.fuel_web.update_nodes(cluster_id,
825 832
                                    {'slave-01': ['controller'],
826 833
                                     'slave-02': ['compute'],
@@ -829,6 +836,7 @@ class TestDVSSystem(TestBasic):
829 836
                                     'slave-05': ['compute-vmware']})
830 837
 
831 838
         self.show_step(8)
839
+        self.show_step(9)
832 840
         logger.info('Configure VMware vCenter Settings.')
833 841
         target_node_2 = self.node_name('slave-05')
834 842
         self.fuel_web.vcenter_configure(cluster_id,
@@ -1545,17 +1553,17 @@ class TestDVSSystem(TestBasic):
1545 1553
         os_conn.add_router_interface(router_id=router_1["id"],
1546 1554
                                      subnet_id=subnet["id"])
1547 1555
 
1556
+        self.show_step(3)
1557
+        self.show_step(4)
1548 1558
         self.show_step(5)
1549 1559
         sg1 = os_conn.nova.security_groups.create('SG1', "descr")
1550 1560
         sg2 = os_conn.nova.security_groups.create('SG2', "descr")
1551 1561
 
1552
-        self.show_step(3)
1553 1562
         access_point_1, access_point_ip_1 = openstack.create_access_point(
1554 1563
             os_conn=os_conn,
1555 1564
             nics=[{'net-id': net_1['id']}],
1556 1565
             security_groups=[security_group.name, sg1.name])
1557 1566
 
1558
-        self.show_step(4)
1559 1567
         access_point_2, access_point_ip_2 = openstack.create_access_point(
1560 1568
             os_conn=os_conn,
1561 1569
             nics=[{'net-id': net_1['id']}],

Loading…
Cancel
Save