1、修改重定向不同操作系统使用文件；

2、添加测试时默认添加测试机IP或subid；

02-Keyword/tsg_common/ManagePolicyBody.robot

@@ -183,8 +183,14 @@ AnalysisUserRegion
 ManageReferenceObject
     # 处理引用对象字符串
     [Arguments]    ${policyList}
-    ${emptyList}    Create List
-    Run Keyword If    '${addTestClentIPFlag}'=='1'    ManageClientObject    ${emptyList}
+    ${emptyList}    Create List    
+    #默认客户端条件类型：clientip or clientsubid
+    ${return}    ${defaultClient}    Run Keyword And Ignore Error    Set Variable    ${policyList}[defalutClient]     
+    ${defaultClient}    Run Keyword If    "${return}"=="FAIL" or "${defaultClient}"=="${EMPTY}"    Set Variable    ${Default_Client_Type}  
+    ...    ELSE    Set Variable     ${defaultClient}      
+    Run Keyword If    '${addTestClentIPFlag}'=='1' and '${defaultClient}'=='clientip'    ManageClientIPObject    ${emptyList}
+    Run Keyword If    '${addTestClentIPFlag}'=='1' and '${defaultClient}'=='clientsubid'    ManageClientSubIDObject    ${emptyList} 
+    #Run Keyword If    '${addTestClentIPFlag}'=='1'    ManageClientObject    ${emptyList}
     # Run Keyword If    "${clientHostObj}"!="${None}"    Append To List    ${emptyList}    ${clientHostObj}
     
     ${defaultObj}    Create Dictionary
@@ -199,7 +205,7 @@ ManageReferenceObject
     END
     Set To Dictionary    ${policyList}    referenceObject=${emptyList}   
 
-ManageClientObject
+ManageClientIPObject
     [Arguments]    ${emptyList}    
     # 增加引用测试终端IP策略对象
     ${list1}    Create List    TSG_SECURITY_SOURCE_ADDR        
@@ -208,7 +214,12 @@ ManageClientObject
     # ${list2}    Create List    null        
     # ${obj2}    Create Dictionary    objectId=${testClentSubID}    protocolFields=${list2}      
     # Append To List    ${emptyList}    ${obj2}
-
+ManageClientSubIDObject
+    [Arguments]    ${emptyList}    
+    # 增加引用测试终端IP策略对象
+    ${list1}    Create List      
+    ${obj1}    Create Dictionary    objectId=${testClentSubID}    protocolFields=${list1}
+    Append To List    ${emptyList}    ${obj1}
 
 AnalysisReferenceObject
     # 解析引用对象