openinfra/refstack
Code Issues Proposed changes

Merge "modified to seperate callback url from test id"

Browse Source
This commit is contained in:
Jenkins
2014-04-12 00:09:53 +00:00
committed by Gerrit Code Review
parent 1e31b63785 057f7d727b
commit 3993ed50d8
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
refstack/tools/docker_buildfile.template
View File

@@ -63,4 +63,4 @@ RUN /usr/local/bin/pip install -r /tempest/test-requirements.txt
# CONF_JSON - JSON string that contains portion of the Tempest # CONF_JSON - JSON string that contains portion of the Tempest
# config. For example, the passwords of the users. # config. For example, the passwords of the users.
CMD wget http://${APP_SERVER_ADDRESS}/get-script -O execute_test.py && python execute_test.py --callback ${APP_SERVER_ADDRESS} ${TEST_ID} --conf-json ${CONF_JSON} --tempest-home /tempest -v CMD wget http://${APP_SERVER_ADDRESS}/get-script -O execute_test.py && python execute_test.py --callback ${APP_SERVER_ADDRESS} --test-id ${TEST_ID} --conf-json ${CONF_JSON} --tempest-home /tempest -v

31
refstack/tools/execute_test.py
View File

@@ -29,6 +29,12 @@ import urllib2
class Test: class Test:
app_server_address = None
test_id = None
extra_conf_dict = dict()
mini_conf_dict = dict()
testcases = {"testcases": ["tempest"]}
def __init__(self, args): def __init__(self, args):
'''Prepare a tempest test against a cloud.''' '''Prepare a tempest test against a cloud.'''
@@ -37,6 +43,7 @@ class Test:
console_log_handle = logging.StreamHandler() console_log_handle = logging.StreamHandler()
console_log_handle.setFormatter(logging.Formatter(log_format)) console_log_handle.setFormatter(logging.Formatter(log_format))
self.logger.addHandler(console_log_handle) self.logger.addHandler(console_log_handle)
if os.environ.get("DEBUG"): if os.environ.get("DEBUG"):
self.logger.setLevel(logging.DEBUG) self.logger.setLevel(logging.DEBUG)
elif args.verbose: elif args.verbose:
@@ -44,17 +51,17 @@ class Test:
else: else:
self.logger.setLevel(logging.CRITICAL) self.logger.setLevel(logging.CRITICAL)
self.app_server_address = None
self.test_id = None
if args.callback: if args.callback:
self.app_server_address, self.test_id = args.callback self.app_server_address = args.callback
if args.test_id:
self.test_id = args.test_id
self.mini_conf_dict = json.loads(self.get_mini_config()) self.mini_conf_dict = json.loads(self.get_mini_config())
self.extra_conf_dict = dict()
if args.conf_json: if args.conf_json:
self.extra_conf_dict = args.conf_json self.extra_conf_dict = args.conf_json
self.testcases = {"testcases": ["tempest"]}
if args.testcases: if args.testcases:
self.testcases = {"testcases": args.testcases} self.testcases = {"testcases": args.testcases}
@@ -410,12 +417,18 @@ if __name__ == '__main__':
conflict_group = parser.add_mutually_exclusive_group() conflict_group = parser.add_mutually_exclusive_group()
conflict_group.add_argument("--callback", conflict_group.add_argument("--callback",
nargs=2,
metavar=("APP_SERVER_ADDRESS", "TEST_ID"),
type=str, type=str,
help="refstack API IP address and test ID to\ action='store',
help="refstack API IP address \
retrieve configurations. i.e.:\ retrieve configurations. i.e.:\
--callback 127.0.0.1:8000 1234") --callback 127.0.0.1:8000")
conflict_group.add_argument("--test-id",
action='store',
dest='test_id',
type=str,
help="refstack test ID i.e.:\
--test-id 1234 ")
parser.add_argument("--tempest-home", parser.add_argument("--tempest-home",
help="tempest directory path") help="tempest directory path")