From 971990815925ff78f258dddabcaf7b9b07ae7a71 Mon Sep 17 00:00:00 2001 From: hebingning Date: Wed, 10 Mar 2021 19:28:18 +0800 Subject: [PATCH] =?UTF-8?q?allow=20ssl=E7=BD=91=E5=9D=80=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=EF=BC=8CManagePolicyBody=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A0=87=E7=AD=BE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot | 8 ++++---- 02-Keyword/tsg_common/ManagePolicyBody.robot | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot index 6e9493d..f33d11c 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot @@ -14,8 +14,8 @@ SecurityPolicy-Allow-Ssl-00001 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_SSL_00001.bat ... ELSE set variable curl https://homebank.kz/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Виртуальная - ... ELSE Create List Виртуальная + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Переводы + ... ELSE Create List Переводы ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变Allow策略 ${policyDict} Create Dictionary policyId=${allow_ssl_policyId} source=${allow_ssl_objectId2}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Allow-Ssl-00001 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"SSL"} filterList=${allow_ssl_objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} @@ -25,8 +25,8 @@ SecurityPolicy-Allow-Ssl-00001 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_SSL_00001.bat ... ELSE set variable curl https://homebank.kz/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Виртуальная - ... ELSE Create List Виртуальная + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Переводы + ... ELSE Create List Переводы ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Allow-Ssl-00002 diff --git a/02-Keyword/tsg_common/ManagePolicyBody.robot b/02-Keyword/tsg_common/ManagePolicyBody.robot index 70cd98e..4cee538 100644 --- a/02-Keyword/tsg_common/ManagePolicyBody.robot +++ b/02-Keyword/tsg_common/ManagePolicyBody.robot @@ -152,7 +152,7 @@ EffectiveRangeValueType2 FOR ${var} IN @{list1} Append To List ${valueList1} ${var} END - ${obj1} Create Dictionary tag=location value=${valueList1} + ${obj1} Create Dictionary tag=data_center value=${valueList1} # ISP ${valueList2} Create List ${list2} Evaluate re.split('[&]', '${list}[1]') re @@ -173,7 +173,7 @@ EffectiveRangeValueType3 FOR ${var} IN @{list} Append To List ${valueList} ${var} END - ${obj} Create Dictionary tag=location value=${valueList} + ${obj} Create Dictionary tag=data_center value=${valueList} #适应adc设定标签 #${obj} Create Dictionary tag=device_id value=${valueList} ${return} Create List ${obj}