From 97bf4de59302fb55798c57d829b81f418e56ed23 Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@zdjizhi.com>
Date: Tue, 14 Apr 2020 19:25:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E6=8E=A7=E5=88=B6=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D=E4=B8=8B=E9=9D=A2=E4=BB=A3=E7=A0=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tsg_adc/selfserver/DenyAllTests.robot     |  6 +++--
 03-Variable/PolciyObjectDefault.txt           | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 03-Variable/PolciyObjectDefault.txt

diff --git a/01-TestCase/tsg_adc/selfserver/DenyAllTests.robot b/01-TestCase/tsg_adc/selfserver/DenyAllTests.robot
index 7d654a0..176850d 100644
--- a/01-TestCase/tsg_adc/selfserver/DenyAllTests.robot
+++ b/01-TestCase/tsg_adc/selfserver/DenyAllTests.robot
@@ -37,13 +37,15 @@ SecurityPolicy-Deny-AllProtol-00001
 			   ...    policyName=SecurityPolicy-Deny-AllProtol-00001
 		   	   ...    policyType=tsg_security
                ...    policyDesc=autotest        
-               ...    userTags=
            	   ...    action=deny
-           	   ...    effectiveRange=Nursurtan|Transtelecom&Astel,|Astel&Transtelecom
+           	   ...    effectiveRange=${effectiveRange} 
            	   ...    userRegion=method:rst
            	   ...    referenceObject=${objectId}|TSG_SECURITY_DESTINATION_ADDR
            	   ...    isValid=${1}
            	   ...    appObjectIdArray=2,3,4,5,6
+               ...    userTags=${userTags} 
+               ...    doLog=${2}
+               ...    scheduleId=${referenceObject}
     ${rescode}    ${policyId}    AddPolicy2    ${1}    ${policyDict}
     ${policyId}    set Variable    {"policyType":"tsg_security","policyIds":[${policyId}]}   
 
diff --git a/03-Variable/PolciyObjectDefault.txt b/03-Variable/PolciyObjectDefault.txt
new file mode 100644
index 0000000..2b1af9b
--- /dev/null
+++ b/03-Variable/PolciyObjectDefault.txt
@@ -0,0 +1,22 @@
+*** Variables ***
+#策略
+policyName      autotest_policy
+policyType      tsg_security
+policyDesc      autotest        
+action      deny
+effectiveRange      Nursurtan|Transtelecom&Astel,|Astel&Transtelecom
+userRegion      method:rst
+referenceObject      1|TSG_SECURITY_DESTINATION_ADDR
+isValid      ${1}
+appObjectIdArray      2,3,4,5,6
+userTags      3
+doLog      2
+scheduleId      7
+#对象
+objectSubType      ${objectSubType}
+isValid      ${isValid}      
+isInitialize      ${isInitialize}
+isExclusion      ${isExclusion}
+objectName      ${objectName}
+objectDesc      ${objectDesc}
+subObjectIds      ${subObjectIds}