From 920d871fe9ba0b7f05daea0a8c8af8c77659b5e2 Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Tue, 1 Sep 2020 15:24:15 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=88=A0=E9=99=A4=E5=9C=A8=E5=88=86?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E4=B8=AD=E6=B7=BB=E5=8A=A0UIAPI=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E7=9A=84=E7=99=BD=E5=90=8D=E5=8D=95=EF=BC=9B=202?= =?UTF-8?q?=E3=80=81BifangApiVariable.txt=E6=96=87=E4=BB=B6=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80=E4=B8=BA?= =?UTF-8?q?44.17=EF=BC=9B=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E5=9D=80${currentpath}=20E:/auto=5Fgit/eclipsegit/tsg?= =?UTF-8?q?=5Fautotest/=EF=BC=9B=E6=B7=BB=E5=8A=A0#=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E6=8A=8A?= =?UTF-8?q?tsgui=E5=92=8Capi=E6=B7=BB=E5=8A=A0=E4=B8=BASecurityPolicy-Allo?= =?UTF-8?q?w=201=E4=B8=BA=E9=9C=80=E8=A6=81=EF=BC=8C=E9=BB=98=E8=AE=A41=20?= =?UTF-8?q?=EF=BC=8C=20${addTsgUIAPIFlag}=20=20=20=201=203=E3=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0UIAPI=E5=9C=B0=E5=9D=80=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E6=94=BE=E5=88=B0setup=E5=BC=95=E7=94=A8=E4=B8=AD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=EF=BC=9ALoginLogout.robot?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 4、修改本机ip对象引用id带“”问题：修改ManagePolicyBody。robot文件；ProcessPolicyBody.robot文件； --- .../multi_step/a_Allow_Allow_120UIAPI.robot | 38 ------------------- 02-Keyword/tsg_bfapi/LoginLogout.robot | 32 +++++++++++++++- .../policy_object/ProcessPolicyBody.robot | 4 +- 02-Keyword/tsg_common/ManagePolicyBody.robot | 9 +++-- 03-Variable/BifangApiVariable.txt | 9 +++-- 5 files changed, 44 insertions(+), 48 deletions(-) delete mode 100644 01-TestCase/tsg_adc/multi_step/a_Allow_Allow_120UIAPI.robot diff --git a/01-TestCase/tsg_adc/multi_step/a_Allow_Allow_120UIAPI.robot b/01-TestCase/tsg_adc/multi_step/a_Allow_Allow_120UIAPI.robot deleted file mode 100644 index e099f10..0000000 --- a/01-TestCase/tsg_adc/multi_step/a_Allow_Allow_120UIAPI.robot +++ /dev/null @@ -1,38 +0,0 @@ -*** Settings *** -Force Tags tsg_adc_wp adc_api security_policy -Library OperatingSystem -Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot -Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot -Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot -Resource ../../../02-Keyword/tsg_adc/FileOperation.robot -Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot - -*** Test Cases *** -SecurityPolicy-Allow-UIAPI - [Tags] uiallow - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.44.17/32 port=0-0 direction=0 protocol=0 isInitialize=0 - #可以添加多个 - ${addItemLists} Create list ${addItemList1} - #objectList对象 - ${objectDict} Create Dictionary objectType=ip isValid=${1} addItemList=${addItemLists} - ${rescode} ${objectId} AddObjects ${1} ${objectDict} - Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-120 policyType=tsg_security policyDesc=autotest action=allow destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR userRegion={"protocol":"HTTP"} isValid=${1} appIdObjects=2 - log ${policyDict} - ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 - insert_policyId_to_file1 SecurityPolicy-Allow ${objectId} - insert_policyId_to_file1 SecurityPolicy-Allow ${policyId} - #SecurityPolicy-Allow-UIAPI - # [Tags] uiallow - # ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.40.120/32 port=0-0 direction=0 protocol=0 isInitialize=0 - # #可以添加多个 - # ${addItemLists} Create list ${addItemList1} - # #objectList对象 - # ${objectDict} Create Dictionary objectType=ip isValid=${1} addItemList=${addItemLists} - # ${rescode} ${objectId} AddObjects ${1} ${objectDict} - # Comment 创建安全策略 - # ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-120 policyType=tsg_security policyDesc=autotest action=allow destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR userRegion=${EMPTY} isValid=${1} appIdObjects=2,3 - # log ${policyDict} - # ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 - # insert_policyId_to_file1 SecurityPolicy-Allow ${objectId} - # insert_policyId_to_file1 SecurityPolicy-Allow ${policyId} diff --git a/02-Keyword/tsg_bfapi/LoginLogout.robot b/02-Keyword/tsg_bfapi/LoginLogout.robot index 6d487a9..9aa8921 100644 --- a/02-Keyword/tsg_bfapi/LoginLogout.robot +++ b/02-Keyword/tsg_bfapi/LoginLogout.robot @@ -6,6 +6,8 @@ Library SSHLibrary Resource PolicyObject.robot Resource ../tsg_ui/logout/Logout.robot Resource ../tsg_ui/login/Login.robot +#Resource ../../02-Keyword/tsg_bfapi/PolicyObject.robot +Resource ../../02-Keyword/tsg_bfapi/policy_object/Policy.robot Resource Tag.robot *** Keywords *** @@ -48,7 +50,6 @@ Login log ${token} SET GLOBAL VARIABLE ${headers} {"Contest-Type":"application/json","Authorization":"${token}"} #Return ${rescode} - Logout [Tags] tsg_adc tsg_bf_api POST /${version}/user/logout headers=${headers} @@ -67,6 +68,9 @@ ApiLoginAndAddLocalIP #ApiAddAutoTagsCase #[Return] ${rescode} + #添加tsgUIAPI + Run Keyword If ${addTsgUIAPIFlag}==1 SecurityPolicy-Allow-TSGUIAPI-Add + ApiLogoutAndDelLocalIP [Tags] tsg_adc tsg_bf_api log ApiLogoutAndDelLocalIP @@ -76,6 +80,9 @@ ApiLogoutAndDelLocalIP loginlogout.Logout #[Return] ${rescode} + #添加tsgUIAPI + Run Keyword If ${addTsgUIAPIFlag}==1 SecurityPolicy-Allow-TSGUIAPI-DEL + CliLogin [Tags] tsg_cli cli_login Open Connection ${cliHost} @@ -85,4 +92,25 @@ CliLogout [Tags] tsg_cli cli_logout Close Connection Log Close CLI Connection - \ No newline at end of file + +SecurityPolicy-Allow-TSGUIAPI-Add + [Tags] uiallow + log toAddTSGUIAPI + ${addItemList1} Create Dictionary isSession=endpoint ip=${host}/32 port=0-0 direction=0 protocol=0 isInitialize=0 + #可以添加多个 + ${addItemLists} Create list ${addItemList1} + #objectList对象 + ${objectDict} Create Dictionary objectType=ip isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + SET GLOBAL VARIABLE ${testBifangIP} ${objectId} + Comment 创建安全策略 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-TSGUIAPI policyType=tsg_security policyDesc=autotest action=allow destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR userRegion={} isValid=${1} appIdObjects=2,3 + log ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + SET GLOBAL VARIABLE ${testBifangPolicy} ${policyId} + log addTSGUIAPISucess +SecurityPolicy-Allow-TSGUIAPI-DEL + [Tags] uiallow + log toDelTSGUIAPI + DeletePolicyAndObject ${testBifangPolicy} ${testBifangIP} + log delTSGUIAPISucess \ No newline at end of file diff --git a/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot b/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot index 884d8cb..8cc448b 100644 --- a/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot +++ b/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot @@ -263,7 +263,9 @@ ManageObjectV2 ManageClientIPObjectV2 [Arguments] ${emptyList} # 增加引用测试终端IP策略对象 - ${obj1} Create Dictionary objectId=${testClentID} protocolField=TSG_SECURITY_SOURCE_ADDR + + ${intid} Evaluate int(${testClentID}) + ${obj1} Create Dictionary objectId=${intid} protocolField=TSG_SECURITY_SOURCE_ADDR Append To List ${emptyList} ${obj1} ManageClientSubIDObjectV2 diff --git a/02-Keyword/tsg_common/ManagePolicyBody.robot b/02-Keyword/tsg_common/ManagePolicyBody.robot index 073d144..70cd98e 100644 --- a/02-Keyword/tsg_common/ManagePolicyBody.robot +++ b/02-Keyword/tsg_common/ManagePolicyBody.robot @@ -173,7 +173,9 @@ EffectiveRangeValueType3 FOR ${var} IN @{list} Append To List ${valueList} ${var} END - ${obj} Create Dictionary tag=location value=${valueList} + ${obj} Create Dictionary tag=location value=${valueList} + #适应adc设定标签 + #${obj} Create Dictionary tag=device_id value=${valueList} ${return} Create List ${obj} [Return] ${return} @@ -234,8 +236,9 @@ ManageReferenceObject ManageClientIPObject [Arguments] ${emptyList} # 增加引用测试终端IP策略对象 - ${list1} Create List TSG_SECURITY_SOURCE_ADDR - ${obj1} Create Dictionary objectId=${testClentID} protocolFields=${list1} + ${list1} Create List TSG_SECURITY_SOURCE_ADDR + ${intid} Evaluate int(${testClentID}) + ${obj1} Create Dictionary objectId=${intid} protocolFields=${list1} Append To List ${emptyList} ${obj1} # ${list2} Create List null # ${obj2} Create Dictionary objectId=${testClentSubID} protocolFields=${list2} diff --git a/03-Variable/BifangApiVariable.txt b/03-Variable/BifangApiVariable.txt index b1547a0..b0216d1 100644 --- a/03-Variable/BifangApiVariable.txt +++ b/03-Variable/BifangApiVariable.txt @@ -4,7 +4,7 @@ ${loginType} api #执行环境是否Widonws ${systemType} api #API配置信息 -${host} 192.168.40.120 +${host} 192.168.44.17 ${port} 8080 ${authmode} 1 ${authCode} ${EMPTY} @@ -21,14 +21,15 @@ ${testSubscriberID} $test57 #自动化标签 ${userTagIds} ${EMPTY} #Documentation] 是否添加测试终端IP到策略统一配置，0为不添加测试终端IP，1为添加测试终端IP，默认1 -${addTestClentIPFlag} 0 +${addTestClentIPFlag} 1 +#测试环境是否需要把tsgui和api添加为SecurityPolicy-Allow 1为需要，默认1 ， +${addTsgUIAPIFlag} 1 #执行需要暂停时间 #策略下发后到验证需等待时间 ${policyVerificationSleepSeconds} 20 #策略验证后到验证策略日志需等待时间 ${policyLogVerificationSleepSeconds} 60 -${path} F:/tsg-git/tsg_autotest/05-Other/ -${currentpath} E:/auto_git/eclipsegit/tsg_autotest/ +${path} C:/Users/admin/git/tsg_autotest/05-Other/ ${curlbatpath} ${path}/curl/ ${mailpath} ${path}/mail/ ${responsePageFiles} ${path}/response_pages_files/