From 3cf33a494b878101ec1a4a19ef6b0a9fb89f13f0 Mon Sep 17 00:00:00 2001 From: lvzhonglin Date: Tue, 21 May 2024 14:52:18 +0800 Subject: [PATCH 1/2] modiy testcases/doc-test/admin_guide/oe_test_nmcli_config_dynamic_IP/oe_test_nmcli_config_dynamic_IP.sh --- .../oe_test_nmcli_config_dynamic_IP.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testcases/doc-test/admin_guide/oe_test_nmcli_config_dynamic_IP/oe_test_nmcli_config_dynamic_IP.sh b/testcases/doc-test/admin_guide/oe_test_nmcli_config_dynamic_IP/oe_test_nmcli_config_dynamic_IP.sh index 4266fa4c5..d90260855 100755 --- a/testcases/doc-test/admin_guide/oe_test_nmcli_config_dynamic_IP/oe_test_nmcli_config_dynamic_IP.sh +++ b/testcases/doc-test/admin_guide/oe_test_nmcli_config_dynamic_IP/oe_test_nmcli_config_dynamic_IP.sh @@ -20,12 +20,13 @@ source ${OET_PATH}/libs/locallibs/common_lib.sh function config_params() { LOG_INFO "Start loading data!" con_name='test_con' + test_eth1=$(ls /sys/class/net/ | grep -Ewv 'lo.*|docker.*|bond.*|vlan.*|virbr.*|br.*' | grep -v $(ip route | grep ${NODE1_IPV4} | awk '{print$3}') | sed -n 1p) LOG_INFO "Loading data is complete!" } function run_test() { LOG_INFO "Start executing testcase!" - nmcli connection add type ethernet con-name ${con_name} ifname ${NODE1_NIC} | grep successfully + nmcli connection add type ethernet con-name ${con_name} ifname ${test_eth1} | grep successfully CHECK_RESULT $? nmcli con up ${con_name} -- Gitee From a7e6ab25c0d524358da1f8752f3e9f7e962d56d7 Mon Sep 17 00:00:00 2001 From: lvzhonglin Date: Wed, 22 May 2024 09:27:37 +0800 Subject: [PATCH 2/2] add double quote necessary --- .../oe_test_nmcli_config_dynamic_IP.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testcases/doc-test/admin_guide/oe_test_nmcli_config_dynamic_IP/oe_test_nmcli_config_dynamic_IP.sh b/testcases/doc-test/admin_guide/oe_test_nmcli_config_dynamic_IP/oe_test_nmcli_config_dynamic_IP.sh index d90260855..d229f54aa 100755 --- a/testcases/doc-test/admin_guide/oe_test_nmcli_config_dynamic_IP/oe_test_nmcli_config_dynamic_IP.sh +++ b/testcases/doc-test/admin_guide/oe_test_nmcli_config_dynamic_IP/oe_test_nmcli_config_dynamic_IP.sh @@ -16,17 +16,17 @@ # @License : Mulan PSL v2 # @Desc : Nmcli configure dynamic IP connection # ############################################ -source ${OET_PATH}/libs/locallibs/common_lib.sh +source "${OET_PATH}"/libs/locallibs/common_lib.sh function config_params() { LOG_INFO "Start loading data!" con_name='test_con' - test_eth1=$(ls /sys/class/net/ | grep -Ewv 'lo.*|docker.*|bond.*|vlan.*|virbr.*|br.*' | grep -v $(ip route | grep ${NODE1_IPV4} | awk '{print$3}') | sed -n 1p) + test_eth1=$(ls /sys/class/net/ | grep -Ewv 'lo.*|docker.*|bond.*|vlan.*|virbr.*|br.*' | grep -v $(ip route | grep "${NODE1_IPV4}" | awk '{print$3}') | sed -n 1p) LOG_INFO "Loading data is complete!" } function run_test() { LOG_INFO "Start executing testcase!" - nmcli connection add type ethernet con-name ${con_name} ifname ${test_eth1} | grep successfully + nmcli connection add type ethernet con-name ${con_name} ifname "${test_eth1}" | grep successfully CHECK_RESULT $? nmcli con up ${con_name} @@ -42,4 +42,4 @@ function post_test() { LOG_INFO "Finish environment cleanup." } -main $@ +main "$@" -- Gitee