From d6fa6cfd3dad478c56a2e53ca33c473bf77915ab Mon Sep 17 00:00:00 2001 From: hebingning Date: Mon, 17 May 2021 13:33:21 +0600 Subject: [PATCH] =?UTF-8?q?GTP=E7=9B=B8=E5=85=B3=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 02-Keyword/tsg_bfapi/PolicyObject.robot | 50 +++++++++---------- .../policy_object/ProcessObjectBody.robot | 3 +- .../policy_object/ProcessPolicyBody.robot | 38 +++++++------- 3 files changed, 45 insertions(+), 46 deletions(-) diff --git a/02-Keyword/tsg_bfapi/PolicyObject.robot b/02-Keyword/tsg_bfapi/PolicyObject.robot index efd7f6d..b061ae3 100644 --- a/02-Keyword/tsg_bfapi/PolicyObject.robot +++ b/02-Keyword/tsg_bfapi/PolicyObject.robot @@ -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 diff --git a/02-Keyword/tsg_bfapi/policy_object/ProcessObjectBody.robot b/02-Keyword/tsg_bfapi/policy_object/ProcessObjectBody.robot index 887ee58..fbb4c27 100644 --- a/02-Keyword/tsg_bfapi/policy_object/ProcessObjectBody.robot +++ b/02-Keyword/tsg_bfapi/policy_object/ProcessObjectBody.robot @@ -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 diff --git a/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot b/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot index daba534..0c527ef 100644 --- a/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot +++ b/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot @@ -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