dns限速用例删除

5 files changed, 2 insertions, 248 deletions

diff --git a/keyword/policys/policy.robot b/keyword/policys/policy.robot
index 416bc37..fff9cfe 100644
--- a/keyword/policys/policy.robot
+++ b/keyword/policys/policy.robot
@@ -894,6 +894,7 @@ ExcuteCommand
     ${isUTC}    Evaluate    ${tsgVersion}>=22.03

     ${starttime}    Run Keyword If    "${isUTC}"=="True"        Get Current Date    UTC    exclude_millis=True

     ...  ELSE    Get Time  

+    sleep    5

     ${returnConnect}    ${connect}    Run Keyword And Ignore Error    Open Connection    ${manageIp}

     ${returnLogin}    ${login}    Run Keyword And Ignore Error    SSHLibrary.Login    ${manageUser}    ${managePassword}      

     ${return}    ${write}    Run Keyword And Ignore Error    SSHLibrary.Write    ${command}

diff --git a/other/data/proxy/http/proxy-http-redirect-url-reqbody-data.yaml b/other/data/proxy/http/proxy-http-redirect-url-reqbody-data.yaml
index 94ecdec..bb6a44c 100644
--- a/other/data/proxy/http/proxy-http-redirect-url-reqbody-data.yaml
+++ b/other/data/proxy/http/proxy-http-redirect-url-reqbody-data.yaml
@@ -41,7 +41,7 @@
        "objectList":
          - "addItemList":  
             -  "keywordArray":  
-                - "reabodySubstring*" 
+                - "reabodySubstring" 
       -       
        "protocolField": "TSG_FIELD_HTTP_URL"
        "objectType": "url"
diff --git a/other/data/security/dns/security-dns-deny-fqdn-exactly-data.yaml b/other/data/security/dns/security-dns-deny-fqdn-exactly-data.yaml
index 2a7183c..d04be9d 100644
--- a/other/data/security/dns/security-dns-deny-fqdn-exactly-data.yaml
+++ b/other/data/security/dns/security-dns-deny-fqdn-exactly-data.yaml
@@ -234,48 +234,6 @@
             -  "keywordArray":  
                 - "$www.prlib.ru"
   -
-    "opAction": "update"
-    "returnData": 1 
-    "policyName": "security-ssl-deny-fqdn-exactly-0003-1"
-    "policyType": "tsg_security"
-    "logType": "security_event"
-    "action": "deny"
-    "method": "rate_limit"
-    "bps": 10 
-    "isEdit": 1
-    "isGre": 0
-    "userTags": ""
-    "doBlacklist": 0
-    "doLog": 1
-    "policyDesc": "autotest"
-    "effectiveRange":           
-    "userRegion":
-      "protocol": "dns"          
-    "appIdObjects":
-     - "dns"  
-    "appSelectorObjects":
-    "isTestMachine": 1
-    "testMachine": 
-      -
-       "hopeSuccessNumber": 1
-       "command": "nslookup  nghttp2.org -timeout=1"
-       "commandRes": "timed out"
-       "logQueryParam":
-        -
-         "queryFiledKey": "dns_qname"
-         "queryValue": "nghttp2.org"
-    "isValid": 1
-    "scheduleId":             
-    "condation": 
-      -       
-       "protocolField": "TSG_FIELD_DNS_QNAME"
-       "objectType": "fqdn"
-       "objectSubType": ""
-       "objectList":
-         - "addItemList":  
-            -  "keywordArray":  
-                - "$nghttp2.org"
-  -
     "opAction": "add"
     "returnData": 1 
     "policyName": "security-ssl-deny-fqdn-exactly-0004"
@@ -393,55 +351,4 @@
                 - "$www.bilibili.com"
             -  "keywordArray":  
                 - "$tengrinews.kz" 
-  -
-    "opAction": "add"
-    "returnData": 1 
-    "policyName": "security-ssl-deny-fqdn-exactly-0005"
-    "policyType": "tsg_security"
-    "logType": "security_event"
-    "action": "deny"
-    "method": "rate_limit"
-    "bps": 100000 
-    "isGre": 0
-    "userTags": ""
-    "doBlacklist": 0
-    "doLog": 1
-    "policyDesc": "autotest"
-    "effectiveRange":           
-    "userRegion":
-      "protocol": "dns"          
-    "appIdObjects":
-     - "dns"  
-    "appSelectorObjects":
-    "isTestMachine": 1
-    "testMachine": 
-      -
-       "hopeSuccessNumber": 1
-       "command": "nslookup  www.hupu.com"
-       "commandRes": "www.hupu.com"
-       "logQueryParam":
-        -
-         "queryFiledKey": "dns_qname"
-         "queryValue": "www.hupu.com"
-      -
-       "hopeSuccessNumber": 1
-       "command": "nslookup  www.prlib.ru"
-       "commandRes": "www.prlib.ru"
-       "logQueryParam":
-        -
-         "queryFiledKey": "dns_qname"
-         "queryValue": "www.prlib.ru"
-    "isValid": 1
-    "scheduleId":             
-    "condation": 
-      -       
-       "protocolField": "TSG_FIELD_DNS_QNAME"
-       "objectType": "fqdn"
-       "objectSubType": ""
-       "objectList":
-         - "addItemList":  
-            -  "keywordArray":  
-                - "$www.hupu.com"          
-            -  "keywordArray":  
-                - "$www.prlib.ru" 
                                                                                                                                                      
\ No newline at end of file
diff --git a/other/data/security/dns/security-dns-deny-fqdn-suffix-data.yaml b/other/data/security/dns/security-dns-deny-fqdn-suffix-data.yaml
index e60a1e6..d9edb54 100644
--- a/other/data/security/dns/security-dns-deny-fqdn-suffix-data.yaml
+++ b/other/data/security/dns/security-dns-deny-fqdn-suffix-data.yaml
@@ -234,58 +234,6 @@
             -  "keywordArray":  
                 - "*prlib.ru"
   -
-    "opAction": "update"
-    "returnData": 1 
-    "policyName": "security-ssl-deny-fqdn-exactly-0003-1"
-    "policyType": "tsg_security"
-    "logType": "security_event"
-    "action": "deny"
-    "method": "rate_limit"
-    "bps": 10 
-    "isEdit": 1
-    "isGre": 0
-    "userTags": ""
-    "doBlacklist": 0
-    "doLog": 1
-    "policyDesc": "autotest"
-    "effectiveRange":           
-    "userRegion":
-      "protocol": "dns"          
-    "appIdObjects":
-     - "dns"  
-    "appSelectorObjects":
-    "isTestMachine": 1
-    "testMachine": 
-      -
-       "hopeSuccessNumber": 1
-       "command": "nslookup  www.hupu.com -timeout=1"
-       "commandRes": "timed out"
-       "logQueryParam":
-        -
-         "queryFiledKey": "dns_qname"
-         "queryValue": "www.hupu.com"
-      -
-       "hopeSuccessNumber": 1
-       "command": "nslookup  www.prlib.ru -timeout=1"
-       "commandRes": "timed out"
-       "logQueryParam":
-        -
-         "queryFiledKey": "dns_qname"
-         "queryValue": "www.prlib.ru"
-    "isValid": 1
-    "scheduleId":             
-    "condation": 
-      -       
-       "protocolField": "TSG_FIELD_DNS_QNAME"
-       "objectType": "fqdn"
-       "objectSubType": ""
-       "objectList":
-         - "addItemList":  
-            -  "keywordArray":  
-                - "*w.hupu.com"          
-            -  "keywordArray":  
-                - "*prlib.ru"
-  -
     "opAction": "add"
     "returnData": 1 
     "policyName": "security-ssl-deny-fqdn-exactly-0004"
@@ -403,54 +351,3 @@
                 - "*libili.com"
             -  "keywordArray":  
                 - "*inews.kz" 
-  -
-    "opAction": "add"
-    "returnData": 1 
-    "policyName": "security-ssl-deny-fqdn-exactly-0005"
-    "policyType": "tsg_security"
-    "logType": "security_event"
-    "action": "deny"
-    "method": "rate_limit"
-    "bps": 100000 
-    "isGre": 0
-    "userTags": ""
-    "doBlacklist": 0
-    "doLog": 1
-    "policyDesc": "autotest"
-    "effectiveRange":           
-    "userRegion":
-      "protocol": "dns"          
-    "appIdObjects":
-     - "dns"  
-    "appSelectorObjects":
-    "isTestMachine": 1
-    "testMachine": 
-      -
-       "hopeSuccessNumber": 1
-       "command": "nslookup  www.hupu.com"
-       "commandRes": "www.hupu.com"
-       "logQueryParam":
-        -
-         "queryFiledKey": "dns_qname"
-         "queryValue": "www.hupu.com"
-      -
-       "hopeSuccessNumber": 1
-       "command": "nslookup  www.prlib.ru"
-       "commandRes": "www.prlib.ru"
-       "logQueryParam":
-        -
-         "queryFiledKey": "dns_qname"
-         "queryValue": "www.prlib.ru"
-    "isValid": 1
-    "scheduleId":             
-    "condation": 
-      -       
-       "protocolField": "TSG_FIELD_DNS_QNAME"
-       "objectType": "fqdn"
-       "objectSubType": ""
-       "objectList":
-         - "addItemList":  
-            -  "keywordArray":  
-                - "*w.hupu.com"          
-            -  "keywordArray":  
-                - "*prlib.ru"                                                                                                                                   
\ No newline at end of file
diff --git a/other/data/security/dns/security-dns-deny-only-IpAndApplication-data.yaml b/other/data/security/dns/security-dns-deny-only-IpAndApplication-data.yaml
index 50f0fe2..741669f 100644
--- a/other/data/security/dns/security-dns-deny-only-IpAndApplication-data.yaml
+++ b/other/data/security/dns/security-dns-deny-only-IpAndApplication-data.yaml
@@ -213,57 +213,6 @@
              "ip": "1.1.1.1"
              "port": "0-65535" 
   -
-    "opAction": "update"
-    "returnData": 1 
-    "policyName": "security-ssl-deny-only-IpAndApplication-0003-1"
-    "policyType": "tsg_security"
-    "logType": "security_event"
-    "action": "deny"
-    "method": "rate_limit"
-    "bps": 10 
-    "isEdit": 1
-    "isGre": 0
-    "userTags": ""
-    "doBlacklist": 0
-    "doLog": 1
-    "policyDesc": "autotest"
-    "effectiveRange":           
-    "userRegion":
-      "protocol": "dns"          
-    "appIdObjects":
-     - "dns"  
-    "appSelectorObjects":
-    "isTestMachine": 1
-    "testMachine": 
-      -
-       "hopeSuccessNumber": 1
-       "command": "nslookup  https://www.hupu.com/ -timeout=1"
-       "commandRes": "timed out"
-       "logQueryParam":
-        -
-         "queryFiledKey": "common_schema_type"
-         "queryValue": "DNS"
-      -
-       "hopeSuccessNumber": 1
-       "command": "nslookup  https://www.prlib.ru -timeout=1"
-       "commandRes": "timed out"
-       "logQueryParam":
-        -
-         "queryFiledKey": "common_schema_type"
-         "queryValue": "DNS"
-    "isValid": 1
-    "scheduleId":             
-    "condation": 
-      -  
-       "protocolField": "TSG_SECURITY_SOURCE_ADDR"
-       "objectType": "ip"
-       "objectSubType": "endpoint" 
-       "objectList":
-         - "addItemList":
-            -
-             "ip": "1.1.1.1"
-             "port": "0-65535" 
-  -
     "opAction": "add"
     "returnData": 1 
     "policyName": "security-ssl-deny-only-IpAndApplication-0004"