From aa2c161a6bb63fb9c2a2b1f8e553f6220919dcf7 Mon Sep 17 00:00:00 2001
From: Srinivasan <srinivasan.s.n@huawei.com>
Date: Fri, 7 Jun 2019 08:45:13 +0000
Subject: [PATCH] Kubeedge code optimization

Signed-off-by: Srinivasan <srinivasan.s.n@huawei.com>
Change-Id: If7fb71194f7e033f9fc02d5a56a560acd5a3489b
---
 scripts/ci_management/cleanup_control.sh | 32 +++++++++++++++++++-------------
 scripts/ci_management/cleanup_edge.sh    |  2 +-
 scripts/src/kubeedge_setup.sh            | 12 ++++++------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/scripts/ci_management/cleanup_control.sh b/scripts/ci_management/cleanup_control.sh
index 574552b..3f14b02 100755
--- a/scripts/ci_management/cleanup_control.sh
+++ b/scripts/ci_management/cleanup_control.sh
@@ -14,23 +14,29 @@ TESTYAML="testk8s-nginx.yaml"
 
 # start
 
-source ../src/config_kubeedge
+source ../src/config_kubeedge > /dev/null 2>&1
 cd
 kubectl delete -f $TESTYAML
 
-sshpass -p ${EDGENODEPASSWORD} \
-scp ${PATH_OF_ELIOTFOLDER}/scripts/ci_management/cleanup_edge.sh \
-${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
+exec_edge_master(){
 
-sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
-source cleanup_edge.sh
+   sshpass -p ${EDGENODEPASSWORD} \
+   scp ${PATH_OF_ELIOTFOLDER}/scripts/ci_management/cleanup_edge.sh \
+   ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
 
-cd $PATH_OF_ELIOTFOLDER/scripts/ci_management
-source cleanup_master.sh
+   sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
+   source cleanup_edge.sh
 
-sshpass -p ${EDGENODEPASSWORD} \
-scp ${PATH_OF_ELIOTFOLDER}/scripts/ci_management/cleanup_edge_final.sh \
-${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
+   cd $PATH_OF_ELIOTFOLDER/scripts/ci_management
+   source cleanup_master.sh
 
-sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
-source cleanup_edge_final.sh
+   sshpass -p ${EDGENODEPASSWORD} \
+   scp ${PATH_OF_ELIOTFOLDER}/scripts/ci_management/cleanup_edge_final.sh \
+   ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
+
+   sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
+   source cleanup_edge_final.sh
+
+}
+
+exec_edge_master > /dev/null 2>&1
diff --git a/scripts/ci_management/cleanup_edge.sh b/scripts/ci_management/cleanup_edge.sh
index 646f5be..37cc2b6 100644
--- a/scripts/ci_management/cleanup_edge.sh
+++ b/scripts/ci_management/cleanup_edge.sh
@@ -16,7 +16,7 @@ CONSTZERO="0"
 
 # start
 
-source config_kubeedge
+source config_kubeedge > /dev/null 2>&1
 source ~/.profile
 
 cd
diff --git a/scripts/src/kubeedge_setup.sh b/scripts/src/kubeedge_setup.sh
index e75c1be..cc9c638 100755
--- a/scripts/src/kubeedge_setup.sh
+++ b/scripts/src/kubeedge_setup.sh
@@ -16,7 +16,7 @@ take_keedge(){
    make
 }
 
-source config_kubeedge
+source config_kubeedge > /dev/null 2>&1
 
 common_steps="echo $GOPATH && \
 echo $HOME && \
@@ -49,9 +49,9 @@ exec_edge(){
    sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
    source config_kubeedge
 
-   source config_kubeedge
+   source config_kubeedge > /dev/null 2>&1
    sshpass -p ${EDGENODEPASSWORD} \
-   ssh ${EDGENODEUSR}@${EDGENODEIP} ${common_steps} < /dev/null
+   ssh ${EDGENODEUSR}@${EDGENODEIP} ${common_steps}
 
    echo "After cloning the code in ELIOT edge node"
    sshpass -p ${EDGENODEPASSWORD} \
@@ -62,18 +62,18 @@ exec_edge(){
    tar -xvzf /etc/kubeedge/certs.tgz --directory /etc/kubeedge
 
    sshpass -p ${EDGENODEPASSWORD} \
-   ssh ${EDGENODEUSR}@${EDGENODEIP} ${edge_start} < /dev/null
+   ssh ${EDGENODEUSR}@${EDGENODEIP} ${edge_start}
 }
 
 # start
 
-source config_kubeedge
+source config_kubeedge > /dev/null 2>&1
 
 take_keedge
 
 execute_keedge_controller
 
-exec_edge
+exec_edge > /dev/null 2>&1
 
 sleep 10
 sudo kubectl get nodes
-- 
2.16.6