diff --git a/02-Keyword/tsg_bfapi/LoginLogout.robot b/02-Keyword/tsg_bfapi/LoginLogout.robot index e1ec2a0..81662d1 100644 --- a/02-Keyword/tsg_bfapi/LoginLogout.robot +++ b/02-Keyword/tsg_bfapi/LoginLogout.robot @@ -10,6 +10,7 @@ Resource Tag.robot *** Keywords *** Login + [Tags] tsg_adc tsg_bf_api #[Arguments] ${username} ${password} ${authmode} ${authCode} ${ldapId} # 毕方接口用户名密码 GET /v1/user/encryptpwd?password=${password} @@ -49,6 +50,7 @@ Login #Return ${rescode} Logout + [Tags] tsg_adc tsg_bf_api POST /v1/user/logout headers=${headers} Object response body Integer $.code 200 @@ -56,8 +58,8 @@ Logout #[Return] ${rescode} ApiLoginAndAddLocalIP - [Arguments] ${tempparm} - log ApiLoginAndAddLocalIP${tempparm} + [Tags] tsg_adc tsg_bf_api + log ApiLoginAndAddLocalIP loginlogout.Login #log ********** Run Keyword If ${addTestClentIPFlag}==1 AddLocalIPObject @@ -66,8 +68,8 @@ ApiLoginAndAddLocalIP #[Return] ${rescode} ApiLogoutAndDelLocalIP - [Arguments] ${tempparm} - log ApiLogoutAndDelLocalIP${tempparm} + [Tags] tsg_adc tsg_bf_api + log ApiLogoutAndDelLocalIP log to_LogoutAndDelLocalIP_LogoutAndDelLocalIP Run Keyword If ${addTestClentIPFlag}==1 DelLocalIPObject #ApiDeleteAutoTagsCase @@ -75,10 +77,12 @@ ApiLogoutAndDelLocalIP #[Return] ${rescode} CliLogin + [Tags] tsg_cli cli_login Open Connection ${cliHost} SSHLibrary.Login ${cliUsername} ${cliPassword} -CliLogout +CliLogout + [Tags] tsg_cli cli_logout Close Connection Log Close connection #exit \ No newline at end of file diff --git a/02-Keyword/tsg_common/LoginAndLogoutTypeSwitch.robot b/02-Keyword/tsg_common/LoginAndLogoutTypeSwitch.robot index cb9000a..212a015 100644 --- a/02-Keyword/tsg_common/LoginAndLogoutTypeSwitch.robot +++ b/02-Keyword/tsg_common/LoginAndLogoutTypeSwitch.robot @@ -9,15 +9,17 @@ Resource ../tsg_ui/Login/Login.robot *** Keywords *** LoginAndAddLocalIP + [Tags] tsg_adc tsg_bf_api tsg_cli # 获取主机IP - ${ip} Get Host IP - Run Keyword If '${ip}' != '${EMPTY}' Set Global Variable ${testClentIP} ${ip} + #${ip} Get Host IP + #Run Keyword If '${ip}' != '${EMPTY}' Set Global Variable ${testClentIP} ${ip} - Run Keyword If '${loginType}' == 'api' ApiLoginAndAddLocalIP aa + Run Keyword If '${loginType}' == 'api' ApiLoginAndAddLocalIP ... ELSE IF '${loginType}' == 'cli' CliLogin - ... ELSE UiLoginAndAaddLocalIP bb + ... ELSE UiLoginAndAaddLocalIP LogoutAndDelLocalIP - Run Keyword If '${loginType}' == 'api' ApiLogoutAndDelLocalIP aa + [Tags] tsg_adc tsg_bf_api tsg_cli + Run Keyword If '${loginType}' == 'api' ApiLogoutAndDelLocalIP ... ELSE IF '${loginType}' == 'cli' CliLogout - ... ELSE UiLogoutAndDelLocalIP bb + ... ELSE UiLogoutAndDelLocalIP diff --git a/02-Keyword/tsg_ui/Login/Login.robot b/02-Keyword/tsg_ui/Login/Login.robot index e91f39f..6eab9ec 100644 --- a/02-Keyword/tsg_ui/Login/Login.robot +++ b/02-Keyword/tsg_ui/Login/Login.robot @@ -19,8 +19,7 @@ AddLocalIp set global variable ${LocahIPName} ${obj1}[name] UiLoginAndAaddLocalIP - [Arguments] ${tempParm} - log UiLoginAndAaddLocalIP${tempParm} + log UiLoginAndAaddLocalIP Login.Login Run Keyword If ${addTestClentIPFlag}==1 AddLocalIp log UiLoginAndAaddLocalIP:${LocahIPName} diff --git a/05-Other/docker.txt b/05-Other/docker.txt index 84311b2..19a36f6 100644 --- a/05-Other/docker.txt +++ b/05-Other/docker.txt @@ -22,3 +22,11 @@ for /f %%i in ('dir /ad /b scoped_dir*') do (rd /s /q %%i) 然后在robotframework中,使用OperatingSystem中的run命令运行这个批处理文件,如下所示: Run Keyword And Ignore Error OperatingSystem.run cleartmp.bat +5、删除所有已经退出容器: +docker rm $(docker ps -a -q) + + +docker run --add-host=open.node.com:192.168.100.5 -it auto-rf-library:1.0 + + +docker run --name autotest.open.node.com --add-host=open.node.com:192.168.100.5 -it -v /home/autoTest_tsg/:/usr/src/python -w /usr/src/python auto-rf-library:1.0 robot -i tsg_adc -d newreport/ tsg_autotest0406