openstack/fuel-qa
Code Issues Proposed changes

Add wait for feature_group enabled

Browse Source 
Change-Id: I08558ff0df57cad50163f1062f93a004bae145a7
Closes-Bug: #1529869
(cherry picked from commit 651f112e2e)
This commit is contained in:
Dmitry Kalashnik
2015-12-31 13:09:59 +03:00
parent 3b738e7f9d
commit ce315c50e9
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fuelweb_test/helpers/checkers.py
View File

@@ -16,6 +16,7 @@ import json
import os import os
import re import re
import traceback import traceback
import urllib2
from devops.error import TimeoutError from devops.error import TimeoutError
from devops.helpers.helpers import _wait from devops.helpers.helpers import _wait
@@ -362,6 +363,19 @@ def enable_feature_group(env, group):
fuel_settings = env.admin_actions.get_fuel_settings() fuel_settings = env.admin_actions.get_fuel_settings()
fuel_settings["FEATURE_GROUPS"].append(group) fuel_settings["FEATURE_GROUPS"].append(group)
env.admin_actions.save_fuel_settings(fuel_settings) env.admin_actions.save_fuel_settings(fuel_settings)
env.docker_actions.restart_container("nailgun")
def check_api_available():
try:
env.fuel_web.client.get_api_version()
except (urllib2.HTTPError, urllib2.URLError):
return False
return True
wait(check_api_available, interval=10, timeout=60 * 15)
wait(lambda: group in
env.fuel_web.client.get_api_version()["feature_groups"],
interval=10, timeout=60 * 5)
@logwrap @logwrap

11
fuelweb_test/tests/test_reduced_footprint.py
View File

@@ -51,8 +51,7 @@ class TestVirtRole(TestBasic):
self.env.revert_snapshot("ready_with_1_slaves") self.env.revert_snapshot("ready_with_1_slaves")
checkers.enable_feature_group(self.env, 'advanced') checkers.enable_feature_group(self.env, "advanced")
self.env.docker_actions.restart_container("nailgun")
cluster_id = self.fuel_web.create_cluster( cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__, name=self.__class__.__name__,
@@ -110,8 +109,7 @@ class TestVirtRole(TestBasic):
self.env.revert_snapshot("ready_with_1_slaves") self.env.revert_snapshot("ready_with_1_slaves")
checkers.enable_feature_group(self.env, 'advanced') checkers.enable_feature_group(self.env, "advanced")
self.env.docker_actions.restart_container("nailgun")
cluster_id = self.fuel_web.create_cluster( cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__, name=self.__class__.__name__,
@@ -176,8 +174,7 @@ class TestVirtRole(TestBasic):
self.env.revert_snapshot("ready_with_3_slaves") self.env.revert_snapshot("ready_with_3_slaves")
checkers.enable_feature_group(self.env, 'advanced') checkers.enable_feature_group(self.env, "advanced")
self.env.docker_actions.restart_container("nailgun")
cluster_id = self.fuel_web.create_cluster( cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__, name=self.__class__.__name__,
@@ -214,7 +211,7 @@ class TestVirtRole(TestBasic):
self.fuel_web.spawn_vms_wait(cluster_id) self.fuel_web.spawn_vms_wait(cluster_id)
wait(lambda: len(self.fuel_web.client.list_nodes()) == 6, wait(lambda: len(self.fuel_web.client.list_nodes()) == 6,
timeout=60 * 60, timeout=60 * 120,
timeout_msg=("Timeout waiting 6 available nodes, " timeout_msg=("Timeout waiting 6 available nodes, "
"current nodes: \n{0}" + '\n'.join( "current nodes: \n{0}" + '\n'.join(
['Name: {0}, status: {1}, online: {2}'. ['Name: {0}, status: {1}, online: {2}'.