diff options
| author |   Herry Huang <huangxiangyu5@huawei.com> | 2016-09-12 19:03:40 +0800 |
|---|---|---|
| committer | Herry Huang <huangxiangyu5@huawei.com> | 2016-09-23 19:45:46 +0800 |
| commit | 7e9120d10db671b65df70f8433064756a34517e4 (patch) | |
| tree | 7da8e329602ec20571f01b5bfe54c62528779305 /deploy | |
| parent | 239a72670e7ea9fcfdfa97c0b508581e474ce790 (diff) | |
Add ip and mac valid check functionality
Add function check_input_para in /deploy/launch.sh to check
whether there is invalid address in DHA and NETWORK file after
function process_input_para is called.
Check_input_para is defined in /deploy/deploy_parameter.sh and
calls check_valid.py in /util. Exit installation when invalid
address or format error is found.
JIRA:COMPASS-480
Change-Id: Ib01c368db6b48cbded0045a2819d895c980c2b1b
Signed-off-by: Herry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy')
| -rwxr-xr-x | deploy/deploy_parameter.sh | 9 | ||||
| -rwxr-xr-x | deploy/launch.sh | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/deploy/deploy_parameter.sh b/deploy/deploy_parameter.sh index d8696ce8..92e3467d 100755 --- a/deploy/deploy_parameter.sh +++ b/deploy/deploy_parameter.sh @@ -111,3 +111,12 @@ function process_input_para() echo $input_file } + +function check_input_para() +{ + python ${COMPASS_DIR}/util/check_valid.py "$DHA" "$NETWORK" + if [ $? -ne 0 ];then + exit 1 + fi +} + diff --git a/deploy/launch.sh b/deploy/launch.sh index 488e0fd7..f73b400a 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -18,7 +18,8 @@ source ${COMPASS_DIR}/deploy/prepare.sh prepare_python_env source ${COMPASS_DIR}/util/log.sh source ${COMPASS_DIR}/deploy/deploy_parameter.sh -source $(process_input_para $*) || exit 1 +source $(process_input_para $* ) || exit 1 +check_input_para source $(process_default_para $*) || exit 1 source ${COMPASS_DIR}/deploy/conf/${FLAVOR}.conf source ${COMPASS_DIR}/deploy/conf/${TYPE}.conf |