summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Novikov <snovikov@mirantis.com>2017-03-29 10:23:44 +0400
committerSergey Novikov <snovikov@mirantis.com>2017-03-29 13:15:10 +0000
commit73bee9ba3e1e98a0b652aef949195fbc3ffc6be2 (patch)
treea79938a7cc51bb463d594a0bb4db37252f9eb38f
parentad30a92874a73fa3f2f0f154176d06efee90e2a8 (diff)
Check only preservation of config after cluster reset
After the reworking of feature "Openstack config" we can apply a new config only for pre-defined role. That's a reason to change a logic of the test Change-Id: Idb5fb67feb45ae6fa54891a3d0eb6fef205978bd Closes-Bug: 1676859
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+2: Vladimir Khlyunev <vkhlyunev@mirantis.com> Code-Review+1: Alexey Stepanov <penguinolog@gmail.com> Workflow+1: Alexey Stepanov <penguinolog@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 31 Mar 2017 13:30:17 +0000 Reviewed-on: https://review.openstack.org/451393 Project: openstack/fuel-qa Branch: refs/heads/master
-rw-r--r--fuelweb_test/tests/test_services_reconfiguration.py37
1 files changed, 11 insertions, 26 deletions
diff --git a/fuelweb_test/tests/test_services_reconfiguration.py b/fuelweb_test/tests/test_services_reconfiguration.py
index de18cba..104164f 100644
--- a/fuelweb_test/tests/test_services_reconfiguration.py
+++ b/fuelweb_test/tests/test_services_reconfiguration.py
@@ -699,14 +699,12 @@ class ServicesReconfiguration(TestBasic):
699 Scenario: 699 Scenario:
700 1. Revert snapshot reconfigure_ml2_vlan_range 700 1. Revert snapshot reconfigure_ml2_vlan_range
701 2. Reset cluster 701 2. Reset cluster
702 3. Upload a new openstack configuration for nova 702 3. Deploy changes
703 4. Deploy changes 703 4. Run OSTF
704 5. Run OSTF 704 5. Verify neutron settings
705 6. Verify nova and neutron settings 705 6. Create new private network
706 7. Create new private network 706 7. Try to create one more, verify that it is impossible
707 8. Try to create one more, verify that it is impossible 707
708 9. Boot instances with flavor that occupy all CPU
709 10. Boot extra instance and catch the error
710 708
711 Snapshot "preservation_config_after_reset_and_preconfigured_deploy" 709 Snapshot "preservation_config_after_reset_and_preconfigured_deploy"
712 710
@@ -719,43 +717,30 @@ class ServicesReconfiguration(TestBasic):
719 cluster_id = self.fuel_web.get_last_created_cluster() 717 cluster_id = self.fuel_web.get_last_created_cluster()
720 self.fuel_web.stop_reset_env_wait(cluster_id) 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 config = utils.get_config_template('neutron') 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 self.fuel_web.wait_nodes_get_online_state( 724 self.fuel_web.wait_nodes_get_online_state(
733 self.env.d_env.nodes().slaves[:4], timeout=10 * 60) 725 self.env.d_env.nodes().slaves[:4], timeout=10 * 60)
734 726
735 self.fuel_web.deploy_cluster_wait(cluster_id) 727 self.fuel_web.deploy_cluster_wait(cluster_id)
736 728
737 self.show_step(5) 729 self.show_step(4)
738 self.fuel_web.run_ostf( 730 self.fuel_web.run_ostf(
739 cluster_id=cluster_id) 731 cluster_id=cluster_id)
740 732
741 self.show_step(6) 733 self.show_step(5)
742 controllers = self.fuel_web.get_nailgun_cluster_nodes_by_roles( 734 controllers = self.fuel_web.get_nailgun_cluster_nodes_by_roles(
743 cluster_id, ['controller']) 735 cluster_id, ['controller'])
744 structured_config = {}
745 structured_config.update(structured_config_neutron)
746 structured_config.update(structured_config_nova)
747 self.check_config_on_remote(controllers, structured_config) 736 self.check_config_on_remote(controllers, structured_config)
748 737
738 self.show_step(6)
749 self.show_step(7) 739 self.show_step(7)
750 self.show_step(8)
751 os_conn = os_actions.OpenStackActions( 740 os_conn = os_actions.OpenStackActions(
752 self.fuel_web.get_public_vip(cluster_id)) 741 self.fuel_web.get_public_vip(cluster_id))
753 self.check_ml2_vlan_range(os_conn) 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 snapshot = "preservation_config_after_reset_and_preconfigured_deploy" 744 snapshot = "preservation_config_after_reset_and_preconfigured_deploy"
760 self.env.make_snapshot(snapshot, is_make=True) 745 self.env.make_snapshot(snapshot, is_make=True)
761 746