From 7f7a03a7c65dcc2976d4e224da40dc9f9e1964ea Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@zdjizhi.com>
Date: Mon, 27 Jul 2020 17:42:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=BA=86=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=8C=E5=AE=8C=E5=96=84=E4=BA=86=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 01-TestCase/zjj/DLL-DeviceID-Test.robot | 31 ++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/01-TestCase/zjj/DLL-DeviceID-Test.robot b/01-TestCase/zjj/DLL-DeviceID-Test.robot
index d8ba3c2..c337fb8 100644
--- a/01-TestCase/zjj/DLL-DeviceID-Test.robot
+++ b/01-TestCase/zjj/DLL-DeviceID-Test.robot
@@ -34,8 +34,37 @@ DLL-DeviceID-SecurityPolicy-Deny-Http-00001
     ...    ELSE    set variable    curl http://webalta.ru/
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Connection was reset
     ...    ELSE    Create List    Connection reset by peer
+    ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     ${endtime}    Get Time
+    Sleep    ${policyLogVerificationSleepSeconds}s
     #鏃ュ織楠岃瘉
     ${s}    Convert to String    ${policyId}
-    GetLogList    security_event_log    ${deny_http_starttime}    ${deny_http_endtime}    ${testClentIP}    ${s}    http_host    webalta.ru
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    webalta.ru
+DLL-DeviceID-SecurityPolicy-Deny-Http-00002
+    [Tags]    fqdn
+    Comment    鍒涘缓fqdn
+    ${objectDict}    Create Dictionary    objectType=fqdn    isValid=${1}    addItemList=$webalta.ru
+    ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
+    ${objectids}    set Variable    ${objectId}
+    #鍒涘缓 Deny 鎼厤Allow
+    Comment    鍒涘缓瀹夊叏绛栫暐
+    ${policyDict}    Create Dictionary    policyName=DLL-DeviceID-SecurityPolicy-Deny-Http-000021    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"drop"}    effectiveRange=device_1   filterList=${objectId}|TSG_FIELD_HTTP_HOST    isValid=${1}    appIdObjects=2
+    log    ${policyDict}
+    ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
+    ${policyIds1}    set Variable    {"policyType":"tsg_security","policyIds":[${policyId}]}   
+    ${policyIds}    Create List    ${policyIds1} 
+    ${starttime}    Get Time
+    #鍔熻兘绔獙璇�
+    Sleep    ${policyVerificationSleepSeconds}s
+     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00001.bat
+    ...    ELSE    set variable    curl http://webalta.ru/
+    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Connection was reset
+    ...    ELSE    Create List    Connection reset by peer
+    ${emptyList}    Create List
+    ${rescode}    SystemCommandReturnCompare    ${commandstr}	${emptyList}    ${stringlist}
+    ${endtime}    Get Time
+    Sleep    ${policyLogVerificationSleepSeconds}s
+    #鏃ュ織楠岃瘉
+    ${s}    Convert to String    ${policyId}
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    webalta.ru
     
\ No newline at end of file