gfwleak/dongxiaoyan-tsg-autotest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

纠正文件大小写以适应linux下的大小写区分

Browse Source
This commit is contained in:
dongxiaoyan
2020-04-17 10:12:15 +08:00
parent a32c839dc6
commit 7d1cfae8b4
25 changed files with 91 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
01-TestCase/tsg_adc/selfserver/DenyAllTests.robot
View File

@@ -6,6 +6,7 @@ Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot
Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot
Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot
Resource ../../../03-Variable/PolicyObjectDefault.txt
Resource ../../../02-Keyword/tsg_common/StmpHandle.robot
Library Custometest
Library json
@@ -54,9 +55,10 @@ SecurityPolicy-Deny-AllProtol-00001
... doLog=${Default_DoLog}
... scheduleId=${Default_ScheduleId}
${rescode} ${policyId} AddPolicy2 ${1} ${policyDict}
${policyId} set Variable {"policyType":"tsg_security","policyIds":[${policyId}]}
${s} Convert to String ${policyId}
${policyId} Create List {"policyType":"tsg_security","policyIds":[${policyId}]}
Comment 功能端验证HTTP验证
${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/SecurityPolicy-Deny-AllProtol-00001_HTTP.bat
... ELSE set variable curl -kv http://open.node.com/
@@ -90,25 +92,38 @@ SecurityPolicy-Deny-AllProtol-00001
GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni open.node.com
Comment 功能端验证DNS验证
Comment 功能端验证FTP验证
${starttime} Get Time
Sleep ${policyVerificationSleepSeconds}s
${ftpLogin} FTP_login ftp:192.168.100.5 -u"ftp_user:qazXSW@edc"
should contain ${ftpLogin} fail
Sleep ${policyLogVerificationSleepSeconds}s
${endtime} Get Time
#日志验证
GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftp_user
Comment 功能端验证MAIL验证
${starttime} Get Time
${mail} EmailLogin mail.tsgmail.com 25 dongxiaoyan@mail.tsgmail.com dxy123
should contain ${mail} fail
#${mail} EmailLogin mail.tsgmail.com 25 dongxiaoyan@mail.tsgmail.com dxy123
${starttime} Get Time
${Smtp服务器} Set Variable 192.168.100.5
${Smtp服务器端口} Set Variable 25
${邮箱账号} Set Variable dongxiaoyan@mail.tsgmail.com
${邮箱密码} Set Variable dxy123
${邮件主题} Set Variable что- иностранныеsuject
${发送者} Set Variable dongxiaoyan@mail.tsgmail.com
${附件} Set Variable ["${mailpath}/朱明明测试文件.txt"]
${接收者} Set Variable ["jwctest@mail.tsgmail.com"]
${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"]
${密送者} Set Variable ["lyftest@mail.tsgmail.com"]
${邮件正文} Set Variable 朱明明contentчто-иностранныеsuject
${mail} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件}
should contain ${mail} mail_fail
Sleep ${policyLogVerificationSleepSeconds}s
${endtime} Get Time
#日志验证
GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account dongxiaoyan@mail.tsgmail.com
GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_protocol_type SMTP
Comment 功能端验证FTP验证
${starttime} Get Time
Sleep ${policyVerificationSleepSeconds}s
${ftpLogin} FTP_login ftp://192.168.100.5:21 -u"ftp_user:qazXSW@edc" test.txt
should contain ${ftpLogin} ftp_fail
Sleep ${policyLogVerificationSleepSeconds}s
${endtime} Get Time
#日志验证
GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ''
#{"opAction":"add","policyList":{"policyId":"","policyName":"dxytest","policyType":"tsg_security","action":"deny","userTags":"","doBlacklist":0,"doLog":1,"policyDesc":"","effectiveRange":{"tag_sets":[[]]},"userRegion":{"method":"rst"},"referenceObject":[{"objectId":6926,"protocolFields":["TSG_SECURITY_SOURCE_ADDR"]},{"objectId":6943,"protocolFields":["TSG_SECURITY_DESTINATION_ADDR"]}],"isValid":0,"scheduleId":[],"appObjectIdArray":[2,3,4,5,6]}}

2
01-TestCase/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot
View File

@@ -2,7 +2,7 @@
Force Tags tsg-bfapi dashboard clientIP topn
Library Collections
Library REST
Resource ../../../03-Variable/Bifangapivariable.txt
Resource ../../../03-Variable/BifangApiVariable.txt
Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot
*** Test Cases ***

2
01-TestCase/tsg_bfapi/dashboard_data_compare/DomainTopN.robot
View File

@@ -2,7 +2,7 @@
Force Tags tsg-bfapi dashboard Domain topn
Library Collections
Library REST
Resource ../../../03-Variable/Bifangapivariable.txt
Resource ../../../03-Variable/BifangApiVariable.txt
Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/DomainTopN.robot
*** Test Cases ***

2
01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot
View File

@@ -2,7 +2,7 @@
Force Tags tsg-bfapi dashboard policy action
Library Collections
Library REST
Resource ../../../03-Variable/Bifangapivariable.txt
Resource ../../../03-Variable/BifangApiVariable.txt
Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot
*** Test Cases ***

2
01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot
View File

@@ -1,7 +1,7 @@
*** Settings ***
Force Tags tsg-bfapi dashboard policy topn
Library Collections
Resource ../../../03-Variable/Bifangapivariable.txt
Resource ../../../03-Variable/BifangApiVariable.txt
Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot
*** Test Cases ***

2
01-TestCase/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot
View File

@@ -2,7 +2,7 @@
Force Tags tsg-bfapi dashboard proxy pinning
Library Collections
Library REST
Resource ../../../03-Variable/Bifangapivariable.txt
Resource ../../../03-Variable/BifangApiVariable.txt
Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot
*** Test Cases ***

2
01-TestCase/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot
View File

@@ -2,7 +2,7 @@
Force Tags tsg-bfapi dashboard serviceIP topn
Library Collections
Library REST
Resource ../../../03-Variable/Bifangapivariable.txt
Resource ../../../03-Variable/BifangApiVariable.txt
Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot
*** Test Cases ***

2
01-TestCase/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot
View File

@@ -2,7 +2,7 @@
Force Tags tsg-bfapi dashboard subscriberid topn
Library Collections
Library REST
Resource ../../../03-Variable/Bifangapivariable.txt
Resource ../../../03-Variable/BifangApiVariable.txt
Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot
*** Test Cases ***

2
01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot
View File

@@ -1,7 +1,7 @@
*** Settings ***
Force Tags tsg-bfapi dashboard traffic newCount liveCount
Library Collections
Resource ../../../03-Variable/Bifangapivariable.txt
Resource ../../../03-Variable/BifangApiVariable.txt
Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot
*** Test Cases ***

2
01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot
View File

@@ -1,7 +1,7 @@
*** Settings ***
Force Tags tsg-bfapi dashboard traffic
Library Collections
Resource ../../../03-Variable/Bifangapivariable.txt
Resource ../../../03-Variable/BifangApiVariable.txt
Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot
*** Test Cases ***

2
01-TestCase/tsg_bfapi/dashboard_data_compare/UrlTopN.robot
View File

@@ -2,7 +2,7 @@
Force Tags tsg-bfapi dashboard url topn
Library Collections
Library REST
Resource ../../../03-Variable/Bifangapivariable.txt
Resource ../../../03-Variable/BifangApiVariable.txt
Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/UrlTopN.robot
*** Test Cases ***

6
01-TestCase/tsg_bfapi/policy_file_interface/ClearAllPolicy.robot
View File

@@ -4,9 +4,9 @@ Library String
Library OperatingSystem
Library Selenium2Library
Library Collections
Resource ../../../02-Keyword/tsg_bfapi/common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/functionalKeywords.robot
Resource ../../../03-Variable/bifangapivariable.txt
Resource ../../../02-Keyword/tsg_bfapi/Common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot
Resource ../../../03-Variable/BifangApiVariable.txt
*** Variables ***
${url1} /policy/profile/keyringobj

6
01-TestCase/tsg_bfapi/policy_file_interface/HijackFilesPolicy.robot
View File

@@ -5,9 +5,9 @@ Library String
Library OperatingSystem
Library Selenium2Library
Library Collections
Resource ../../../02-Keyword/tsg_bfapi/common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/functionalKeywords.robot
Resource ../../../03-Variable/bifangapivariable.txt
Resource ../../../02-Keyword/tsg_bfapi/Common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot
Resource ../../../03-Variable/BifangApiVariable.txt
*** Variables ***
${url} /policy/profile/hijackfiles

6
01-TestCase/tsg_bfapi/policy_file_interface/InsertScriptsPolicy.robot
View File

@@ -5,9 +5,9 @@ Library String
Library OperatingSystem
Library Selenium2Library
Library Collections
Resource ../../../02-Keyword/tsg_bfapi/common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/functionalKeywords.robot
Resource ../../../03-Variable/bifangapivariable.txt
Resource ../../../02-Keyword/tsg_bfapi/Common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot
Resource ../../../03-Variable/BifangApiVariable.txt
*** Variables ***
${url} /policy/profile/insertscripts

6
01-TestCase/tsg_bfapi/policy_file_interface/IntermediaCert.robot
View File

@@ -4,9 +4,9 @@ Library String
Library OperatingSystem
Library Selenium2Library
Library Collections
Resource ../../../02-Keyword/tsg_bfapi/common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/functionalKeywords.robot
Resource ../../../03-Variable/bifangapivariable.txt
Resource ../../../02-Keyword/tsg_bfapi/Common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot
Resource ../../../03-Variable/BifangApiVariable.txt
*** Variables ***
${url} /policy/exch/intermediacert

6
01-TestCase/tsg_bfapi/policy_file_interface/KeyringPolicyFile.robot
View File

@@ -5,9 +5,9 @@ Library String
Library OperatingSystem
Library Selenium2Library
Library Collections
Resource ../../../02-Keyword/tsg_bfapi/common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/functionalKeywords.robot
Resource ../../../03-Variable/bifangapivariable.txt
Resource ../../../02-Keyword/tsg_bfapi/Common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot
Resource ../../../03-Variable/BifangApiVariable.txt
*** Variables ***
${url} /policy/profile/keyringobj

4
01-TestCase/tsg_bfapi/policy_file_interface/ResponsePagesPolicy.robot
View File

@@ -5,9 +5,9 @@ Library String
Library OperatingSystem
Library Selenium2Library
Library Collections
Resource ../../../02-Keyword/tsg_bfapi/common.robot
Resource ../../../02-Keyword/tsg_bfapi/Common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot
Resource ../../../03-Variable/bifangapivariable.txt
Resource ../../../03-Variable/BifangApiVariable.txt
*** Variables ***
${url} /policy/profile/responsepages

6
01-TestCase/tsg_bfapi/policy_file_interface/TrafficMirrorPolicy.robot
View File

@@ -5,9 +5,9 @@ Library String
Library OperatingSystem
Library Selenium2Library
Library Collections
Resource ../../../02-Keyword/tsg_bfapi/common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/functionalKeywords.robot
Resource ../../../03-Variable/bifangapivariable.txt
Resource ../../../02-Keyword/tsg_bfapi/Common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot
Resource ../../../03-Variable/BifangApiVariable.txt
*** Variables ***
${url} /policy/profile/trafficmirror

6
01-TestCase/tsg_bfapi/policy_file_interface/TrustedCertPolicy.robot
View File

@@ -5,9 +5,9 @@ Library String
Library OperatingSystem
Library Selenium2Library
Library Collections
Resource ../../../02-Keyword/tsg_bfapi/common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/functionalKeywords.robot
Resource ../../../03-Variable/bifangapivariable.txt
Resource ../../../02-Keyword/tsg_bfapi/Common.robot
Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot
Resource ../../../03-Variable/BifangApiVariable.txt
*** Variables ***
${url} /policy/profile/trustedcacertobj

4
01-TestCase/tsg_cli/ImExportObject.robot
View File

@@ -1,8 +1,8 @@
*** Settings ***
Test Teardown Clear_Test_Data
Force Tags tsg-cli Object ExImport
Resource ../../03-Variable/bifangapivariable.txt
Resource ../../02-Keyword/tsg_cli/interface.robot
Resource ../../03-Variable/BifangApiVariable.txt
Resource ../../02-Keyword/tsg_cli/Interface.robot
*** Test Cases ***
Object_Export_And_Import_TestCase

4
01-TestCase/tsg_cli/OtherCommand.robot
View File

@@ -1,6 +1,6 @@
*** Settings ***
Resource ../../03-Variable/bifangapivariable.txt
Resource ../../02-Keyword/tsg_cli/interface.robot
Resource ../../03-Variable/BifangApiVariable.txt
Resource ../../02-Keyword/tsg_cli/Interface.robot
*** Test Cases ***
Tsg_Help_TestCase

4
01-TestCase/tsg_cli/QueryManipulationPolicy.robot
View File

@@ -1,7 +1,7 @@
*** Settings ***
Force Tags tsg-cli ManipulationPolicy Query
Resource ../../03-Variable/bifangapivariable.txt
Resource ../../02-Keyword/tsg_cli/interface.robot
Resource ../../03-Variable/BifangApiVariable.txt
Resource ../../02-Keyword/tsg_cli/Interface.robot
*** Test Cases ***
PxyManipulation_Policy_Query_TestCase

4
01-TestCase/tsg_cli/QuerySecurityPolicy.robot
View File

@@ -1,7 +1,7 @@
*** Settings ***
Force Tags tsg-cli SecurityPolicy Query
Resource ../../03-Variable/bifangapivariable.txt
Resource ../../02-Keyword/tsg_cli/interface.robot
Resource ../../03-Variable/BifangApiVariable.txt
Resource ../../02-Keyword/tsg_cli/Interface.robot
*** Test Cases ***
Security_Policy_Query_TestCase

8
02-Keyword/tsg_common/Case.robot
View File

@@ -1,10 +1,10 @@
*** Settings ***
Library json
Resource ../../03-Variable/BifangApiVariable.txt
Resource ../../02-Keyword/tsg_adc/systemcommand.robot
Resource ../../02-Keyword/tsg_bfapi/policyobject.robot
Resource ../../02-Keyword/tsg_bfapi/logvariable.robot
Resource ../../02-Keyword/tsg_bfapi/logschema.robot
Resource ../../02-Keyword/tsg_adc/SystemCommand.robot
Resource ../../02-Keyword/tsg_bfapi/PolicyObject.robot
Resource ../../02-Keyword/tsg_bfapi/LogVariable.robot
Resource ../../02-Keyword/tsg_bfapi/LogSchema.robot
*** Test Cases ***
case01

15
05-Other/docker.txt
View File

@@ -7,6 +7,8 @@ docker run --name autotest.open.node.com --add-host=open.node.com:192.168.100.5
docker run -it -v /home/autoTest_tsg/:/usr/src/python -w /usr/src/python auto-rf-lib:latest[docker最新镜像] -d /newrepot/ robot tsg_autotest0406[project path]
执行添加hosts文件：使用自建服务器作为网页访问：
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 -d newreport/ tsg_autotest0406
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:3.0 robot -d newreport/ tsg_autotest0416
执行不添加hosts文件：
docker run -it -v /home/autoTest_tsg/:/usr/src/python -w /usr/src/python auto-rf-library:1.0 robot -d /newrepot/ tsg_autotest0406
@@ -31,3 +33,16 @@ 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
更新自定义库生成新镜像：
1、进入镜像
docker run -it -v /home/autoTest_tsg/:/usr/src/python -w /usr/src/python auto-rf-library:2.0
2、复制自定义库到python目录
cp -r tsg_autotest0416/04-CustomLibrary/Custometest /usr/local/lib/python3.6/site-packages/
cp -r tsg_autotest0416/04-CustomLibrary/Smtp3Library /usr/local/lib/python3.6/site-packages/
3、提交新镜像f827为第一步进入镜像是的id
--------例如：[root@sugon1 ~]# docker run -it -v /home/autoTest_tsg/:/usr/src/python -w /usr/src/python auto-rf-library:2.0
----------root@b053a29b9b64:/usr/src/python# ls
docker commit f827 auto-rf-library:3.0