diff options
Diffstat (limited to 'common/ui_common/objects/applications.py')
| -rw-r--r-- | common/ui_common/objects/applications.py | 115 |
1 files changed, 59 insertions, 56 deletions
diff --git a/common/ui_common/objects/applications.py b/common/ui_common/objects/applications.py index 34ccaf38..ceed816a 100644 --- a/common/ui_common/objects/applications.py +++ b/common/ui_common/objects/applications.py @@ -325,7 +325,7 @@ class App: # save App self.driver.find_element(By.XPATH, application_ok_button_posXpath).click() # 点击OK - self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok + # self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok #引用计数:删除被引用数据;查看引用计数 @@ -427,24 +427,25 @@ class App: def new_security_policy_app(self,data): # 跳转到安全策略创建页面 - self.driver.find_element(By.XPATH, mainPage_firstLevelMenu_Policy_posId).click() - self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Security_posId).click() + self.driver.find_element(By.XPATH, mainPage_firstLevelMenu_Policy_posXpath).click() + self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Security_posXpath).click() # 添加appGroup self.driver.find_element(By.XPATH, listpage_create_button_posXpath).click() self.driver.find_element(By.XPATH, security_create_Name_input_frame_PosXpath).send_keys(data["Name"]) self.driver.find_element(By.XPATH, security_create_add_application_button_click_posXpath).click() # app +按钮 time.sleep(2) - self.driver.find_element(By.XPATH, '(//*[@id="object_ip_search"])[2]').send_keys(self.table_dict["Name"]+Keys.ENTER) # 输入框输入app name并搜索 + self.driver.find_element(By.XPATH, '//input[@class="MuiInput-input css-za5rna"]').send_keys(self.table_dict["Name"]+Keys.ENTER) # 输入框输入app name并搜索 # 如tunnel存在则创建 time.sleep(1) - self.driver.isElementExist(Element='(//div[3]/div[1]/div/div[2]/div/ul/li/div[2]/span/div/div)[2]') # 直接选择第一个最新的，不用搜索 + self.driver.isElementExist(Element='//*[@id="root"]/div/div/main/div[1]/div/div[1]/div[2]/div[3]/div/div[2]/div[2]/ul/li[1]/div[1]/div/div/span') # 直接选择第一个最新的，不用搜索 if self.driver.Exist: # 如果存在，就进行创建 assert self.driver.Exist == True print('正常找到Object，正常进行引用创建') time.sleep(1) - self.driver.find_element(By.XPATH, '(//div[3]/div[1]/div/div[2]/div/ul/li/div[2]/span/div/div)[2]').click() + self.driver.find_element(By.XPATH, '//*[@id="root"]/div/div/main/div[1]/div/div[1]/div[2]/div[3]/div/div[2]/div[2]/ul/li[1]/div[1]/div/div/span').click() + self.driver.find_element(By.XPATH, '//i[@class="iconfont icon-Clear_aNormal close-icon"]').click() self.driver.find_element(By.XPATH, security_create_ok_click_posXpath).click() - self.driver.find_element(By.XPATH, security_create_Warn_ok_click_posXpath).click() + # self.driver.find_element(By.XPATH, security_create_Warn_ok_click_posXpath).click() else: # 不存在就跳过 assert self.driver.Exist == False # 未找到元素 print('未找到Object，无法进行引用创建') @@ -1054,20 +1055,21 @@ class App: time.sleep(1) self.driver.find_element(By.XPATH, Application_create_ip_address).click() time.sleep(1) - self.driver.find_element(By.XPATH,'(//div[@class="rel-input el-input el-input--mini"]/input[@class="el-input__inner"])[1]').send_keys(name_ip) #输入name + self.driver.find_element(By.XPATH,'//div[@class="ip-object-name"]//input').send_keys(name_ip) #输入name time.sleep(1) self.driver.find_element(By.XPATH, Edit_signature_Condition_add_items).click() time.sleep(1) - self.driver.find_element(By.XPATH, '//div[@class="object-item-box"]//input[@placeholder="Please enter the content"]').send_keys(name_ip)#输入ip + self.driver.find_element(By.XPATH, '//div[@class="ip-object-ip"]//input').send_keys(name_ip)#输入ip time.sleep(1) # 点击保存 self.driver.find_element(By.XPATH,Edit_Ip_input_save_xpath ).click() time.sleep(1) - self.driver.find_element(By.XPATH,'//div[@class="IpDetail edit-page"]//button[@class="el-button el-button--success el-button--small"]').click() + self.driver.find_element(By.XPATH,'(//button[text()="OK"])[4]').click() time.sleep(1) - self.driver.find_element(By.XPATH, Edit_signature_OK_button_confirm_yes).click() + # self.driver.find_element(By.XPATH, Edit_signature_OK_button_confirm_yes).click() time.sleep(1) time.sleep(1) + self.driver.find_element(By.XPATH, '(//I[@class="iconfont icon-Clear_aNormal close-icon"])[4]').click() #点击保存condition的ok按钮 self.driver.find_element(By.XPATH,Edit_signature_Condition_OK_button).click() time.sleep(2) @@ -1075,44 +1077,45 @@ class App: self.driver.find_element(By.XPATH,Edit_signature_OK_button).click() time.sleep(2) #点击确认保存 - self.driver.find_element(By.XPATH,Edit_signature_OK_button_confirm_yes).click() + # self.driver.find_element(By.XPATH,Edit_signature_OK_button_confirm_yes).click() time.sleep(2) self.driver.find_element(By.XPATH, application_select_content_dropwmn_posXpath).click() # content self.driver.find_element(By.XPATH, application_content_voicecall_xpath).click() self.driver.find_element(By.XPATH, application_ok_button_posXpath).click() # 点击OK - self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok + # self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok time.sleep(5) - self.app_id = self.driver.find_element(By.XPATH,'//table/tbody/tr[1]/td[2]/div/div/div[3]/div').text + self.app_name = self.driver.find_element(By.XPATH,'//*[@id="root"]/div/div/main/div[1]/div[3]/div[2]/div[1]/div[2]/div/div[4]/div[4]').text #进入到User-defined Signatures页面,获取修改的信息 - self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posId).click() + self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posXpath).click() time.sleep(2) - self.driver.find_element(By.XPATH, listPage_objectSearch_appgroup_selectLabel_posId).click() + self.driver.find_element(By.XPATH, listpage_search_input_posXpath).click() #进行搜索 - time.sleep(2) - self.driver.find_element(By.XPATH, User_defined_search_type_name).click() time.sleep(1) - self.driver.find_element(By.XPATH, User_defined_search_type_name_input).send_keys("test-serveip") - self.driver.find_element(By.XPATH, listPage_objectSearch_appgroup_buttonSearch_posId).click() + self.driver.find_element(By.XPATH, listpage_search_input_posXpath).send_keys("test-serveip") + time.sleep(2) + self.driver.find_element(By.XPATH, listPage_objectSearch_select_Name_posXpath).click() + + self.driver.find_element(By.XPATH, listpage_search_button_posXpath).click() time.sleep(1) #点击Conditions self.driver.find_element(By.XPATH,listPage_signature_first_condition_all_button).click() time.sleep(1) text = self.driver.find_element(By.XPATH,'(//span[@class="el-tooltip html-attributeName"])[1]').text assert name_ip in text.split()[1] - self._delete_02({"Search_type": "ID", "ID": self.app_id}) + self._delete_02({"Search_type": "Name", "Name": self.app_name}) #去删除已经修改的特征 - self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posId).click() - self.driver.find_element(By.XPATH, listPage_objectSearch_appgroup_selectLabel_posId).click() + self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posXpath).click() + self.driver.find_element(By.XPATH, listpage_search_input_posXpath).click() # 进行搜索 - self.driver.find_element(By.XPATH, User_defined_search_type_name).click() - self.driver.find_element(By.XPATH, User_defined_search_type_name_input).send_keys("test-serveip") - self.driver.find_element(By.XPATH, listPage_objectSearch_appgroup_buttonSearch_posId).click() + self.driver.find_element(By.XPATH, listpage_search_input_posXpath).send_keys("test-serveip") + self.driver.find_element(By.XPATH, listPage_objectSearch_select_Name_posXpath).click() + self.driver.find_element(By.XPATH, listpage_search_button_posXpath).click() time.sleep(1) #选中第一条 - self.driver.find_element(By.XPATH,listPage_object_Attributes_select_First_object_posXpath).click() + self.driver.find_element(By.XPATH,listPage_select_first_object_posXpath).click() time.sleep(1) #点击删除 self.driver.find_element(By.XPATH,listpage_delete_button_posXpath).click() @@ -1128,7 +1131,7 @@ class App: self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posXpath).click() self.driver.find_element(By.XPATH, listpage_search_box_posXpath).click() # 进行搜索 - self.driver.find_element(By.XPATH, User_defined_search_type_name).click() + self.driver.find_element(By.XPATH, listPage_objectSearch_select_Name_posXpath).click() self.driver.find_element(By.XPATH, listpage_search_input_posXpath).send_keys(name) self.driver.find_element(By.XPATH, listpage_search_button_posXpath).click() time.sleep(1) @@ -1597,7 +1600,7 @@ class App: element.clear() element.send_keys(10) self.driver.find_element(By.XPATH, application_ok_button_posXpath).click() # 点击OK - self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok + # self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok time.sleep(8) self.driver.find_element(By.XPATH, listPage_select_first_object_posXpath).click() # 点击edit按钮 @@ -1642,7 +1645,7 @@ class App: element = self.driver.find_element(By.XPATH, Applications_create_default_packet) self.text = element.get_attribute("value") self.driver.find_element(By.XPATH, application_ok_button_posXpath).click() # 点击OK - self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok + # self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok time.sleep(8) # 删除创建的app @@ -1668,8 +1671,8 @@ class App: time.sleep(8) # self.driver.find_element(By.XPATH,'//*[@id="appAll2"]/span').click() # time.sleep(8) - self.driver.find_element(By.XPATH,'//table/tbody/tr[1]/td[2]').click() - self.driver.find_element(By.XPATH,Admin_application_edit_button).click() + self.driver.find_element(By.XPATH,listPage_select_first_object_posXpath).click() + self.driver.find_element(By.XPATH,listpage_edit_button_posXpath).click() element = self.driver.find_element(By.XPATH, Applications_create_default_packet) if data["model"] == 1: self.driver.find_element(By.XPATH,Applications_create_check_send_Tcp_reset).click() @@ -1682,25 +1685,25 @@ class App: element.clear() element.send_keys("10") self.driver.find_element(By.XPATH, application_ok_button_posXpath).click() # 点击OK - self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok + # self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok time.sleep(8) - self.driver.find_element(By.XPATH, '//table/tbody/tr[1]/td[2]').click() - self.driver.find_element(By.XPATH, Admin_application_edit_button).click() + self.driver.find_element(By.XPATH, listPage_select_first_object_posXpath).click() + self.driver.find_element(By.XPATH, listpage_edit_button_posXpath).click() element = self.driver.find_element(By.XPATH, Applications_create_default_packet) elif data["model"] == 4: self.driver.find_element(By.XPATH, Applications_create_rate_limiting).click() self.driver.find_element(By.XPATH, Applications_create_rate_limiting_input).send_keys(2) self.driver.find_element(By.XPATH, application_ok_button_posXpath).click() # 点击OK - self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok + # self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok time.sleep(8) - self.driver.find_element(By.XPATH, '//table/tbody/tr[1]/td[2]').click() - self.driver.find_element(By.XPATH, Admin_application_edit_button).click() + self.driver.find_element(By.XPATH, listPage_select_first_object_posXpath).click() + self.driver.find_element(By.XPATH, listpage_edit_button_posXpath).click() #切回drop self.driver.find_element(By.XPATH, Applications_create_Drop_button).click() time.sleep(2) element = self.driver.find_element(By.XPATH, Applications_create_default_packet) self.driver.find_element(By.XPATH, application_ok_button_posXpath).click() # 点击OK - self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok + # self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok self.text = element.get_attribute("value") # print(self.text) @@ -1726,13 +1729,13 @@ class App: if data["result"] == "error": self.driver.find_element(By.XPATH, application_inputname_xpath).send_keys(exit_name) self.driver.find_element(By.XPATH, application_ok_button_posXpath).click() # 点击OK - self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok - self.tip = self.driver.find_element(By.XPATH,'//div[@class="el-message el-message--error"]/p').text + # self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok + self.tip = self.driver.find_element(By.XPATH,'//div[@class="MuiAlert-message css-1xsto0d"]').text elif data["result"] == "success": self.driver.find_element(By.XPATH, application_inputname_xpath).send_keys(data["Name"]) self.driver.find_element(By.XPATH, application_ok_button_posXpath).click() # 点击OK - self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok + # self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok time.sleep(8) self._search_02(data) self.tip = self.driver.find_element(By.XPATH,'//table/tbody/tr[1]/td[4]/div/div[1]').text @@ -2395,15 +2398,15 @@ class App: self.driver.find_element(By.XPATH, application_confirm_ok_button_xpath).click() # 点击confirm ok # 进入到User-defined Signatures页面,获取修改的信息 - self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posId).click() + self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posXpath).click() time.sleep(2) - self.driver.find_element(By.XPATH, listPage_objectSearch_appgroup_selectLabel_posId).click() + self.driver.find_element(By.XPATH, listpage_search_input_posXpath).click() # 进行搜索 time.sleep(2) - self.driver.find_element(By.XPATH, User_defined_search_type_name).click() + self.driver.find_element(By.XPATH, listPage_objectSearch_select_Name_posXpath).click() time.sleep(1) - self.driver.find_element(By.XPATH, User_defined_search_type_name_input).send_keys("test-serverip") - self.driver.find_element(By.XPATH, listPage_objectSearch_appgroup_buttonSearch_posId).click() + self.driver.find_element(By.XPATH, listpage_search_input_posXpath).send_keys("test-serverip") + self.driver.find_element(By.XPATH, listpage_search_button_posXpath).click() time.sleep(1) # 点击Conditions self.driver.find_element(By.XPATH, listPage_signature_first_condition_all_button).click() @@ -2412,15 +2415,15 @@ class App: assert name_ip in text.split()[1] # 去删除已经修改的特征 - self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posId).click() - self.driver.find_element(By.XPATH, listPage_objectSearch_appgroup_selectLabel_posId).click() + self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posXpath).click() + self.driver.find_element(By.XPATH, listpage_search_input_posXpath).click() # 进行搜索 - self.driver.find_element(By.XPATH, User_defined_search_type_name).click() - self.driver.find_element(By.XPATH, User_defined_search_type_name_input).send_keys("test-serverip") - self.driver.find_element(By.XPATH, listPage_objectSearch_appgroup_buttonSearch_posId).click() + self.driver.find_element(By.XPATH, listPage_objectSearch_select_Name_posXpath).click() + self.driver.find_element(By.XPATH, listpage_search_input_posXpath).send_keys("test-serverip") + self.driver.find_element(By.XPATH, listpage_search_button_posXpath).click() time.sleep(1) # 选中第一条 - self.driver.find_element(By.XPATH, listPage_object_Attributes_select_First_object_posXpath).click() + self.driver.find_element(By.XPATH, listPage_select_first_object_posXpath).click() time.sleep(1) # 点击删除 self.driver.find_element(By.XPATH, listpage_delete_button_posXpath).click() @@ -2961,7 +2964,7 @@ class App: profile_public = ProfilesPublicOperations(self.driver) profile_public.change_vsys(vsys_name=link_list_dict[link_index]["link_dst_vsys"]) self.driver.find_element(By.XPATH, mainPage_firstLevelMenu_Objects_posXpath).click() - self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posId).click() + self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posXpath).click() self.driver.find_element(By.XPATH, listpage_search_box_posXpath).click() # 选中查询框 self.driver.find_element(By.XPATH, listPage_objectSearch_signature_select_Id_posXpath).click() # 选中ID self.driver.find_element(By.XPATH, listpage_search_input_posXpath).send_keys(Des_ID_list[2]) # 输入ID @@ -2989,7 +2992,7 @@ class App: self.driver.find_element(By.XPATH, listpage_delete_yes_button_posXpath).click() # del yes time.sleep(2) self.driver.find_element(By.XPATH, mainPage_firstLevelMenu_Objects_posXpath).click() - self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posId).click() + self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posXpath).click() time.sleep(2) self.driver.find_element(By.XPATH, listpage_search_box_posXpath).click() # 选中查询框 self.driver.find_element(By.XPATH, listPage_objectSearch_signature_select_Id_posXpath).click() # 选中ID @@ -3024,7 +3027,7 @@ class App: self._goto_subObjectPage() self._delete(data) self.driver.find_element(By.XPATH, mainPage_firstLevelMenu_Objects_posXpath).click() - self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posId).click() + self.driver.find_element(By.XPATH, mainPage_secondLevelMenu_Application_appSignatures_posXpath).click() time.sleep(2) self.driver.find_element(By.XPATH, listpage_search_box_posXpath).click() # 选中查询框 self.driver.find_element(By.XPATH, listPage_objectSearch_signature_select_Id_posXpath).click() # 选中ID |