summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-10-11 08:09:39 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-11 08:09:39 +0000
commit3d8da42ac3e7c844106a6bfa1c36df40387704dc (patch)
tree6c7437b0f9a12b7e5430f81148f625a4c26b561a /deploy
parent63d8f65494ed9e57d29ed1ecbce1caba81677499 (diff)
parent7e9120d10db671b65df70f8433064756a34517e4 (diff)
Merge "Add ip and mac valid check functionality"
Diffstat (limited to 'deploy')
-rwxr-xr-xdeploy/deploy_parameter.sh9
-rwxr-xr-xdeploy/launch.sh3
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 ed65f40d..976af3c0 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