aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2016-11-28 21:13:05 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2016-11-28 21:13:05 +0800
commit0d643bc668a33a45a8df63a50a71683bf232cf34 (patch)
tree9efde5199adf0c5718d32eb3425e4f8e973db782 /deploy
parent1908bad07fdc419fb7f26769781d1d16307c2e26 (diff)
Add ip and mac valid check functionality
Change-Id: I5b560b2ed75036e72e51dfe1ee79c4ff6123e24e Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
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