gfwleak/dongxiaoyan-tsg-autotest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git.mesalab.cn:443/dongxiaoyan/tsg_autotest.git into develop

Browse Source
This commit is contained in:
朱明明
2020-08-03 15:20:15 +08:00
parent eb69e84d5e 83fd79b90c
commit dcb980fd54
141 changed files with 6802 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
02-Keyword/tsg_bfapi/PolicyObject.robot
View File

@@ -74,7 +74,7 @@ AddObject
[Arguments] ${body}
#addIPobject#################################################################################
${response} BasePostRequest /${version}/policy/object body=${body}
#log ${response}
log 11111111111111${response}
${objectId} Set Variable ${response['data']['objectList'][0]['objectId']}
${rescodeReturn} Set Variable ${response['code']}
[Return] ${rescodeReturn} ${objectId}
@@ -244,7 +244,7 @@ DeleteProfiles
Run Keyword If "${profile}"!="" and ${profile}!="${EMPTY}" DeleteProfile ${profile}[typeUrl] ${profile}[profileIds]
END
DeletePolicyAndObject
[Arguments] ${policyids} ${objectids}
[Arguments] ${policyids} ${objectids} ${group}
#删除和对象
#删除策略
log toDeletePolicy_DeletePolicyAndObject
@@ -252,11 +252,13 @@ DeletePolicyAndObject
FOR ${var} IN RANGE ${listlenth}
#log dxytest111111
log ${var}
DeletePolicy ${policyids}[${var}]
DeletePolicy ${policyids}[${var}]
#Should Contain ${commandreturn} ${ca}
END
#删除对象
log todeleteobj_DeletePolicyAndObject
Run Keyword If "${group}"=="${EMPTY}" log no obj to del
... ELSE DeleteObject ${group}
Run Keyword If "${objectids}"=="${EMPTY}" log no obj to del
... ELSE DeleteObject ${objectids}

246
02-Keyword/tsg_ui/tag/Tags.robot
View File

@@ -1,120 +1,126 @@
*** Settings ***
Library Selenium2Library
*** Keywords ***
ui-tags-create
[Arguments] ${tag-name} ${color-element} ${tag-value}
[Documentation] 引用关键字，填入必填参数：
... ${tag-name}:输入tag 的name
... ${color-element}:选择tag字体的颜色
... ${tag-value}:输入tag内容
click element id=tagAdd #点击create按钮，新建tag
sleep 2
input text id=tagsAdd_name ${tag-name} #输入tag name
sleep 1
click element id=tagsAdd_color #点击color
sleep 2
click element ${color-element} #选择tag字体颜色
sleep 2
input text id=tag_tagName0 ${tag-value} #输入tag内容
sleep 1
click element id=tagAddOk1
sleep 1
ui-tags-create-1
[Arguments] ${tag-name} ${color-element} ${tag-value} ${tag-value1}
[Documentation] 引用关键字，填入必填参数：
... ${tag-name}:输入tag 的name
... ${color-element}:选择tag字体的颜色
... ${tag-value}:输入tag内容
... ${tag-value1}:输入tag内容
click element id=tagAdd #点击create按钮，新建tag
sleep 2
input text id=tagsAdd_name ${tag-name} #输入tag name
sleep 1
click element id=tagsAdd_color #点击color
sleep 2
click element ${color-element} #选择tag字体颜色
sleep 1
input text id=tag_tagName0 ${tag-value} #输入tag内容
sleep 1
click element id=tagAddInput
input text id=tag_tagName1 ${tag-value1} #输入tag内容
sleep 1
click element id=tagAddOk1
ui-tags-edit
[Arguments] ${tag-name} ${color-element} ${tag-value}
[Documentation] 引用关键字，填入必填参数：
... ${tag-name}:输入tag 的name
... ${color-element}:选择tag字体的颜色
... ${tag-value}:输入tag内容
sleep 1
click element id=tagEdit #点击edit按钮
sleep 2
input text id=tagsAdd_name ${tag-name} #输入tag name
sleep 2
click element id=tagsAdd_color #点击color
sleep 1
click element ${color-element} #选择tag字体颜色
sleep 1
input text id=tag_tagName0 ${tag-value} #输入tag内容
sleep 1
click element id=tagAddOk1
sleep 1
ui-tags-search-id
[Arguments] ${id}
sleep 1
click element id=one-input
sleep 1
click element id=input_list_li1
sleep 1
input text id=sreach_input ${id}
sleep 1
click element id=select_new_search_btn
sleep 1
click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table
ui-tags-search-name
[Arguments] ${name}
sleep 1
click element id=one-input
sleep 1
click element id=input_list_li2
sleep 1
input text id=sreach_input ${name}
sleep 1
click element id=select_new_search_btn
sleep 1
click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table
ui-tags-delete
sleep 1
click element id=tagDel #点击删除按钮
sleep 1
click element id=tags-tagsDel-confirm
ui-tags-edit-1
[Arguments] ${tag-name} ${color-element} ${tag-value} ${tag-value1}
[Documentation] 引用关键字，填入必填参数：
... ${tag-name}:输入tag 的name
... ${color-element}:选择tag字体的颜色
... ${tag-value}:输入tag内容
... ${tag-value1}:输入tag内容
sleep 1
click element id=tagEdit #点击edit按钮
sleep 2
input text id=tagsAdd_name ${tag-name} #输入tag name
sleep 1
click element id=tagsAdd_color #点击color
sleep 1
click element ${color-element} #选择tag字体颜色
sleep 2
input text id=tag_tagName0 ${tag-value} #输入tag内容
sleep 1
sleep 1
click element id=tagAddInput
input text id=tag_tagName1 ${tag-value1} #输入tag内容
click element id=tagAddOk1
sleep 1
*** Settings ***
Library Selenium2Library
Resource ../Menu.robot
Library Collections
*** Keywords ***
ui-tags-create
[Arguments] ${tag-name} ${color-element} ${tag-value}
[Documentation] 引用关键字，填入必填参数：
... ${tag-name}:输入tag 的name
... ${color-element}:选择tag字体的颜色
... ${tag-value}:输入tag内容
Menu policy&objects Tags
sleep 3
click element id=tagAdd #点击create按钮，新建tag
sleep 2
input text id=tagsAdd_name ${tag-name} #输入tag name
sleep 1
click element id=tagsAdd_color #点击color
sleep 2
click element ${color-element} #选择tag字体颜色
sleep 2
input text id=tag_tagName0 ${tag-value} #输入tag内容
sleep 1
click element id=tagAddOk1
sleep 1
ui-tags-create-1
[Arguments] ${tag-name} ${color-element} ${tag-value} ${tag-value1}
[Documentation] 引用关键字，填入必填参数：
... ${tag-name}:输入tag 的name
... ${color-element}:选择tag字体的颜色
... ${tag-value}:输入tag内容
... ${tag-value1}:输入tag内容
Menu policy&objects Tags
sleep 3
click element id=tagAdd #点击create按钮，新建tag
sleep 2
input text id=tagsAdd_name ${tag-name} #输入tag name
sleep 1
click element id=tagsAdd_color #点击color
sleep 2
click element ${color-element} #选择tag字体颜色
sleep 1
input text id=tag_tagName0 ${tag-value} #输入tag内容
sleep 1
click element id=tagAddInput
input text id=tag_tagName1 ${tag-value1} #输入tag内容
sleep 1
click element id=tagAddOk1
ui-tags-edit
[Arguments] ${tag-name} ${color-element} ${tag-value}
[Documentation] 引用关键字，填入必填参数：
... ${tag-name}:输入tag 的name
... ${color-element}:选择tag字体的颜色
... ${tag-value}:输入tag内容
sleep 1
click element id=tagEdit #点击edit按钮
sleep 2
input text id=tagsAdd_name ${tag-name} #输入tag name
sleep 2
click element id=tagsAdd_color #点击color
sleep 1
click element ${color-element} #选择tag字体颜色
sleep 1
input text id=tag_tagName0 ${tag-value} #输入tag内容
sleep 1
click element id=tagAddOk1
sleep 1
ui-tags-search-id
[Arguments] ${id}
sleep 1
click element id=one-input
sleep 1
click element id=input_list_li1
sleep 1
input text id=sreach_input ${id}
sleep 1
click element id=select_new_search_btn
sleep 1
click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table
ui-tags-search-name
[Arguments] ${name}
sleep 1
click element id=one-input
sleep 1
click element id=input_list_li2
sleep 1
input text id=sreach_input ${name}
sleep 1
click element id=select_new_search_btn
sleep 1
click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table
ui-tags-delete
sleep 1
click element id=tagDel #点击删除按钮
sleep 1
click element xpath=/html/body/div/div/div[3]/button[2]
ui-tags-edit-1
[Arguments] ${tag-name} ${color-element} ${tag-value} ${tag-value1}
[Documentation] 引用关键字，填入必填参数：
... ${tag-name}:输入tag 的name
... ${color-element}:选择tag字体的颜色
... ${tag-value}:输入tag内容
... ${tag-value1}:输入tag内容
sleep 1
click element id=tagEdit #点击edit按钮
sleep 2
input text id=tagsAdd_name ${tag-name} #输入tag name
sleep 1
click element id=tagsAdd_color #点击color
sleep 1
click element ${color-element} #选择tag字体颜色
sleep 2
input text id=tag_tagName0 ${tag-value} #输入tag内容
sleep 1
sleep 1
click element id=tagAddInput
input text id=tag_tagName1 ${tag-value1} #输入tag内容
click element id=tagAddOk1
sleep 1