summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-11-28 08:46:57 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-28 08:46:57 +0000
commit5f29c023fe065bb9d65eb721d4e357225bf531d6 (patch)
tree906f65086c2488e19f9524c77e90a2f31ef8f635 /deploy
parentb212b7ac454fea642d7637e7489ff69665e54289 (diff)
parent0d643bc668a33a45a8df63a50a71683bf232cf34 (diff)
Merge "Add ip and mac valid check functionality" into stable/colorado
Diffstat (limited to 'deploy')
-rwxr-xr-xdeploy/deploy_parameter.sh8
-rwxr-xr-xdeploy/launch.sh1
2 files changed, 9 insertions, 0 deletions
diff --git a/deploy/deploy_parameter.sh b/deploy/deploy_parameter.sh
index d8696ce8..9c0d5dc0 100755
--- a/deploy/deploy_parameter.sh
+++ b/deploy/deploy_parameter.sh
@@ -111,3 +111,11 @@ 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..489c06d8 100755
--- a/deploy/launch.sh
+++ b/deploy/launch.sh
@@ -19,6 +19,7 @@ prepare_python_env
source ${COMPASS_DIR}/util/log.sh
source ${COMPASS_DIR}/deploy/deploy_parameter.sh
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