updata monitor case

5 files changed, 25 insertions, 12 deletions

diff --git a/support/api_utils/query_rule_log.py b/support/api_utils/query_rule_log.py
index 6ea0a58d9..a7f8ca9ec 100644
--- a/support/api_utils/query_rule_log.py
+++ b/support/api_utils/query_rule_log.py
@@ -42,7 +42,10 @@ class QueryRuleLog:
                 elif log_result == False:
                     print(datetime.now().strftime("%Y-%m-%d %H:%M:%S"), str(datetime.now().microsecond)[:3], 'The log result checked by calling api is failed.', flush=True)
                 elif log_result == None:
-                    print(datetime.now().strftime("%Y-%m-%d %H:%M:%S"), str(datetime.now().microsecond)[:3], 'The log result checked by calling api is none.', flush=True)
+                    if not verification_result["expected_log"]:
+                        print(datetime.now().strftime("%Y-%m-%d %H:%M:%S"), str(datetime.now().microsecond)[:3], 'The log result checked by calling api is passed.', flush=True)
+                    else:
+                        print(datetime.now().strftime("%Y-%m-%d %H:%M:%S"), str(datetime.now().microsecond)[:3], 'The log result checked by calling api is none.', flush=True)
                 elif log_result == "no_set":
                     print(datetime.now().strftime("%Y-%m-%d %H:%M:%S"), str(datetime.now().microsecond)[:3], 'The log result checked by calling api is no_set.', flush=True)
                 return log_result
diff --git a/tests/monitor/monit_apn_dns.py b/tests/monitor/monit_apn_dns.py
index 130bc4968..264dc1fad 100644
--- a/tests/monitor/monit_apn_dns.py
+++ b/tests/monitor/monit_apn_dns.py
@@ -84,13 +84,21 @@ def run(parameter):
                 {"query_field_key": "apn", "query_value": parameter['test_apn']}
             ]
         }
-
         # 创建
         if parameter["initiation_method"] == "ui":
-            ui_client = UIClient()
-            rules_tuple, ui_error = ui_client.create_rules(policy_configuration)
-            if len(ui_error) > 0:
-                return ui_error
+            ui_client = UIClient(parameter)
+            created_object_code = ui_client.create_objects(policy_configuration)
+            if created_object_code != 200:
+                return "Fail to create object."
+            objects_tuple, searched_object_code = ui_client.search_objects(policy_configuration, "name")
+            if searched_object_code != 200:
+                return "Fail to search object."
+            created_rule_code = ui_client.create_rules(policy_configuration)
+            if created_rule_code != 200:
+                return "Fail to create rule."
+            rules_tuple, searched_rule_code = ui_client.search_rules(policy_configuration, "name")
+            if searched_rule_code != 200:
+                return "Fail to search rule."
         elif parameter["initiation_method"] == "api":
             api_client = APIClient(parameter)
             # {uuid, type}, i.e., {"12341-232-a21", "ip"}
diff --git a/tests/monitor/monit_neg_srcip_ssl_hit_no.py b/tests/monitor/monit_neg_srcip_ssl_hit_no.py
index f87b503ff..1a523e3c3 100644
--- a/tests/monitor/monit_neg_srcip_ssl_hit_no.py
+++ b/tests/monitor/monit_neg_srcip_ssl_hit_no.py
@@ -91,7 +91,7 @@ def run(parameter):
 
         traffic_generation = {
             "tool": "ssl",  # or trex/http
-             "command": "curl -kv https://www.youtube.com"
+            "command": "curl -kv https://www.youtube.com"
         }
 
         verification_result = {
diff --git a/tests/monitor/monit_srcip_appgroup_ssl.py b/tests/monitor/monit_srcip_appgroup_ssl.py
index db43a6c42..03dfb4d1b 100644
--- a/tests/monitor/monit_srcip_appgroup_ssl.py
+++ b/tests/monitor/monit_srcip_appgroup_ssl.py
@@ -52,15 +52,16 @@ def run(parameter):
                             "attribute_name": "ATTR_APP_ID",
                             "type": "application",
                             "statistics_option": "brief",
+                            "member_type": "subordinate",
                             "name": "monitor_application_group",
-                            "included_sub_object_uuids": [
+                            "included_sub_objects": [
                                 {
                                     "attribute_name": "ATTR_APP_ID",
                                     "type": "application",
                                     "items": ["ssl"],
                                 }
                             ],
-                            "excluded_sub_object_uuids": [
+                            "excluded_sub_objects": [
                                 {
                                     "attribute_name": "ATTR_APP_ID",
                                     "type": "application",
diff --git a/tests/monitor/monit_srcip_appgroup_ssl_verify_exclude_app.py b/tests/monitor/monit_srcip_appgroup_ssl_verify_exclude_app.py
index 3111e088e..0a2a7d00b 100644
--- a/tests/monitor/monit_srcip_appgroup_ssl_verify_exclude_app.py
+++ b/tests/monitor/monit_srcip_appgroup_ssl_verify_exclude_app.py
@@ -52,15 +52,16 @@ def run(parameter):
                             "attribute_name": "ATTR_APP_ID",
                             "type": "application",
                             "statistics_option": "brief",
+                            "member_type": "subordinate",
                             "name": "monitor_application_group",
-                            "included_sub_object_uuids": [
+                            "included_sub_objects": [
                                 {
                                     "attribute_name": "ATTR_APP_ID",
                                     "type": "application",
                                     "items": ["ssl"],
                                 }
                             ],
-                            "excluded_sub_object_uuids": [
+                            "excluded_sub_objects": [
                                 {
                                     "attribute_name": "ATTR_APP_ID",
                                     "type": "application",
@@ -87,7 +88,7 @@ def run(parameter):
         }
 
         traffic_generation = {
-            "tool": "ssl",  # or trex/http
+            "tool": "http",  # or trex/http
             "command": "curl -kv http://www.yumi.com"
         }