From 8af6c69a1cb28c7eadf923b116c07786e51a4dc9 Mon Sep 17 00:00:00 2001 From: hebingning Date: Thu, 11 Mar 2021 15:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E8=87=AA=E5=8A=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=9A=84ip=E5=92=8Csubid=E5=AD=98=E5=85=A5=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=8B=BC=E5=86=99=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84default?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tsg_bfapi/policy_object/ProcessPolicyBody.robot | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot b/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot index 32e4903..220c5fd 100644 --- a/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot +++ b/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot @@ -4,6 +4,7 @@ Library Collections Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../03-Variable/PolicyObjectDefault.txt Resource ../../tsg_common/ManagePolicyBody.robot +Resource ../../../02-Keyword/tsg_adc/FileOperation.robot *** Variables *** #arraySplitor:数组元素之间的分隔符 @@ -247,7 +248,7 @@ ManageObjectV2 # 处理引用对象字符串 Log To Console Call ManageObjectV2 #默认客户端条件类型:clientip or clientsubid - ${return} ${defaultClient} Run Keyword And Ignore Error Get From Dictionary ${policy} defalutClient + ${return} ${defaultClient} Run Keyword And Ignore Error Get From Dictionary ${policy} defaultClient ${defaultClient} Run Keyword If "${return}"=="FAIL" or "${defaultClient}"=="${EMPTY}" Set Variable ${Default_Client_Type} ... ELSE Set Variable ${defaultClient} ${sourceList} Create List @@ -264,8 +265,9 @@ ManageObjectV2 ManageClientIPObjectV2 [Arguments] ${emptyList} # 增加引用测试终端IP策略对象 - - ${intid} Evaluate int(${testClentID}) + ${intid} Evaluate int(${testClentID}) + log ${intid} + insert_policyId_to_file1 testClentIpId ${intid} ${obj1} Create Dictionary objectId=${intid} protocolField=TSG_SECURITY_SOURCE_ADDR Append To List ${emptyList} ${obj1} @@ -273,6 +275,8 @@ ManageClientSubIDObjectV2 [Arguments] ${emptyList} # 增加引用测试终端IP策略对象 ${protocolField} Set Variable + log ${testClentSubID} + insert_policyId_to_file1 testClentSubId ${testClentSubID} ${obj1} Create Dictionary objectId=${testClentSubID} protocolField=${protocolField} Append To List ${emptyList} ${obj1}