diff options
| author | dongxiaoyan <[email protected]> | 2024-11-26 19:24:53 +0800 |
|---|---|---|
| committer | dongxiaoyan <[email protected]> | 2024-11-26 19:24:53 +0800 |
| commit | a799484cebd0845d7a94f8d4ae2083e65a832278 (patch) | |
| tree | f40a4209f2a8b968ec3bceeab8c5b87ca56c483b | |
| parent | 2b38630962a53b763f06ecb8c6cea479eb6d30f4 (diff) | |
统一Trex获取log逻辑
| -rw-r--r-- | support/api_utils/query_rule_log.py | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/support/api_utils/query_rule_log.py b/support/api_utils/query_rule_log.py index a1cb9c4fe..375baf004 100644 --- a/support/api_utils/query_rule_log.py +++ b/support/api_utils/query_rule_log.py @@ -105,21 +105,18 @@ class QueryRuleLog: log_condition_dict['vsys'] = self.parameter["vsys"] log_condition_dict['execution_mode'] = 'oneshot' - if self.rule_type == "dos_protection": - attack_type = "Custom Network Attack" - log_condition_dict['filter'] = f"destination_ip='{traffic_generation['servers_start_ip']}'AND attack_type='{attack_type}'" if self.is_attribute_name_exsit("ATTR_SUBSCRIBER_ID") == True: log_filter = f"subscriber_id='{self.parameter['test_subcriber_id']}' AND has({log_query_rule_type}, '{rule_uuid}')" log_condition_dict['filter'] = log_filter else: - if self.rule_type == "statistics": - log_filter = f"client_ip={traffic_generation['clients_start_ip']} AND has({log_query_rule_type}, '{rule_uuid}')" - log_condition_dict['filter'] = log_filter - log_condition_dict['filter'] = log_condition_dict['filter'].replace(f"client_ip={traffic_generation['clients_start_ip']}", f"client_ip='{traffic_generation['clients_start_ip']}'") - if self.rule_type == "monitor" and self.traffic_generation["tool"] == "trex": - log_filter = f"client_ip={traffic_generation['clients_start_ip']} AND has({log_query_rule_type}, '{rule_uuid}')" - log_condition_dict['filter'] = log_filter - log_condition_dict['filter'] = log_condition_dict['filter'].replace(f"client_ip={traffic_generation['clients_start_ip']}",f"client_ip='{traffic_generation['clients_start_ip']}'") + if self.traffic_generation["tool"] == "trex": + if self.rule_type == "dos_protection": + attack_type = "Custom Network Attack" + log_condition_dict['filter'] = f"destination_ip='{traffic_generation['servers_start_ip']}'AND attack_type='{attack_type}'" + else: + log_filter = f"client_ip={traffic_generation['clients_start_ip']} AND has({log_query_rule_type}, '{rule_uuid}')" + log_condition_dict['filter'] = log_filter + log_condition_dict['filter'] = log_condition_dict['filter'].replace(f"client_ip={traffic_generation['clients_start_ip']}",f"client_ip='{traffic_generation['clients_start_ip']}'") else: log_filter = f"client_ip={self.parameter['test_pc_ip']} AND has({log_query_rule_type}, '{rule_uuid}')" log_condition_dict['filter'] = log_filter |