From e74e017a25832f74b4c7b0091d1378556a2b851f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=AC=E5=B7=8D=E5=B7=9D?= Date: Thu, 18 Jun 2020 15:44:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=A0=E9=99=A4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../selfserver/Api_Proxy/Deny_Ssl_Tests.robot | 35 ++++--------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Deny_Ssl_Tests.robot b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Deny_Ssl_Tests.robot index c0fc232..c9e6f83 100644 --- a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Deny_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Deny_Ssl_Tests.robot @@ -1,4 +1,5 @@ *** Settings *** +DeletePolicyAndObject1 | ${policyIds} | ${objectids} | ${url} | ${profiledId} Force Tags tsg_adc proxy_policy Library OperatingSystem Resource ../../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -45,7 +46,6 @@ ProxyPolicy-Deny-Ssl-00001 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00002 [Tags] selfserver ip+fqdn完整匹配 @@ -78,7 +78,6 @@ ProxyPolicy-Deny-Ssl-00002 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00003 [Tags] selfserver ip+cat右匹配 @@ -111,7 +110,6 @@ ProxyPolicy-Deny-Ssl-00003 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00004 [Tags] selfserver ip+url右匹配 @@ -146,7 +144,6 @@ ProxyPolicy-Deny-Ssl-00004 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ProxyPolicy-Deny-Ssl-00005 [Tags] selfserver ip+url字串匹配 @@ -181,7 +178,6 @@ ProxyPolicy-Deny-Ssl-00005 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ProxyPolicy-Deny-Ssl-00006 [Tags] selfserver ip+url完整匹配 @@ -214,7 +210,6 @@ ProxyPolicy-Deny-Ssl-00006 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00007 [Tags] selfserver ip+url左匹配 @@ -250,7 +245,6 @@ ProxyPolicy-Deny-Ssl-00007 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ProxyPolicy-Deny-Ssl-00008 [Tags] selfserver ip+请求头右匹配 @@ -285,7 +279,6 @@ ProxyPolicy-Deny-Ssl-00008 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ProxyPolicy-Deny-Ssl-00009 [Tags] selfserver ip+请求头字串匹配 @@ -320,7 +313,6 @@ ProxyPolicy-Deny-Ssl-00009 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ProxyPolicy-Deny-Ssl-00010 [Tags] selfserver ip+请求头完整匹配 @@ -353,7 +345,6 @@ ProxyPolicy-Deny-Ssl-00010 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00011 [Tags] selfserver ip+请求头左匹配 @@ -389,7 +380,6 @@ ProxyPolicy-Deny-Ssl-00011 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ProxyPolicy-Deny-Ssl-00012 [Tags] selfserver ip+cookie字串匹配 @@ -422,7 +412,6 @@ ProxyPolicy-Deny-Ssl-00012 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00013 [Tags] selfserver ip+应答头右匹配 @@ -455,7 +444,6 @@ ProxyPolicy-Deny-Ssl-00013 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00014 [Tags] selfserver ip+应答头字串匹配 @@ -490,7 +478,6 @@ ProxyPolicy-Deny-Ssl-00014 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ProxyPolicy-Deny-Ssl-00015 [Tags] selfserver ip+应答头完整匹配 @@ -523,7 +510,6 @@ ProxyPolicy-Deny-Ssl-00015 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00016 [Tags] selfserver ip+应答头左匹配 @@ -556,7 +542,6 @@ ProxyPolicy-Deny-Ssl-00016 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00017 [Tags] selfserver ip+set-cookie右匹配 @@ -589,7 +574,6 @@ ProxyPolicy-Deny-Ssl-00017 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00018 [Tags] selfserver ip+set-cookie字串匹配 @@ -624,7 +608,6 @@ ProxyPolicy-Deny-Ssl-00018 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ProxyPolicy-Deny-Ssl-00019 [Tags] selfserver ip+set-cookie完整匹配 @@ -657,7 +640,6 @@ ProxyPolicy-Deny-Ssl-00019 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00020 [Tags] selfserver ip+set-cookie左匹配 @@ -690,7 +672,6 @@ ProxyPolicy-Deny-Ssl-00020 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00021 [Tags] selfserver ip+请求体字串匹配 @@ -723,7 +704,6 @@ ProxyPolicy-Deny-Ssl-00021 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00022 [Tags] selfserver ip+应答体字串匹配 @@ -756,7 +736,6 @@ ProxyPolicy-Deny-Ssl-00022 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} ProxyPolicy-Deny-Ssl-00023 [Tags] selfserver 最大组合 @@ -805,7 +784,7 @@ ProxyPolicy-Deny-Ssl-00023 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} + ProxyPolicy-Deny-Ssl-00024 [Tags] selfserver 修改 Comment 创建fqdn @@ -855,7 +834,7 @@ ProxyPolicy-Deny-Ssl-00024 Sleep ${policyLogVerificationSleepSeconds}s ${endtime} Get Time GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} + ProxyPolicy-Deny-Ssl-00025 [Tags] selfserver ip+请求体and关系 Comment 创建请求体 @@ -887,7 +866,7 @@ ProxyPolicy-Deny-Ssl-00025 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} + ProxyPolicy-Deny-Ssl-00026 [Tags] selfserver ip+请求体或关系 @@ -920,7 +899,7 @@ ProxyPolicy-Deny-Ssl-00026 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} + ProxyPolicy-Deny-Ssl-00027 [Tags] selfserver ip+应答体and关系 @@ -953,7 +932,7 @@ ProxyPolicy-Deny-Ssl-00027 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} + ProxyPolicy-Deny-Ssl-00028 [Tags] selfserver ip+应答体或关系 @@ -986,5 +965,5 @@ ProxyPolicy-Deny-Ssl-00028 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - [Teardown] DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${EMPTY} +