diff --git a/01-TestCase/tsg_ui/Administration/LDAPServerCase.robot b/01-TestCase/tsg_ui/Administration/LDAPServerCase.robot
new file mode 100644
index 0000000..4291808
--- /dev/null
+++ b/01-TestCase/tsg_ui/Administration/LDAPServerCase.robot
@@ -0,0 +1,156 @@
+*** Settings ***
+Force Tags        tsg-ui    LDAP Server
+Resource          ../../../02-Keyword/tsg_ui/administration/Administration.robot
+Library           OperatingSystem
+*** Test Cases ***
+
+CreateLDAPServer
+    [Tags]    Positive    UI    Administration    LDAP Server
+    ${list}    Create List    ${TEST NAME}    192.168.40.120    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    21
+    CreateLDAPServer       ${list}
+    LDAPServerSearch    ${TEST NAME}    name
+    Assertion    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span    ${TEST NAME}
+    DeleteLDAPServer
+    
+CreateLDAPServerEnableANDADCAuthenticationOpen
+    [Tags]    Positive    UI    Administration    LDAP Server
+    ${list}    Create List    ${TEST NAME}    192.168.40.120    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    21
+    LDAPVerificationADC    192.168.40.120    close
+    CreateLDAPServer       ${list}    open    open
+    LDAPServerSearch    ${TEST NAME}    name
+    Assertion-ElementAttributes    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[7]/div/div/span/div    el-switch is-checked    class
+    Assertion-ElementAttributes    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[9]/div/div/span/div    el-switch is-checked    class
+    DeleteLDAPServer
+    LDAPVerificationADC    192.168.40.120    open
+    
+EditLDAPServer
+    [Tags]    Positive    UI    Administration    LDAP Server
+    ${list}    Create List    CreateLDAPServer    192.168.40.120    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    21
+    ${list1}    Create List    ${TEST NAME}    192.168.40.120    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    22
+    CreateLDAPServer       ${list}
+    LDAPServerSearch    CreateLDAPServer    name
+    ${id}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span/span
+    EditLDAPServer    ${list1}    open
+    LDAPServerSearch    ${id}    id
+    Assertion    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span    ${TEST NAME}
+    DeleteLDAPServer
+    
+LDAPServerClickOn/OffButton
+    [Tags]    Positive    UI    Administration    LDAP Server
+    AdminOpenPages    sidebarsystem_LadpServer    sidebarsystem_LadpServer
+    LDAPServerSearch    9    id
+    ${text1}    Get Element Attribute    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[7]/div/div/span/div    class
+    click element    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[7]/div/div/span/div/span
+    AdminOpenPages    sidebarsystem_LadpServer    sidebarsystem_LadpServer
+    LDAPServerSearch    9    id
+    ${text2}    Get Element Attribute    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[7]/div/div/span/div    class
+    Should Not Be Equal    ${text1}    ${text2}
+    click element    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[7]/div/div/span/div/span
+    
+LDAPServerClickADCAuthenticationButton
+    [Tags]    Positive    UI    Administration    LDAP Server
+    AdminOpenPages    sidebarsystem_LadpServer    sidebarsystem_LadpServer
+    LDAPServerSearch    9    id
+    ${text1}    Get Element Attribute    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[9]/div/div/span/div    class
+    click element    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[9]/div/div/span/div/span
+    AdminOpenPages    sidebarsystem_LadpServer    sidebarsystem_LadpServer
+    LDAPServerSearch    9    id
+    ${text2}    Get Element Attribute    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[9]/div/div/span/div    class
+    Should Not Be Equal    ${text1}    ${text2}
+    click element    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[9]/div/div/span/div/span
+    
+LDAPServer
+    [Tags]    Positive    UI    Administration    LDAP Server
+    AdminOpenPages    sidebarsystem_LadpServer    sidebarsystem_LadpServer
+    AuditLogs-PagingDisplay    50
+    
+CreateLDAPServerNameMinSize
+    [Tags]    Boundary    UI    Administration    LDAP Server
+    ${list}    Create List    1    192.168.40.120    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    21
+    CreateLDAPServer       ${list}
+    LDAPServerSearch    1    name
+    Assertion    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span    1
+    DeleteLDAPServer
+    
+CreateLDAPServerNameMaxSize
+    [Tags]    Boundary    UI    Administration    LDAP Server
+    ${name}    Set Variable    CreateLDAPServerNameMaxSizeCreateLDAPServerNameMaxSizeCreateLDAPServerNameMaxSizeCreateLDAPServerNameMaxSizeCreateLDAPServerName
+    ${list}    Create List    ${name}    192.168.40.120    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    21
+    CreateLDAPServer       ${list}
+    LDAPServerSearch    ${name}    name
+    Assertion    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span    ${name}
+    DeleteLDAPServer
+    
+CreateLDAPServerNameSpecialChar
+    [Tags]    Boundary    UI    Administration    LDAP Server
+    ${name}    Set Variable    中文+absc+моряков+@#￥%……&*
+    ${list}    Create List    ${name}    192.168.40.120    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    21
+    CreateLDAPServer       ${list}
+    LDAPServerSearch    ${name}    name
+    Assertion    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span    ${name}
+    DeleteLDAPServer
+    
+CreateLDAPServerConnectionTimeoutMinimum
+    [Tags]    Boundary    UI    Administration    LDAP Server
+    ${list}    Create List    ${TEST NAME}    192.168.40.120    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    1
+    CreateLDAPServer       ${list}
+    LDAPServerSearch    ${TEST NAME}    name
+    Assertion    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span    ${TEST NAME}
+    DeleteLDAPServer
+    
+CreateLDAPServerConnectionTimeoutMax
+    [Tags]    Boundary    UI    Administration    LDAP Server
+    ${list}    Create List    ${TEST NAME}    192.168.40.120    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    60
+    CreateLDAPServer       ${list}
+    LDAPServerSearch    ${TEST NAME}    name
+    Assertion    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span    ${TEST NAME}
+    DeleteLDAPServer
+
+CreateLDAPServerErrorHost
+    [Tags]    Negtive    UI    Administration    LDAP Server
+    ${list}    Create List    ${TEST NAME}    192.168.40.12    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    21
+    CreateLDAPServer       ${list}    NoOKButton=2
+    Assertion    /html/body/div[last()]/p    Test connection failed
+    
+CreateLDAPServerErrorPort
+    [Tags]    Negtive    UI    Administration    LDAP Server
+    ${list}    Create List    ${TEST NAME}    192.168.40.12    38    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    21
+    CreateLDAPServer       ${list}    NoOKButton=2
+    Assertion    /html/body/div[last()]/p    Test connection failed
+    
+CreateLDAPServerErrorUserName
+    [Tags]    Negtive    UI    Administration    LDAP Server
+    ${list}    Create List    ${TEST NAME}    192.168.40.12    389    test    uid    dc=bifang,dc=com    111111    21
+    CreateLDAPServer       ${list}    NoOKButton=2
+    Assertion    /html/body/div[last()]/p    Test connection failed
+    
+CreateLDAPServerErrorPassword
+    [Tags]    Negtive    UI    Administration    LDAP Server
+    ${list}    Create List    ${TEST NAME}    192.168.40.12    389    cn=root,dc=bifang,dc=com    ui    dc=bifang,dc    11    21
+    CreateLDAPServer       ${list}    NoOKButton=2
+    Assertion    /html/body/div[last()]/p    Test connection failed
+    
+CreateLDAPServerPortExceedMax
+    [Tags]    Negtive    UI    Administration    LDAP Server
+    AdminOpenPages    sidebarsystem_LadpServer    sidebarsystem_LadpServer
+    click element    id=ldapAdd
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[3]/div/div[1]/input    65536
+    click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[1]/label
+    sleep    1
+    Assertion    //*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[3]/div/div[2]    save LDAP config port cannot be empty or must between 1 ~ 65535.
+    
+CreateLDAPServerConnectionTimeoutExceedMax
+    [Tags]    Boundary    UI    Administration    LDAP Server
+    ${list}    Create List    ${TEST NAME}    192.168.40.120    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    60
+    CreateLDAPServer       ${list}
+    LDAPServerSearch    ${TEST NAME}    name
+    Assertion    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span    ${TEST NAME}
+    DeleteLDAPServer
+    
+
+    
+
+    
+
+    
diff --git a/01-TestCase/tsg_ui/ui_settings/ProxyTCPOptionsCase.robot b/01-TestCase/tsg_ui/ui_settings/ProxyTCPOptionsCase.robot
deleted file mode 100644
index d5832e6..0000000
--- a/01-TestCase/tsg_ui/ui_settings/ProxyTCPOptionsCase.robot
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Settings ***
-Force Tags        tsg-ui    settings    Proxy TCP Options
-Resource          ../../../03-Variable/bifangapivariable.txt
-Resource          ../../../02-Keyword/tsg_ui/setting/Settings.robot
-Library           OperatingSystem
-Resource          ../../../02-Keyword/tsg_ui/objects/NewObjectPages.robot
-Resource          ../../../02-Keyword/tsg_ui/objects/NewObject.robot
-*** Test Cases ***
\ No newline at end of file
diff --git a/02-Keyword/tsg_ui/administration/Administration.robot b/02-Keyword/tsg_ui/administration/Administration.robot
index 68d82d4..ff4608f 100644
--- a/02-Keyword/tsg_ui/administration/Administration.robot
+++ b/02-Keyword/tsg_ui/administration/Administration.robot
@@ -22,7 +22,7 @@ AdminOpenPages
     ...    AND    click element    id=${Three-levelMenu}
     run keyword if    "${Targeting}"=="xpath"    run keywords    sleep    1
     ...    AND    click element    ${Targeting}=${Three-levelMenu}     
-    sleep    1
+    sleep    1   
     
 UserCreatePage
     [Arguments]    ${name}    ${username}    ${accPasswd}    ${Required_Password_Change}    ${day}    ${accEnable}    ${role} 
@@ -61,7 +61,7 @@ UserEdit
     click element    id=userEdit
     Sleep    1
     input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div/input    ${password}
-    sleep    1
+    sleep    1 
     input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[4]/div/div/input    ${password}
     Sleep    1
     run keyword if   "${enable}"=="close"    run keywords    click element   xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[6]/div/div
@@ -242,7 +242,122 @@ LoginLogsSearch
     click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/i
     sleep    2
     
-
+CreateLDAPServer
+    [Arguments]    ${list}    ${Enbale}=close    ${ADCAuthentication}=close    ${NoOKButton}=1
+    [Documentation]
+    ...    ${Name}:LDAP服务器名称    ${Host}：主机地址    ${Port}：端口号    ${UserName} ：用户名    ${UserMapper-prefix}：用户映射左匹配    ${UserMapper-suffix}：用户映射器右匹配
+    ...    ${Password}：密码    ${ConnectionTimeout}：链接超时时间    ${Enbale};是否生效默认为关闭（open开启）    ${ADCAuthentication}：ADC认证默认关闭（open开启）    ${NoOKButton}=1不点击OK按钮
+    AdminOpenPages    sidebarsystem_LadpServer    sidebarsystem_LadpServer
+    click element    id=ldapAdd
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[1]/div/div[1]/input    ${list}[0]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[2]/div/div[1]/input    ${list}[1]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[3]/div/div/input    ${list}[2]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[4]/div/div[1]/input    ${list}[3]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[5]/div/div[1]/input    ${list}[4]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[5]/div/div[2]/input    ${list}[5]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[6]/div/div/input    ${list}[6]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[8]/div/div/div/input    ${list}[7]
+    sleep    1
+    run keyword if    "${Enbale}"!= "close"    run keywords    sleep    1
+    ...    AND    click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[7]/div/div/span
+    ...    AND    sleep    1
+    ...    ELSE    log    不开启Enable按钮
+    run keyword if    "${ADCAuthentication}"!= "close"    run keywords    sleep    1
+    ...    AND    click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[9]/div/div/span
+    ...    AND    sleep    1
+    ...    ELSE    log    不开启ADCAuthentication按钮
+    click element    id=ldapTestConnection
+    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    20
+    run keyword if    "${NoOKButton}"== "1"    run keywords    sleep    1
+    ...    AND    click element    id=ldapAddSuccess
+    sleep    2
+    
+EditLDAPServer
+    [Arguments]    ${list}    ${Enbale}=close    ${ADCAuthentication}=close
+    [Documentation]
+    ...    ${Name}:LDAP服务器名称    ${Host}：主机地址    ${Port}：端口号    ${UserName} ：用户名    ${UserMapper-prefix}：用户映射左匹配    ${UserMapper-suffix}：用户映射器右匹配
+    ...    ${Password}：密码    ${ConnectionTimeout}：链接超时时间    ${Enbale};是否生效默认为关闭（open开启）    ${ADCAuthentication}：ADC认证默认关闭（open开启)
+    sleep    2
+    click element    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    sleep    1
+    click element    id=ldapEdit
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[4]/div/div[1]/input    ${list}[0]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[5]/div/div[1]/input    ${list}[1]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[6]/div/div/input    ${list}[2]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[7]/div/div[1]/input    ${list}[3]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[8]/div/div[1]/input    ${list}[4]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[8]/div/div[2]/input    ${list}[5]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[9]/div/div/input    ${list}[6]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[11]/div/div/div/input    ${list}[7]
+    sleep    1
+    run keyword if    "${Enbale}"!= "close"    run keywords    sleep    1
+    ...    AND    click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[10]/div/div/span
+    ...    AND    sleep    1
+    ...    ELSE    log    不开启Enable按钮
+    run keyword if    "${ADCAuthentication}"!= "close"    run keywords    sleep    1
+    ...    AND    click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[12]/div/div/span
+    ...    AND    sleep    1
+    ...    ELSE    log    不开启ADCAuthentication按钮
+    click element    id=ldapTestConnection
+    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    20
+    click element    id=ldapAddSuccess
+    sleep    2
+    
+DeleteLDAPServer
+    sleep    1
+    click element    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    sleep    1
+    click element    id=ldapDel
+    sleep    2
+    click element    xpath=/html/body/div/div/div[3]/button[2]
+    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    20
+    
+LDAPServerSearch
+    [Arguments]    ${value}    ${search}
+    Wait Until Element Is Enabled    id=ldapAdd    20
+    click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div/div/input
+    sleep    1
+    run keyword if    "${search}" == "id"    run keywords    sleep    1
+    ...    AND    click element    xpath=/html/body/div/div[1]/div[1]/ul/li[2]
+    run keyword if    "${search}" == "name"    run keywords    sleep    1
+    ...    AND    click element    xpath=/html/body/div/div[1]/div[1]/ul/li[3]
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div/div[3]/div/input    ${value}
+    sleep    2
+    click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/i
+    sleep    2
+    
+LDAPVerificationADC
+    [Arguments]    ${name}    ${type}
+    [Documentation]    验证name的ADC按钮是否开启，同一个服务ADC只能开启一个
+    ...    ${name}：要查询的LDAPServer的名称
+    ...    ${type}:判断开启和关闭（close / open）
+    AdminOpenPages    sidebarsystem_LadpServer    sidebarsystem_LadpServer
+    LDAPServerSearch    ${name}    name
+    ${text}    Get Element Attribute    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[9]/div/div/span/div    class
+    sleep    1
+    run keyword if    "${text}" != "el-switch" and "${type}"=="close"    run keywords    sleep    1
+    ...    AND    click element    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[9]/div/div/span/div
+    run keyword if    "${text}" != "el-switch is-checked" and "${type}"=="open"    run keywords    sleep    1
+    ...    AND    click element    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[9]/div/div/span/div
+    sleep    1
+ 
 Login
     [Arguments]    ${UserName}    ${Password}
     Mouse Hover    xpath=//*[@id="app"]/div/div[1]/div[2]/div/span/div/span
@@ -358,5 +473,10 @@ Assertion
     ${text}    Get text    xpath=${assertxpath}
     Should Be Equal As Strings    ${text}    ${asserttext}
     
+Assertion-ElementAttributes
+    [Arguments]    ${assertxpath}    ${asserttext}    ${Element} 
+    ${text}    Get Element Attribute    xpath=${assertxpath}    ${Element} 
+    Should Be Equal As Strings    ${text}    ${asserttext}
+    
 
      
diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot
index b6dcaf9..adb9359 100644
--- a/02-Keyword/tsg_ui/setting/Settings.robot
+++ b/02-Keyword/tsg_ui/setting/Settings.robot
@@ -264,142 +264,6 @@ VPNAccountsDelete
     click    xpath=/html/body/div/div/div[3]/button[2]
     sleep    2
     
-Create-Proxy-TCP-Options
-    [Arguments]    ${name}    ${ip-type}    ${ip-value}    ${ip-type1}    ${ip-value1}    ${Client-ttl-value}    ${Client-User-Timeout}    ${Server-ttl-value}    ${Server-User-Timeout}    ${search}
-    ...    ${Filter}=1    ${Source}=yes    ${Destination}=1    ${sni-type}=FQDN    ${sni-value}=test-.com    ${Enable-TCP-Passthrough}=1    ${Bypass-Duplicated-Packet}=1    ${Client-Override-MSS}=1
-    ...    ${Client-MSS-value}=1000    ${Client-No-Delay}=1    ${Client-Keepalive}=1    ${Client-Probe-Number}=1    ${Client-Idle-Time}=30    ${Client-Interval}=15
-    ...    ${Server-Override-MSS}=1    ${Server-MSS-value}=100    ${Server-No-Delay}=1    ${Server-Keepalive}=1    ${Server-Probe-Number}=1    ${Server-Idle-Time}=30    ${Server-Interval}=15
-    Sleep    1
-    click    id=children6    #点击一级目录Settings
-    Sleep    1
-    click    id=sidebarAdvanced    #点击Advanced按钮
-    sleep    1
-    click    id=Advanced/advanced    #点击Proxy-TCP-Options
-    sleep    1
-    click    id=proxyTCPCreate    #点击Create按钮
-    sleep    1
-    input    id=advancedAdd_policyName    ${name}    #输入name
-    sleep    1
-    #判断是否添加源ip，${Source}=yes,为添加源ip，否则不添加源ip
-    run keyword if    "${Source}"=="yes"    run keywords    sleep    1
-    ...    AND    click    xpath=/html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[2]/div[1]/div/div    #点击添加源ip
-    ...    AND    sleep    1
-    ...    AND    Source-or-Destination-Search    ${ip-type}    #判断添加源ip的类型
-    ...    AND    sleep    1
-    ...    AND    input    id=objectName_seach    ${ip-value}    #输入搜索内容
-    ...    AND    sleep    1    
-    ...    AND    press keys    id=objectName_seach    ENTER    #回车搜索
-    ...    AND    sleep    1
-    ...    AND    click    xpath=/html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[5]/div[1]/div[2]/div[1]/div[2]/div[2]/div/div[2]/div/div/ul/li[1]/span/label    #点击搜索到的列表
-    ...    AND    sleep    1    
-    ...    AND    click    id=interceptionadd_allcancelobjec8tSource    #点击close按钮关闭侧滑
-    ...    ELSE    log    不添加源ip
-    #判断是否添加目的ip，${Destination}=yes,为添加目的ip，否则不添加目的ip
-    run keyword if    "${Destination}"=="yes"    run keywords    sleep    1
-    ...    AND    click    xpath=/html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[3]/div[1]/div/div    #点击添加源ip
-    ...    AND    sleep    1
-    ...    AND    Source-or-Destination-Search    ${ip-type1}    #判断添加源ip的类型
-    ...    AND    sleep    1
-    ...    AND    input    id=objectName_seach    ${ip-value1}    #输入搜索内容
-    ...    AND    sleep    1    
-    ...    AND    press keys    id=objectName_seach    ENTER    #回车搜索
-    ...    AND    sleep    1
-    ...    AND    click    xpath=/html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[5]/div[1]/div[2]/div[1]/div[2]/div[2]/div/div[2]/div/div/ul/li[1]/span/label    #点击搜索到的列表
-    ...    AND    sleep    1    
-    ...    AND    click    id=interceptionadd_allcancelobjec8tSource    #点击close按钮关闭侧滑
-    ...    ELSE    log    不添加目的ip
-    #判断是否添加Filter，${Filter}=yes,为添加Filter，否则不添加Filter
-    run keyword if    "${Filter}"=="yes"    run keywords    sleep    1
-    ...    AND    click    id=interceptionadd_FilterList    #点击添加filter-sni
-    ...    AND    sleep    1
-    ...    AND    click    id=interceptionadd_checkappshow0    #点击SNI
-    ...    AND    sleep    1
-    ...    AND    click    id=interceptionadd_add_filter    #点击添加sni的+号
-    ...    AND    sleep    
-    ...    AND    FQDN-or-Category-Search    ${sni-type}    #判断添加Filter的类型
-    ...    AND    sleep    1
-    ...    AND    input    id=objectName_seach    ${sni-value}    #输入搜索内容
-    ...    AND    sleep    1    
-    ...    AND    press keys    id=objectName_seach    ENTER    #回车搜索
-    ...    AND    sleep    1
-    ...    AND    click    xpath=/html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[5]/div[1]/div[2]/div[1]/div[2]/div[2]/div/div[2]/div/div/ul/li[1]/span/label    #点击搜索到的列表
-    ...    AND    sleep    1    
-    ...    AND    click    id=interceptionadd_allcancelobjec8tSource    #点击close按钮关闭侧滑
-    ...    ELSE    log    不添加Filter
-    #判断是否开启Enable TCP Passthrough按钮，${Enable-TCP-Passthrough}=open,为开启，否则不添开启
-    run keyword if    "${Enable-TCP-Passthrough}"=="open"    run keywords    sleep    1
-    ...    AND    click    id=proxytcpThrough1    #点击Enable-TCP-Passthrough按钮开启
-    ...    AND    sleep    1
-    ...    ELSE    log    不开启
-    #判断是否开启Bypass Duplicated Packet按钮，${Bypass-Duplicated-Packet}=open,为开启，否则不添开启
-    run keyword if    "${Bypass-Duplicated-Packet}"=="open"    run keywords    sleep    1
-    ...    AND    click    id=proxyduplicatedPacket1    #点击Bypass-Duplicated-Packet按钮开启
-    ...    AND    sleep    1
-    ...    ELSE    log    不开启
-    click    id=tab-first    #点击Client-side Parameters
-    sleep    1
-    #判断是否开启Override MSS按钮，${Override-MSS}=open,为开启，否则不添开启
-    run keyword if    "${Client-Override-MSS}"=="open"    run keywords    sleep    1
-    ...    AND    click    xpath=//*[@id="pane-first"]/div/form/div[1]/div/div/span    #点击Override-MSS按钮开启
-    ...    AND    sleep    1
-    ...    AND    input    xpath=//*[@id="pane-first"]/div/form/div[2]/div/div/input    ${Client-MSS-value}    #输入MSS内容
-    ...    AND    sleep    1
-    ...    ELSE    log    不开启
-    #判断是否开启No Delay按钮，${No-Delay}=open,为开启，否则不添开启
-    run keyword if    "${Client-No-Delay}"=="open"    run keywords    sleep    1
-    ...    AND    click    xpath=//*[@id="pane-first"]/div/form/div[2]/div/div/span        #点击No-Delay按钮开启
-    ...    AND    sleep    1
-    ...    ELSE    log    不开启
-    input    xpath=//*[@id="pane-first"]/div/form/div[3]/div/div/input    ${Client-ttl-value}    #输入ttl内容   
-    sleep    1
-    #判断是否开启Keepalive按钮，${Keepalive}=open,为开启，否则不添开启
-    run keyword if    "${Client-Keepalive}"=="open"    run keywords    sleep    1
-    ...    AND    click    xpath=//*[@id="pane-first"]/div/form/div[4]/div/div/span        #点击Keepalive按钮开启
-    ...    AND    sleep    1
-    ...    AND    input    xpath=//*[@id="pane-first"]/div/form/div[5]/div/form/div[1]/div/div/input    ${Client-Probe-Number}    #输入Probe Number内容
-    ...    AND    sleep    1
-    ...    AND    input    xpath=//*[@id="pane-first"]/div/form/div[5]/div/form/div[2]/div/div/input    ${Client-Idle-Time}    #输入Idle Time内容
-    ...    AND    sleep    1
-    ...    AND    input    xpath=//*[@id="pane-first"]/div/form/div[5]/div/form/div[3]/div/div/input   ${Client-Interval}    #输入Interval内容
-    ...    AND    sleep    1
-    ...    ELSE    log    不开启
-    input    xpath=//*[@id="pane-first"]/div/form/div[5]/div/div/input    ${Client-User-Timeout}    #输入User Timeout内容
-    sleep    1  
-    click    id=tab-second    #点击Server-side Parameters
-    sleep    1
-    #判断是否开启Override MSS按钮，${Override-MSS}=open,为开启，否则不添开启
-    run keyword if    "${Server-Override-MSS}"=="open"    run keywords    sleep    1
-    ...    AND    click    xpath=//*[@id="pane-second"]/div/form/div[1]/div/div/span    #点击Override-MSS按钮开启
-    ...    AND    sleep    1
-    ...    AND    input    xpath=//*[@id="pane-second"]/div/form/div[2]/div/div/input    ${Server-MSS-value}    #输入MSS内容
-    ...    AND    sleep    1
-    ...    ELSE    log    不开启
-    #判断是否开启No Delay按钮，${No-Delay}=open,为开启，否则不添开启
-    run keyword if    "${Server-No-Delay}"=="open"    run keywords    sleep    1
-    ...    AND    click    xpath=//*[@id="pane-second"]/div/form/div[2]/div/div/span        #点击No-Delay按钮开启
-    ...    AND    sleep    1
-    ...    ELSE    log    不开启
-    input    xpath=//*[@id="pane-second"]/div/form/div[3]/div/div/input    ${Server-ttl-value}    #输入ttl内容   
-    sleep    1
-    #判断是否开启Keepalive按钮，${Keepalive}=open,为开启，否则不添开启
-    run keyword if    "${Server-Keepalive}"=="open"    run keywords    sleep    1
-    ...    AND    click    xpath=//*[@id="pane-second"]/div/form/div[4]/div/div/span        #点击Keepalive按钮开启
-    ...    AND    sleep    1
-    ...    AND    input    xpath=//*[@id="pane-second"]/div/form/div[5]/div/form/div[1]/div/div/input    ${Server-Probe-Number}    #输入Probe Number内容
-    ...    AND    sleep    1
-    ...    AND    input    xpath=//*[@id="pane-second"]/div/form/div[5]/div/form/div[2]/div/div/input    ${Server-Idle-Time}    #输入Idle Time内容
-    ...    AND    sleep    1
-    ...    AND    input    xpath=//*[@id="pane-second"]/div/form/div[5]/div/form/div[3]/div/div/input   ${Server-Interval}    #输入Interval内容
-    ...    AND    sleep    1
-    ...    ELSE    log    不开启
-    input    xpath=//*[@id="pane-second"]/div/form/div[5]/div/div/input    ${Server-User-Timeout}    #输入User Timeout内容
-    sleep    1    
-    click    id=proxyManipulationSuccess    #点击OK
-    sleep    1
-    Proxy-TCP-Options-Search    ${name}    ${search}    #搜索刚新建的name
-    ${text1}    Get Text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/p    #获取点击后页面文本信息
-    Should Be Equal As Strings    ${text1}    ${name}    #断言
-
 Source-or-Destination-Search
     [Arguments]    ${value}
     run keyword if    "${value}"=="IP"    run keywords    sleep    1
@@ -424,23 +288,6 @@ FQDN-or-Category-Search
     ...    AND    click    id=tab-fqdn_category    #点击category
     ...    AND    sleep    1
  
-Proxy-TCP-Options-Search
-    [Arguments]    ${value}    ${search}
-    Wait Until Element Is Visible    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/div/div[2]/div/div/div[1]/input    20  
-    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/div/div[2]/div/div/div[1]/input    #点击搜索框
-    sleep    1
-    #判断是使用name搜索还是id搜索
-    run keyword if    "${search}"=="Name"    run keywords    sleep    1
-    ...    AND    click   xpath=/html/body/div/div[1]/div[1]/ul/li[3]
-    ...    AND    input    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[2]/div[2]/div/div/div[2]/div/div[1]/div[3]/div/input    ${value}
-    ...    ELSE IF    "${search}"=="ID"    run keywords    sleep    1
-    ...    AND    click   xpath=/html/body/div/div[1]/div[1]/ul/li[2]
-    ...    AND    input    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[2]/div[2]/div/div/div[2]/div/div[1]/div[3]/div/input    ${value}
-    ...    AND    sleep    1
-    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/i    #点击搜索按钮
-    sleep    1
-    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]    #点击搜索到的列表
-    sleep    1
 CreateHijackFiles
     [Arguments]    ${name}    ${file}    ${type}    ${search}    ${shift}=1    ${input1}=1
     Sleep    1