summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author董晓燕 <[email protected]>2021-06-02 06:28:46 +0000
committer董晓燕 <[email protected]>2021-06-02 06:28:46 +0000
commit8d625edd0596702e27d6098df4ef8ddd2311f435 (patch)
tree8660bc902d00fb1bc5472c88793e1b79f8ef6d0f
parentdeb29aee67680fc0295d05a4609bf735f45e8767 (diff)
Deleted AautotestTsg/01-TestCase/tsg_adc/.gitkeep, AautotestTsg/01-TestCase/tsg_adc/AllFlow.robot, AautotestTsg/01-TestCase/tsg_adc/AllFlowDNS-001.robot, AautotestTsg/01-TestCase/tsg_adc/AllFlowHTTPSIntercept-001.robot, AautotestTsg/01-TestCase/tsg_adc/AllFlowHTTPSIntercept-001_dos.bat, AautotestTsg/01-TestCase/tsg_bf_api/.gitkeep, AautotestTsg/01-TestCase/tsg_galaxy_api/.gitkeep, AautotestTsg/01-TestCase/tsg_ui/login/.gitkeep, AautotestTsg/01-TestCase/tsg_ui/.gitkeep, AautotestTsg/01-TestCase/.gitkeep, AautotestTsg/02-Keyword/tsg-adc/.gitkeep, AautotestTsg/02-Keyword/tsg-adc/systemcommand.txt, AautotestTsg/02-Keyword/tsg-api/.gitkeep, AautotestTsg/02-Keyword/tsg-bifang/.gitkeep, AautotestTsg/02-Keyword/tsg-bifang/apirequest.txt, AautotestTsg/02-Keyword/tsg-bifang/loginlogout.txt, AautotestTsg/02-Keyword/tsg-bifang/logschema.txt, AautotestTsg/02-Keyword/tsg-bifang/logvariable.txt, AautotestTsg/02-Keyword/tsg-bifang/policyobject.txt, AautotestTsg/02-Keyword/tsg-ui/Loginout/.gitkeep, AautotestTsg/02-Keyword/tsg-ui/.gitkeep, AautotestTsg/02-Keyword/.gitkeep, AautotestTsg/03-Variable/.gitkeep, AautotestTsg/03-Variable/DOS.bat, AautotestTsg/03-Variable/bifangapivariable.txt, AautotestTsg/04-CustomLibrary/.gitkeep, AautotestTsg/05-Other/.gitkeep, AautotestTsg/05-Other/AllFlowHTTPSIntercept-001_dos.bat, AautotestTsg/.gitkeep files
-rw-r--r--AautotestTsg/.gitkeep0
-rw-r--r--AautotestTsg/01-TestCase/.gitkeep0
-rw-r--r--AautotestTsg/01-TestCase/tsg_adc/.gitkeep0
-rw-r--r--AautotestTsg/01-TestCase/tsg_adc/AllFlow.robot55
-rw-r--r--AautotestTsg/01-TestCase/tsg_adc/AllFlowDNS-001.robot63
-rw-r--r--AautotestTsg/01-TestCase/tsg_adc/AllFlowHTTPSIntercept-001.robot65
-rw-r--r--AautotestTsg/01-TestCase/tsg_adc/AllFlowHTTPSIntercept-001_dos.bat1
-rw-r--r--AautotestTsg/01-TestCase/tsg_bf_api/.gitkeep0
-rw-r--r--AautotestTsg/01-TestCase/tsg_galaxy_api/.gitkeep0
-rw-r--r--AautotestTsg/01-TestCase/tsg_ui/.gitkeep0
-rw-r--r--AautotestTsg/01-TestCase/tsg_ui/login/.gitkeep0
-rw-r--r--AautotestTsg/02-Keyword/.gitkeep0
-rw-r--r--AautotestTsg/02-Keyword/tsg-adc/.gitkeep0
-rw-r--r--AautotestTsg/02-Keyword/tsg-adc/systemcommand.txt100
-rw-r--r--AautotestTsg/02-Keyword/tsg-api/.gitkeep0
-rw-r--r--AautotestTsg/02-Keyword/tsg-bifang/.gitkeep0
-rw-r--r--AautotestTsg/02-Keyword/tsg-bifang/apirequest.txt14
-rw-r--r--AautotestTsg/02-Keyword/tsg-bifang/loginlogout.txt50
-rw-r--r--AautotestTsg/02-Keyword/tsg-bifang/logschema.txt26
-rw-r--r--AautotestTsg/02-Keyword/tsg-bifang/logvariable.txt34
-rw-r--r--AautotestTsg/02-Keyword/tsg-bifang/policyobject.txt74
-rw-r--r--AautotestTsg/02-Keyword/tsg-ui/.gitkeep0
-rw-r--r--AautotestTsg/02-Keyword/tsg-ui/Loginout/.gitkeep0
-rw-r--r--AautotestTsg/03-Variable/.gitkeep0
-rw-r--r--AautotestTsg/03-Variable/DOS.bat1
-rw-r--r--AautotestTsg/03-Variable/bifangapivariable.txt11
-rw-r--r--AautotestTsg/04-CustomLibrary/.gitkeep0
-rw-r--r--AautotestTsg/05-Other/.gitkeep0
-rw-r--r--AautotestTsg/05-Other/AllFlowHTTPSIntercept-001_dos.bat1
29 files changed, 0 insertions, 495 deletions
diff --git a/AautotestTsg/.gitkeep b/AautotestTsg/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/01-TestCase/.gitkeep b/AautotestTsg/01-TestCase/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/01-TestCase/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/01-TestCase/tsg_adc/.gitkeep b/AautotestTsg/01-TestCase/tsg_adc/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/01-TestCase/tsg_adc/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/01-TestCase/tsg_adc/AllFlow.robot b/AautotestTsg/01-TestCase/tsg_adc/AllFlow.robot
deleted file mode 100644
index 1b8f382..0000000
--- a/AautotestTsg/01-TestCase/tsg_adc/AllFlow.robot
+++ /dev/null
@@ -1,55 +0,0 @@
-*** Settings ***
-Test Setup Login
-Test Teardown Logout
-Resource ../../02-Keyword/tsg-adc/systemcommand.txt
-Resource ../../02-Keyword/tsg-bifang/policyobject.txt
-Resource ../../02-Keyword/tsg-bifang/loginlogout.txt
-
-*** Test Cases ***
-allflow
- #登录 放到setup
- #Login
- #创建对象
- ${rescode} ${objectId} AddObject { \ \ \ \ "opAction":"add", \ \ \ \ "returnData":1, \ \ \ \ "objectList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "objectType":"IP", \ \ \ \ \ \ \ \ \ \ \ \ "objectName":"dxytestip", \ \ \ \ \ \ \ \ \ \ \ \ "objectDesc":"dxytestip", \ \ \ \ \ \ \ \ \ \ \ \ "isInitialize":0, \ \ \ \ \ \ \ \ \ \ \ \ "isExclusion":0, \ \ \ \ \ \ \ \ \ \ \ \ "subObjectIds":[], \ \ \ \ \ \ \ \ \ \ \ \ "addItemList":[ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "itemName":"dxytestip", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "itemDesc":"dxytestip", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "addrType":4, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientIpFormat":"mask", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientIp1":"111.111.111.111", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientIp2":"255.255.255.255", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientPortFormat":"mask", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientPort1":"0", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientPort2":"65535", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverIpFormat":"range", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverIp1":"222.222.222.222", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverIp2":"255.255.255.0", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverPortFormat":"mask", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverPort1":"0", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverPort2":"65535", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "protocol":0, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "direction":1, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "isInitialize":0 \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ } \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ "updateItemList":[ \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ "deleteItemIds":[ \ \ \ \ \ \ \ \ \ \ \ \ ] \ \ \ \ \ \ \ \ } \ \ \ \ ] }
- log ${rescode}
- #log 1111
- #Integer ${rescode} 200
- #Should Be Equal As Strings ${rescode} 200
- #log 22222
- log ${objectId}
- #log 333333
- #${objid} Get From List ${objectId} 0
- #创建策略
- ${rescode} ${policyId} AddPolicy {"opAction":"add","returnData":1,"policyList":{"action":"allow","appObjectIdArray":[1600,1596,1597,1598,1599],"doLog":1,"isValid":0,"opTime":"2020-02-12 10:01:43","opUser":981,"opUserName":"uitest","policyDesc":"dxytest","policyName":"dxytest","policyType":"tsg_security","referenceObject":[{"objectId": ${objectId},"protocolFields":[]}],"scheduleId":[],"userTags":"","groupNum":null,"effectiveRange":null}}
- log ${rescode}
- log ${policyId}
- #Integer ${rescode} 200
- #功能端验证
- ${commandstr} set variable nslookup -d www.jd.com
- @{stringlist} set variable www.jd.com, type = AAAA, class = IN www.jd.com.gslb.qianxun.com ttl =
- ${starttime} Get Time
- ${rescode} SystemCommand ${commandstr} @{stringlist}
- ${endtime} Get Time
- log ${rescode}
- ${commandstr} set variable curl -kv https://www.baidu.com
- @{stringlist} set variable CN=GlobalSign Organization Validation CA - SHA256 - G2 text/html
- ${starttime} Get Time
- ${rescode} SystemCommand ${commandstr} @{stringlist}
- ${endtime} Get Time
- log ${rescode}
- #Integer ${rescode} 200
- #日志验证
- #${rescode} SecurityEventLogs ${starttime} ${endtime} ${policyid} ${clientip} ${key} ${value}
- #Integer ${rescode} 200
- #清理环境 放Teardown
- #删除策略
- log toDeletePolicy
- ${rescode} DeletePolicy ${policyId}
- Integer ${rescode} 200
- #删除对象
- log todeleteobj
- ${rescode} DeleteObject ${objectId}
- Integer ${rescode} 200
- #清理日志?
- #退出登录 放到teardown
- #最为彻底的清理方式是每次重新初始化数据库
diff --git a/AautotestTsg/01-TestCase/tsg_adc/AllFlowDNS-001.robot b/AautotestTsg/01-TestCase/tsg_adc/AllFlowDNS-001.robot
deleted file mode 100644
index 24f4344..0000000
--- a/AautotestTsg/01-TestCase/tsg_adc/AllFlowDNS-001.robot
+++ /dev/null
@@ -1,63 +0,0 @@
-*** Settings ***
-Test Setup Login
-Test Teardown Logout
-Library OperatingSystem
-Resource ../../02-Keyword/tsg-adc/systemcommand.txt
-Resource ../../02-Keyword/tsg-bifang/policyobject.txt
-Resource ../../02-Keyword/tsg-bifang/loginlogout.txt
-Resource ../../02-Keyword/tsg-bifang/logvariable.txt
-Resource ../../02-Keyword/tsg-bifang/logschema.txt #Resource log-3.robot
-
-*** Test Cases ***
-DNS-Redrict
- #登录 放到setup
- #Login
- #创建对象fqdn
- ${rescode} ${objectId} AddObject { \ \ \ \ "opAction":"add", \ \ \ \ "returnData":1, \ \ \ \ "objectList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "objectType":"fqdn", \ \ \ \ \ \ \ \ \ \ \ \ "objectName":"dxytest_fqdn_jd", \ \ \ \ \ \ \ \ \ \ \ \ "objectDesc":"dxytest_fqdn_jd", \ \ \ \ \ \ \ \ \ \ \ \ "isInitialize":0, \ \ \ \ \ \ \ \ \ \ \ \ "isExclusion":0, \ \ \ \ \ \ \ \ \ \ \ \ "subObjectIds":[], \ \ \ \ \ \ \ \ \ \ \ \ "addItemList":[ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "itemName":"item name", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "itemDesc":"item description", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "keywordArray":[ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "*jd.com" \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "isHexbin":0, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "isInitialize":0 \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ } \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ "updateItemList":[ \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ "deleteItemIds":[ \ \ \ \ \ \ \ \ \ \ \ \ ] \ \ \ \ \ \ \ \ } \ \ \ \ ] }
- #log ${rescode}
- #log 1111
- #Integer ${rescode} 200
- #Should Be Equal As Strings ${rescode} 200
- #log 22222
- log ${objectId}
- #log 333333
- #${objid} Get From List ${objectId} 0
- #创建对象IP
- ${rescodeip} ${objidip} AddObject { \ \ \ \ "opAction":"add", \ \ \ \ "returnData":1, \ \ \ \ "objectList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "objectType":"IP", \ \ \ \ \ \ \ \ \ \ \ \ "objectName":"dxytest_ip", \ \ \ \ \ \ \ \ \ \ \ \ "objectDesc":"dxytest_ip", \ \ \ \ \ \ \ \ \ \ \ \ "isInitialize":0, \ \ \ \ \ \ \ \ \ \ \ \ "isExclusion":0, \ \ \ \ \ \ \ \ \ \ \ \ "subObjectIds":[ \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ "addItemList":[ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "itemName":"dxytest_name_ip", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "itemDesc":"dxytest_name_ip", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "addrType":4, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientIpFormat":"range", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientIp1":"192.168.50.17", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientIp2":"192.168.50.17", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientPortFormat":"mask", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientPort1":"0", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientPort2":"65535", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverIpFormat":"", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverIp1":"", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverIp2":"", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverPortFormat":"", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverPort1":"", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverPort2":"", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "protocol":0, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "direction":0, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "isInitialize":0 \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ } \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ "updateItemList":[ \ \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ "deleteItemIds":[ \ \ \ \ \ \ \ \ \ \ \ \ \ ] \ \ \ \ \ \ \ \ } \ \ \ \ ] }
- #log ${rescode}
- #log 1111
- #Integer ${rescodeip} 200
- #Should Be Equal As Strings ${rescode} 200
- #log 22222
- log ${objidip}
- #log 333333
- #${objidip} Get From List ${objectId} 0
- #创建策略
- ${rescode} ${policyId} AddPolicy { \ \ \ \ "opAction":"add", \ \ \ \ "returnData":1, \ \ \ \ "policyList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "policyId":"", \ \ \ \ \ \ \ \ \ \ \ \ "isValid":0, \ \ \ \ \ \ \ \ \ \ \ \ "policyName":"dxytest_DNS通用1", \ \ \ \ \ \ \ \ \ \ \ \ "policyType":"tsg_security", \ \ \ \ \ \ \ \ \ \ \ \ "action":"deny", \ \ \ \ \ \ \ \ \ \ \ \ "userTags":"", \ \ \ \ \ \ \ \ \ \ \ \ "doBlacklist":0, \ \ \ \ \ \ \ \ \ \ \ \ "doLog":1, \ \ \ \ \ \ \ \ \ \ \ \ "userRegion":{"protocol":"DNS", \ \ \ \ \ \ \ \ \ \ \ \ "method":"redirect", \ \ \ \ \ \ \ \ \ \ \ \ "resolution":[{ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "answer":[{"atype":"A","value":"192.168.50.1", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "ttl":{"min":300,"max":300}}, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ {"atype":"CNAME","value":"www.jd.com", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "ttl":{"min":300,"max":300}}], \ \ \ \ \ \ \ \ \ \ \ \ "qtype":"A"}]}, \ \ \ \ \ \ \ \ \ \ \ \ "referenceObject":[{"objectId":${objectId},"protocolFields":["TSG_FIELD_DNS_QNAME"]}, \ \ \ \ \ \ \ \ {"objectId":${objidip},"protocolFields":[]}], \ \ \ \ \ \ \ \ \ \ \ \ "scheduleId":[ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ] \ \ \ \ \ \ \ \ } \ \ \ \ ] }
- log ${rescode}
- log ${policyId}
- #Integer ${rescode} 200
- #功能端验证
- ${commandstr} set variable nslookup -d www.jd.com
- @{stringlist} set variable www.jd.com, type = AAAA, class = IN www.jd.com.gslb.qianxun.com ttl =
- ${starttime} Get Time
- ${rescode} SystemCommand ${commandstr} @{stringlist}
- ${endtime} Get Time
- log ${rescode}
- #Integer ${rescode} 200
- #日志验证
- GetLogList security_event_log 2020-02-18 14:11:19 2020-02-18 15:11:19 192.168.50.4 1746 live.com
- #${rescode} SecurityEventLogs ${starttime} ${endtime} ${policyid} ${clientip} ${key} ${value}
- #Integer ${rescode} 200
- #清理环境 放Teardown
- #删除策略
- log toDeletePolicy
- #${rescode} DeletePolicy ${policyId}
- #Integer ${rescode} 200
- #删除对象
- log todeleteobj
- #${rescode} DeleteObject ${objectId}
- #Integer ${rescode} 200
- #清理日志?
- #退出登录 放到teardown
- #最为彻底的清理方式是每次重新初始化数据库
diff --git a/AautotestTsg/01-TestCase/tsg_adc/AllFlowHTTPSIntercept-001.robot b/AautotestTsg/01-TestCase/tsg_adc/AllFlowHTTPSIntercept-001.robot
deleted file mode 100644
index 4925475..0000000
--- a/AautotestTsg/01-TestCase/tsg_adc/AllFlowHTTPSIntercept-001.robot
+++ /dev/null
@@ -1,65 +0,0 @@
-*** Settings ***
-Test Setup Login
-Test Teardown Logout
-Library OperatingSystem
-Resource ../../02-Keyword/tsg-adc/systemcommand.txt
-Resource ../../02-Keyword/tsg-bifang/policyobject.txt
-Resource ../../02-Keyword/tsg-bifang/loginlogout.txt
-Resource ../../02-Keyword/tsg-bifang/logvariable.txt
-Resource ../../02-Keyword/tsg-bifang/logschema.txt #Resource log-3.robot
-
-*** Test Cases ***
-HTTPS-Intecept
- #登录 放到setup
- #Login
- #创建对象
- ${rescode} ${objectId} AddObject { \ \ \ \ "opAction":"add", \ \ \ \ "returnData":1, \ \ \ \ "objectList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "objectType":"fqdn", \ \ \ \ \ \ \ \ \ \ \ \ "objectName":"dxytest_fqdn_baidu", \ \ \ \ \ \ \ \ \ \ \ \ "objectDesc":"dxytest_fqdn_baidu", \ \ \ \ \ \ \ \ \ \ \ \ "isInitialize":0, \ \ \ \ \ \ \ \ \ \ \ \ "isExclusion":0, \ \ \ \ \ \ \ \ \ \ \ \ "subObjectIds":[], \ \ \ \ \ \ \ \ \ \ \ \ "addItemList":[ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "itemName":"item name", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "itemDesc":"item description", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "keywordArray":[ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "*baidu.com" \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "isHexbin":0, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "isInitialize":0 \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ } \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ "updateItemList":[ \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ "deleteItemIds":[ \ \ \ \ \ \ \ \ \ \ \ \ ] \ \ \ \ \ \ \ \ } \ \ \ \ ] }
- #log ${rescode}
- #log 1111
- #Integer ${rescode} 200
- #Should Be Equal As Strings ${rescode} 200
- #log 22222
- log ${objectId}
- #log 333333
- #${objid} Get From List ${objectId} 0
- #创建对象IP
- ${rescodeip} ${objidip} AddObject { \ \ \ \ "opAction":"add", \ \ \ \ "returnData":1, \ \ \ \ "objectList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "objectType":"IP", \ \ \ \ \ \ \ \ \ \ \ \ "objectName":"dxytest_ip", \ \ \ \ \ \ \ \ \ \ \ \ "objectDesc":"dxytest_ip", \ \ \ \ \ \ \ \ \ \ \ \ "isInitialize":0, \ \ \ \ \ \ \ \ \ \ \ \ "isExclusion":0, \ \ \ \ \ \ \ \ \ \ \ \ "subObjectIds":[ \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ "addItemList":[ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "itemName":"dxytest_name_ip", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "itemDesc":"dxytest_name_ip", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "addrType":4, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientIpFormat":"range", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientIp1":"192.168.50.17", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientIp2":"192.168.50.17", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientPortFormat":"mask", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientPort1":"0", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "clientPort2":"65535", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverIpFormat":"", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverIp1":"", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverIp2":"", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverPortFormat":"", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverPort1":"", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "serverPort2":"", \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "protocol":0, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "direction":0, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "isInitialize":0 \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ } \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ "updateItemList":[ \ \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ "deleteItemIds":[ \ \ \ \ \ \ \ \ \ \ \ \ \ ] \ \ \ \ \ \ \ \ } \ \ \ \ ] }
- #Integer ${rescodeip} 200
- #Should Be Equal As Strings ${rescode} 200
- #log 22222
- log ${objidip}
- #创建策略
- ${rescode} ${policyId} AddPolicy { \ \ \ \ "opAction":"add", \ \ \ \ "returnData":1, \ \ \ \ "policyList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "policyId":"", \ \ \ \ \ \ \ \ \ \ \ \ "isValid":0, \ \ \ \ \ \ \ \ \ \ \ \ "policyName":"dxytest_拦截通用1", \ \ \ \ \ \ \ \ \ \ \ \ "policyType":"tsg_security", \ \ \ \ \ \ \ \ \ \ \ \ "action":"intercept", \ \ \ \ \ \ \ \ \ \ \ \ "userTags":"", \ \ \ \ \ \ \ \ \ \ \ \ "doBlacklist":0, \ \ \ \ \ \ \ \ \ \ \ \ "doLog":1, \ \ \ \ \ \ \ \ \ \ \ \ "userRegion":{ \ \ \ \ \ \ \ \ \ \ \ \ \ "protocol":"SSL", \ \ \ \ "protocol_version":{"allow_http2":1, \ \ \ \ \ \ \ \ \ \ "min":"ssl3", \ \ \ \ \ \ \ \ \ "max":"tls13", \ \ \ \ \ \ \ \ \ "mirror_client":1}, \ \ \ \ "dynamic_bypass":{"mutual_authentication":1, \ \ \ \ "cert_pinning":1,"cert_transparency":0, \ \ \ \ "protocol_errors":1,"ev_cert":0}, \ \ \ \ "decrypt_mirror":{"enable":0}, \ \ \ \ "certificate_checks":{"fail_action":"pass-through", \ \ \ \ "approach":{"self-signed":1, \ \ \ \ "expiration":1, \ \ \ \ "cn":1, \ \ \ \ "issuer":1}}, \ \ \ \ "keyring":1}, \ \ \ \ \ \ \ \ \ \ \ \ "referenceObject":[{"objectId":${objectId}, \ \ \ \ \ \ \ \ "protocolFields":["TSG_FIELD_SSL_SNI"]}, \ \ \ \ \ \ \ \ {"objectId":${objidip}, \ \ \ \ \ \ \ \ "protocolFields":[]}], \ \ \ \ \ \ \ \ \ \ \ \ "scheduleId":[ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ] \ \ \ \ \ \ \ \ } \ \ \ \ ] }
- log ${rescode}
- log ${policyId}
- #Integer ${rescode} 200
- #功能端验证
- #${commandstr} set variable F:/AllFlowHTTPSIntercept-001_dos.bat
- #${rescode} SystemCommand ${commandstr} @{stringlist}
- @{stringlist} set variable CN=GlobalSign Organization Validation CA - SHA256 - G2 text/html
- ${starttime} Get Time
- ${commandreturn} OperatingSystem.Run E:/AllFlowHTTPSIntercept-001_dos.bat
- FOR ${var} IN @{stringlist}
- log dxytest
- log ${var}
- Should Contain ${commandreturn} ${var}
- END
- ${endtime} Get Time
- #log ${rescode}
- #Integer ${rescode} 200
- #日志验证
- GetLogList security_event_log 2020-02-18 14:11:19 2020-02-18 15:11:19 192.168.50.4 1746 live.com
- #${rescode} SecurityEventLogs ${starttime} ${endtime} ${policyid} ${clientip} ${key} ${value}
- #Integer ${rescode} 200
- #清理环境 放Teardown
- #删除策略
- log toDeletePolicy
- #${rescode} DeletePolicy ${policyId}
- #Integer ${rescode} 200
- #删除对象
- log todeleteobj
- #${rescode} DeleteObject ${objectId}
- #Integer ${rescode} 200
- #清理日志?
- #退出登录 放到teardown
- #最为彻底的清理方式是每次重新初始化数据库
diff --git a/AautotestTsg/01-TestCase/tsg_adc/AllFlowHTTPSIntercept-001_dos.bat b/AautotestTsg/01-TestCase/tsg_adc/AllFlowHTTPSIntercept-001_dos.bat
deleted file mode 100644
index a688f70..0000000
--- a/AautotestTsg/01-TestCase/tsg_adc/AllFlowHTTPSIntercept-001_dos.bat
+++ /dev/null
@@ -1 +0,0 @@
-curl -kv https://www.baidu.com | iconv -f utf-8 -t gbk \ No newline at end of file
diff --git a/AautotestTsg/01-TestCase/tsg_bf_api/.gitkeep b/AautotestTsg/01-TestCase/tsg_bf_api/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/01-TestCase/tsg_bf_api/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/01-TestCase/tsg_galaxy_api/.gitkeep b/AautotestTsg/01-TestCase/tsg_galaxy_api/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/01-TestCase/tsg_galaxy_api/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/01-TestCase/tsg_ui/.gitkeep b/AautotestTsg/01-TestCase/tsg_ui/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/01-TestCase/tsg_ui/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/01-TestCase/tsg_ui/login/.gitkeep b/AautotestTsg/01-TestCase/tsg_ui/login/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/01-TestCase/tsg_ui/login/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/02-Keyword/.gitkeep b/AautotestTsg/02-Keyword/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/02-Keyword/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/02-Keyword/tsg-adc/.gitkeep b/AautotestTsg/02-Keyword/tsg-adc/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/02-Keyword/tsg-adc/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/02-Keyword/tsg-adc/systemcommand.txt b/AautotestTsg/02-Keyword/tsg-adc/systemcommand.txt
deleted file mode 100644
index 726142c..0000000
--- a/AautotestTsg/02-Keyword/tsg-adc/systemcommand.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-*** Settings ***
-Library OperatingSystem
-Library Selenium2Library
-Library RequestsLibrary
-Library Collections
-
-*** Keywords ***
-SystemCommandnew
- [Arguments] ${commandstr} @{stringlist}
- #log ${commandreturn}
- ${commandreturn} OperatingSystem.Run ${commandstr}
- FOR ${var} IN @{stringlist}
- log dxytest
- log ${var}
- Should Contain ${commandreturn} ${var}
- END
- #Should Contain ${commandreturn} ${qatype}
- ${rescode} Set Variable 200
- log ${rescode}
- [Return] ${rescode}
-
-SystemCommands
- [Arguments] ${commandstr} @{stringlist}
- ${commandreturn} OperatingSystem.Run cd E:\curl-7.67.0-win64-mingw\bin
- ${commandreturn} OperatingSystem.Run e:
- log dxytest
- log ${commandreturn}
- ${commandreturn} OperatingSystem.Run ${commandstr}
- #nslookup -d www.jd.com
- #log ${commandreturn}
- FOR ${var} IN @{stringlist}
- log dxytest
- log ${var}
- Should Contain ${commandreturn} ${var}
- END
- #Should Contain ${commandreturn} ${qatype}
- ${rescode} Set Variable 200
- log ${rescode}
- [Return] ${rescode}
-
-SystemCommand
- [Arguments] ${commandstr} @{stringlist}
- log dxytest${commandstr}
- ${commandreturn} OperatingSystem.Run ${commandstr}
- #nslookup -d www.jd.com
- log ${commandreturn}
- FOR ${var} IN @{stringlist}
- log dxytest
- log ${var}
- Should Contain ${commandreturn} ${var}
- END
- #Should Contain ${commandreturn} ${qatype}
- ${rescode} Set Variable 200
- log ${rescode}
- [Return] ${rescode}
-
-DNS
- [Arguments] ${commandstr} ${qatype} ${qaaatype} ${ttlparm}
- ${commandreturn} OperatingSystem.Run ${commandstr}
- #log ${commandreturn}
- #${qatype} Set Variable www.jd.com, type = A, class = IN
- #${qaaatype} Set Variable www.jd.com.gslb.qianxun.com
- #${ttlparm} Set Variable ttl =
- #${b} Should Contain ${c} ${qatype}
- Should Contain ${commandreturn} ${qatype}
- Should Contain ${commandreturn} ${qaaatype}
- Should Contain ${commandreturn} ${ttlparm}
- ${rescode} Set Variable 200
- [Return] ${rescode}
-
-CURL
- [Arguments] ${commandstr} ${cn} ${User-Agent} ${Content-Type} ${text}
- ${commandreturn} OperatingSystem.Run ${commandstr}
- #curl -kv https://www.baidu.com | iconv -f utf-8 -t gbk
- #log ${commandreturn}
- #${cn} Set Variable CN=GlobalSign Organization Validation CA - SHA256 - G2
- #${User-Agent} Set Variable curl/7.67.0
- #${Content-Type} Set Variable text/html
- #${text} Set Variable 百度一下
- Should Contain ${commandreturn} ${cn}
- Should Contain ${commandreturn} ${User-Agent}
- Should Contain ${commandreturn} ${Content-Type}
- Should Contain ${commandreturn} ${text}
- ${rescode} Set Variable 200
- [Return] ${rescode}
-
-CURLNEW
- ${commandreturn} OperatingSystem.Run E:\\curl-7.67.0-win64-mingw\\bin\\curl -kv https://www.baidu.com | iconv -f utf-8 -t gbk
- #curl -kv https://www.baidu.com | iconv -f utf-8 -t gbk
- #log ${commandreturn}
- #${cn} Set Variable CN=GlobalSign Organization Validation CA - SHA256 - G2
- #${User-Agent} Set Variable curl/7.67.0
- #${Content-Type} Set Variable text/html
- #${text} Set Variable 百度一下
- Should Contain ${commandreturn} ${User-Agent}
- Should Contain ${commandreturn} ${Content-Type}
- Should Contain ${commandreturn} ${text}
- Should Contain ${commandreturn} ${cn}
- ${rescode} Set Variable 200
- [Return] ${rescode}
diff --git a/AautotestTsg/02-Keyword/tsg-api/.gitkeep b/AautotestTsg/02-Keyword/tsg-api/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/02-Keyword/tsg-api/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/02-Keyword/tsg-bifang/.gitkeep b/AautotestTsg/02-Keyword/tsg-bifang/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/02-Keyword/tsg-bifang/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/02-Keyword/tsg-bifang/apirequest.txt b/AautotestTsg/02-Keyword/tsg-bifang/apirequest.txt
deleted file mode 100644
index 3a56fc4..0000000
--- a/AautotestTsg/02-Keyword/tsg-bifang/apirequest.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-*** Keywords ***
-PostRequest
- [Arguments] ${url} ${data}
- ${header} Create Dictionary Content-Type=application/json Authorization=${token}
- Create Session api http://${host}:${port}/${version} headers=${header}
- ${remoteResponse} Post Request api ${url} data=${data} headers=${header}
- [Return] ${remoteResponse}
-
-GetRequest
- [Arguments] ${url}
- ${header} Create Dictionary Content-Type=application/json Authorization=${token}
- Create Session api http://${host}:${port}/${version} headers=${header}
- ${remoteResponse} Get Request api ${url} headers=${header}
- [Return] ${remoteResponse}
diff --git a/AautotestTsg/02-Keyword/tsg-bifang/loginlogout.txt b/AautotestTsg/02-Keyword/tsg-bifang/loginlogout.txt
deleted file mode 100644
index 3292051..0000000
--- a/AautotestTsg/02-Keyword/tsg-bifang/loginlogout.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-*** Settings ***
-Resource ../../03-Variable/bifangapivariable.txt
-Library REST http://${host}:${port}
-Library Collections
-
-*** Keywords ***
-Login
- #[Arguments] ${username} ${password} ${authmode} ${authCode} ${ldapId}# 毕方接口用户名密码
- GET /v1/user/encryptpwd?password=${password}
- Object response body
- #OUTPUT response body
- #${rescode} Integer $.code
- Integer $.code 200
- #log ${rescode}
- ${pwd} String $.data.encryptpwd
- #log ${pwd}
- ${pwdstr} Get From List ${pwd} 0
- #log aaaaaaa
- log ${pwdstr}
- #log bbb
- SET GLOBAL VARIABLE ${encodePassword} ${pwdstr}
- #log aaaaaaa
- log ${encodePassword}
- #log aaaaaaa
- #log ${host}:${port}
- #getToken##################################################################################
- #log ${username}
- #log ${pwdstr}
- POST /v1/user/login?username=${username}&password=${encodePassword}&authMode=${authmode}
- Object response body
- #OUTPUT response body
- Integer $.code 200
- #${rescodelist} Integer $.code
- #${rescode} Get From List ${rescodelist} 0
- ${rescode} Integer $.code
- log ${rescode}
- ${tokenGlobal} String $.data.token
- ${tokenStr} Get From List ${tokenGlobal} 0
- log ${tokenStr}
- SET GLOBAL VARIABLE ${token} ${tokenStr}
- log ${token}
- SET GLOBAL VARIABLE ${headers} {"Contest-Type":"application/json","Authorization":"${token}"}
- [Return] ${rescode}
-
-Logout
- POST /v1/user/logout headers=${headers}
- Object response body
- Integer $.code 200
- ${rescode} Integer $.code
- [Return] ${rescode}
diff --git a/AautotestTsg/02-Keyword/tsg-bifang/logschema.txt b/AautotestTsg/02-Keyword/tsg-bifang/logschema.txt
deleted file mode 100644
index 7214337..0000000
--- a/AautotestTsg/02-Keyword/tsg-bifang/logschema.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-*** Settings ***
-Resource ../../03-Variable/bifangapivariable.txt
-Resource logvariable.txt
-Library REST http://${host}:${port}/${version}
-Library RequestsLibrary
-Library OperatingSystem
-Library Collections
-Library string
-
-*** Keywords ***
-GetLogList
- [Arguments] ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id} ${ssl_sni}
- ${logCondition} GetLogCondition ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id}
- log ${logCondition}
- ${LogListResponse} PostRemoteData /log/list ${logCondition}
- Should Be Equal As Strings ${LogListResponse.status_code} 200
- ${returnData} To Json ${LogListResponse.content}
- ${responseCode} Get From Dictionary ${returnData} code
- Log ${responseCode}
- Should Be Equal ${responseCode} ${200} security_event_log \ \ test query list failed
- log this time request security_event_log \ table logRecord \ : ${LogListResponse.content}
- ${a} Set Variable this time request security_event_log \ table logRecord \ : ${LogListResponse.content}
- log ${a}
- Should Contain ${LogListResponse.json()}[data][list][0][common_policy_id] ${policy_id}
- Should Contain ${LogListResponse.json()}[data][list][0][common_client_ip] ${client_ip}
- Should Contain ${LogListResponse.json()}[data][list][0][ssl_sni] ${ssl_sni}
diff --git a/AautotestTsg/02-Keyword/tsg-bifang/logvariable.txt b/AautotestTsg/02-Keyword/tsg-bifang/logvariable.txt
deleted file mode 100644
index 1bb74be..0000000
--- a/AautotestTsg/02-Keyword/tsg-bifang/logvariable.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-*** Settings ***
-Resource ../../03-Variable/bifangapivariable.txt
-Library RequestsLibrary
-Library OperatingSystem
-Library Collections
-Library string
-Library REST http://${host}:${port}
-
-*** Keywords ***
-GetLogCondition
- [Arguments] ${logname} ${startTime} ${endTime} ${client_ip} ${policy_id}
- Set Headers {"Content-Type":"application/x-www-form-urlencoded","Authorization":"${token}"}
- &{LogSchemaResponse}= GET /v1/log/schema?logType=${logname}
- log ${logname}
- Output Schema response body
- Object response body
- #Integer $.code 200
- log ${LogSchemaResponse.body['data']}
- ${field} Evaluate json.dumps(eval(str(${LogSchemaResponse.body['data']['fields']}))) json
- log ${field}
- ${pageSize} Set Variable 30
- ${pageNo} Set Variable 1
- ${condition} Set Variable [{"value":["${startTime}","${endTime}"],"symbol":"between","field":"common_recv_time","type":"timestamp"}]
- ${simpleCondition} Set Variable "common_server_ips": "40"
- ${logCondition} Set Variable {"pageNo":${pageNo},"pageSize":${pageSize},"logType":"${logname}","fields":${field},"start_common_recv_time":"${startTime}","end_common_recv_time":"${endTime}","conditions":${condition} ,"common_client_ips":"${client_ip}","common_policy_ids":"${policy_id}",${simpleCondition}}
- log this time query condition:${logCondition}
- [Return] ${logCondition}
-
-PostRemoteData
- [Arguments] ${url} ${data}
- ${header} Create Dictionary Content-Type=application/json Authorization=${token}
- Create Session api http://${host}:${port}/${version} headers=${header}
- ${remoteResponse} Post Request api ${url} data=${data} headers=${header}
- [Return] ${remoteResponse}
diff --git a/AautotestTsg/02-Keyword/tsg-bifang/policyobject.txt b/AautotestTsg/02-Keyword/tsg-bifang/policyobject.txt
deleted file mode 100644
index 10bc810..0000000
--- a/AautotestTsg/02-Keyword/tsg-bifang/policyobject.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-*** Settings ***
-Resource ../../03-Variable/bifangapivariable.txt
-Library REST http://${host}:${port}
-Library Collections
-
-*** Keywords ***
-AddObject
- [Arguments] ${body}
- #addIPobject#################################################################################
- POST /v1/policy/object body=${body} headers=${headers}
- Object response body
- #Output response body
- ${rescode} Integer $.code
- #log ${rescode}
- #log aaa
- ${objectIdList} Integer $.data.objectList[0].objectId
- ${objectId} Get From List ${objectIdList} 0
- #log aaa
- #${count} Get Length $.data.objectList
- #log ${count}
- #FOR ${var} IN ${objectId}
- # log ${var}
- #END
- #log ${objectId}
- ${rescodeReturn} Get From List ${rescode} 0
- [Return] ${rescodeReturn} ${objectId}
-
-EditObject
- [Arguments] @{body}
- [Return] ${rescode} ${objectId}
-
-DeleteObject
- [Arguments] ${objectids}
- ${body} String {"objectIds":[${objectids}]}
- DELETE /v1/policy/object body=${body} headers=${headers}
- Object response body
- log DeleteObject
- log dxytestOUtputstart
- Output response body
- log dxytestOUtputstart
- ${rescode} Integer $.code
- ${rescodeReturn} Get From List ${rescode} 0
- [Return] ${rescodeReturn}
-
-AddPolicy
- [Arguments] ${body}
- #addIPobject#################################################################################
- #log ${host}:${port}
- #log ${headers}
- #log ${body}
- POST /v1/policy/compile body=${body} headers=${headers}
- #log 1111111
- Object response body
- #Output response body
- ${rescode} Integer $.code
- #log ${rescode}
- ${policyId} Integer $.data.policyList[0].policyId
- #log ${policyId}
- [Return] ${rescode} ${policyId}
-
-EditPolicy
- [Arguments] @{body}
- [Return] ${rescode} ${objectId}
-
-DeletePolicy
- [Arguments] ${policyids}
- ${body} String {"policyType":"tsg_security","policyIds":[${policyids}]}
- DELETE /v1/policy/compile body=${body} headers=${headers}
- Object response body
- log DeletePolicy
- Output response body
- ${rescode} Integer $.code
- ${rescodeReturn} Get From List ${rescode} 0
- [Return] ${rescodeReturn}
diff --git a/AautotestTsg/02-Keyword/tsg-ui/.gitkeep b/AautotestTsg/02-Keyword/tsg-ui/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/02-Keyword/tsg-ui/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/02-Keyword/tsg-ui/Loginout/.gitkeep b/AautotestTsg/02-Keyword/tsg-ui/Loginout/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/02-Keyword/tsg-ui/Loginout/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/03-Variable/.gitkeep b/AautotestTsg/03-Variable/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/03-Variable/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/03-Variable/DOS.bat b/AautotestTsg/03-Variable/DOS.bat
deleted file mode 100644
index c99444a..0000000
--- a/AautotestTsg/03-Variable/DOS.bat
+++ /dev/null
@@ -1 +0,0 @@
-E:\\curl-7.67.0-win64-mingw\\bin\\curl -kv https://www.baidu.com | iconv -f utf-8 -t gbk \ No newline at end of file
diff --git a/AautotestTsg/03-Variable/bifangapivariable.txt b/AautotestTsg/03-Variable/bifangapivariable.txt
deleted file mode 100644
index fccd52f..0000000
--- a/AautotestTsg/03-Variable/bifangapivariable.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-*** Variables ***
-${host} 192.168.40.120
-${port} 8080
-${authmode} 1
-${authCode} ${EMPTY}
-${ldapId} 27
-${version} v1
-${username} uitest
-${password} 111111
-${encodePassword} ${EMPTY}
-${token} ${EMPTY}
diff --git a/AautotestTsg/04-CustomLibrary/.gitkeep b/AautotestTsg/04-CustomLibrary/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/04-CustomLibrary/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/05-Other/.gitkeep b/AautotestTsg/05-Other/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/AautotestTsg/05-Other/.gitkeep
+++ /dev/null
diff --git a/AautotestTsg/05-Other/AllFlowHTTPSIntercept-001_dos.bat b/AautotestTsg/05-Other/AllFlowHTTPSIntercept-001_dos.bat
deleted file mode 100644
index a688f70..0000000
--- a/AautotestTsg/05-Other/AllFlowHTTPSIntercept-001_dos.bat
+++ /dev/null
@@ -1 +0,0 @@
-curl -kv https://www.baidu.com | iconv -f utf-8 -t gbk \ No newline at end of file