Browse Source

Merge "Check only preservation of config after cluster reset"

Jenkins 2 years ago
parent
commit
6bc6c7946e
1 changed files with 11 additions and 26 deletions
  1. 11
    26
      fuelweb_test/tests/test_services_reconfiguration.py

+ 11
- 26
fuelweb_test/tests/test_services_reconfiguration.py View File

@@ -699,14 +699,12 @@ class ServicesReconfiguration(TestBasic):
699 699
         Scenario:
700 700
             1. Revert snapshot reconfigure_ml2_vlan_range
701 701
             2. Reset cluster
702
-            3. Upload a new openstack configuration for nova
703
-            4. Deploy changes
704
-            5. Run OSTF
705
-            6. Verify nova and neutron settings
706
-            7. Create new private network
707
-            8. Try to create one more, verify that it is impossible
708
-            9. Boot instances with flavor that occupy all CPU
709
-            10. Boot extra instance and catch the error
702
+            3. Deploy changes
703
+            4. Run OSTF
704
+            5. Verify neutron settings
705
+            6. Create new private network
706
+            7. Try to create one more, verify that it is impossible
707
+
710 708
 
711 709
         Snapshot "preservation_config_after_reset_and_preconfigured_deploy"
712 710
 
@@ -719,43 +717,30 @@ class ServicesReconfiguration(TestBasic):
719 717
         cluster_id = self.fuel_web.get_last_created_cluster()
720 718
         self.fuel_web.stop_reset_env_wait(cluster_id)
721 719
 
722
-        self.show_step(3)
723
-        config = utils.get_config_template('nova_cpu')
724
-        structured_config_nova = get_structured_config_dict(config)
725
-        self.fuel_web.client.upload_configuration(config,
726
-                                                  cluster_id,
727
-                                                  role='controller')
728 720
         config = utils.get_config_template('neutron')
729
-        structured_config_neutron = get_structured_config_dict(config)
721
+        structured_config = get_structured_config_dict(config)
730 722
 
731
-        self.show_step(4)
723
+        self.show_step(3)
732 724
         self.fuel_web.wait_nodes_get_online_state(
733 725
             self.env.d_env.nodes().slaves[:4], timeout=10 * 60)
734 726
 
735 727
         self.fuel_web.deploy_cluster_wait(cluster_id)
736 728
 
737
-        self.show_step(5)
729
+        self.show_step(4)
738 730
         self.fuel_web.run_ostf(
739 731
             cluster_id=cluster_id)
740 732
 
741
-        self.show_step(6)
733
+        self.show_step(5)
742 734
         controllers = self.fuel_web.get_nailgun_cluster_nodes_by_roles(
743 735
             cluster_id, ['controller'])
744
-        structured_config = {}
745
-        structured_config.update(structured_config_neutron)
746
-        structured_config.update(structured_config_nova)
747 736
         self.check_config_on_remote(controllers, structured_config)
748 737
 
738
+        self.show_step(6)
749 739
         self.show_step(7)
750
-        self.show_step(8)
751 740
         os_conn = os_actions.OpenStackActions(
752 741
             self.fuel_web.get_public_vip(cluster_id))
753 742
         self.check_ml2_vlan_range(os_conn)
754 743
 
755
-        self.show_step(9)
756
-        self.show_step(10)
757
-        self.check_overcommit_ratio(os_conn, cluster_id)
758
-
759 744
         snapshot = "preservation_config_after_reset_and_preconfigured_deploy"
760 745
         self.env.make_snapshot(snapshot, is_make=True)
761 746
 

Loading…
Cancel
Save