From 98760ccdebe7b8c05810aeaa0804f04274cdbdfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E6=98=8E=E6=98=8E?= <zhumingming@zdjizhi.com>
Date: Wed, 22 Jul 2020 18:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=9D=E5=A7=8B=E5=8C=96ip?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 02-Keyword/tsg_bfapi/PolicyObject.robot | 41 ++++++++++++++++---------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/02-Keyword/tsg_bfapi/PolicyObject.robot b/02-Keyword/tsg_bfapi/PolicyObject.robot
index cce81ff..5c50c44 100644
--- a/02-Keyword/tsg_bfapi/PolicyObject.robot
+++ b/02-Keyword/tsg_bfapi/PolicyObject.robot
@@ -3,6 +3,7 @@ Resource          ../../03-Variable/BifangApiVariable.txt
 Resource          ../tsg_common/ManagePolicyBody.robot
 Resource          ../tsg_common/ManageObjectBody.robot
 Resource          ../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot
+Resource          ../../02-Keyword/tsg_bfapi/policy_object/Object.robot
 Library           REST    http://${host}:${port}
 Library           Collections
 Library           RequestsLibrary
@@ -10,6 +11,7 @@ Resource          Common.robot
 
 *** Keywords ***
 AddLocalIPObject
+    
     #创建对象IP
     log    to_AddLocalIPObject
     #${localIP}    set variable    {"opAction":"add","returnData":1,"objectList":{"objectType":"ip","objectSubType":"endpoint","isValid":1,"isInitialize":0,"isExclusion":0,"objectName":"autotestLocalIPObject_${testClentIP}","objectDesc":"LocalIPObject_${testClentIP}自动化测试机IP","subObjectIds":[],"addItemList":[{"addrType":4,"protocol":0,"direction":0,"isSession":"endpoint","clientIp1":"${testClentIP}","clientIp2":"${testClentIP}","clientIpFormat":"range","clientPortFormat":"range","clientPort1":0,"clientPort2":0,"serverIpFormat":"range","serverIp1":"","serverIp2":"","serverPortFormat":"range","serverPort1":0,"serverPort2":0}],"updateItemList":[],"deleteItemIds":[]}}
@@ -17,23 +19,32 @@ AddLocalIPObject
     #${localSubIP}    set variable    {"opAction":"add","returnData":1,"objectList":{"objectType":"subscriberid","objectSubType":"","isValid":1,"isInitialize":0,"isExclusion":0,"objectName":"test57","objectDesc":"${testSubscriberID}","subObjectIds":[],"addItemList":[{"keywordArray":["${testSubscriberID}"],"itemId":"","isHexbin":0}],"updateItemList":[],"deleteItemIds":[]}}
     #${rescodesub}    ${subiid}    AddObject    ${localSubIP}
     # 创建对象-IP
-   Create Dictionary
+   # Create Dictionary
     
-    ${objectDict}    Create Dictionary
-		   	   ...    objectType=ip
-		   	   ...    objectSubType=${Default_ObjectSubType}
-		   	   ...    isInitialize=${Default_IsInitialize}
-		   	   ...    isExclusion=${Default_IsExclusion}
-		   	   ...    objectName=autotest_localIP_${testClentIP}
-		   	   ...    objectDesc=${Default_ObjectDesc}
-		   	   ...    subObjectIds=${Default_SubObjectIds}
-           	   ...    isValid=${1}
-           	   ...    addItemList=range|${testClentIP}|${testClentIP}|0/0&${Default_AddItem_ServerIpFormat}|${Default_AddItem_ServerIp1}|${Default_AddItem_ServerIp2}|${Default_AddItem_ServerPort}|${Default_AddItem_IsInitialize}|${Default_AddItem_ItemName}|${Default_AddItem_ItemDesc}
-    ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
-    #log    ${rescodeip}
-    log    LocalIP：${objectId}
-    SET GLOBAL VARIABLE    ${testClentID}    ${objectId}
+    # ${objectDict}    Create Dictionary
+		   	   # ...    objectType=ip
+		   	   # ...    objectSubType=${Default_ObjectSubType}
+		   	   # ...    isInitialize=${Default_IsInitialize}
+		   	   # ...    isExclusion=${Default_IsExclusion}
+		   	   # ...    objectName=autotest_localIP_${testClentIP}
+		   	   # ...    objectDesc=${Default_ObjectDesc}
+		   	   # ...    subObjectIds=${Default_SubObjectIds}
+           	   # ...    isValid=${1}
+           	   # ...    addItemList=range|${testClentIP}|${testClentIP}|0/0&${Default_AddItem_ServerIpFormat}|${Default_AddItem_ServerIp1}|${Default_AddItem_ServerIp2}|${Default_AddItem_ServerPort}|${Default_AddItem_IsInitialize}|${Default_AddItem_ItemName}|${Default_AddItem_ItemDesc}
+    # ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
+    # #log    ${rescodeip}
+    # log    LocalIP：${objectId}
     
+    
+    Comment    创建IP
+    #object为IP→endpoint时的addItemList单个对象
+    ${addItemList1}   Create Dictionary    isSession=endpoint   ip=${testClentIP}-${testClentIP}   port=0-0   direction=0   protocol=0      isInitialize=0
+    #可以添加多个
+    ${addItemLists}    Create list    ${addItemList1}
+    #objectList对象
+    ${objectDict}    Create Dictionary    objectType=ip    isValid=${1}    addItemList=${addItemLists}
+    ${rescode}    ${objectId1}    AddObjects    ${1}    ${objectDict}    
+    SET GLOBAL VARIABLE    ${testClentID}    ${objectId1}
     log    to_AddLocalSubidObject
     ${objectDict}    Create Dictionary
 		   	   ...    objectType=subscriberid