Merge remote-tracking branch 'origin/develop' into develop

5 files changed, 12 insertions, 12 deletions

diff --git a/support/general_ui_utils/object/search_objects.py b/support/general_ui_utils/object/search_objects.py
index ff11d6d1f..c47adee72 100644
--- a/support/general_ui_utils/object/search_objects.py
+++ b/support/general_ui_utils/object/search_objects.py
@@ -102,7 +102,7 @@ class SearchObjects:
 
         return search_value
 
-    def get_objects_uuid(self,name,object_element_position):
+    def get_object_uuids(self,name,object_element_position):
         try:
             page_jump_element_position = object_element_position["page_jump"]
             # 打开该列表
diff --git a/support/ui_utils/objects/search_objects_example.py b/support/ui_utils/objects/search_objects_example.py
index c35782594..8a9bac514 100644
--- a/support/ui_utils/objects/search_objects_example.py
+++ b/support/ui_utils/objects/search_objects_example.py
@@ -19,7 +19,7 @@ class SearchObjects:
 
     def search(self,name,policy_configuration,search_type):
         if "name" != "":
-            self.get_objects_uuid(name,policy_configuration)
+            self.get_object_uuids(name,policy_configuration)
         else:
             self.search_objects(policy_configuration,search_type)
 
@@ -112,7 +112,7 @@ class SearchObjects:
 
         return search_value
 
-    def get_objects_uuid(self,name,object_configuration):
+    def get_object_uuids(self,name,object_configuration):
         try:
             object_uuids_list = []
             object_uuids_temp_dict = {}
diff --git a/support/ui_utils/policies/search_rules.py b/support/ui_utils/policies/search_rules.py
index 7534fee2b..148ccdcb1 100644
--- a/support/ui_utils/policies/search_rules.py
+++ b/support/ui_utils/policies/search_rules.py
@@ -55,7 +55,7 @@ class SearchRules:
             print(datetime.now().strftime("%Y-%m-%d %H:%M:%S"), str(datetime.now().microsecond)[:3], "When searching rule, the exception error: ", str(e), flush=True)
             raise
 
-    def get_rules_uuid(self, policy_configuration):
+    def get_rule_uuids(self, policy_configuration):
         try:
             type = policy_configuration["type"]
             name = policy_configuration["name"]
diff --git a/support/ui_utils/ui_client.py b/support/ui_utils/ui_client.py
index e0b761fe0..bc8670f86 100644
--- a/support/ui_utils/ui_client.py
+++ b/support/ui_utils/ui_client.py
@@ -36,9 +36,9 @@ class UIClient:
         error = objects.search_objects(name, policy_configuration)
         return error
     
-    def get_objects_uuid(self, policy_configuration):
+    def get_object_uuids(self, policy_configuration):
         objects = SearchObjects(self.driver)
-        objects_tuple, error = objects.get_objects_uuid(policy_configuration)
+        objects_tuple, error = objects.get_object_uuids(policy_configuration)
         # self.objects_tuple = objects_tuple
         return objects_tuple, error
 
@@ -61,9 +61,9 @@ class UIClient:
         error = profiles.search_profiles(policy_configuration)
         return error
     
-    def get_profiles_uuid(self, policy_configuration):
+    def get_profile_uuids(self, policy_configuration):
         profiles = SearchProfiles(self.driver)
-        profiles_tuple, error = profiles.get_profiles_uuid(policy_configuration)
+        profiles_tuple, error = profiles.get_profile_uuids(policy_configuration)
         # self.profiles_tuple = profiles_tuple
         return profiles_tuple, error
 
@@ -78,9 +78,9 @@ class UIClient:
         error = rules.search_rules(policy_configuration)
         return error
     
-    def get_rules_uuid(self, policy_configuration):
+    def get_rule_uuids(self, policy_configuration):
         rules = SearchRules(self.driver)
-        rules_tuple, error = rules.get_rules_uuid(policy_configuration)
+        rules_tuple, error = rules.get_rule_uuids(policy_configuration)
         # self.rules_tuple = rules_tuple
         return rules_tuple, error
 
diff --git a/tests/example/rule_with_traffic_example.py b/tests/example/rule_with_traffic_example.py
index db389c869..7f9a20ed4 100644
--- a/tests/example/rule_with_traffic_example.py
+++ b/tests/example/rule_with_traffic_example.py
@@ -89,13 +89,13 @@ def run(parameter):
             ui_error = ui_client.create_objects(policy_configuration)
             if len(ui_error) > 0:
                 return ui_error
-            objects_tuple, ui_error = ui_client.get_objects_uuid(policy_configuration)
+            objects_tuple, ui_error = ui_client.get_object_uuids(policy_configuration)
             if len(ui_error) > 0:
                 return ui_error
             ui_error = ui_client.create_rules(policy_configuration)
             if len(ui_error) > 0:
                 return ui_error
-            rules_tuple, ui_error = ui_client.get_rules_uuid(policy_configuration)
+            rules_tuple, ui_error = ui_client.get_rule_uuids(policy_configuration)
             if len(ui_error) > 0:
                 return ui_error
         elif parameter["initiation_method"] == "api":