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

feat(Cli)：1、策略状态更改测试用例补充策略类型，2、策略对象查询测试用例多次迭代，3、增加对各cli命令help参数返回值测试

Browse Source
This commit is contained in:
zhangwenqing
2020-04-14 15:42:54 +08:00
parent 4dc63558d0
commit 44bd76e32b
10 changed files with 100 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
02-Keyword/tsg_cli/Interface.robot
View File

@@ -32,7 +32,8 @@ Get_Policy_Object1
[Arguments] ${type}
${dict} Tsg_Policy_Query ${type} ${None} ${None} ${None} ${True}
Should Be True ${dict}[data][total] > 1
[Return] ${dict}[data][list][1]
${list} Evaluate list(${dict}[data][list])[1:11]
[Return] ${list}
Get_Policy_Object2
[Documentation]
@@ -41,7 +42,8 @@ Get_Policy_Object2
... 返回：任意单条策略
[Arguments] ${type}
${dict} Tsg_Policy_Query ${type} ${None} ${None} ${None} ${True}
[Return] ${dict}[data][list][0]
${list} Evaluate list(${dict}[data][list])[:10]
[Return] ${list}
Get_Policy_Object3
[Documentation]
@@ -49,7 +51,11 @@ Get_Policy_Object3
... 参数：type(策略类型)
... 返回：policyId(策略ID)、commandType1(enable/disable，修改)、commandType2(enable/disable，还原)
[Arguments] ${type}
${obj} Get_Policy_Object1 ${type}
#${obj} Get_Policy_Object1 ${type}
${dict} Tsg_Policy_Query ${type} ${None} ${None} ${None} ${True}
Should Be True ${dict}[data][total] > 1
${obj} Set Variable ${dict}[data][list][1]
${commandType1} Run Keyword If ${obj}[isValid]==0 Set Variable enable
... ELSE Set Variable disable
${commandType2} Run Keyword If ${obj}[isValid]==1 Set Variable enable
@@ -64,7 +70,8 @@ Get_Policy_Object4
... 返回：任意单条对象
[Arguments] ${type}
${dict} Tsg_Policy_Object_Query ${type} ${None} ${True}
[Return] ${dict}[data][list][0]
${list} Evaluate list(${dict}[data][list])[:10]
[Return] ${list}
Get_File_Name
[Documentation]
@@ -209,6 +216,17 @@ Tsg_Diagnose_Keyword
# 执行'text'指令，在'timeout'时间内每隔'retry_interval'时间重试，直至返回值出现'expected'时或超时结束
Write Until Expected Output tsg_diagnose\n Success ${timeout} ${retryInterval}
Tsg_Command_Help
[Documentation]
... 描述：执行'* --help'指令，并验证返回值
... 参数：无
... 返回：无
[Arguments] ${cmd}
${str} Set Variable ${cmd} --help
${r} Run9 ${str}
${data} Evaluate open(r"${path}/cli_files/${cmd}_help.txt",'rb').read()
Should Be Equal ${r} ${data}
Tsg_Show_Chassis-ip
[Documentation]
... 描述：执行'tsg_show --chassis-ip'指令，并验证返回值
@@ -464,3 +482,15 @@ Run9
${r} Read delay=10s
Should Not Be Empty ${r}
[Return] ${r}
QueryObjectInnerForEach
# 循环嵌套
[Arguments] ${objectType}
${list} Get_Policy_Object4 ${objectType}
# 取最多10条策略对象数据，分别做条件查询
FOR ${obj} IN @{list}
Tsg_Policy_Object_Query ${None} ${obj}[objectName] ${True}
Tsg_Policy_Object_Query ${obj}[objectType] ${None} ${True}
Tsg_Policy_Object_Query ${obj}[objectType] ${obj}[objectName] ${True}
END