Revert "Revert "21.05版关键字修改""

This reverts commit ae82eba445.
This commit is contained in:
hebingning
2021-05-17 10:19:01 +08:00
parent ae82eba445
commit 1512173611
28 changed files with 293 additions and 67 deletions

View File

@@ -16,7 +16,7 @@ InitPotocol
${appDict} Create Dictionary
${appVDict} Create Dictionary
Connect To Database Using Custom Params pymysql ${mysqlHost}
${app_id} query SELECT group_id,low_boundary,region_name FROM tsg_obj_app_id WHERE is_valid=1
${app_id} query SELECT group_id,low_boundary,region_name FROM tsg_obj_app_id WHERE is_valid=1 AND region_name='http' OR region_name='ssl' OR region_name='dns' OR region_name='ftp' OR region_name='mail' OR region_name='doh' OR region_name='rtp' OR region_name='sip'
${app_length} Get Length ${app_id}
FOR ${n} IN RANGE ${app_length}
log ${n}
@@ -29,7 +29,43 @@ InitPotocol
#供策略创建使用的appid
SET GLOBAL VARIABLE ${objprotol} ${appDict}
#供策略验证使用的appid
SET GLOBAL VARIABLE ${appportol} ${appVDict}
SET GLOBAL VARIABLE ${appportol} ${appVDict}
GetProtocol
GetProtocol
${HTTP_ID1} Get From Dictionary ${objprotol} http
${RTP_ID1} Get From Dictionary ${objprotol} rtp
${DNS_ID1} Get From Dictionary ${objprotol} dns
${MAIL_ID1} Get From Dictionary ${objprotol} MAIL
${FTP_ID1} Get From Dictionary ${objprotol} ftp
${SIP_ID1} Get From Dictionary ${objprotol} sip
${SSL_ID1} Get From Dictionary ${objprotol} ssl
${DOH_ID1} Get From Dictionary ${objprotol} DoH
SET GLOBAL VARIABLE ${HTTP_ID} ${HTTP_ID1}
SET GLOBAL VARIABLE ${RTP_ID} ${RTP_ID1}
SET GLOBAL VARIABLE ${DNS_ID} ${DNS_ID1}
SET GLOBAL VARIABLE ${MAIL_ID} ${MAIL_ID1}
SET GLOBAL VARIABLE ${FTP_ID} ${FTP_ID1}
SET GLOBAL VARIABLE ${SIP_ID} ${SIP_ID1}
SET GLOBAL VARIABLE ${SSL_ID} ${SSL_ID1}
SET GLOBAL VARIABLE ${DOH_ID} ${DOH_ID1}
${HTTP_VID1} Get From Dictionary ${appportol} http
${RTP_VID1} Get From Dictionary ${appportol} rtp
${DNS_VID1} Get From Dictionary ${appportol} dns
${MAIL_VID1} Get From Dictionary ${appportol} MAIL
${FTP_VID1} Get From Dictionary ${appportol} ftp
${SIP_VID1} Get From Dictionary ${appportol} sip
${SSL_VID1} Get From Dictionary ${appportol} ssl
${DOH_VID1} Get From Dictionary ${appportol} DoH
SET GLOBAL VARIABLE ${HTTP_VID} ${HTTP_VID1}
SET GLOBAL VARIABLE ${RTP_VID} ${RTP_VID1}
SET GLOBAL VARIABLE ${DNS_VID} ${DNS_VID1}
SET GLOBAL VARIABLE ${MAIL_VID} ${MAIL_VID1}
SET GLOBAL VARIABLE ${FTP_VID} ${FTP_VID1}
SET GLOBAL VARIABLE ${SIP_VID} ${SIP_VID1}
SET GLOBAL VARIABLE ${SSL_VID} ${SSL_VID1}
SET GLOBAL VARIABLE ${DOH_VID} ${DOH_VID1}
Login
[Tags] tsg_adc tsg_bf_api
#[Arguments] ${username} ${password} ${authmode} ${authCode} ${ldapId}
@@ -69,7 +105,7 @@ Login
log ${token}
SET GLOBAL VARIABLE ${headers} {"Contest-Type":"application/json","Authorization":"${token}"}
#初始化接口中策略中引用协议和策略校验协议
InitPotocol
Run Keyword If ${addPolicy}==1 InitPotocol
#Return ${rescode}
Logout
[Tags] tsg_adc tsg_bf_api