diff --git a/01-TestCase/tsg_bfapi/api_log/LogStatistics_Timeandcount.robot b/01-TestCase/tsg_bfapi/api_log/LogStatistics_Timeandcount.robot index 76de6e2..462af69 100644 --- a/01-TestCase/tsg_bfapi/api_log/LogStatistics_Timeandcount.robot +++ b/01-TestCase/tsg_bfapi/api_log/LogStatistics_Timeandcount.robot @@ -7,6 +7,7 @@ ${url} /${version}/report/policyevent/hit/timeandcount *** Test Cases *** LogStatistics-Timeandcount-00001 + [Tags] security_event_hits_log类型正常输出 单policyId Timeandcount ${url} security_event_hits_log 20515 diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot index 51c597f..80b2720 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot @@ -4,16 +4,30 @@ Library Collections Library REST Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot +Library GetTimeLibrary *** Test Cases *** ClientIPTopN-0001 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m #dashboard 源IP统计 bifang和bigData对比 - ClientIPTopN 1 bytes 5 + + ClientIPTopN ${starttime} ${endtime} bytes 5 ClientIPTopN-0002 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m #dashboard 源IP统计 bifang和bigData对比 - ClientIPTopN 2 packets 5 + ClientIPTopN ${starttime} ${endtime} packets 5 ClientIPTopN-0003 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m #dashboard 源IP统计 bifang和bigData对比 - ClientIPTopN 3 sessions 10 \ No newline at end of file + ClientIPTopN ${starttime} ${endtime} sessions 10 diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/DomainTopN.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/DomainTopN.robot index 70b26d4..7aa0616 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/DomainTopN.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/DomainTopN.robot @@ -4,16 +4,29 @@ Library Collections Library REST Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/DomainTopN.robot +Library GetTimeLibrary *** Test Cases *** DomainTopN-0001 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m #dashboard 域名统计 bifang和bigData对比 - DomainTopN 1 bytes 10 + DomainTopN ${starttime} ${endtime} bytes 10 DomainTopN-0002 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m #dashboard 域名统计 bifang和bigData对比 - DomainTopN 2 packets 10 + DomainTopN ${starttime} ${endtime} packets 10 DomainTopN-0003 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m #dashboard 域名统计 bifang和bigData对比 - DomainTopN 3 sessions 10 \ No newline at end of file + DomainTopN ${starttime} ${endtime} sessions 10 \ No newline at end of file diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot index fd146a3..fa344c0 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot @@ -4,100 +4,249 @@ Library Collections Library REST Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot +Library GetTimeLibrary + *** Test Cases *** SecurityEventActionHit-bytes-0001 # dashboard界面 安全策略各动作命中计数 bytes bifang和bigData对比 - SecurityEventActionHit-bytes 1 300 5 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-bytes ${startTime} ${endTime} 300 5 SecurityEventActionHit-bytes-0002 - # dashboard界面 安全策略各动作命中计数 bytes bifang和bigData对比 - SecurityEventActionHit-bytes 2 600 5 + # dashboard界面 安全策略各动作命中计数 bytes bifang和bigData对比 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-bytes ${startTime} ${endTime} 600 5 SecurityEventActionHit-bytes-0003 - # dashboard界面 安全策略各动作命中计数 bytes bifang和bigData对比 - SecurityEventActionHit-bytes 3 600 10 + # dashboard界面 安全策略各动作命中计数 bytes bifang和bigData对比 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-bytes ${startTime} ${endTime} 600 10 SecurityEventActionHit-packets-0001 # dashboard界面 安全策略各动作命中计数 packets bifang和bigData对比 - SecurityEventActionHit-packets 1 300 5 + + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-packets ${startTime} ${endTime} 300 5 SecurityEventActionHit-packets-0002 # dashboard界面 安全策略各动作命中计数 packets bifang和bigData对比 - SecurityEventActionHit-packets 2 600 5 + + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-packets ${startTime} ${endTime} 600 5 SecurityEventActionHit-packets-0003 # dashboard界面 安全策略各动作命中计数 packets bifang和bigData对比 - SecurityEventActionHit-packets 3 600 10 2020-03-31 16:00:00 2020-04-07 16:00:00 + + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-packets ${startTime} ${endTime} 600 10 SecurityEventActionHit-sessions-0001 # dashboard界面 安全策略各动作命中计数 sessions bifang和bigData对比 - SecurityEventActionHit-sessions 1 300 5 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-sessions ${startTime} ${endTime} 300 5 SecurityEventActionHit-sessions-0002 # dashboard界面 安全策略各动作命中计数 sessions bifang和bigData对比 - SecurityEventActionHit-sessions 2 300 5 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-sessions ${startTime} ${endTime} 300 5 SecurityEventActionHit-sessions-0003 # dashboard界面 安全策略各动作命中计数 sessions bifang和bigData对比 - SecurityEventActionHit-sessions 3 300 10 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-sessions ${startTime} ${endTime} 300 10 SecurityEventActionHit-thrend-bytes-0001 # dashboard界面 安全策略各动作命中计数趋势 bytes bifang和bigData对比 - SecurityEventActionHit-thrend-bytes 1 300 5 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-thrend-bytes ${startTime} ${endTime} 300 5 SecurityEventActionHit-thrend-bytes-0002 # dashboard界面 安全策略各动作命中计数趋势 bytes bifang和bigData对比 - SecurityEventActionHit-thrend-bytes 2 300 5 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-thrend-bytes ${startTime} ${endTime} 300 5 SecurityEventActionHit-thrend-bytes-0003 # dashboard界面 安全策略各动作命中计数趋势 bytes bifang和bigData对比 - SecurityEventActionHit-thrend-bytes 3 600 10 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-thrend-bytes ${startTime} ${endTime} 600 10 SecurityEventActionHit-thrend-packets-0001 # dashboard界面 安全策略各动作命中计数趋势 packets bifang和bigData对比 - SecurityEventActionHit-thrend-packets 1 300 5 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-thrend-packets ${startTime} ${endTime} 300 5 SecurityEventActionHit-thrend-packets-0002 # dashboard界面 安全策略各动作命中计数趋势 packets bifang和bigData对比 - SecurityEventActionHit-thrend-packets 2 300 5 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-thrend-packets ${startTime} ${endTime} 300 5 SecurityEventActionHit-thrend-packets-0003 # dashboard界面 安全策略各动作命中计数趋势 packets bifang和bigData对比 - SecurityEventActionHit-thrend-packets 3 600 10 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-thrend-packets ${startTime} ${endTime} 600 10 SecurityEventActionHit-thrend-sessions-0001 # dashboard界面 安全策略各动作命中计数趋势 sessions bifang和bigData对比 - SecurityEventActionHit-thrend-sessions 1 300 5 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-thrend-sessions ${startTime} ${endTime} 300 5 SecurityEventActionHit-thrend-sessions-0002 # dashboard界面 安全策略各动作命中计数趋势 sessions bifang和bigData对比 - SecurityEventActionHit-thrend-sessions 2 300 5 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-thrend-sessions ${startTime} ${endTime} 300 5 SecurityEventActionHit-thrend-sessions-0003 # dashboard界面 安全策略各动作命中计数趋势 sessions bifang和bigData对比 - SecurityEventActionHit-thrend-sessions 3 600 10 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SecurityEventActionHit-thrend-sessions ${startTime} ${endTime} 600 10 ProxyEventActionHit-sessions-0001 # dashboard界面 代理策略各动作命中计数 sessions bifang和bigData对比 - ProxyEventActionHit-sessions 1 300 5 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + ProxyEventActionHit-sessions ${startTime} ${endTime} 300 5 ProxyEventActionHit-sessions-0002 # dashboard界面 代理策略各动作命中计数 sessions bifang和bigData对比 - ProxyEventActionHit-sessions 2 300 5 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + ProxyEventActionHit-sessions ${startTime} ${endTime} 300 5 ProxyEventActionHit-sessions-0003 # dashboard界面 代理策略各动作命中计数 sessions bifang和bigData对比 - ProxyEventActionHit-sessions 3 600 10 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + ProxyEventActionHit-sessions ${startTime} ${endTime} 600 10 ProxyEventActionHit-trend-sessions-0001 # dashboard界面 代理策略各动作命中计数趋势 sessions bifang和bigData对比 - ProxyEventActionHit-trend-sessions 1 300 5 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + ProxyEventActionHit-trend-sessions ${startTime} ${endTime} 300 5 ProxyEventActionHit-trend-sessions-0002 # dashboard界面 代理策略各动作命中计数趋势 sessions bifang和bigData对比 - ProxyEventActionHit-trend-sessions 2 300 5 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + ProxyEventActionHit-trend-sessions ${startTime} ${endTime} 300 5 ProxyEventActionHit-trend-sessions-0003 # dashboard界面 代理策略各动作命中计数趋势 sessions bifang和bigData对比 - ProxyEventActionHit-trend-sessions 3 600 10 + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + ProxyEventActionHit-trend-sessions ${startTime} ${endTime} 600 10 diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot index 0aba79f..b2b3e02 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot @@ -3,28 +3,54 @@ Force Tags tsg-bfapi dashboard policy topn Library Collections Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot +Library GetTimeLibrary + *** Test Cases *** SecurityEventHitTopN-0001 # dashboard界面 安全策略命中TopN bifang和bigData对比 - SecurityEventHit 1 10 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + SecurityEventHit ${startTime} ${endTime} 10 SecurityEventHitTopN-0002 # dashboard界面 安全策略命中TopN bifang和bigData对比 - SecurityEventHit 2 10 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + SecurityEventHit ${startTime} ${endTime} 10 SecurityEventHitTopN-0003 # dashboard界面 安全策略命中TopN bifang和bigData对比 - SecurityEventHit 3 10 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + SecurityEventHit ${startTime} ${endTime} 10 ProxyEventHitTopN-0001 # dashboard界面 代理策略命中TopN bifang和bigData对比 - ProxyEventHit 1 10 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + ProxyEventHit ${startTime} ${endTime} 10 ProxyEventHitTopN-0002 # dashboard界面 代理策略命中TopN bifang和bigData对比 - ProxyEventHit 2 10 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + ProxyEventHit ${startTime} ${endTime} 10 ProxyEventHitTopN-0003 # dashboard界面 代理策略命中TopN bifang和bigData对比 - ProxyEventHit 3 10 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + ProxyEventHit ${startTime} ${endTime} 10 diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot index 1c7005f..11d653f 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot @@ -4,29 +4,54 @@ Library Collections Library REST Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot +Library GetTimeLibrary *** Test Cases *** ProxyPinning-0001 # dashboard界面 Proxy Pinning计数 bifang和bigData对比 - ProxyPinning 1 300 5 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + ProxyPinning ${startTime} ${endTime} 300 5 ProxyPinning-0002 # dashboard界面 Proxy Pinning计数 bifang和bigData对比 - ProxyPinning 2 300 5 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + ProxyPinning ${startTime} ${endTime} 300 5 ProxyPinning-0003 # dashboard界面 Proxy Pinning计数 bifang和bigData对比 - ProxyPinning 3 600 10 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + ProxyPinning ${startTime} ${endTime} 600 10 ProxyPinning-trend-0001 # dashboard界面 Proxy Pinning计数 bifang和bigData对比 - ProxyPinningTrend 1 300 5 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + ProxyPinningTrend ${startTime} ${endTime} 300 5 ProxyPinning-trend-0002 # dashboard界面 Proxy Pinning计数 bifang和bigData对比 - ProxyPinningTrend 2 300 5 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + ProxyPinningTrend ${startTime} ${endTime} 300 5 ProxyPinning-trend-0003 # dashboard界面 Proxy Pinning计数 bifang和bigData对比 - ProxyPinningTrend 3 600 10 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + ProxyPinningTrend ${startTime} ${endTime} 600 10 diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot index ee67b66..d12cd40 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot @@ -4,16 +4,28 @@ Library Collections Library REST Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot - +Library GetTimeLibrary *** Test Cases *** ServiceIPTopN-0001 #dashboard 目的IP统计 bifang和bigData对比 - ServiceIPTopN 1 bytes 10 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + ServiceIPTopN ${startTime} ${endTime} bytes 10 ServiceIPTopN-0002 - #dashboard 目的IP统计 bifang和bigData对比 - ServiceIPTopN 2 packets 10 + #dashboard 目的IP统计 bifang和bigData对比 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + ServiceIPTopN ${startTime} ${endTime} packets 10 ServiceIPTopN-0003 #dashboard 目的IP统计 bifang和bigData对比 - ServiceIPTopN 3 sessions 10 \ No newline at end of file + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + ServiceIPTopN ${startTime} ${endTime} sessions 10 \ No newline at end of file diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot index 2bf317b..341b708 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot @@ -4,16 +4,32 @@ Library Collections Library REST Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot +Library GetTimeLibrary *** Test Cases *** SubscriberidTopN-0001 #dashboard 用户TopN统计 bifang和bigData对比 - SubscriberidTopN 1 bytes 10 + + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + SubscriberidTopN ${startTime} ${endTime} bytes 10 SubscriberidTopN-0002 #dashboard 用户TopN统计 bifang和bigData对比 - SubscriberidTopN 2 packets 10 + + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + SubscriberidTopN ${startTime} ${endTime} packets 10 SubscriberidTopN-0003 #dashboard 用户TopN统计 bifang和bigData对比 - SubscriberidTopN 3 sessions 10 \ No newline at end of file + + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + SubscriberidTopN ${startTime} ${endTime} sessions 10 \ No newline at end of file diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot index e88be2f..3e11939 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot @@ -7,25 +7,67 @@ Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/TrafficSe *** Test Cases *** SessionStatistics-NewLive-0001 # dashboard界面新建和活跃连接数统计 bifang和bigData对比 - SessionStatistics-NewLive 1 + + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SessionStatistics-NewLive ${starttime} ${endtime} SessionStatistics-NewLive-0002 # dashboard界面新建和活跃连接数统计 bifang和bigData对比 - SessionStatistics-NewLive 2 + + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SessionStatistics-NewLive ${starttime} ${endtime} SessionStatistics-NewLive-0003 # dashboard界面新建和活跃连接数统计 bifang和bigData对比 - SessionStatistics-NewLive 3 + + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SessionStatistics-NewLive ${starttime} ${endtime} SessionStatistics-NewLiveTrend-0001 # dashboard界面新建和活跃连接数趋势 bifang和bigData对比 - SessionStatistics-NewLive-Trend 1 60 5 + + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SessionStatistics-NewLive-Trend ${starttime} ${endtime} 60 5 SessionStatistics-NewLiveTrend-0002 # dashboard界面新建和活跃连接数趋势 bifang和bigData对比 - SessionStatistics-NewLive-Trend 2 300 5 + + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SessionStatistics-NewLive-Trend ${starttime} ${endtime} 300 5 SessionStatistics-NewLiveTrend-0003 # dashboard界面新建和活跃连接数趋势 bifang和bigData对比 - SessionStatistics-NewLive-Trend 3 600 10 + + #开始时间 + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -01:00:00 + SessionStatistics-NewLive-Trend ${starttime} ${endtime} 600 10 diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot index 872c5fe..4072be5 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot @@ -3,77 +3,167 @@ Force Tags tsg-bfapi dashboard traffic Library Collections Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot +Library GetTimeLibrary *** Test Cases *** TrafficStatistics-bytes-0001 # Traffics-带宽统计 统计类型：bytes bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-bytes 1 + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-bytes ${startTime} ${endTime} TrafficStatistics-bytes-0002 # Traffics-带宽统计 统计类型：bytes bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-bytes 2 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-bytes ${startTime} ${endTime} TrafficStatistics-bytes-0003 # Traffics-带宽统计 统计类型：bytes bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-bytes 3 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-bytes ${startTime} ${endTime} TrafficStatistics-packets-0001 # Traffics-带宽统计 统计类型：packets bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-packets 1 2020-04-06 10:00:00 2020-04-06 12:00:00 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-packets ${startTime} ${endTime} TrafficStatistics-packets-0002 # Traffics-带宽统计 统计类型：packets bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-packets 2 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-packets ${startTime} ${endTime} TrafficStatistics-packets-0003 # Traffics-带宽统计 统计类型：packets bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-packets 3 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-packets ${startTime} ${endTime} TrafficStatistics-sessions-0001 # Traffics-带宽统计 统计类型：sessions bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-sessions 1 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-sessions ${startTime} ${endTime} TrafficStatistics-sessions-0002 # Traffics-带宽统计 统计类型：sessions bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-sessions 2 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-sessions ${startTime} ${endTime} TrafficStatistics-sessions-0003 # Traffics-带宽统计 统计类型：sessions bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-sessions 3 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-sessions ${startTime} ${endTime} TrafficStatistics-trend-bytes-0001 # Traffics-带宽趋势 统计类型：bytes bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-trend-bytes 1 60 5 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-trend-bytes ${startTime} ${endTime} 60 5 TrafficStatistics-trend-bytes-0002 # Traffics-带宽趋势 统计类型：bytes bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-trend-bytes 2 300 5 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-trend-bytes ${startTime} ${endTime} 300 5 TrafficStatistics-trend-bytes-0003 # Traffics-带宽趋势 统计类型：bytes bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-trend-bytes 3 300 10 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-trend-bytes ${startTime} ${endTime} 300 10 TrafficStatistics-trend-packets-0001 # Traffics-带宽趋势 统计类型：packets bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-trend-packets 1 60 5 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-trend-packets ${startTime} ${endTime} 60 5 TrafficStatistics-trend-packets-0002 # Traffics-带宽趋势 统计类型：packets bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-trend-packets 2 60 10 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-trend-packets ${startTime} ${endTime} 60 10 TrafficStatistics-trend-packets-0003 # Traffics-带宽趋势 统计类型：packets bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-trend-packets 3 300 10 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-trend-packets ${startTime} ${endTime} 300 10 TrafficStatistics-trend-sessions-0001 # Traffics-带宽趋势 统计类型：sessions bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-trend-sessions 1 60 5 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-trend-sessions ${startTime} ${endTime} 60 5 TrafficStatistics-trend-sessions-0002 # Traffics-带宽趋势 统计类型：sessions bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-trend-sessions 2 60 10 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-trend-sessions ${startTime} ${endTime} 60 10 TrafficStatistics-trend-sessions-0003 # Traffics-带宽趋势 统计类型：sessions bifang和bigData对比 Traffic IN/OUT - Dashboard-Traffic-trend-sessions 3 300 10 + + #开始时间 + ${starttime} time1 30s + #结束时间 + ${endtime} time1 s + Dashboard-Traffic-trend-sessions ${startTime} ${endTime} 300 10 \ No newline at end of file diff --git a/01-TestCase/tsg_bfapi/dashboard_data_compare/UrlTopN.robot b/01-TestCase/tsg_bfapi/dashboard_data_compare/UrlTopN.robot index 9747754..0a3569b 100644 --- a/01-TestCase/tsg_bfapi/dashboard_data_compare/UrlTopN.robot +++ b/01-TestCase/tsg_bfapi/dashboard_data_compare/UrlTopN.robot @@ -4,16 +4,29 @@ Library Collections Library REST Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../02-Keyword/tsg_bfapi/dashboard_data_compare/UrlTopN.robot +Library GetTimeLibrary *** Test Cases *** UrlTopN-0001 #dashboard Url统计 bifang和bigData对比 - UrlTopN 1 10 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + UrlTopN ${starttime} ${endtime} 10 UrlTopN-0002 #dashboard Url统计 bifang和bigData对比 - UrlTopN 2 10 + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + UrlTopN ${starttime} ${endtime} 10 UrlTopN-0003 #dashboard Url统计 bifang和bigData对比 - UrlTopN 3 10 \ No newline at end of file + #开始时间 + ${starttime} time1 5m + #结束时间 + ${endtime} time1 m + UrlTopN ${starttime} ${endtime} 10 \ No newline at end of file diff --git a/01-TestCase/tsg_bfapi/predefine_stat/PolicyHitCountTrendQuery.robot b/01-TestCase/tsg_bfapi/predefine_stat/PolicyHitCountTrendQuery.robot new file mode 100644 index 0000000..01af08d --- /dev/null +++ b/01-TestCase/tsg_bfapi/predefine_stat/PolicyHitCountTrendQuery.robot @@ -0,0 +1,24 @@ +*** Settings *** +Library OperatingSystem +Library DateTime +Library String +Resource ../../../03-Variable/BifangApiVariable.txt +Resource ../../../02-Keyword/tsg_bfapi/Common.robot +Library E:/Program Files (x86)/Python37-32/Lib/site-packages/GetTimeLibrary/GetTime.py + + +*** Test Cases *** +PolicyHitCountTrendQuery-001 + #通过策略查询接口得到policy的id，安全策略 + ${response} BaseGetRequestOK /v2/policy/compile pageSize=20&pageNo=1&policyType=tsg_security&policyName= + ${policy_id} Set Variable ${response}[data][list][1][policyId] + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + ${endTime} Get Substring ${endTime} \ -4 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -1 days + ${startTime} Get Substring ${startTime} \ -4 + #通过policy的id，查询策略命中计数趋势 + ${response1} BaseGetRequestOK /v1/report/policyevent/hit/trend policyId=77703&startTime=${startTime}&endTime=${endTime}&logType=security_event_hits_log + \ No newline at end of file diff --git a/01-TestCase/tsg_bfapi/predefine_stat/PolicyHitTimeAndCountqQuery.robot b/01-TestCase/tsg_bfapi/predefine_stat/PolicyHitTimeAndCountqQuery.robot new file mode 100644 index 0000000..ec25be3 --- /dev/null +++ b/01-TestCase/tsg_bfapi/predefine_stat/PolicyHitTimeAndCountqQuery.robot @@ -0,0 +1,76 @@ +*** Settings *** +Library OperatingSystem +Library DateTime +Library String +Resource ../../../03-Variable/BifangApiVariable.txt +Resource ../../../02-Keyword/tsg_bfapi/Common.robot +*** Test Cases *** +PolicyHitTimeAndCountqQuery-001 + #通过策略查询接口得到policy的id，安全策略 + ${response} BaseGetRequestOK /v2/policy/compile pageSize=20&pageNo=1&policyType=tsg_security&policyName= + ${policy_id} Set Variable ${response}[data][list][1][policyId] + #通过policy的id统计策略命中时间与计数,安全策略 + ${response1} BaseGetRequestOK /v1/report/policyevent/hit/timeandcount policyIds=${policy_id}&logType=security_event_hits_log&startTime=&endTime= + +PolicyHitTimeAndCountqQuery-002 + #通过策略查询接口得到policy的id，安全策略 + ${response} BaseGetRequestOK /v2/policy/compile pageSize=20&pageNo=1&policyType=tsg_security&policyName= + ${policy_id} Set Variable ${response}[data][list][1][policyId] + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + ${endTime} Get Substring ${endTime} \ -4 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -1 days + ${startTime} Get Substring ${startTime} \ -4 + #通过policy的id统计策略命中时间与计数,安全策略 + ${response1} BaseGetRequestOK /v1/report/policyevent/hit/timeandcount policyIds=${policy_id}&logType=security_event_hits_log&startTime=${startTime}&endTime=${endTime} + +PolicyHitTimeAndCountqQuery-003 + #通过策略查询接口得到policy的id,安全策略 + ${response} BaseGetRequestOK /v2/policy/compile pageSize=20&pageNo=1&policyType=tsg_security&policyName= + ${policy_id} Set Variable ${response}[data][list][1][policyId],${response}[data][list][2][policyId],${response}[data][list][3][policyId] + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + ${endTime} Get Substring ${endTime} \ -4 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -1 days + ${startTime} Get Substring ${startTime} \ -4 + #通过policy的id统计策略命中时间与计数,安全策略 + ${response1} BaseGetRequestOK /v1/report/policyevent/hit/timeandcount policyIds=${policy_id}&logType=security_event_hits_log&startTime=${startTime}&endTime=${endTime} + +PolicyHitTimeAndCountqQuery-004 + #通过策略查询接口得到policy的id，管控策略 + ${response} BaseGetRequestOK /v2/policy/compile pageSize=20&pageNo=1&policyType=pxy_manipulation&policyName= + ${policy_id} Set Variable ${response}[data][list][1][policyId] + #通过policy的id统计策略命中时间与计数,管控策略 + ${response1} BaseGetRequestOK /v1/report/policyevent/hit/timeandcount policyIds=${policy_id}&logType=proxy_event_hits_log&startTime=&endTime= + +PolicyHitTimeAndCountqQuery-005 + #通过策略查询接口得到policy的id，管控策略 + ${response} BaseGetRequestOK /v2/policy/compile pageSize=20&pageNo=1&policyType=pxy_manipulation&policyName= + ${policy_id} Set Variable ${response}[data][list][1][policyId] + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + ${endTime} Get Substring ${endTime} \ -4 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -1 days + ${startTime} Get Substring ${startTime} \ -4 + #通过policy的id统计策略命中时间与计数,管控策略 + ${response1} BaseGetRequestOK /v1/report/policyevent/hit/timeandcount policyIds=${policy_id}&logType=proxy_event_hits_log&startTime=${startTime}&endTime=${endTime} + +PolicyHitTimeAndCountqQuery-006 + #通过策略查询接口得到policy的id,管控策略 + ${response} BaseGetRequestOK /v2/policy/compile pageSize=20&pageNo=1&policyType=pxy_manipulation&policyName= + ${policy_id} Set Variable ${response}[data][list][1][policyId],${response}[data][list][2][policyId],${response}[data][list][3][policyId] + #结束时间格式Y-M-D h:i:s + ${Time} get current date + ${endTime}= add time to date ${Time} -00:05:00 + ${endTime} Get Substring ${endTime} \ -4 + #开始时间格式Y-M-D h:i:s + ${startTime}= add time to date ${endTime}= -1 days + ${startTime} Get Substring ${startTime} \ -4 + #通过policy的id统计策略命中时间与计数,管控策略 + ${response1} BaseGetRequestOK /v1/report/policyevent/hit/timeandcount policyIds=${policy_id}&logType=proxy_event_hits_log&startTime=${startTime}&endTime=${endTime} diff --git a/02-Keyword/tsg_bfapi/Common.robot b/02-Keyword/tsg_bfapi/Common.robot index 009b144..7664247 100644 --- a/02-Keyword/tsg_bfapi/Common.robot +++ b/02-Keyword/tsg_bfapi/Common.robot @@ -57,7 +57,7 @@ BasePostRequestForV2 BaseGetRequest [Arguments] ${apistr} ${body} Set Headers {"Authorization":"${token}","Content-Type":"application/json"} - &{httpResponse} Get /${apistr}?${body} + &{httpResponse} Get ${apistr}?${body} #Output response body Object response body #Integer $.code 200 diff --git a/02-Keyword/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot b/02-Keyword/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot index e1d6d92..91bf29f 100644 --- a/02-Keyword/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot +++ b/02-Keyword/tsg_bfapi/dashboard_data_compare/ClientIPTopN.robot @@ -2,28 +2,26 @@ Library Collections Library RequestsLibrary Library String +Resource ../../../02-Keyword/tsg_bfapi/Common.robot Resource ../../../03-Variable/Bifangapivariable.txt Resource ForTwoKeywords.robot +*** Variables *** +${bigDataIP} 192.168.40.186 +${bigDataPort} 9999 *** Keywords *** ClientIPTopN #dashboard 源IP统计 bifang和bigData对比 [Documentation] ... 描述：ProxyPinning - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) + ... 参数：starttime(必传，开始时间) ... orderBy(必传，排序 sessions、bytes、packets 从这三个中选择) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${orderBy} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} - #${orderBy} Set Variable bytes - #${limit} Set Variable 10 + ... endtime(必传，结束时间) + [Arguments] ${starttime} ${endtime} ${orderBy} ${limit} ${data} Set Variable startTime=${startTime}&endTime=${endTime}&orderBy=${orderBy}&limit=${limit} ${url1} Set Variable report/traffic/topn/clientip - ${bfResponse} trafficBFRequest ${url1} ${data} + ${bfResponse} TrafficBFRequest ${url1} ${data} @{List1} Set Variable ${bfResponse['data']['list']} Create Session bdapi http://${bigDataIP}:${bigDataPort} ${sql} Set Variable select source as client_ip, sum(session_num) as sessions, sum(c2s_byte_num) as sent_bytes, sum(s2c_byte_num) as received_bytes, sum(c2s_byte_num + s2c_byte_num) as bytes, \ sum(c2s_pkt_num) as sent_packets ,sum(s2c_pkt_num) as received_packets, sum(c2s_pkt_num+s2c_pkt_num) as packets from top_internal_host_log where \ __time >= '${startTime}' and __time < '${endTime}' and order_by='${orderBy}' group by source order by \ ${orderBy} desc limit ${limit} diff --git a/02-Keyword/tsg_bfapi/dashboard_data_compare/DomainTopN.robot b/02-Keyword/tsg_bfapi/dashboard_data_compare/DomainTopN.robot index f22f54e..8aac2b5 100644 --- a/02-Keyword/tsg_bfapi/dashboard_data_compare/DomainTopN.robot +++ b/02-Keyword/tsg_bfapi/dashboard_data_compare/DomainTopN.robot @@ -10,17 +10,11 @@ DomainTopN #dashboard 域名统计 bifang和bigData对比 [Documentation] ... 描述：ProxyPinning - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) + ... 参数：starttime(必传，开始时间) ... orderBy(必传，排序 sessions、bytes、packets 从这三个中选择) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${orderBy} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} - #${orderBy} Set Variable bytes - #${limit} Set Variable 10 + ... endtime(必传，结束时间) + [Arguments] ${starttime} ${endtime} ${orderBy} ${limit} ${data} Set Variable startTime=${startTime}&endTime=${endTime}&orderBy=${orderBy}&limit=${limit} ${url1} Set Variable report/traffic/topn/domain ${bfResponse} trafficBFRequest ${url1} ${data} diff --git a/02-Keyword/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot b/02-Keyword/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot index ed87b2c..fd35d24 100644 --- a/02-Keyword/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot +++ b/02-Keyword/tsg_bfapi/dashboard_data_compare/PolicyActionHitStatistics.robot @@ -10,18 +10,13 @@ SecurityEventActionHit-bytes # dashboard界面 安全策略各动作命中计数 bytes bifang和bigData对比 [Documentation] ... 描述：Security-Action-bytes - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) + ... 参数：starttime(必传，开始时间紧) ... timeGranularity(必传，时间粒度 ) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + ... endtime(必传，结束时间) + ... logType(必填，日志类型。) + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} ${logType} Set Variable security_event_hits_log - #${timeGranularity} Set Variable 300 - #${limit} Set Variable 5 ${data} Set Variable startTime=${startTime}&endTime=${endTime}&logType=${logType}&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/policyevent/hit/action ${bfResponse} trafficBFRequest ${url1} ${data} @@ -39,18 +34,13 @@ SecurityEventActionHit-packets # dashboard界面 安全策略各动作命中计数 packets bifang和bigData对比 [Documentation] ... 描述：Security-Action-packets - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) + ... 参数：starttime(必传，开始时间紧) ... timeGranularity(必传，时间粒度 ) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + ... endtime(必传，结束时间) + ... logType(必填，日志类型。) + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} ${logType} Set Variable security_event_hits_log - #${timeGranularity} Set Variable 300 - #${limit} Set Variable 5 ${data} Set Variable startTime=${startTime}&endTime=${endTime}&logType=${logType}&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/policyevent/hit/action ${bfResponse} trafficBFRequest ${url1} ${data} @@ -68,18 +58,13 @@ SecurityEventActionHit-sessions # dashboard界面 安全策略各动作命中计数 sessions bifang和bigData对比 [Documentation] ... 描述：Security-Action-sessions - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) + ... 参数：starttime(必传，开始时间紧) ... timeGranularity(必传，时间粒度 ) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + ... endtime(必传，结束时间) + ... logType(必填，日志类型。) + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} ${logType} Set Variable security_event_hits_log - #${timeGranularity} Set Variable 300 - #${limit} Set Variable 5 ${data} Set Variable startTime=${startTime}&endTime=${endTime}&logType=${logType}&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/policyevent/hit/action ${bfResponse} trafficBFRequest ${url1} ${data} @@ -97,18 +82,13 @@ SecurityEventActionHit-thrend-bytes # dashboard界面 安全策略各动作命中计数趋势 bytes bifang和bigData对比 [Documentation] ... 描述：Security-Action-thrend-bytes - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) + ... 参数：starttime(必传，开始时间紧) ... timeGranularity(必传，时间粒度 ) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + ... endtime(必传，结束时间) + ... logType(必填，日志类型。) + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} ${logType} Set Variable security_event_hits_log - #${timeGranularity} Set Variable 300 - #${limit} Set Variable 5 ${data} Set Variable startTime=${startTime}&endTime=${endTime}&logType=${logType}&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/policyevent/hit/action ${bfResponse} trafficBFRequest ${url1} ${data} @@ -129,18 +109,13 @@ SecurityEventActionHit-thrend-packets # dashboard界面 安全策略各动作命中计数趋势 packets bifang和bigData对比 [Documentation] ... 描述：Security-Action-thrend-packets - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... timeGranularity(必传，时间粒度300s ) + ... 参数：starttime(必传，开始时间紧) + ... timeGranularity(必传，时间粒度 ) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + ... endtime(必传，结束时间) + ... logType(必填，日志类型。) + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} ${logType} Set Variable security_event_hits_log - #${timeGranularity} Set Variable 300 - #${limit} Set Variable 5 ${data} Set Variable startTime=${startTime}&endTime=${endTime}&logType=${logType}&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/policyevent/hit/action ${bfResponse} trafficBFRequest ${url1} ${data} @@ -160,18 +135,13 @@ SecurityEventActionHit-thrend-sessions # dashboard界面 安全策略各动作命中计数趋势 sessions bifang和bigData对比 [Documentation] ... 描述：Security-Action-thrend-packets - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... timeGranularity(必传，时间粒度300s ) + ... 参数：starttime(必传，开始时间紧) + ... timeGranularity(必传，时间粒度 ) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + ... endtime(必传，结束时间) + ... logType(必填，日志类型。) + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} ${logType} Set Variable security_event_hits_log - #${timeGranularity} Set Variable 300 - #${limit} Set Variable 5 ${data} Set Variable startTime=${startTime}&endTime=${endTime}&logType=${logType}&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/policyevent/hit/action ${bfResponse} trafficBFRequest ${url1} ${data} @@ -191,18 +161,13 @@ ProxyEventActionHit-sessions # dashboard界面 代理策略各动作命中计数 sessions bifang和bigData对比 [Documentation] ... 描述：Proxy-Action-sessions - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... timeGranularity(必传，时间粒度300s ) + ... 参数：starttime(必传，开始时间紧) + ... timeGranularity(必传，时间粒度 ) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + ... endtime(必传，结束时间) + ... logType(必填，日志类型。) + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} ${logType} Set Variable proxy_event_hits_log - #${timeGranularity} Set Variable 300 - #${limit} Set Variable 5 ${data} Set Variable startTime=${startTime}&endTime=${endTime}&logType=${logType}&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/policyevent/hit/action ${bfResponse} trafficBFRequest ${url1} ${data} @@ -220,18 +185,13 @@ ProxyEventActionHit-trend-sessions # dashboard界面 代理策略各动作命中计数趋势 sessions bifang和bigData对比 [Documentation] ... 描述：Proxy-Action-trend-sessions - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... timeGranularity(必传，时间粒度300s ) + ... 参数：starttime(必传，开始时间紧) + ... timeGranularity(必传，时间粒度 ) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + ... endtime(必传，结束时间) + ... logType(必填，日志类型。) + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} ${logType} Set Variable proxy_event_hits_log - #${timeGranularity} Set Variable 300 - #${limit} Set Variable 5 ${data} Set Variable startTime=${startTime}&endTime=${endTime}&logType=${logType}&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/policyevent/hit/action ${bfResponse} trafficBFRequest ${url1} ${data} diff --git a/02-Keyword/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot b/02-Keyword/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot index 0459fcd..16f36ab 100644 --- a/02-Keyword/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot +++ b/02-Keyword/tsg_bfapi/dashboard_data_compare/PolicyEventHitTopN.robot @@ -10,17 +10,13 @@ SecurityEventHit # dashboard界面 安全策略命中TopN bifang和bigData对比 [Documentation] ... 描述：SecurityEventHit 安全策略命中TopN - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) + ... 参数：starttime(必传，开始时间紧) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) + ... endtime(必传，结束时间) + ... logType(必填，日志类型。) ... 返回：对比结果 - [Arguments] ${timeNum} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + [Arguments] ${starttime} ${endtime} ${limit} ${logType} Set Variable security_event_hits_log - #${limit} Set Variable 5 ${data} Set Variable startTime=${startTime}&endTime=${endTime}&logType=${logType}&limit=${limit} ${url1} Set Variable report/policyevent/hit/topn ${bfResponse} trafficBFRequest ${url1} ${data} @@ -43,17 +39,13 @@ ProxyEventHit # dashboard界面 代理策略命中TopN bifang和bigData对比 [Documentation] ... 描述：ProxyEventHit 代理策略命中TopN - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) + ... 参数：starttime(必传，开始时间紧) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) + ... endtime(必传，结束时间) + ... logType(必填，日志类型。) ... 返回：对比结果 - [Arguments] ${timeNum} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + [Arguments] ${starttime} ${endtime} ${limit} ${logType} Set Variable proxy_event_hits_log - #${limit} Set Variable 5 ${data} Set Variable startTime=${startTime}&endTime=${endTime}&logType=${logType}&limit=${limit} ${url1} Set Variable report/policyevent/hit/topn ${bfResponse} trafficBFRequest ${url1} ${data} diff --git a/02-Keyword/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot b/02-Keyword/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot index 8a5f6e2..f49e959 100644 --- a/02-Keyword/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot +++ b/02-Keyword/tsg_bfapi/dashboard_data_compare/ProxyPinningStatistics.robot @@ -10,17 +10,11 @@ ProxyPinning # dashboard界面 Proxy Pinning计数 bifang和bigData对比 [Documentation] ... 描述：ProxyPinning - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... timeGranularity(必传，时间粒度 300s) + ... 参数：starttime(必传，开始时间紧) + ... timeGranularity(必传，时间粒度 ) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} - #${timeGranularity} Set Variable 300 - #${limit} Set Variable 5 + ... endtime(必传，结束时间) + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} ${data} Set Variable startTime=${startTime}&endTime=${endTime}&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/policyevent/hit/pinning ${bfResponse} TrafficBFRequest ${url1} ${data} @@ -45,17 +39,11 @@ ProxyPinningTrend # dashboard界面 Proxy Pinning计数趋势 bifang和bigData对比 [Documentation] ... 描述：ProxyPinning-trend - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... timeGranularity(必传，时间粒度 300s) + ... 参数：starttime(必传，开始时间紧) + ... timeGranularity(必传，时间粒度 ) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} - #${timeGranularity} Set Variable 300 - #${limit} Set Variable 5 + ... endtime(必传，结束时间) + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} ${data} Set Variable startTime=${startTime}&endTime=${endTime}&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/policyevent/hit/pinning ${bfResponse} trafficBFRequest ${url1} ${data} diff --git a/02-Keyword/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot b/02-Keyword/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot index 0dbdd31..11daf81 100644 --- a/02-Keyword/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot +++ b/02-Keyword/tsg_bfapi/dashboard_data_compare/ServiceIPTopN.robot @@ -10,17 +10,11 @@ ServiceIPTopN #dashboard 目的IP统计 bifang和bigData对比 [Documentation] ... 描述：ProxyPinning - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) + ... 参数：starttime(必传，开始时间紧) ... orderBy(必传，排序 sessions、bytes、packets 从这三个中选择) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${orderBy} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} - #${orderBy} Set Variable bytes - #${limit} Set Variable 10 + ... endtime(必传，结束时间 + [Arguments] ${starttime} ${endtime} ${orderBy} ${limit} ${data} Set Variable startTime=${startTime}&endTime=${endTime}&orderBy=${orderBy}&limit=${limit} ${url1} Set Variable report/traffic/topn/serverip ${bfResponse} trafficBFRequest ${url1} ${data} diff --git a/02-Keyword/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot b/02-Keyword/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot index d709b6c..027ca62 100644 --- a/02-Keyword/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot +++ b/02-Keyword/tsg_bfapi/dashboard_data_compare/SubscriberidTopN.robot @@ -10,17 +10,11 @@ SubscriberidTopN #dashboard 用户TopN统计 bifang和bigData对比 [Documentation] ... 描述：ProxyPinning - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) + ... 参数：starttime(必传，开始时间紧) ... orderBy(必传，排序 sessions、bytes、packets 从这三个中选择) ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${orderBy} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} - #${orderBy} Set Variable bytes - #${limit} Set Variable 10 + ... endtime(必传，结束时间 + [Arguments] ${starttime} ${endtime} ${orderBy} ${limit} ${data} Set Variable startTime=${startTime}&endTime=${endTime}&orderBy=${orderBy}&limit=${limit} ${url1} Set Variable report/traffic/topn/subscriberid ${bfResponse} trafficBFRequest ${url1} ${data} diff --git a/02-Keyword/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot b/02-Keyword/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot index 0f6fb6d..3202784 100644 --- a/02-Keyword/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot +++ b/02-Keyword/tsg_bfapi/dashboard_data_compare/TrafficSessionNewLiveStatistic.robot @@ -10,14 +10,10 @@ SessionStatistics-NewLive # dashboard界面新建和活跃连接数统计 bifang和bigData对比 [Documentation] ... 描述：Session-NewLive统计(新建和存活的链接数) - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) + ... 参数：starttime(必传，开始时间紧) + ... endtime(必传，结束时间 ... 返回：对比结果 - [Arguments] ${timeNum} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + [Arguments] ${starttime} ${endtime} ${data} Set Variable startTime=${startTime}&endTime=${endTime} ${url1} Set Variable report/traffic/sessions/statisticsbytype ${bfResponse} trafficBFRequest ${url1} ${data} @@ -38,18 +34,12 @@ SessionStatistics-NewLive-Trend # dashboard界面新建和活跃连接数趋势 bifang和bigData对比 [Documentation] ... 描述：Session-NewLive-Trend统计(新建和存活的链接数趋势) - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... timeGranularity(必传，时间粒度 ) - ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) + ... 参数：starttime(必传，开始时间紧) + ... timeGranularity(非必传，时间粒度 ) + ... limit(非必传，限制条数) + ... endtime(必传，结束时间 ... 返回：对比结果 - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} - #${timeGranularity} Set Variable 60 - #${limit} Set Variable 5 + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} ${data} Set Variable startTime=${startTime}&endTime=${endTime}&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/traffic/sessions/statisticsbytype ${bfResponse} trafficBFRequest ${url1} ${data} diff --git a/02-Keyword/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot b/02-Keyword/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot index 957996e..1117cf2 100644 --- a/02-Keyword/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot +++ b/02-Keyword/tsg_bfapi/dashboard_data_compare/TrafficStatistics.robot @@ -10,14 +10,10 @@ Dashboard-Traffic-bytes # Traffics-带宽统计 统计类型：bytes bifang和bigData对比 Traffic IN/OUT [Documentation] ... 描述：Traffic-Bytes统计 - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) + ... 参数：starttime(必传，开始时间紧) + ... endtime(必传，结束时间 ... 返回：对比结果 - [Arguments] ${timeNum} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + [Arguments] ${starttime} ${endtime} ${data} Set Variable startTime=${startTime}&endTime=${endTime}&statisticsUnit=bytes ${url1} Set Variable report/traffic/statisticsbyunit ${bfResponse} TrafficBFRequest ${url1} ${data} @@ -37,14 +33,10 @@ Dashboard-Traffic-packets # Traffics-带宽统计 统计类型：packets bifang和bigData对比 Traffic IN/OUT [Documentation] ... 描述：Traffic-packets统计 - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) + ... 参数：starttime(必传，开始时间紧) + ... endtime(必传，结束时间 ... 返回：对比结果 - [Arguments] ${timeNum} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + [Arguments] ${starttime} ${endtime} ${data} Set Variable startTime=${startTime}&endTime=${endTime}&statisticsUnit=packets ${url1} Set Variable report/traffic/statisticsbyunit ${bfResponse} TrafficBFRequest ${url1} ${data} @@ -66,14 +58,11 @@ Dashboard-Traffic-sessions # Traffics-带宽统计 统计类型：sessions bifang和bigData对比 Traffic IN/OUT [Documentation] ... 描述：Traffic-sessions统计 - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) + ... 参数：starttime(必传，开始时间紧) + ... endtime(必传，结束时间 ... 返回：对比结果 - [Arguments] ${timeNum} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} + [Arguments] ${starttime} ${endtime} + ${data} Set Variable startTime=${startTime}&endTime=${endTime}&statisticsUnit=sessions ${url1} Set Variable report/traffic/statisticsbyunit ${bfResponse} trafficBFRequest ${url1} ${data} @@ -92,18 +81,13 @@ Dashboard-Traffic-trend-bytes # Traffics-带宽趋势 统计类型：bytes bifang和bigData对比 Traffic IN/OUT [Documentation] ... 描述：Traffic-trend-bytes - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... timeGranularity(必传，时间粒度 ) - ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) + ... 参数：starttime(必传，开始时间紧) + ... endtime(必传，结束时间 + ... timeGranularity(非必传，时间粒度 ) + ... limit(非必传，限制条数) ... 返回：对比结果 - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} - #${timeGranularity} Set Variable 60 - #${limit} Set Variable 5 + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} + ${data} Set Variable startTime=${startTime}&endTime=${endTime}&statisticsUnit=bytes&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/traffic/statisticsbyunit ${bfResponse} trafficBFRequest ${url1} ${data} @@ -126,17 +110,13 @@ Dashboard-Traffic-trend-packets # Traffics-带宽趋势 统计类型：packets bifang和bigData对比 Traffic IN/OUT [Documentation] ... 描述：Traffic-trend-packets - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... timeGranularity(必传，时间粒度 ) - ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) + ... 参数：starttime(必传，开始时间紧) + ... endtime(必传，结束时间 + ... timeGranularity(非必传，时间粒度 ) + ... limit(非必传，限制条数) ... 返回：对比结果 - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} - #${timeGranularity} Set Variable 60 + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} + ${data} Set Variable startTime=${startTime}&endTime=${endTime}&statisticsUnit=packets&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/traffic/statisticsbyunit ${bfResponse} trafficBFRequest ${url1} ${data} @@ -161,16 +141,11 @@ Dashboard-Traffic-trend-sessions # Traffics-带宽趋势 统计类型：sessions bifang和bigData对比 Traffic IN/OUT [Documentation] ... 描述：Traffic-trend-sessions - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) - ... timeGranularity(必传，时间粒度 ) - ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${timeGranularity} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} - #${timeGranularity} Set Variable 60 + ... 参数：starttime(必传，开始时间紧) + ... endtime(必传，结束时间 + ... timeGranularity(非必传，时间粒度 ) + ... limit(非必传，限制条数) + [Arguments] ${starttime} ${endtime} ${timeGranularity} ${limit} ${data} Set Variable startTime=${startTime}&endTime=${endTime}&statisticsUnit=sessions&timeGranularity=${timeGranularity}&limit=${limit} ${url1} Set Variable report/traffic/statisticsbyunit ${bfResponse} trafficBFRequest ${url1} ${data} diff --git a/02-Keyword/tsg_bfapi/dashboard_data_compare/UrlTopN.robot b/02-Keyword/tsg_bfapi/dashboard_data_compare/UrlTopN.robot index 17a5c88..8f3f007 100644 --- a/02-Keyword/tsg_bfapi/dashboard_data_compare/UrlTopN.robot +++ b/02-Keyword/tsg_bfapi/dashboard_data_compare/UrlTopN.robot @@ -10,15 +10,10 @@ UrlTopN #dashboard Url统计 bifang和bigData对比 [Documentation] ... 描述：ProxyPinning - ... 参数：timeNum(必传，查询的时间范围类型 1 当前时间前一小时 2 当前时间前一天 3 当前时间前一周) + ... 参数：starttime(必传，开始时间紧) + ... endtime(必传，结束时间 ... limit(必传，限制条数) - ... param(非必传，参数数量为2位，依次顺序为'startTime'、'endTime'，自定义时两个参数必须都有，如果没有就使用timeNum查询) - [Arguments] ${timeNum} ${limit} @{param} - ${length} Run Keyword If ${param}!=[] Get Length ${param} - ... ELSE Set Variable ${0} - ${startTime} ${endTime} Run Keyword If ${length}==${0} GetFormateTime ${timeNum} - ... ELSE IF ${length}>${0} Set Variable ${param[0]} ${param[1]} - #${limit} Set Variable 10 + [Arguments] ${starttime} ${endtime} ${limit} ${data} Set Variable startTime=${startTime}&endTime=${endTime}&limit=${limit} ${url1} Set Variable report/traffic/topn/url ${bfResponse} trafficBFRequest ${url1} ${data} diff --git a/02-Keyword/tsg_bfapi/offline_stat_report/InsertFile.robot b/02-Keyword/tsg_bfapi/offline_stat_report/InsertFile.robot index bd30ba3..8f0f0d5 100644 --- a/02-Keyword/tsg_bfapi/offline_stat_report/InsertFile.robot +++ b/02-Keyword/tsg_bfapi/offline_stat_report/InsertFile.robot @@ -1,20 +1,15 @@ *** Settings *** -Library String -Library json -Library OperatingSystem -Library RequestsLibrary -Library Selenium2Library -Library Collections -Library FileLibrary -Resource ../Common.robot -Resource ../../../03-Variable/BifangApiVariable.txt - +Library String +Library json +Library OperatingSystem +Library RequestsLibrary +Library Selenium2Library +Library Collections +Library FileLibrary +Resource ../Common.robot +Resource ../../../03-Variable/BifangApiVariable.txt *** Keywords *** - InsertFile [Arguments] ${key} ${json} Alter Dict ${path}/02-Keyword/tsg_bfapi/offline_stat_report/Insertfile.txt ${key} ${json} - - - diff --git a/04-CustomLibrary/ExtensionPackages/GetTimeLibrary/GetTime.py b/04-CustomLibrary/ExtensionPackages/GetTimeLibrary/GetTime.py new file mode 100644 index 0000000..6e26711 --- /dev/null +++ b/04-CustomLibrary/ExtensionPackages/GetTimeLibrary/GetTime.py @@ -0,0 +1,57 @@ +#coding=utf-8 +import datetime +import time +import string +class GetTime(): + def __init__(self): + pass + def time1(self,t): + if t=="m": + print(time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time()))) + if time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time()))[-4] >= "5": + time2=time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time()))[0:-4]+"5:00" + return time2 + else: + time2=time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time()))[0:-4] + "0:00" + return time2 + elif t=="s": + if time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time()))[-2] >= "3": + time2=time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time()))[0:-2]+"30" + return time2 + else: + time2=time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time()))[0:-2] + "00" + return time2 + elif t=="h": + time2=time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time()))[0:-7]+":00:00" + startTime = datetime.datetime.strptime(time2, "%Y-%m-%d %H:%M:%S") + startTime2 = (startTime + datetime.timedelta(hours=-1)).strftime("%Y-%m-%d %H:%M:%S") + return startTime2 + elif t=="5m": + time2 = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())) + print(time2) + startTime = datetime.datetime.strptime(time2, "%Y-%m-%d %H:%M:%S") + startTime2 = (startTime + datetime.timedelta(minutes=-5)).strftime("%Y-%m-%d %H:%M:%S") + if startTime2[-4]>="5": + time3 = startTime2[0:-4] + "5:00" + print(time3) + else: + time3 = startTime2[0:-4] + "0:00" + print(time3) + return time3 + elif t== "30s": + time2 = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())) + print(time2) + startTime = datetime.datetime.strptime(time2, "%Y-%m-%d %H:%M:%S") + startTime2 = (startTime + datetime.timedelta(seconds=-30)).strftime("%Y-%m-%d %H:%M:%S") + if startTime2[-2] >= "3": + time3 = startTime2[0:-2]+"30" + print(time3) + return time3 + else: + time3 = startTime2[0:-2]+"00" + print(time3) + return time3 + + + + diff --git a/04-CustomLibrary/ExtensionPackages/GetTimeLibrary/__init__.py b/04-CustomLibrary/ExtensionPackages/GetTimeLibrary/__init__.py new file mode 100644 index 0000000..b666bc5 --- /dev/null +++ b/04-CustomLibrary/ExtensionPackages/GetTimeLibrary/__init__.py @@ -0,0 +1,4 @@ +#coding=utf-8 +from GetTime import GetTime +class GetTimeLibrary(GetTime): + ROBOT_LIBRARY_SCOPE = 'GLOBAL' \ No newline at end of file