调整策略验证测试数据

2 files changed, 69 insertions, 49 deletions

diff --git a/other/data/system/policy_verify_data.yaml b/other/data/system/policy_verify_data.yaml
index 5d78b1b..47d4ffd 100644
--- a/other/data/system/policy_verify_data.yaml
+++ b/other/data/system/policy_verify_data.yaml
@@ -1,59 +1,61 @@
 #policy_verify正向用例
 policy_verify_data:
+         
    -         
       -
          operatingType: create
          Name: policy_verify_security
          SelectTest:
             - SecurityPolicyMatch
+         vsysSelect:
+            -
+               Default Vsys: click            
          AddressType: 
             - IPv4
          ClientIP: '192.168.56.51'
          APPID:
             -
-               Applications: http
+               Applications: dns
          Filter:
             -
                FilterSelect:
-                  - Host
+                  - QNAME
                   -
                      FilterText: jd.com
          OkButton: click
-         searchCriteria: Name           
+         searchCriteria: Name
+#带tunnel的策略验证                 
    -         
       -
          operatingType: create
          Name: policy_verify_security_tunnel
          SelectTest:
             - SecurityPolicyMatch
+         vsysSelect:
+            -
+               Default Vsys: click            
          AddressType: 
             - IPv4
          ClientIP: '192.168.56.51'
          Tunnel:
             -
                GTP: click
-         TunnelType1:
-            -
-               Tunnel Endpoint A: click
          TunnelIp1: '192.168.1.2'
-         AddTunnel: click
-         TunnelType2:
-            -
-               Tunnel Endpoint B: click
          TunnelIp2: '192.168.3.2'
          APPID:
             -
-               Applications: http
+               Applications: dns
          Filter:
             -
                FilterSelect:
-                  - Host
+                  - QNAME
                   -
                      FilterText: jd.com
          OkButton: click
-         searchCriteria: Name
-               
+         searchCriteria: Name   
+                        
 policy_verify_security_data:
+
    -
       -
          operatingType: create
@@ -72,13 +74,13 @@ policy_verify_security_data:
                OkButton: click
          Application: click
          ApplicationData: 
-            - http
+            - dns
          Fiter:
             -
-               Host: click
-         FlterHost:
+               QNAME: click
+         FlterQNAME:
             -
-               HostFQDN:
+               QNAMEFQDN:
                   -
                      NoGroup: click
          FilterFQDN:
@@ -90,7 +92,7 @@ policy_verify_security_data:
             OkButton: click
          Enabled: open
          searchCriteria: Name
-                  
+
    #创建tunnel安全策略
    -
       -
@@ -142,13 +144,13 @@ policy_verify_security_data:
                OkButton: click
          Application: click
          ApplicationData: 
-            - http
+            - dns
          Fiter:
             -
-               Host: click
-         FlterHost:
+               QNAME: click
+         FlterQNAME:
             -
-               HostFQDN:
+               QNAMEFQDN:
                   -
                      NoGroup: click
          FilterFQDN:
@@ -158,4 +160,5 @@ policy_verify_security_data:
                -
                   ItemData: '*jd.com'
             OkButton: click
-         searchCriteria: Name   
+         Enabled: open            
+         searchCriteria: Name
\ No newline at end of file
diff --git a/other/data/template/page_template.yaml b/other/data/template/page_template.yaml
index 153e4fa..f1f361d 100644
--- a/other/data/template/page_template.yaml
+++ b/other/data/template/page_template.yaml
@@ -650,6 +650,27 @@ security_page:
                         value: Group
                         data: null
          -
+            type: combination
+            position: xpath=//*[@id="policy_paper_left"]/div[2]/div[9]/div[1]/label[contains(text(), "QNAME")]/following-sibling::div/div
+            value: FlterQNAME
+            data:
+               -
+                  type: combination
+                  position: id=interceptionadd_proaddaddQNAME
+                  value: QNAMEFQDN
+                  data:
+                     -
+                        type: click
+                        position: id=objectaddressfqdn
+                        value: NoGroup
+                        data: null
+                     -
+                        type: click
+                        position: id=objectaddress_groupfqdn
+                        value: Group
+                        data: null                        
+                        
+         -
             type: policyFileter
             position: id=interceptionadd_proaddaddDestination
             value: FlterURLs
@@ -9649,6 +9670,16 @@ policy_verify_page:
                   data: null
          -
             type: combination
+            position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[2]/div/div/div[1]/span/span/i
+            value: vsysSelect
+            data:
+               -
+                  type: click
+                  position: xpath=/html/body/div[last()]/div[1]/div[1]/ul/li
+                  value: Default Vsys 
+                  data: null                  
+         -
+            type: combination
             position: id=ip_addrType
             value: AddressType
             data:
@@ -9704,7 +9735,7 @@ policy_verify_page:
             value: SubscriberID
          -
             type: combination
-            position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[9]/div/div/div/div[1]/span
+            position: xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/div/div/div[1]/div[1]/form/div[8]/div/div/div/div/span/span/i
             value: Tunnel
             data:
                -
@@ -9714,7 +9745,7 @@ policy_verify_page:
                   data: null
          -
             type: combination
-            position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[9]/div[2]/div/div[1]/div/span/span/i
+            position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[8]/div[2]/div/div[1]/div/span/span/i
             value: TunnelType1
             data:
                -
@@ -9729,30 +9760,11 @@ policy_verify_page:
                   data: null
          -
             type: input
-            position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[9]/div[2]/div/div[2]/input
+            position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[8]/div[2]/div/div[2]/input
             value: TunnelIp1
          -
-            type: click
-            position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[9]/div[3]/div/div/i
-            value: AddTunnel
-         -
-            type: combination
-            position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[9]/div[3]/div/div[1]/div[1]/span/span/i
-            value: TunnelType2
-            data:
-               -
-                  type: click
-                  position: xpath=/html/body/div[last()]/div[1]/div[1]/ul/li[1]
-                  value: Tunnel Endpoint A 
-                  data: null
-               -
-                  type: click
-                  position: xpath=/html/body/div[last()]/div[1]/div[1]/ul/li[2]
-                  value: Tunnel Endpoint B
-                  data: null
-         -
             type: input
-            position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[9]/div[3]/div/div[2]/input
+            position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[8]/div[3]/div/div[2]/input
             value: TunnelIp2     
          -
             type: switch
@@ -9773,7 +9785,7 @@ policy_verify_page:
             value: APN
          -
             type: combination
-            position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[12]/div/div/i
+            position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[14]/div/div/i
             value: APPID
             data:
                -
@@ -9790,7 +9802,7 @@ policy_verify_page:
             data:
                -
                   type: click
-                  position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[13]/div[1]/div/div[1]/div/span/span/i
+                  position: xpath=//*[@id="app"]/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div[15]/div[1]/div/div[1]/div[1]/span/span/i
                   value: FilterSelect
                   data:
                      -
@@ -9838,6 +9850,11 @@ policy_verify_page:
                         position: xpath=/html/body/div/div/div[last()-1]/div/div/div[1]/div/div/div[1]/div[1]/form/div/div[1]/div/div[2]/input
                         value: FilterText
                         data: null
+                     -
+                        type: click
+                        position: id=attributeNameqnameQNAME
+                        value: QNAME
+                        data: null                        
          -
             type: click
             position: id=verify-ok