From 7d1cfae8b4b9bc79d92f8557bc5fdf971bb65c5a Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Fri, 17 Apr 2020 10:12:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=A0=E6=AD=A3=E6=96=87=E4=BB=B6=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E5=86=99=E4=BB=A5=E9=80=82=E5=BA=94linux=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E5=A4=A7=E5=B0=8F=E5=86=99=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tsg_adc/selfserver/DenyAllTests.robot | 47 ++++++++++++------- .../dashboard_data_compare/ClientIPTopN.robot | 2 +- .../dashboard_data_compare/DomainTopN.robot | 2 +- .../PolicyActionHitStatistics.robot | 2 +- .../PolicyEventHitTopN.robot | 2 +- .../ProxyPinningStatistics.robot | 2 +- .../ServiceIPTopN.robot | 2 +- .../SubscriberidTopN.robot | 2 +- .../TrafficSessionNewLiveStatistic.robot | 2 +- .../TrafficStatistics.robot | 2 +- .../dashboard_data_compare/UrlTopN.robot | 2 +- .../ClearAllPolicy.robot | 6 +-- .../HijackFilesPolicy.robot | 6 +-- .../InsertScriptsPolicy.robot | 6 +-- .../IntermediaCert.robot | 6 +-- .../KeyringPolicyFile.robot | 6 +-- .../ResponsePagesPolicy.robot | 4 +- .../TrafficMirrorPolicy.robot | 6 +-- .../TrustedCertPolicy.robot | 6 +-- 01-TestCase/tsg_cli/ImExportObject.robot | 4 +- 01-TestCase/tsg_cli/OtherCommand.robot | 4 +- .../tsg_cli/QueryManipulationPolicy.robot | 4 +- 01-TestCase/tsg_cli/QuerySecurityPolicy.robot | 4 +- 02-Keyword/tsg_common/Case.robot | 8 ++-- 05-Other/docker.txt | 15 ++++++ 25 files changed, 91 insertions(+), 61 deletions(-) diff --git a/01-TestCase/tsg_adc/selfserver/DenyAllTests.robot b/01-TestCase/tsg_adc/selfserver/DenyAllTests.robot index e38a4e4..4fc81be 100644 --- a/01-TestCase/tsg_adc/selfserver/DenyAllTests.robot +++ b/01-TestCase/tsg_adc/selfserver/DenyAllTests.robot @@ -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]}} diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot index 8466206..51c597f 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot @@ -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 *** diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/DomainTopN.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/DomainTopN.robot index c0b6a26..70b26d4 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/DomainTopN.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/DomainTopN.robot @@ -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 *** diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot index 90f174b..fd146a3 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot @@ -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 *** diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot index 43324c8..0aba79f 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot @@ -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 *** diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot index 808ab40..1c7005f 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot @@ -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 *** diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot index e13757c..ee67b66 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot @@ -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 *** diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot index dbab346..2bf317b 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot @@ -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 *** diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot index 361ae23..e88be2f 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot @@ -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 *** diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot index 75fba70..872c5fe 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot @@ -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 *** diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/UrlTopN.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/UrlTopN.robot index bf6b2e1..9747754 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/UrlTopN.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/UrlTopN.robot @@ -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 *** diff --git a/01-TestCase/tsg_bfapi/policy_file_interface/ClearAllPolicy.robot b/01-TestCase/tsg_bfapi/policy_file_interface/ClearAllPolicy.robot index 8434e88..f5bc68a 100644 --- a/01-TestCase/tsg_bfapi/policy_file_interface/ClearAllPolicy.robot +++ b/01-TestCase/tsg_bfapi/policy_file_interface/ClearAllPolicy.robot @@ -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 diff --git a/01-TestCase/tsg_bfapi/policy_file_interface/HijackFilesPolicy.robot b/01-TestCase/tsg_bfapi/policy_file_interface/HijackFilesPolicy.robot index 08b79d1..47fd2bf 100644 --- a/01-TestCase/tsg_bfapi/policy_file_interface/HijackFilesPolicy.robot +++ b/01-TestCase/tsg_bfapi/policy_file_interface/HijackFilesPolicy.robot @@ -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 diff --git a/01-TestCase/tsg_bfapi/policy_file_interface/InsertScriptsPolicy.robot b/01-TestCase/tsg_bfapi/policy_file_interface/InsertScriptsPolicy.robot index 8b8aee0..c58b5da 100644 --- a/01-TestCase/tsg_bfapi/policy_file_interface/InsertScriptsPolicy.robot +++ b/01-TestCase/tsg_bfapi/policy_file_interface/InsertScriptsPolicy.robot @@ -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 diff --git a/01-TestCase/tsg_bfapi/policy_file_interface/IntermediaCert.robot b/01-TestCase/tsg_bfapi/policy_file_interface/IntermediaCert.robot index bcd11cb..6c1fdb6 100644 --- a/01-TestCase/tsg_bfapi/policy_file_interface/IntermediaCert.robot +++ b/01-TestCase/tsg_bfapi/policy_file_interface/IntermediaCert.robot @@ -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 diff --git a/01-TestCase/tsg_bfapi/policy_file_interface/KeyringPolicyFile.robot b/01-TestCase/tsg_bfapi/policy_file_interface/KeyringPolicyFile.robot index f478e8f..69f6789 100644 --- a/01-TestCase/tsg_bfapi/policy_file_interface/KeyringPolicyFile.robot +++ b/01-TestCase/tsg_bfapi/policy_file_interface/KeyringPolicyFile.robot @@ -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 diff --git a/01-TestCase/tsg_bfapi/policy_file_interface/ResponsePagesPolicy.robot b/01-TestCase/tsg_bfapi/policy_file_interface/ResponsePagesPolicy.robot index 83fe1b6..95d374b 100644 --- a/01-TestCase/tsg_bfapi/policy_file_interface/ResponsePagesPolicy.robot +++ b/01-TestCase/tsg_bfapi/policy_file_interface/ResponsePagesPolicy.robot @@ -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 diff --git a/01-TestCase/tsg_bfapi/policy_file_interface/TrafficMirrorPolicy.robot b/01-TestCase/tsg_bfapi/policy_file_interface/TrafficMirrorPolicy.robot index c3f954f..02fdd99 100644 --- a/01-TestCase/tsg_bfapi/policy_file_interface/TrafficMirrorPolicy.robot +++ b/01-TestCase/tsg_bfapi/policy_file_interface/TrafficMirrorPolicy.robot @@ -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 diff --git a/01-TestCase/tsg_bfapi/policy_file_interface/TrustedCertPolicy.robot b/01-TestCase/tsg_bfapi/policy_file_interface/TrustedCertPolicy.robot index a523f2c..4b211f5 100644 --- a/01-TestCase/tsg_bfapi/policy_file_interface/TrustedCertPolicy.robot +++ b/01-TestCase/tsg_bfapi/policy_file_interface/TrustedCertPolicy.robot @@ -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 diff --git a/01-TestCase/tsg_cli/ImExportObject.robot b/01-TestCase/tsg_cli/ImExportObject.robot index 67a3dcf..71f1669 100644 --- a/01-TestCase/tsg_cli/ImExportObject.robot +++ b/01-TestCase/tsg_cli/ImExportObject.robot @@ -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 diff --git a/01-TestCase/tsg_cli/OtherCommand.robot b/01-TestCase/tsg_cli/OtherCommand.robot index fc45645..48aec02 100644 --- a/01-TestCase/tsg_cli/OtherCommand.robot +++ b/01-TestCase/tsg_cli/OtherCommand.robot @@ -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 diff --git a/01-TestCase/tsg_cli/QueryManipulationPolicy.robot b/01-TestCase/tsg_cli/QueryManipulationPolicy.robot index 766ff77..a36710b 100644 --- a/01-TestCase/tsg_cli/QueryManipulationPolicy.robot +++ b/01-TestCase/tsg_cli/QueryManipulationPolicy.robot @@ -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 diff --git a/01-TestCase/tsg_cli/QuerySecurityPolicy.robot b/01-TestCase/tsg_cli/QuerySecurityPolicy.robot index f4df377..3ff11dd 100644 --- a/01-TestCase/tsg_cli/QuerySecurityPolicy.robot +++ b/01-TestCase/tsg_cli/QuerySecurityPolicy.robot @@ -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 diff --git a/02-Keyword/tsg_common/Case.robot b/02-Keyword/tsg_common/Case.robot index a097f56..0487057 100644 --- a/02-Keyword/tsg_common/Case.robot +++ b/02-Keyword/tsg_common/Case.robot @@ -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 diff --git a/05-Other/docker.txt b/05-Other/docker.txt index 00de6bb..8a73b3e 100644 --- a/05-Other/docker.txt +++ b/05-Other/docker.txt @@ -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