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

GTP相关关键字修改

Browse Source
This commit is contained in:
hebingning
2021-05-17 13:33:21 +06:00
parent 716e6dc5f0
commit d6fa6cfd3d
3 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,31 +62,31 @@ AddLocalIPObject
#log ${subiid}
log LocalSubIP：${subiid}
SET GLOBAL VARIABLE ${testClentSubID} ${subiid}
# Comment 创建mobile_identity-imsi
# ${addItemList1} Create Dictionary keywordArray=imsi
# ${addItemLists} Create list ${addItemList1}
# ${objectDict} Create Dictionary objectType=mobile_identity objectSubType=imsi isValid=${1} addItemList=${addItemLists}
# ${rescode} ${imsi_id} AddObjects ${1} ${objectDict}
# insert_policyId_to_file1 global_imsi_id ${imsi_id}
# SET GLOBAL VARIABLE ${object_imsi_id} ${imsi_id}
# Comment 创建mobile_identity-phone_number
# ${addItemList1} Create Dictionary keywordArray=${phone_number1}
# ${addItemList2} Create Dictionary keywordArray=${phone_number2}
# ${addItemList3} Create Dictionary keywordArray=${phone_number3}
# ${addItemList4} Create Dictionary keywordArray=${phone_number4}
# ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4}
# ${objectDict} Create Dictionary objectType=mobile_identity objectSubType=phone_number isValid=${1} addItemList=${addItemLists}
# ${rescode} ${phoneNum_id} AddObjects ${1} ${objectDict}
# insert_policyId_to_file1 global_phoneNum_id ${imsi_id}
# SET GLOBAL VARIABLE ${obj_phoneNum_Id} ${phoneNum_id}
# Comment 创建apn
# ${addItemList1} Create Dictionary keywordArray=${apn1}
# ${addItemList2} Create Dictionary keywordArray=${apn2}
# ${addItemLists} Create list ${addItemList1} ${addItemList2}
# ${objectDict} Create Dictionary objectType=apn objectSubType=apn isValid=${1} addItemList=${addItemLists}
# ${rescode} ${apn_id} AddObjects ${1} ${objectDict}
# insert_policyId_to_file1 global_apn_id ${imsi_id}
# SET GLOBAL VARIABLE ${obj_apn_Id} ${apn_id}
Comment 创建mobile_identity-imsi
${addItemList1} Create Dictionary keywordArray=${imsi} isHexbin=${0}
${addItemLists} Create list ${addItemList1}
${objectDict} Create Dictionary objectType=mobile_identity objectSubType=imsi isValid=${1} addItemList=${addItemLists}
${rescode} ${imsi_id} AddObjects ${1} ${objectDict}
insert_policyId_to_file1 global_imsi_id ${imsi_id}
SET GLOBAL VARIABLE ${object_imsi_id} ${imsi_id}
Comment 创建mobile_identity-phone_number
${addItemList1} Create Dictionary keywordArray=${phone_number1} isHexbin=${0}
${addItemList2} Create Dictionary keywordArray=${phone_number2} isHexbin=${0}
${addItemList3} Create Dictionary keywordArray=${phone_number3} isHexbin=${0}
${addItemList4} Create Dictionary keywordArray=${phone_number4} isHexbin=${0}
${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4}
${objectDict} Create Dictionary objectType=mobile_identity objectSubType=phone_number isValid=${1} addItemList=${addItemLists}
${rescode} ${phoneNum_id} AddObjects ${1} ${objectDict}
insert_policyId_to_file1 global_phoneNum_id ${imsi_id}
SET GLOBAL VARIABLE ${obj_phoneNum_Id} ${phoneNum_id}
Comment 创建apn
${addItemList1} Create Dictionary keywordArray=${apn1} isHexbin=${0}
${addItemList2} Create Dictionary keywordArray=${apn2} isHexbin=${0}
${addItemLists} Create list ${addItemList1} ${addItemList2}
${objectDict} Create Dictionary objectType=apn objectSubType=apn isValid=${1} addItemList=${addItemLists}
${rescode} ${apn_id} AddObjects ${1} ${objectDict}
insert_policyId_to_file1 global_apn_id ${imsi_id}
SET GLOBAL VARIABLE ${obj_apn_Id} ${apn_id}
DelLocalIPObject
log to_DelLocalIPObject

3
02-Keyword/tsg_bfapi/policy_object/ProcessObjectBody.robot
View File

@@ -326,8 +326,7 @@ ManageAddItemListNew
FOR ${item} IN @{addItemList}
${itemNew} Run Keyword If '${type}'=='ip' and '${subType}'=="geo_location" ManageGeoItem ${item} ${subType} add
... ELSE IF '${type}'=='ip' ManageIpItem ${item} ${subType} add
... ELSE IF '${type}'=='url' or ('${type}'=='fqdn' and '${subType}'!='category') or '${type}'=='keywords' or '${type}'=='subscriberid' or '${type}'=='fqdn_category' or '${type}'=='account'
# ... or '${type}'=='app_id' or '${type}'=='mobile_identity' or '${type}'=='apn'
... ELSE IF '${type}'=='url' or ('${type}'=='fqdn' and '${subType}'!='category') or '${type}'=='keywords' or '${type}'=='subscriberid' or '${type}'=='fqdn_category' or '${type}'=='account' or '${type}'=='app_id' or '${type}'=='mobile_identity' or '${type}'=='apn'
... ManageStrItem ${item} ${type} add
... ELSE IF '${type}'=='file_type' ManageFileItem ${item} ${type} add
... ELSE IF '${type}'=='fqdn' and '${subType}'=='category' ManageCategory ${item} ${type} add

38
02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot
View File

@@ -250,26 +250,26 @@ ManageObjectV2
#默认客户端条件类型：clientip or clientsubid
${return} ${defaultClient} Run Keyword And Ignore Error Get From Dictionary ${policy} defaultClient
# ${return1} ${defaultClient} Run Keyword And Ignore Error Get From Dictionary ${policy} defaultClient1
# ${return2} ${defaultClient} Run Keyword And Ignore Error Get From Dictionary ${policy} defaultClient2
# ${return3} ${defaultClient} Run Keyword And Ignore Error Get From Dictionary ${policy} defaultClient3
# ${return4} ${defaultClient} Run Keyword And Ignore Error Get From Dictionary ${policy} defaultClient4
${return1} ${defaultClient1} Run Keyword And Ignore Error Get From Dictionary ${policy} defaultClient1
${return2} ${defaultClient2} Run Keyword And Ignore Error Get From Dictionary ${policy} defaultClient2
${return3} ${defaultClient3} Run Keyword And Ignore Error Get From Dictionary ${policy} defaultClient3
${return4} ${defaultClient4} Run Keyword And Ignore Error Get From Dictionary ${policy} defaultClient4
${defaultClient} Run Keyword If "${return}"=="FAIL" or "${defaultClient}"=="${EMPTY}" Set Variable ${Default_Client_Type}
# ... ELSE IF "${return1}"=="FAIL" or "${defaultClient1}"=="${EMPTY}" Set Variable ${Default_Client_subidType}
# ... ELSE IF "${return2}"=="FAIL" or "${defaultClient2}"=="${EMPTY}" Set Variable ${Default_Client_imsiType}
# ... ELSE IF "${return3}"=="FAIL" or "${defaultClient3}"=="${EMPTY}" Set Variable ${Default_Client_phonenumberType}
# ... ELSE IF "${return4}"=="FAIL" or "${defaultClient4}"=="${EMPTY}" Set Variable ${Default_Client_apnType}
... ELSE Set Variable ${defaultClient}
${defaultClient1} Run Keyword If "${return1}"=="FAIL" or "${defaultClient1}"=="${EMPTY}" Set Variable ${Default_Client_subidType}
${defaultClient2} Run Keyword If "${return2}"=="FAIL" or "${defaultClient2}"=="${EMPTY}" Set Variable ${Default_Client_imsiType}
${defaultClient3} Run Keyword If "${return3}"=="FAIL" or "${defaultClient3}"=="${EMPTY}" Set Variable ${Default_Client_phonenumberType}
${defaultClient4} Run Keyword If "${return4}"=="FAIL" or "${defaultClient4}"=="${EMPTY}" Set Variable ${Default_Client_apnType}
# ... ELSE Set Variable ${defaultClient}
${sourceList} Create List
${destinationList} Create List
${filterList} Create List
Run Keyword If '${addTestClentIPFlag}'=='1' and '${defaultClient}'!='${EMPTY}' and '${defaultClient}'=='clientip' ManageClientIPObjectV2 ${sourceList}
# Run Keyword If '${addTestClentIPFlag}'=='1' and '${defaultClient1}'!='${EMPTY}' and '${defaultClient1}'=='clientsubid' ManageClientSubIDObjectV2 ${sourceList}
# Run Keyword If '${addTestClentIPFlag}'=='1' and '${defaultClient2}'!='${EMPTY}' and '${defaultClient2}'=='clientImsi' ManageClientImsiObjectV2 ${sourceList}
# Run Keyword If '${addTestClentIPFlag}'=='1' and '${defaultClient3}'!='${EMPTY}' and '${defaultClient3}'=='clientPhoneNumber' ManageClientPhoneNumberObjectV2 ${sourceList}
# Run Keyword If '${addTestClentIPFlag}'=='1' and '${defaultClient4}'!='${EMPTY}' and '${defaultClient4}'=='clientApn' ManageClientApnObjectV2 ${sourceList}
Run Keyword If '${addTestClentIPFlag}'=='1' and '${defaultClient1}'!='${EMPTY}' and '${defaultClient1}'=='clientsubid' ManageClientSubIDObjectV2 ${sourceList}
Run Keyword If '${addTestClentIPFlag}'=='1' and '${defaultClient2}'!='${EMPTY}' and '${defaultClient2}'=='clientImsi' ManageClientImsiObjectV2 ${sourceList}
Run Keyword If '${addTestClentIPFlag}'=='1' and '${defaultClient3}'!='${EMPTY}' and '${defaultClient3}'=='clientPhoneNumber' ManageClientPhoneNumberObjectV2 ${sourceList}
Run Keyword If '${addTestClentIPFlag}'=='1' and '${defaultClient4}'!='${EMPTY}' and '${defaultClient4}'=='clientApn' ManageClientApnObjectV2 ${sourceList}
AnalysisObjectV2 ${policy} source ${sourceList}
AnalysisObjectV2 ${policy} destination ${destinationList}
@@ -299,24 +299,24 @@ ManageClientImsiObjectV2
[Arguments] ${emptyList}
# 增加引用测试终端Imsi策略对象
${protocolField} Set Variable
insert_policyId_to_file1 addpolicySubId ${testClentSubID}
${obj1} Create Dictionary objectId=${testClentSubID} protocolField=TSG_FILED_GTP_IMSI
insert_policyId_to_file1 testImsiId ${object_imsi_id}
${obj1} Create Dictionary objectId=${object_imsi_id} protocolField=TSG_FILED_GTP_IMSI
Append To List ${emptyList} ${obj1}
ManageClientPhoneNumberObjectV2
[Arguments] ${emptyList}
# 增加引用测试终端phonenumber策略对象
${protocolField} Set Variable
log ${testClentSubID}
${obj1} Create Dictionary objectId=${testClentSubID} protocolField=TSG_FILED_GTP_PHONE_NUMBER
insert_policyId_to_file1 testPhoneNumberId ${obj_phoneNum_Id}
${obj1} Create Dictionary objectId=${obj_phoneNum_Id} protocolField=TSG_FILED_GTP_PHONE_NUMBER
Append To List ${emptyList} ${obj1}
ManageClientApnObjectV2
[Arguments] ${emptyList}
# 增加引用测试终端apn策略对象
${protocolField} Set Variable
insert_policyId_to_file1 addpolicySubId ${testClentSubID}
${obj1} Create Dictionary objectId=${testClentSubID} protocolField=TSG_FILED_GTP_APN
insert_policyId_to_file1 testApnId ${obj_apn_Id}
${obj1} Create Dictionary objectId=${obj_apn_Id} protocolField=TSG_FILED_GTP_APN
Append To List ${emptyList} ${obj1}
AnalysisObjectV2