From 5e16452209184278412acf0ca338e3c991b65e1b 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, 5 Aug 2020 17:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E7=AD=96=E7=95=A5=20?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=20vpn=20=E8=81=94=E5=90=88=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 02-Keyword/tsg_bfapi/PolicyObject.robot | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/02-Keyword/tsg_bfapi/PolicyObject.robot b/02-Keyword/tsg_bfapi/PolicyObject.robot
index ffb3bd3..b48ad8a 100644
--- a/02-Keyword/tsg_bfapi/PolicyObject.robot
+++ b/02-Keyword/tsg_bfapi/PolicyObject.robot
@@ -284,3 +284,27 @@ DeletePolicyAndObject1
     log    todeleteobj_DeletePolicyAndObject
     Run Keyword If    "${profiledId}"=="${EMPTY}"    log    no file to del
     ...    ELSE    DeletePolicyFile1    ${url}    ${profiledId}
+    
+DeletePolicyAndObjectAndVpn
+    [Arguments]    ${policyids}    ${objectids}    ${wan_vpn}
+    #删除策略
+    log    toDeletePolicy_DeletePolicyAndObject
+    ${listlenth}=    Get Length    ${policyids}
+    FOR    ${var}    IN RANGE    ${listlenth}
+        log    ${var}
+        DeletePolicy    ${policyids}[${var}]
+    END
+    #删除对象
+    log    todeleteobj_DeletePolicyAndObject
+    Run Keyword If    "${objectids}"=="${EMPTY}"    log    no obj to del
+    ...    ELSE    DeleteObject    ${objectids}
+    #删除文件
+    log    todeleteobj_DeletePolicyAndObject
+    Run Keyword If    "${profiledId}"=="${EMPTY}"    log    no file to del
+    ...    ELSE    DeletePolicyFile1    ${url}    ${profiledId}
+    # 删除VPN
+    log    todelete_wan_vpn
+    Run Keyword If    "${wan_vpn}"=="${EMPTY}"    log    no vpn to del
+    ...    ELSE    DeleteWanVpn    ${wan_vpn}
+    
+