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

allow ssl网址内容更换，ManagePolicyBody改变默认标签类型

Browse Source
This commit is contained in:
hebingning
2021-03-10 19:28:18 +08:00
parent 32e5bf77e6
commit 9719908159
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot
View File

@@ -14,8 +14,8 @@ SecurityPolicy-Allow-Ssl-00001
Comment 功能端验证HTTP验证 Comment 功能端验证HTTP验证
${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_SSL_00001.bat ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_SSL_00001.bat
... ELSE set variable curl https://homebank.kz/ ... ELSE set variable curl https://homebank.kz/
${stringlist} run keyword if '${systemType}'=='Windows' Create List Виртуальная ${stringlist} run keyword if '${systemType}'=='Windows' Create List Переводы
... ELSE Create List Виртуальная ... ELSE Create List Переводы
${rescode} SystemCommands ${commandstr} ${stringlist} ${rescode} SystemCommands ${commandstr} ${stringlist}
Comment 改变Allow策略 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} ${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验证 Comment 功能端验证HTTP验证
${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_SSL_00001.bat ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_SSL_00001.bat
... ELSE set variable curl https://homebank.kz/ ... ELSE set variable curl https://homebank.kz/
${stringlist} run keyword if '${systemType}'=='Windows' Create List Виртуальная ${stringlist} run keyword if '${systemType}'=='Windows' Create List Переводы
... ELSE Create List Виртуальная ... ELSE Create List Переводы
${rescode} SystemCommands ${commandstr} ${stringlist} ${rescode} SystemCommands ${commandstr} ${stringlist}
SecurityPolicy-Allow-Ssl-00002 SecurityPolicy-Allow-Ssl-00002

4
02-Keyword/tsg_common/ManagePolicyBody.robot
View File

@@ -152,7 +152,7 @@ EffectiveRangeValueType2
FOR ${var} IN @{list1} FOR ${var} IN @{list1}
Append To List ${valueList1} ${var} Append To List ${valueList1} ${var}
END END
${obj1} Create Dictionary tag=location value=${valueList1} ${obj1} Create Dictionary tag=data_center value=${valueList1}
# ISP # ISP
${valueList2} Create List ${valueList2} Create List
${list2} Evaluate re.split('[&]', '${list}[1]') re ${list2} Evaluate re.split('[&]', '${list}[1]') re
@@ -173,7 +173,7 @@ EffectiveRangeValueType3
FOR ${var} IN @{list} FOR ${var} IN @{list}
Append To List ${valueList} ${var} Append To List ${valueList} ${var}
END END
${obj} Create Dictionary tag=location value=${valueList} ${obj} Create Dictionary tag=data_center value=${valueList}
#适应adc设定标签 #适应adc设定标签
#${obj} Create Dictionary tag=device_id value=${valueList} #${obj} Create Dictionary tag=device_id value=${valueList}
${return} Create List ${obj} ${return} Create List ${obj}