diff options
Diffstat (limited to 'keyword/objects')
| -rw-r--r-- | keyword/objects/object.robot | 12 | ||||
| -rw-r--r-- | keyword/objects/process_object_body.robot | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/keyword/objects/object.robot b/keyword/objects/object.robot index 9f6c729..e9c623a 100644 --- a/keyword/objects/object.robot +++ b/keyword/objects/object.robot @@ -70,7 +70,7 @@ AddLocalIPObject Append To List ${object_ids} ${objectId1}
${object_ids} Create Dictionary object_ids=${object_ids}
Append To List ${objects} ${object_ids}
- ${sourceClientIP} Create Dictionary objects=${objects} protocol_field=ATTR_SOURCE_ADDR not_flag=${0}
+ ${sourceClientIP} Create Dictionary objects=${objects} attribute_name=ATTR_SOURCE_IP is_negate=${0}
# ${imsi_id} Evaluate int(${imsi_id})
# ${imsi_id} Convert To Integer ${imsi_id}
@@ -729,7 +729,7 @@ CreateObjectList ... ELSE IF "${protocolField}" == "TSG_FIELD_FTP_ACCOUNT" Set Variable ATTR_FTP_ACCOUNT
... ELSE IF "${protocolField}" == "TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION" Set Variable ATTR_SIP_ORIGINATOR_DESCRIPTION
... ELSE IF "${protocolField}" == "TSG_FIELD_SIP_RESPONDER_DESCRIPTION" Set Variable ATTR_SIP_RESPONDER_DESCRIPTION
- ... ELSE IF "${protocolField}" == "TSG_SECURITY_SOURCE_ADDR" Set Variable ATTR_SOURCE_ADDR
+ ... ELSE IF "${protocolField}" == "TSG_SECURITY_SOURCE_ADDR" Set Variable ATTR_SOURCE_IP
... ELSE IF "${protocolField}" == "TSG_SECURITY_DESTINATION" Set Variable ATTR_DESTINATION_ADDR
... ELSE IF "${protocolField}" == "TSG_FILED_GTP_IMSI" Set Variable ATTR_GTP_IMSI
... ELSE IF "${protocolField}" == "TSG_FILED_GTP_APN" Set Variable ATTR_GTP_APN
@@ -739,7 +739,7 @@ CreateObjectList #${objectIds} ${objectList} CreateObjects ${objectData}
log ${protocolField}
${objecTemptList} Run Keyword If "${protocolFieldReturn}"=="FAIL" Set Variable ${objectList}
- ... ELSE IF "${protocolField}" == "ATTR_SOURCE_ADDR" or "${protocolField}" == "None" or "${protocolField}" == "TSG_SECURITY_SOURCE_LOCATION" or "${protocolField}" == "TSG_SECURITY_SOURCE_ASN" or "${protocolField}" == "ATTR_GTP_IMSI" or "${protocolField}" == "ATTR_GTP_PHONE_NUMBER" or "${protocolField}" == "ATTR_GTP_APN" OrangeFilter ${objectList}
+ ... ELSE IF "${protocolField}" == "ATTR_SOURCE_IP" or "${protocolField}" == "None" or "${protocolField}" == "TSG_SECURITY_SOURCE_LOCATION" or "${protocolField}" == "TSG_SECURITY_SOURCE_ASN" or "${protocolField}" == "ATTR_GTP_IMSI" or "${protocolField}" == "ATTR_GTP_PHONE_NUMBER" or "${protocolField}" == "ATTR_GTP_APN" OrangeFilter ${objectList}
##############destination
... ELSE IF "${protocolField}" == "ATTR_DESTINATION_ADDR" or "${protocolField}" == "TSG_SECURITY_DESTINATION_LOCATION" Set Variable ${objectList}
#filter
@@ -919,7 +919,7 @@ JoinKeywordsData Append To List ${items} ${string}
log ${patterns}
END
- ${items} Create Dictionary items=${items} type=1
+ ${items} Create Dictionary items=${items} type=item
# ${member} Create Dictionary member=${items}
# ${member} json.dumps ${member}
# log ${member}
@@ -1024,7 +1024,7 @@ ObjectIdsToObjList ... ELSE IF "${protocolField}" == "TSG_FIELD_FTP_ACCOUNT" Set Variable ATTR_FTP_ACCOUNT
... ELSE IF "${protocolField}" == "TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION" Set Variable ATTR_SIP_ORIGINATOR_DESCRIPTION
... ELSE IF "${protocolField}" == "TSG_FIELD_SIP_RESPONDER_DESCRIPTION" Set Variable ATTR_SIP_RESPONDER_DESCRIPTION
- ... ELSE IF "${protocolField}" == "TSG_SECURITY_SOURCE_ADDR" Set Variable ATTR_SOURCE_ADDR
+ ... ELSE IF "${protocolField}" == "TSG_SECURITY_SOURCE_ADDR" Set Variable ATTR_SOURCE_IP
... ELSE IF "${protocolField}" == "TSG_SECURITY_DESTINATION" Set Variable ATTR_DESTINATION_ADDR
... ELSE IF "${protocolField}" == "TSG_FILED_GTP_IMSI" Set Variable ATTR_GTP_IMSI
... ELSE IF "${protocolField}" == "TSG_FILED_GTP_APN" Set Variable ATTR_GTP_APN
@@ -1036,7 +1036,7 @@ ObjectIdsToObjList Append To List ${object_id_list} ${obj}
${objectList} Create Dictionary object_ids=${object_id_list}
Append To List ${objectsList} ${objectList}
- ${objectsList} Create Dictionary objects=${objectsList} protocol_field=${protocolField} not_flag=${0}
+ ${objectsList} Create Dictionary objects=${objectsList} attribute_name=${protocolField} is_negate=${0}
END
Log objectsList：${objectsList}
[Return] ${objectsList}
diff --git a/keyword/objects/process_object_body.robot b/keyword/objects/process_object_body.robot index 3ffbbe8..0460eb1 100644 --- a/keyword/objects/process_object_body.robot +++ b/keyword/objects/process_object_body.robot @@ -201,7 +201,7 @@ ObjectOrganize # ${return} ${subObjectIds} Run Keyword And Ignore Error Get From Dictionary ${object} subObjectIds
# Run Keyword If "${return}"!="FAIL" and "${subObjectIds}"!="${EMPTY}" and "${subObjectIds}"!="${None}" Set To Dictionary ${returnDict} subObjectIds=${subObjectIds}
# ... ELSE Set Variable ${emptyList}
-
+ Set To Dictionary ${returnDict} statistics_option=none
${return} ${iconColor} Run Keyword And Ignore Error Set Variable ${object['iconColor']}
Run Keyword If "${return}"!="FAIL" Set To Dictionary ${returnDict} icon_color=${iconColor}
#补充ip learning对象
@@ -365,7 +365,7 @@ CombineKeywords Append To List ${items} ${string}
log ${patterns}
END
- ${items} Create Dictionary items=${items} type=1
+ ${items} Create Dictionary items=${items} type=item
# ${member} Create Dictionary member=${items}
# ${member} json.dumps ${member}
# log ${member}
@@ -382,7 +382,7 @@ CombineIp ${ip} Create Dictionary ip=${ip} op=add
Append To List ${items} ${ip}
END
- ${items} Create Dictionary items=${items} type=1
+ ${items} Create Dictionary items=${items} type=item
[Return] ${items}
ManageUpdateItemList
[Documentation]
|