openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Update the method feature groups are enabled on deployed Master node"

This commit is contained in:
Jenkins 2015-12-17 21:02:23 +00:00 committed by Gerrit Code Review
parent 64b2e6be63 60a7354902
commit 381e3848da
3 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fuelweb_test/helpers/checkers.py
View File

@ -353,19 +353,10 @@ def get_package_versions_from_node(remote, name, os_type):
@logwrap
def check_enable_experimental_mode(remote, path):
cmd = "sed '/feature_groups:" \
"/a \ \ \ \ - experimental' -i {0}".format(path)
result = remote.execute(cmd)
assert_equal(0, result['exit_code'], result['stderr'])
@logwrap
def enable_advanced_mode(remote, path):
cmd = "sed '/feature_groups:" \
"/a \ \ \ \ - advanced' -i {0}".format(path)
result = remote.execute(cmd)
assert_equal(0, result['exit_code'], result['stderr'])
def enable_feature_group(env, group):
fuel_settings = env.admin_actions.get_fuel_settings()
fuel_settings["FEATURE_GROUPS"].append(group)
env.admin_actions.save_fuel_settings(fuel_settings)
@logwrap

15
fuelweb_test/tests/test_reduced_footprint.py
View File

@ -51,9 +51,8 @@ class TestVirtRole(TestBasic):
self.env.revert_snapshot("ready_with_1_slaves")
with self.env.d_env.get_admin_remote() as remote:
checkers.enable_advanced_mode(remote, '/etc/fuel/version.yaml')
checkers.restart_nailgun(remote)
checkers.enable_feature_group(self.env, 'advanced')
self.env.docker_actions.restart_container("nailgun")
cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__,
@ -111,9 +110,8 @@ class TestVirtRole(TestBasic):
self.env.revert_snapshot("ready_with_1_slaves")
with self.env.d_env.get_admin_remote() as remote:
checkers.enable_advanced_mode(remote, '/etc/fuel/version.yaml')
checkers.restart_nailgun(remote)
checkers.enable_feature_group(self.env, 'advanced')
self.env.docker_actions.restart_container("nailgun")
cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__,
@ -178,9 +176,8 @@ class TestVirtRole(TestBasic):
self.env.revert_snapshot("ready_with_3_slaves")
with self.env.d_env.get_admin_remote() as remote:
checkers.enable_advanced_mode(remote, '/etc/fuel/version.yaml')
checkers.restart_nailgun(remote)
checkers.enable_feature_group(self.env, 'advanced')
self.env.docker_actions.restart_container("nailgun")
cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__,

9
fuelweb_test/tests/test_zabbix.py
View File

@ -53,13 +53,8 @@ class HAOneControllerZabbix(TestBasic):
"""
self.env.revert_snapshot("ready_with_3_slaves")
with self.env.d_env.get_admin_remote() as admin_remote:
# Turn on experimental mode
checkers.check_enable_experimental_mode(
admin_remote, '/etc/fuel/version.yaml')
# restart nailgun
checkers.restart_nailgun(admin_remote)
checkers.enable_feature_group(self.env, 'experimental')
self.env.docker_actions.restart_container("nailgun")
# check if zabbix role appears
self.fuel_web.assert_release_role_present(