From 1dfde34716ace6d6c73850e1a1800fa46f55c095 Mon Sep 17 00:00:00 2001
From: lyf <liuyuanfang@geedgenetworks.com>
Date: Tue, 21 Jul 2020 19:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A403?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 03-Variable/BifangApiVariable.txt | 130 +++++++++++++++---------------
 1 file changed, 64 insertions(+), 66 deletions(-)

diff --git a/03-Variable/BifangApiVariable.txt b/03-Variable/BifangApiVariable.txt
index 8f644af..d1309d8 100644
--- a/03-Variable/BifangApiVariable.txt
+++ b/03-Variable/BifangApiVariable.txt
@@ -1,66 +1,64 @@
-*** Variables ***
-#登录类型：api | cli | ${None}（tsg mib） | 未指定，默认为ui
-${loginType}     api
-#执行环境是否Widonws
-${systemType}     Windows
-#API配置信息
-${host}           192.168.40.120
-${port}           8080
-${authmode}       1
-${authCode}       ${EMPTY}
-${ldapId}         27
-${version}        v1
-${version2}        v2
-${username}       autotest
-${password}       111111
-${encodePassword}    ${EMPTY}
-${token}          ${EMPTY}
-#[Documentation]    测试终端IP统一配置
-${testClentIP}    192.168.41.255
-${testSubscriberID}    $test2552
-#自动化标签
-${userTagIds}     ${EMPTY}
-#Documentation]    是否添加测试终端IP到策略统一配置，0为不添加测试终端IP，1为添加测试终端IP，默认1
-${addTestClentIPFlag}    0
-#执行需要暂停时间
-#策略下发后到验证需等待时间
-${policyVerificationSleepSeconds}    20
-#策略验证后到验证策略日志需等待时间
-${policyLogVerificationSleepSeconds}    60
-${path}           E:/auto_git/eclipsegit/tsg_autotest/05-Other/
-${currentpath}           E:/auto_git/eclipsegit/tsg_autotest/
-${curlbatpath}    ${path}/curl/
-${mailpath}       ${path}/mail/
-${responsePageFiles}    ${path}/response_pages_files/
-#全流程分阶段测试参数
-#[Documentation]    当前测试部分，all为一个终端全网全流程测试，
-#1为添加策略和对象测试；
-#2为功能端业务验证部分测试；
-#3为llog日志验证测试
-${testPart}       all
-#UI配置的本地IP名称
-${LocahIPName}    ${EMPTY}
-${ipType}         ipv4
-${ipMask}         255.255.255.255
-${browserType}    chrome
-# Cli自动化测试变量[start]
-${cliHost}        192.168.40.165
-${cliUsername}    tsgadmin
-${cliPassword}    Cli2019
-${timeout}        600s
-${retryInterval}    300s
-@{PolicyTypes}    tsg_security    pxy_manipulation
-@{ObjectTypes}    ip    url    fqdn    keywords    subscriberid    fqdn_category    account
-...               http_signature
-# Cli自动化测试变量[end]
-# SNMP服务测试变量[start]
-${snmpHost}       192.168.40.165
-${snmpPort}       50161
-${snmpConnTimeout}    5    # 默认超时时间为6s，设置timeout值后超时时间为n*6s
-${snmpCommunity}    public
-# SNMP服务测试变量[end]
-#API配置信息
-${oamHost}	192.168.40.210
-${oamPort}	50080
-#命中日志绝对值差，用于比对两种接口查询数据结果差值
-${hitsAbs}	1000
\ No newline at end of file
+*** Variables ***
+#登录类型：api | cli | ${None}（tsg mib） | 未指定，默认为ui
+${loginType}     ui
+#执行环境是否Widonws
+${systemType}     Windows
+#API配置信息
+${host}           192.168.40.120
+${port}           8080
+${authmode}       1
+${authCode}       ${EMPTY}
+${ldapId}         27
+${version}        v1
+${version2}        v2
+${username}       autotest
+${password}       111111
+${encodePassword}    ${EMPTY}
+${token}          ${EMPTY}
+#[Documentation]    测试终端IP统一配置
+${testClentIP}    192.168.41.255
+${testSubscriberID}    $test2552
+#自动化标签
+${userTagIds}     ${EMPTY}
+#Documentation]    是否添加测试终端IP到策略统一配置，0为不添加测试终端IP，1为添加测试终端IP，默认1
+${addTestClentIPFlag}    0
+#执行需要暂停时间
+#策略下发后到验证需等待时间
+${policyVerificationSleepSeconds}    20
+#策略验证后到验证策略日志需等待时间
+${policyLogVerificationSleepSeconds}    60
+${path}           F:/tsg-git/tsg_autotest/05-Other/
+${currentpath}           E:/auto_git/eclipsegit/tsg_autotest/
+${curlbatpath}    ${path}/curl/
+${mailpath}       ${path}/mail/
+${responsePageFiles}    ${path}/response_pages_files/
+#全流程分阶段测试参数
+#[Documentation]    当前测试部分，all为一个终端全网全流程测试，
+#1为添加策略和对象测试；
+#2为功能端业务验证部分测试；
+#3为llog日志验证测试
+${testPart}       all
+#UI配置的本地IP名称
+${LocahIPName}    ${EMPTY}
+${ipType}         ipv4
+${ipMask}         255.255.255.255
+${browserType}    chrome
+# Cli自动化测试变量[start]
+${cliHost}        192.168.40.165
+${cliUsername}    tsgadmin
+${cliPassword}    Cli2019
+${timeout}        600s
+${retryInterval}    300s
+@{PolicyTypes}    tsg_security    pxy_manipulation
+@{ObjectTypes}    ip    url    fqdn    keywords    subscriberid    fqdn_category    account
+...               http_signature
+# Cli自动化测试变量[end]
+# SNMP服务测试变量[start]
+${snmpHost}       192.168.40.165
+${snmpPort}       50161
+${snmpConnTimeout}    5    # 默认超时时间为6s，设置timeout值后超时时间为n*6s
+${snmpCommunity}    public
+# SNMP服务测试变量[end]
+#API配置信息
+${oamHost}	192.168.40.210
+${oamPort}	50080