diff --git a/01-TestCase/tsg_ui/ui_security/SecurityVoipCase.robot b/01-TestCase/tsg_ui/ui_security/SecurityVoipCase.robot index 362dc08..cc5f23b 100644 --- a/01-TestCase/tsg_ui/ui_security/SecurityVoipCase.robot +++ b/01-TestCase/tsg_ui/ui_security/SecurityVoipCase.robot @@ -8,8 +8,7 @@ Resource ../../../02-Keyword/tsg_ui/policy/UIPolicy.robot *** Test Cases *** -#######################################Allow################################################### -SecuritySIPAllow +CreateSecuritySIPAllow [Tags] Positive UI Security Policies SIP Allow Comment 新建对象fqdn log ${TEST NAME} @@ -29,7 +28,7 @@ SecuritySIPAllow UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} PoliciesDelete -SecurityRTPAllow +CreateSecurityRTPAllow [Tags] Positive UI Security Policies RTP Allow ${ip_name1} create list SecurityVoip_IP ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} @@ -42,7 +41,7 @@ SecurityRTPAllow UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} PoliciesDelete -SecuritySIPAndRTPAllow +CreateSecuritySIPAndRTPAllow [Tags] Positive UI Security Policies SIPAndRTP Allow ${ip_name1} create list SecurityVoip_IP ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} @@ -55,7 +54,7 @@ SecuritySIPAndRTPAllow UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} PoliciesDelete -SecuritySIPAllowFilter-From +CreateSecuritySIPAllowFilter-From [Tags] Positive UI Security Policies SIP Allow ${ip_name1} create list SecurityVoip_IP ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} @@ -71,7 +70,7 @@ SecuritySIPAllowFilter-From UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} PoliciesDelete -SecuritySIPAllowFilter-To +CreateSecuritySIPAllowFilter-To [Tags] Positive UI Security Policies SIP Allow ${ip_name1} create list SecurityVoip_IP ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} @@ -87,9 +86,7 @@ SecuritySIPAllowFilter-To UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} PoliciesDelete -###############################Deny######################################### - -SecuritySIPDeny +CreateSecuritySIPDeny [Tags] Positive UI Security Policies SIP Deny ${ip_name1} create list SecurityVoip_IP ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} @@ -102,7 +99,7 @@ SecuritySIPDeny UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} PoliciesDelete -SecurityRTPDeny +CreateSecurityRTPDeny [Tags] Positive UI Security Policies RTP Deny ${ip_name1} create list SecurityVoip_IP ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} @@ -115,7 +112,7 @@ SecurityRTPDeny UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} PoliciesDelete -SecuritySIPAndRTPDeny +CreateSecuritySIPAndRTPDeny [Tags] Positive UI Security Policies SIPAndRTP Deny ${ip_name1} create list SecurityVoip_IP ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} @@ -128,7 +125,7 @@ SecuritySIPAndRTPDeny UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} PoliciesDelete -SecuritySIPDenyFilter-FromAndTo +CreateSecuritySIPDenyFilter-FromAndTo [Tags] Positive UI Security Policies SIP Deny ${ip_name1} create list SecurityVoip_IP ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} @@ -145,7 +142,7 @@ SecuritySIPDenyFilter-FromAndTo UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} PoliciesDelete -SecuritySIPDenyFilter-From +CreateSecuritySIPDenyFilter-From [Tags] Positive UI Security Policies SIP Deny ${ip_name1} create list SecurityVoip_IP ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} @@ -162,7 +159,7 @@ SecuritySIPDenyFilter-From UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} PoliciesDelete -SecuritySIPDenyFilter-To +CreateSecuritySIPDenyFilter-To [Tags] Positive UI Security Policies SIP Deny ${ip_name1} create list SecurityVoip_IP ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} @@ -179,7 +176,7 @@ SecuritySIPDenyFilter-To UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} PoliciesDelete -SecuritySIPDenyBlock-480 +CreateSecuritySIPDenyBlock-480 [Tags] Positive UI Security Policies SIP Deny ${ip_name1} create list SecurityVoip_IP ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} @@ -197,7 +194,7 @@ SecuritySIPDenyBlock-480 UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} Subactionadd=${subactionadd} PoliciesDelete -SecuritySIPDenyBlock-500 +CreateSecuritySIPDenyBlock-500 [Tags] Positive UI Security Policies SIP Deny ${ip_name1} create list SecurityVoip_IP ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} @@ -215,9 +212,7 @@ SecuritySIPDenyBlock-500 UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} Subactionadd=${subactionadd} PoliciesDelete -################################# Monitor###################################### - -SecuritySIPMonitor +CreateSecuritySIPMonitor [Tags] Positive UI Security Policies SIP Monitor ${ip_name1} create list SecurityVoip_IP ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} @@ -229,66 +224,211 @@ SecuritySIPMonitor ${policyInfo} Create Dictionary PolicyType=Security Policy PolicyName=${TEST NAME} PolicyAction=Monitor ApplicationSearch=SIP PolicyLogSession=1 PolicyEnabled=1 UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} PoliciesDelete - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -test - Menu policys Security Policy - Security-Source Name SecuritySIPAllow +CreateSecurityRTPMonitor + [Tags] Positive UI Security Policies RTP Monitor + ${ip_name1} create list SecurityVoip_IP + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${destinationAddIpList} Create List ${dip1} + ${destinationInfo} Create Dictionary destinationAddIpList=${destinationAddIpList} + ${sip} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${sourceAddIpList} Create List ${sip} + ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} + ${policyInfo} Create Dictionary PolicyType=Security Policy PolicyName=${TEST NAME} PolicyAction=Monitor ApplicationSearch=RTP PolicyLogSession=1 PolicyEnabled=1 + UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} PoliciesDelete - # 删除object - Menu objects Account - ui-object-search-name ${TEST NAME}_Accounts - objects-delete +CreateSecuritySIPAndRTPMonitor + [Tags] Positive UI Security Policies SIPAndRTP Monitor + ${ip_name1} create list SecurityVoip_IP + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${destinationAddIpList} Create List ${dip1} + ${destinationInfo} Create Dictionary destinationAddIpList=${destinationAddIpList} + ${sip} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${sourceAddIpList} Create List ${sip} + ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} + ${policyInfo} Create Dictionary PolicyType=Security Policy PolicyName=${TEST NAME} PolicyAction=Monitor ApplicationSearch=SIP,RTP PolicyLogSession=1 PolicyEnabled=1 + UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} + PoliciesDelete + +CreateSecuritySIPMonitorFilter-FromAndTo + [Tags] Positive UI Security Policies SIP Monitor + ${ip_name1} create list SecurityVoip_IP + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${destinationAddIpList} Create List ${dip1} + ${destinationInfo} Create Dictionary destinationAddIpList=${destinationAddIpList} ${filter} create list From To ${toname} create list SecurityVoip_Accounts ${fromname} create list SecurityVoip_Accounts ${filterInfo} Create Dictionary Filter=${filter} Fromname=${fromname} Toname=${toname} + ${sip} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${sourceAddIpList} Create List ${sip} + ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} + ${policyInfo} Create Dictionary PolicyType=Security Policy PolicyName=${TEST NAME} PolicyAction=Monitor ApplicationSearch=SIP PolicyLogSession=1 PolicyEnabled=1 + UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} + PoliciesDelete + +CreateSecuritySIPMonitorFilter-From + [Tags] Positive UI Security Policies SIP Monitor + ${ip_name1} create list SecurityVoip_IP + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${destinationAddIpList} Create List ${dip1} + ${destinationInfo} Create Dictionary destinationAddIpList=${destinationAddIpList} + ${filter} create list From + ${toname} create list SecurityVoip_Accounts + ${fromname} create list SecurityVoip_Accounts + ${filterInfo} Create Dictionary Filter=${filter} Fromname=${fromname} + ${sip} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${sourceAddIpList} Create List ${sip} + ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} + ${policyInfo} Create Dictionary PolicyType=Security Policy PolicyName=${TEST NAME} PolicyAction=Monitor ApplicationSearch=SIP PolicyLogSession=1 PolicyEnabled=1 + UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} + PoliciesDelete + +CreateSecuritySIPMonitorFilter-To + [Tags] Positive UI Security Policies SIP Monitor + ${ip_name1} create list SecurityVoip_IP + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${destinationAddIpList} Create List ${dip1} + ${destinationInfo} Create Dictionary destinationAddIpList=${destinationAddIpList} + ${filter} create list To + ${toname} create list SecurityVoip_Accounts + ${fromname} create list SecurityVoip_Accounts + ${filterInfo} Create Dictionary Filter=${filter} Toname=${toname} + ${sip} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${sourceAddIpList} Create List ${sip} + ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} + ${policyInfo} Create Dictionary PolicyType=Security Policy PolicyName=${TEST NAME} PolicyAction=Monitor ApplicationSearch=SIP PolicyLogSession=1 PolicyEnabled=1 + UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} + PoliciesDelete + +EditSecurityVoipAction + [Tags] Positive UI Security Policies Voip + ${ip_name1} create list SecurityVoip_IP + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${destinationAddIpList} Create List ${dip1} + ${destinationInfo} Create Dictionary destinationAddIpList=${destinationAddIpList} + ${sip} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${sourceAddIpList} Create List ${sip} + ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} + ${policyInfo} Create Dictionary PolicyType=Security Policy PolicyName=CreateSecurityVoipAction PolicyAction=Allow ApplicationSearch=RTP PolicyLogSession=1 PolicyEnabled=1 + ${EditpolicyInfo} Create Dictionary PolicyType=Security Policy PolicyName=CreateSecurityVoipAction PolicyEditName=${TEST NAME} PolicyAction=Monitor ApplicationSearch=RTP PolicyLogSession=1 PolicyEnabled=1 + UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} + UIUpdataPolicies ${EditpolicyInfo} + PoliciesDelete + +EditSecurityVoipApplication + [Tags] Positive UI Security Policies Voip + ${ip_name1} create list SecurityVoip_IP + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${destinationAddIpList} Create List ${dip1} + ${destinationInfo} Create Dictionary destinationAddIpList=${destinationAddIpList} + ${filter} create list To + ${toname} create list SecurityVoip_Accounts + ${fromname} create list SecurityVoip_Accounts + ${filterInfo} Create Dictionary Filter=${filter} Toname=${toname} + ${sip} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${sourceAddIpList} Create List ${sip} + ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} + ${policyInfo} Create Dictionary PolicyType=Security Policy PolicyName=CreateSecurityVoipAction PolicyAction=Allow ApplicationSearch=SIP PolicyLogSession=1 PolicyEnabled=1 + ${EditpolicyInfo} Create Dictionary PolicyType=Security Policy PolicyName=CreateSecurityVoipAction PolicyEditName=${TEST NAME} PolicyAction=Allow ApplicationSearch=SIP,RTP PolicyLogSession=1 PolicyEnabled=1 + UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} + UIUpdataPolicies ${EditpolicyInfo} + PoliciesDelete + +EditSecuritySIPAllwoFilter_1 + [Tags] Positive UI Security Policies Voip + ${ip_name1} create list SecurityVoip_IP + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${destinationAddIpList} Create List ${dip1} + ${destinationInfo} Create Dictionary destinationAddIpList=${destinationAddIpList} + ${filter} create list To + ${Editfilter} create list From To + ${toname} create list SecurityVoip_Accounts + ${fromname} create list SecurityVoip_Accounts + ${filterInfo} Create Dictionary Filter=${filter} Toname=${toname} + ${EditfilterInfo} Create Dictionary Filter=${Editfilter} Fromname=${fromname} Toname=${toname} + ${sip} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${sourceAddIpList} Create List ${sip} + ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} + ${policyInfo} Create Dictionary PolicyType=Security Policy PolicyName=CreateSecuritySIPAllwoFilter_1 PolicyAction=Allow ApplicationSearch=SIP PolicyLogSession=1 PolicyEnabled=1 + ${EditpolicyInfo} Create Dictionary PolicyType=Security Policy PolicyName=CreateSecuritySIPAllwoFilter_1 PolicyEditName=${TEST NAME} PolicyAction=Allow ApplicationSearch=SIP,SIP PolicyLogSession=1 PolicyEnabled=1 + UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} + Comment 添加Filter条件 + UIUpdataPolicies ${EditpolicyInfo} EditFilterInfo=${EditfilterInfo} + PoliciesDelete + +EditSecuritySIPAllwoAddFilter + [Tags] Positive UI Security Policies Voip + ${ip_name1} create list SecurityVoip_IP + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${destinationAddIpList} Create List ${dip1} + ${destinationInfo} Create Dictionary destinationAddIpList=${destinationAddIpList} + ${filter} create list To + ${Editfilter} create list From To + ${toname} create list SecurityVoip_Accounts + ${fromname} create list SecurityVoip_Accounts + ${filterInfo} Create Dictionary Filter=${filter} Toname=${toname} + ${EditfilterInfo} Create Dictionary Filter=${Editfilter} Fromname=${fromname} Toname=${toname} + ${sip} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${sourceAddIpList} Create List ${sip} + ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} + ${policyInfo} Create Dictionary PolicyType=Security Policy PolicyName=CreateSecuritySIPAllwoFilter_1 PolicyAction=Allow ApplicationSearch=SIP PolicyLogSession=1 PolicyEnabled=1 + ${EditpolicyInfo} Create Dictionary PolicyType=Security Policy PolicyName=CreateSecuritySIPAllwoFilter_1 PolicyEditName=${TEST NAME} PolicyAction=Allow ApplicationSearch=SIP,SIP PolicyLogSession=1 PolicyEnabled=1 + UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} + Comment 添加Filter条件 + UIUpdataPolicies ${EditpolicyInfo} EditFilterInfo=${EditfilterInfo} + PoliciesDelete + +EditSecuritySIPAllwoDeleteFilter + [Tags] Positive UI Security Policies Voip + ${ip_name1} create list SecurityVoip_IP + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${destinationAddIpList} Create List ${dip1} + ${destinationInfo} Create Dictionary destinationAddIpList=${destinationAddIpList} + ${filter} create list To + ${Editfilter} create list From To + ${toname} create list SecurityVoip_Accounts + ${fromname} create list SecurityVoip_Accounts + ${filterInfo} Create Dictionary Filter=${filter} Toname=${toname} + ${EditfilterInfo} Create Dictionary Filter=${Editfilter} Fromname=${fromname} Toname=${toname} + ${sip} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + ${sourceAddIpList} Create List ${sip} + ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} + ${policyInfo} Create Dictionary PolicyType=Security Policy PolicyName=CreateSecuritySIPAllwoFilter_1 PolicyAction=Allow ApplicationSearch=SIP PolicyLogSession=1 PolicyEnabled=1 + ${EditpolicyInfo} Create Dictionary PolicyType=Security Policy PolicyName=CreateSecuritySIPAllwoFilter_1 PolicyEditName=${TEST NAME} PolicyAction=Allow ApplicationSearch=SIP,SIP PolicyLogSession=1 PolicyEnabled=1 + UIAddPolicies ${policyInfo} SourceInfo=${sourceInfo} DestinationInfo=${destinationInfo} FilterInfo=${filterInfo} + Comment 添加Filter条件 + UIUpdataPolicies ${EditpolicyInfo} EditFilterInfo=${EditfilterInfo} + PoliciesDelete + + + + + + + + + + + + + + +# test + # ${ip_name1} create list SecurityVoip_IP + # ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + # ${destinationAddIpList} Create List ${dip1} + # ${destinationInfo} Create Dictionary destinationAddIpList=${destinationAddIpList} + # ${filter} create list To + # ${Editfilter} create list From To + # ${toname} create list SecurityVoip_Accounts + # ${fromname} create list SecurityVoip_Accounts + # ${filterInfo} Create Dictionary Filter=${filter} Toname=${toname} + # ${EditfilterInfo} Create Dictionary Filter=${Editfilter} Fromname=${fromname} Toname=${toname} + # ${sip} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Search ObjectName=${ip_name1} + # ${sourceAddIpList} Create List ${sip} + # ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} + # ${policyInfo} Create Dictionary PolicyType=Security Policy PolicyName=CreateSecuritySIPAllwoFilter_1 PolicyAction=Allow ApplicationSearch=SIP PolicyLogSession=1 PolicyEnabled=1 + # ${EditpolicyInfo} Create Dictionary PolicyType=Security Policy PolicyName=CreateSecuritySIPAllwoFilter_1 PolicyEditName=${TEST NAME} PolicyAction=Allow ApplicationSearch=SIP,RTP PolicyLogSession=1 PolicyEnabled=1 + # UIUpdataPolicies ${EditpolicyInfo} EditFilterInfo=${EditfilterInfo} diff --git a/02-Keyword/tsg_ui/policy/UIPolicy.robot b/02-Keyword/tsg_ui/policy/UIPolicy.robot index d302139..d1231aa 100644 --- a/02-Keyword/tsg_ui/policy/UIPolicy.robot +++ b/02-Keyword/tsg_ui/policy/UIPolicy.robot @@ -103,7 +103,7 @@ UIAddPolicies ... ELSE ProxyEnabled ${PolicyEnabled} Run Keyword If "${PolicyType}"=="Security Policy" Security-Policies-OK ... ELSE Proxy-Policies-OK - Wait Until Element Is Enabled id=app_create + Wait Until Element Is Enabled id=app_create 20 Security-Source Name ${PolicyName} Run Keyword If "${PolicyType}"=="Security Policy" SecurityAssert ${PolicyName} ... ELSE ProxyAssert ${PolicyName} @@ -179,7 +179,7 @@ UIUpdataPolicies UIPolicy.Create-Application-Button ${PolicyType} ${ApplicationSearchV} ${PolicyAction} #编辑filter Run Keyword If "${EditFilterInfo}"=="${EMPTY}" or "${EditFilterInfo}"=="null" log there is no FilterInfo - ... ELSE Create-Filter-SecurityOrProxy ${PolicyType} ${ApplicationFilter} ${EditFilterInfo} + ... ELSE Create-Filter-SecurityOrProxy ${PolicyType} ${ApplicationSearchV}[0] ${EditFilterInfo} Run Keyword If "${CreateOrDeleteFilterInfo}"=="${EMPTY}" or "${CreateOrDeleteFilterInfo}"=="null" log there is no FilterInfo ... ELSE Edit-Filter-SecurityOrProxy ${PolicyType} ${CreateOrDeleteFilterInfo} @@ -204,6 +204,7 @@ UIUpdataPolicies ... ELSE ProxyEnabled ${PolicyEnabled} Run Keyword If "${PolicyType}"=="Security Policy" Security-Policies-OK ... ELSE Proxy-Policies-OK + Wait Until Element Is Enabled id=app_create 20 Security-Source Name ${PolicyEditName} Run Keyword If "${PolicyType}"=="Security Policy" SecurityAssert ${PolicyEditName} ... ELSE ProxyAssert ${PolicyEditName} @@ -560,16 +561,14 @@ Create-Application-Button ... AND sleep ${sleep} run keyword if "${PolicyType}"=="Proxy Policy" ProxyApplicationSearch ${Action} ${ApplicationSearchV} - SecurityApplicationFor [Arguments] ${ApplicationSearchV} - ${a} set variable ${ApplicationSearchV}[0] FOR ${i} IN @{ApplicationSearchV} - run keyword if "${a}" != "${i}" run keywords sleep ${sleep} - ... AND click element xpath=//*[@id="interceptionadd_application"]/i + click element id=interceptionadd_application SecurityApplicationSearch ${i} ${a} set variable ${i} END + SecurityApplicationSearch [Arguments] ${Application} [Documentation] 调用次关键字前需要添加必填参数： @@ -582,12 +581,10 @@ SecurityApplicationSearch sleep ${sleep} click element xpath=/html/body/div[1]/div/div[3]/div[2]/div/div[5]/div[2]/div[2]/div/div[3]/div/div/ul/li[1] sleep ${sleep} - ${status} Run Keyword And Return Status Page Should Contain Element xpath=/html/body/div[last()]/div/div[3]/button[2] + ${status} Run Keyword And Return Status Page Should Contain element xpath=/html/body/div/div/div[3]/button[2]/span #xpath=/html/body/div/div/div[3]/button[2] log ${status} - run keyword if "${status}" == "True" run keywords sleep 1 - ... AND click element xpath=/html/body/div/div/div[3]/button[2] - ... AND sleep ${sleep} - ... ELSE log 未检测弹出框不操作 + ${return} Run Keyword And Ignore Error JudgmentPopup ${status} + # ... ELSE log 未检测弹出框不操作 # ${style}= Get Element Attribute class=el-message-box__wrapper style # log ${style}1111111111111 # ${c} Evaluate "display: none" in """${style}""" @@ -596,7 +593,13 @@ SecurityApplicationSearch # sleep ${sleep} click element id=check_list_allcancelobject sleep ${sleep} - + +JudgmentPopup + [Arguments] ${status} + Comment 判断弹出框 + run keyword if "${status}" == "True" run keywords click element xpath=/html/body/div/div/div[3]/button[2] + ... AND sleep ${sleep} + ProxyApplicationSearch [Arguments] ${Action} ${HttpOrDoh} [Documentation] 调用次关键字前需要添加必填参数： @@ -707,7 +710,7 @@ Create-SecurityFilter-judge ... ${Filter}:是一个列表，列表中填入filter类型，例如Host或URL等 ... name:各个对象名称的列表 ... 判断filter是否可以点击 - ${class}= Get Element Attribute xpath=/html/body/div[1]/div/div[3]/div[2]/div/div[1]/form/div/div[8]/div[1]/div/div class + ${class}= Get Element Attribute id=interceptionadd_add_filter class run keyword if "${class}"=="addobject addobject-long-list obj-content-null filter-width-style cursor addobject-long-list-disabled" log filter不可点击，不可添加filter run keyword if "${class}"=="addobject addobject-long-list obj-content-null filter-width-style cursor" run keywords sleep ${sleep} ... AND Create-SecurityFilter ${Application} ${Filter} ${Hostname} ${URLname} ${Request Headername} ${Response Headername} ${Request Contentname}