Add upload packages retry

1. retry 5 times if csar package uploads fail
2. clearwater service name varies over the time
3. use the word vnf instead of app

Change-Id: Id85c7f467cbefbc46fd1f1daf6202d89ef3ac898
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>

1 files changed, 13 insertions, 3 deletions

diff --git a/juju/vims_deploy.sh b/juju/vims_deploy.sh
index 763a4f7..5fa86ac 100755
--- a/juju/vims_deploy.sh
+++ b/juju/vims_deploy.sh
@@ -10,9 +10,19 @@
 
 juju_client_ip=$(openstack server list | grep juju-client-vm | awk '{print $9}')
 
-function deploy_app() {
-    python ${JUJU_DIR}/deploy_application.py --msb_ip $OPENO_IP:$COMMON_SERVICES_MSB_PORT \
-                                             --application $APP_NAME
+function exec_cmd_on_client()
+{
+    local ssh_args="-o StrictHostKeyChecking=no"
+
+    if [ ! $juju_client_ip ]; then
+        log_error "juju-client ip not found"
+        exit 1
+    fi
+    ssh $ssh_args ubuntu@$juju_client_ip "$@"
+}
+
+function log_error() {
+    echo -e "\033[31m$*\033[0m"
 }
 
 function check_clearwater() {