From 62b09ccf7a3a20694d906020fe6e02c61c75bcac Mon Sep 17 00:00:00 2001
From: haozi007 <liuhao27@huawei.com>
Date: Wed, 28 Apr 2021 19:25:42 +0800
Subject: [PATCH 090/104] add testcase for contailer log opts

Signed-off-by: haozi007 <liuhao27@huawei.com>
---
 CI/test_cases/container_cases/log_test.sh     | 133 ++++++++++++++++--
 .../container_cases/test_data/daemon.json     |   1 +
 2 files changed, 125 insertions(+), 9 deletions(-)

diff --git a/CI/test_cases/container_cases/log_test.sh b/CI/test_cases/container_cases/log_test.sh
index 08abf212..119a005a 100755
--- a/CI/test_cases/container_cases/log_test.sh
+++ b/CI/test_cases/container_cases/log_test.sh
@@ -12,6 +12,7 @@ function do_pre()
 {
     mv /etc/isulad/daemon.json /etc/isulad/daemon.bak
     cp ${data_path}/daemon.json /etc/isulad/daemon.json
+    TC_RET_T=0
 }
 
 function do_post()
@@ -23,8 +24,9 @@ function do_post()
 
 function do_check_item()
 {
-    cat ${ISULAD_ROOT_PATH}/engine/lcr/$1/config | grep console | grep "$2"
+    cat ${ISULAD_ROOT_PATH}/engines/lcr/$1/config | grep console | grep "$2"
     if [ $? -ne 0 ]; then
+        cat ${ISULAD_ROOT_PATH}/engines/lcr/$1/config | grep console
         msg_err "expect $2"
         TC_RET_T=$(($TC_RET_T+1))
     fi
@@ -61,6 +63,112 @@ function do_test_syslog_helper()
     return $TC_RET_T
 }
 
+function do_test_syslog_tag()
+{
+    local cid
+    msg_info "this is $0 do_test"
+
+    crictl pull busybox
+    if [ $? -ne 0 ]; then
+        msg_err "Failed to pull busybox image"
+        TC_RET_T=$(($TC_RET_T+1))
+    fi
+
+    isula run -ti --log-opt="syslog-tag={{.xxx}}" busybox date
+    if [ $? -eq 0 ]; then
+        msg_err "run container success with invalid syslog-tag"
+        TC_RET_T=$(($TC_RET_T+1))
+    fi
+
+    isula run -ti --log-opt="syslog-tag={{" busybox date
+    if [ $? -eq 0 ]; then
+        msg_err "run container success with invalid syslog-tag"
+        TC_RET_T=$(($TC_RET_T+1))
+    fi
+
+    isula run -ti --log-opt="syslog-tag=aab{{cd" busybox date
+    if [ $? -eq 0 ]; then
+        msg_err "run container success with invalid syslog-tag"
+        TC_RET_T=$(($TC_RET_T+1))
+    fi
+
+    cid=$(isula run -tid --log-opt="syslog-tag={{.DaemonName}}" busybox sh)
+    if [ $? -ne 0 ]; then
+        msg_err "Failed to run container"
+        TC_RET_T=$(($TC_RET_T+1))
+    fi
+    do_check_item ${cid} "logdriver = syslog"
+    do_check_item ${cid} "syslog_tag = iSulad"
+
+    cid=`isula run -tid --log-opt="syslog-tag={{.ID}}" busybox sh`
+    if [ $? -ne 0 ]; then
+        msg_err "Failed to run container"
+        TC_RET_T=$(($TC_RET_T+1))
+    fi
+    do_check_item ${cid} "logdriver = syslog"
+    do_check_item ${cid} "syslog_tag = ${cid: 0: 12}"
+
+    cid=`isula run -tid --name=haozi --log-opt="syslog-tag={{.ID}}xx{{.Name}}" busybox sh`
+    if [ $? -ne 0 ]; then
+        msg_err "Failed to run container"
+        TC_RET_T=$(($TC_RET_T+1))
+    fi
+    do_check_item ${cid} "logdriver = syslog"
+    do_check_item ${cid} "syslog_tag = ${cid: 0: 12}xxhaozi"
+    isula rm -f haozi
+
+    cid=`isula run -tid --log-opt="syslog-tag={{.FullID}}" busybox sh`
+    if [ $? -ne 0 ]; then
+        msg_err "Failed to run container"
+        TC_RET_T=$(($TC_RET_T+1))
+    fi
+    do_check_item ${cid} "logdriver = syslog"
+    do_check_item ${cid} "syslog_tag = ${cid}"
+
+    cid=`isula run -tid --name haozi --log-opt="syslog-tag={{.Name}}" busybox sh`
+    if [ $? -ne 0 ]; then
+        msg_err "Failed to run container"
+        TC_RET_T=$(($TC_RET_T+1))
+    fi
+    do_check_item ${cid} "logdriver = syslog"
+    do_check_item ${cid} "syslog_tag = haozi"
+    isula rm -f haozi
+
+    cid=`isula run -tid --name haozi --log-opt="syslog-tag=xx{{.Name}}yy" busybox sh`
+    if [ $? -ne 0 ]; then
+        msg_err "Failed to run container"
+        TC_RET_T=$(($TC_RET_T+1))
+    fi
+    do_check_item ${cid} "logdriver = syslog"
+    do_check_item ${cid} "syslog_tag = xxhaoziyy"
+    isula rm -f haozi
+
+    cid=`isula run -tid --log-opt="syslog-tag={{.ImageName}}" busybox sh`
+    if [ $? -ne 0 ]; then
+        msg_err "Failed to run container"
+        TC_RET_T=$(($TC_RET_T+1))
+    fi
+    do_check_item ${cid} "logdriver = syslog"
+    do_check_item ${cid} "syslog_tag = busybox"
+
+    cid=`isula run -tid --log-opt="syslog-tag={{.ImageID}}" busybox sh`
+    if [ $? -ne 0 ]; then
+        msg_err "Failed to run container"
+        TC_RET_T=$(($TC_RET_T+1))
+    fi
+    img_id=`isula inspect -f '{{.image.id}}' busybox`
+    do_check_item ${cid} "logdriver = syslog"
+    do_check_item ${cid} "syslog_tag = sha256:${img_id:0:5}"
+
+    isula rm -f `isula ps -aq`
+    if [ $? -ne 0 ]; then
+        msg_err "Failed to remove container"
+        TC_RET_T=$(($TC_RET_T+1))
+    fi
+
+    return $TC_RET_T
+}
+
 function do_test_json_file_helper()
 {
     msg_info "this is $0 do_test"
@@ -96,6 +204,8 @@ function do_test_json_file_helper()
 function do_test_container_log()
 {
     msg_info "this is $0 do_test"
+    cat /etc/isulad/daemon.json
+    ps aux | grep -i isulad
 
     cid=`isula run -tid --log-driver=json-file busybox sh`
     if [ $? -ne 0 ]; then
@@ -129,7 +239,7 @@ function do_test_container_log()
         msg_err "Failed to run container"
         TC_RET_T=$(($TC_RET_T+1))
     fi
-    cat ${ISULAD_ROOT_PATH}/engine/lcr/${cid}/config | grep console | grep "logfile ="
+    cat ${ISULAD_ROOT_PATH}/engines/lcr/${cid}/config | grep console | grep "logfile ="
     if [ $? -eq 0 ]; then
         msg_err "Failed to disable log"
         TC_RET_T=$(($TC_RET_T+1))
@@ -139,14 +249,20 @@ function do_test_container_log()
     return $TC_RET_T
 }
 
+function do_test_container_syslog() {
+    do_test_syslog_helper "xxxx"
+
+    do_test_syslog_tag
+}
+
 function do_test() {
     check_valgrind_log
-    start_isulad_with_valgrind --log-opts="syslog-tag=xxxx"
+    start_isulad_with_valgrind --container-log-opts="syslog-tag=xxxx"
 
-    do_test_syslog_helper "xxxx"
+    do_test_container_syslog
 
     check_valgrind_log
-    start_isulad_with_valgrind --log-driver=json-file --log-opts="max-size=10MB" --log-opts="max-file=3"
+    start_isulad_with_valgrind --container-log-driver=json-file --container-log-opts="max-size=10MB" --container-log-opts="max-file=3"
     do_test_json_file_helper "3" "10MB"
 
     check_valgrind_log
@@ -157,10 +273,9 @@ function do_test() {
 ret=0
 
 do_pre
-if [ $? -ne 0 ];then
-    let "ret=$ret + 1"
-fi
+
+do_test
 
 do_post
 
-show_result $ret "cni base test"
+show_result $TC_RET_T "container log test"
diff --git a/CI/test_cases/container_cases/test_data/daemon.json b/CI/test_cases/container_cases/test_data/daemon.json
index f8914ed4..aa88c9da 100644
--- a/CI/test_cases/container_cases/test_data/daemon.json
+++ b/CI/test_cases/container_cases/test_data/daemon.json
@@ -23,6 +23,7 @@
         "overlay2.override_kernel_check=true"
     ],
     "registry-mirrors": [
+        "docker.io"
     ],
     "insecure-registries": [
     ],
-- 
2.25.1