diff options
-rwxr-xr-x | ci/deploy.sh | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 4e4586c2e..8411714eb 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -29,7 +29,7 @@ cat << EOF xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx `basename $0`: Deploys the Fuel@OPNFV stack -usage: `basename $0` -b base-uri [-B PXE Bridge] [-f] [-F] [-H] -l lab-name -p pod-name -s deploy-scenario [-S image-dir] -i iso +usage: `basename $0` -b base-uri [-B PXE Bridge] [-f] [-F] [-H] -l lab-name -p pod-name -s deploy-scenario [-S image-dir] [-T timeout] -i iso -s deployment-scenario [-S optional Deploy-scenario path URI] [-R optional local relen repo (containing deployment Scenarios] @@ -47,6 +47,7 @@ OPTIONS: -p Pod-name -s Deploy-scenario short-name/base-file-name -S Storage dir for VM images + -T Timeout, in minutes, for the deploy. -i iso url Description: @@ -78,6 +79,8 @@ Input parameters to the build script is: or a deployment short-name as defined by scenario.yaml in the deployment scenario path. -S Storage dir for VM images, default is fuel/deploy/images +-T Timeout, in minutes, for the deploy. It defaults to using the DEPLOY_TIMEOUT + environment variable when defined, or to the default in deploy.py otherwise -i .iso image to be deployed (needs to be provi #!/usr/bin/python
#
# Copyright (c) 2015 Orange
# morgan.richomme@orange.com
#
# This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# This script is used to build json files for the dashboard
# for the vPing test case
#
# v0.1: basic example
#
import logging
import argparse
import pprint
import json
import dashboard_utils
import os
import yaml
pp = pprint.PrettyPrinter(indent=4)
parser = argparse.ArgumentParser()
parser.add_argument("repo_path", help="Path to the repository")
parser.add_argument("-d", "--debug", help="Debug mode", action="store_true")
args = parser.parse_args()
""" logging configuration """
logger = logging.getLogger('config_functest')
logger.setLevel(logging.DEBUG)
if not os.path.exists(args.repo_path):
logger.error("Repo directory not found '%s'" % args.repo_path)
exit(-1)
with open(args.repo_path+"testcases/config_functest.yaml") as f:
functest_yaml = yaml.safe_load(f)
f.close()
""" global variables """
# Directories
HOME = os.environ['HOME']+"/"
REPO_PATH = args.repo_path
TEST_DB = functest_yaml.get("results").get("test_db_url")
def format_vPing_for_dashboard(criteria):
# Get results
myDataResults = dashboard_utils.get_results(TEST_DB, criteria)
# Depending on the use case, json for dashboarding is customized
# depending on the graph you want to show
test_data = [{'description': 'vPing results for Dashboard'}]
# Graph 1: Duration = f(time)
# ***************************
new_element = []
for data in myDataResults:
new_element.append({'x': data['creation_date'],
'y': data['details']['duration']})
test_data.append({'name': "vPing duration",
'info': {'type': "graph",
'xlabel': 'time',
'ylabel': 'duration (s)'},
'data_set': new_element})
# Graph 2: bar
# ************
nbTest = 0
nbTestOk = 0
for data in myDataResults:
nbTest += 1
if data['details']['status'] == "OK":
nbTestOk += 1
test_data.append({'name': "vPing status",
'info': {"type": "bar"},
'data_set': [{'Nb tests': nbTest,
'Nb Success': nbTestOk}]})
# Generate json file
fileName = criteria.format()
logger.debug("Generate json file:" + fileName)
with open(fileName, "w") as outfile:
json.dump(test_data, outfile, indent=4)
|