提交安全策略用例优化

01-TestCase/tsg_ui/ui_security/Ui_MonitorMAILCase.robot

@@ -13,14 +13,14 @@ Resource          ../../../02-Keyword/tsg_ui/policy/UIPolicy.robot
 SecurityMonitorMAIL001
     [Tags]    Monitor    MAIL
 
-    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
+    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}${tag}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
     
     ${sourceAddIpList}    Create List    ${sip1}
     
     ${sourceInfo}    Create Dictionary    sourceAddIpList=${sourceAddIpList}
     
     
-    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
+    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}${tag}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
     
     UIPolicies    ${policyInfo}    SourceInfo=${sourceInfo}
  
@@ -29,21 +29,21 @@ SecurityMonitorMAIL001
 SecurityMonitorMAIL002
     [Tags]    Monitor    MAIL    Subject
     #新建Subject
-    CreatePage    Key    single    ${TEST NAME}_Subject    keywordtext=主题测试
+    CreatePage    Key    single    ${TEST NAME}${tag}_Subject    keywordtext=主题测试
 
-    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
+    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}${tag}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
     
     ${sourceAddIpList}    Create List    ${sip1}
     
     ${sourceInfo}    Create Dictionary    sourceAddIpList=${sourceAddIpList}
     
-    ${Subjectname}    create list    ${TEST NAME}_Subject
+    ${Subjectname}    create list    ${TEST NAME}${tag}_Subject
     
     ${filter}    create list    Subject
     
     ${filterInfo}    Create Dictionary    Filter=${filter}    Subjectname=${Subjectname}
     
-    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
+    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}${tag}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
     
 
     UIPolicies    ${policyInfo}    SourceInfo=${sourceInfo}    FilterInfo=${filterInfo}    Subactionadd=${Subactionadd}
@@ -53,21 +53,21 @@ SecurityMonitorMAIL002
 SecurityMonitorMAIL003
     [Tags]    Monitor    MAIL    Content
     #新建Content
-    CreatePage    Key    single    ${TEST NAME}_Content   keywordtext=内容测试
+    CreatePage    Key    single    ${TEST NAME}${tag}_Content   keywordtext=内容测试
 
-    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
+    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}${tag}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
     
     ${sourceAddIpList}    Create List    ${sip1}
     
     ${sourceInfo}    Create Dictionary    sourceAddIpList=${sourceAddIpList}
     
-    ${MAILContentname}    create list    ${TEST NAME}_Content
+    ${MAILContentname}    create list    ${TEST NAME}${tag}_Content
     
     ${filter}    create list    Content
     
     ${filterInfo}    Create Dictionary    Filter=${filter}    MAILContentname=${MAILContentname}
     
-    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
+    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}${tag}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
     
     UIPolicies    ${policyInfo}    SourceInfo=${sourceInfo}    FilterInfo=${filterInfo}    Subactionadd=${Subactionadd}
  
@@ -78,21 +78,21 @@ SecurityMonitorMAIL003
 SecurityMonitorMAIL004
     [Tags]    Monitor    MAIL    Attachment Name
     #新建Attachment Name
-    CreatePage    Key    single    ${TEST NAME}_ AttachmentName   keywordtext=添加附件   
+    CreatePage    Key    single    ${TEST NAME}${tag}_ AttachmentName   keywordtext=添加附件   
 
-    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
+    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}${tag}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
     
     ${sourceAddIpList}    Create List    ${sip1}
     
     ${sourceInfo}    Create Dictionary    sourceAddIpList=${sourceAddIpList}
     
-    ${Attachment Namename}    create list    ${TEST NAME}_ AttachmentName
+    ${Attachment Namename}    create list    ${TEST NAME}${tag}_ AttachmentName
     
     ${filter}    create list    Attachment Name
     
     ${filterInfo}    Create Dictionary    Filter=${filter}    Attachment Namename=${Attachment Namename}
     
-    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
+    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}${tag}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
     
     UIPolicies    ${policyInfo}    SourceInfo=${sourceInfo}    FilterInfo=${filterInfo}
     
@@ -100,42 +100,42 @@ SecurityMonitorMAIL004
 SecurityMonitorMAIL005
     [Tags]    Monitor    MAIL    Attachment Content
     #新建Attachment Content
-    CreatePage    Key    single    ${TEST NAME}_AttachmentContent  keywordtext=附件的内容  
+    CreatePage    Key    single    ${TEST NAME}${tag}_AttachmentContent  keywordtext=附件的内容  
 
-    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
+    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}${tag}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
     
     ${sourceAddIpList}    Create List    ${sip1}
     
     ${sourceInfo}    Create Dictionary    sourceAddIpList=${sourceAddIpList}
     
-    ${Attachment Contentname}    create list    ${TEST NAME}_AttachmentContent
+    ${Attachment Contentname}    create list    ${TEST NAME}${tag}_AttachmentContent
     
     ${filter}    create list    Attachment Content
     
     ${filterInfo}    Create Dictionary    Filter=${filter}    Attachment Contentname=${Attachment Contentname}
     
-    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
+    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}${tag}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
     
     UIPolicies    ${policyInfo}    SourceInfo=${sourceInfo}    FilterInfo=${filterInfo}
     
 SecurityMonitorMAIL006
     [Tags]    Monitor    MAIL    From
     #新建From
-    CreatePage    Account    single    ${TEST NAME}_From    keywordtext=9005
+    CreatePage    Account    single    ${TEST NAME}${tag}_From    keywordtext=9005
     
-    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
+    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}${tag}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
     
     ${sourceAddIpList}    Create List    ${sip1}
     
     ${sourceInfo}    Create Dictionary    sourceAddIpList=${sourceAddIpList}
     
-    ${Fromname}    create list    ${TEST NAME}_From
+    ${Fromname}    create list    ${TEST NAME}${tag}_From
     
     ${filter}    create list    From
     
     ${filterInfo}    Create Dictionary    Filter=${filter}    Fromname=${Fromname}
     
-    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
+    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}${tag}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
     
     UIPolicies    ${policyInfo}    FilterInfo=${filterInfo}
  
@@ -144,21 +144,21 @@ SecurityMonitorMAIL006
 SecurityMonitorMAIL007
     [Tags]    Monitor    MAIL    To
     #新建To
-    CreatePage    Account    single    ${TEST NAME}_To    keywordtext=geedge
+    CreatePage    Account    single    ${TEST NAME}${tag}_To    keywordtext=geedge
     
-    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
+    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}${tag}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
     
     ${sourceAddIpList}    Create List    ${sip1}
     
     ${sourceInfo}    Create Dictionary    sourceAddIpList=${sourceAddIpList}
     
-    ${Toname}    create list    ${TEST NAME}_To
+    ${Toname}    create list    ${TEST NAME}${tag}_To
     
     ${filter}    create list    To
     
     ${filterInfo}    Create Dictionary    Filter=${filter}    Toname=${Toname}
     
-    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
+    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}${tag}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
     
     UIPolicies    ${policyInfo}    FilterInfo=${filterInfo}
  
@@ -167,21 +167,21 @@ SecurityMonitorMAIL007
 SecurityMonitorMAIL008
     [Tags]    Monitor    MAIL    Account
     #新建Account
-    CreatePage    Account    single    ${TEST NAME}_Account   keywordtext=zhang
+    CreatePage    Account    single    ${TEST NAME}${tag}_Account   keywordtext=zhang
     
-    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
+    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}${tag}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
     
     ${sourceAddIpList}    Create List    ${sip1}
     
     ${sourceInfo}    Create Dictionary    sourceAddIpList=${sourceAddIpList}
     
-    ${MAILAccountname}    create list    ${TEST NAME}_Account
+    ${MAILAccountname}    create list    ${TEST NAME}${tag}_Account
     
     ${filter}    create list    Account
     
     ${filterInfo}    Create Dictionary    Filter=${filter}    MAILAccountname=${MAILAccountname}
     
-    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
+    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}${tag}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
     
     UIPolicies    ${policyInfo}    FilterInfo=${filterInfo}
  
@@ -190,31 +190,31 @@ SecurityMonitorMAIL008
 SecurityMonitorMAIL009
     [Tags]    Monitor    MAIL    Subject+Content+From
     #新建Subject
-    CreatePage    Key    single    ${TEST NAME}_Subject    keywordtext=主题测试
+    CreatePage    Key    single    ${TEST NAME}${tag}_Subject    keywordtext=主题测试
     
     #新建Content
-    CreatePage    Key    single    ${TEST NAME}_Content   keywordtext=内容测试
+    CreatePage    Key    single    ${TEST NAME}${tag}_Content   keywordtext=内容测试
 
     #新建From
-    CreatePage    Account    single    ${TEST NAME}_From    keywordtext=9005
+    CreatePage    Account    single    ${TEST NAME}${tag}_From    keywordtext=9005
     
-    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
+    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}${tag}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
     
     ${sourceAddIpList}    Create List    ${sip1}
     
     ${sourceInfo}    Create Dictionary    sourceAddIpList=${sourceAddIpList}
     
-    ${Subjectname}    create list    ${TEST NAME}_Subject
+    ${Subjectname}    create list    ${TEST NAME}${tag}_Subject
     
-    ${MAILContentname}    create list    ${TEST NAME}_Content
+    ${MAILContentname}    create list    ${TEST NAME}${tag}_Content
     
-    ${Fromname}    create list    ${TEST NAME}_From
+    ${Fromname}    create list    ${TEST NAME}${tag}_From
     
     ${filter}    create list    Subject    Content    From
     
     ${filterInfo}    Create Dictionary    Filter=${filter}    Subjectname=${Subjectname}    MAILContentname=${MAILContentname}    Fromname=${Fromname}    
     
-    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
+    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}${tag}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
     
     UIPolicies    ${policyInfo}    FilterInfo=${filterInfo}
  
@@ -223,31 +223,31 @@ SecurityMonitorMAIL009
 SecurityMonitorMAIL010
     [Tags]    Monitor    MAIL    To
     #新建Attachment Name
-    CreatePage    Key    single    ${TEST NAME}_ AttachmentName   keywordtext=添加附件     
+    CreatePage    Key    single    ${TEST NAME}${tag}_ AttachmentName   keywordtext=添加附件     
     
     #新建Attachment Content
-    CreatePage    Key    single    ${TEST NAME}_AttachmentContent  keywordtext=附件的内容  
+    CreatePage    Key    single    ${TEST NAME}${tag}_AttachmentContent  keywordtext=附件的内容  
 
     #新建To
-    CreatePage    Account    single    ${TEST NAME}_To    keywordtext=geedge
+    CreatePage    Account    single    ${TEST NAME}${tag}_To    keywordtext=geedge
     
-    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
+    ${sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}${tag}_IP1    Ipclienttext1=192.168.50.17    Port=1-65535
     
     ${sourceAddIpList}    Create List    ${sip1}
     
     ${sourceInfo}    Create Dictionary    sourceAddIpList=${sourceAddIpList}
     
-    ${Attachment Namename}    create list    ${TEST NAME}_ AttachmentName
+    ${Attachment Namename}    create list    ${TEST NAME}${tag}_ AttachmentName
     
-    ${Attachment Contentname}    create list    ${TEST NAME}_AttachmentContent
+    ${Attachment Contentname}    create list    ${TEST NAME}${tag}_AttachmentContent
     
-    ${Toname}    create list    ${TEST NAME}_To
+    ${Toname}    create list    ${TEST NAME}${tag}_To
     
     ${filter}    create list    Attachment Name    Attachment Content    To
     
     ${filterInfo}    Create Dictionary    Filter=${filter}    Attachment Namename=${Attachment Namename}    Attachment Contentname=${Attachment Contentname}    Toname=${Toname}
     
-    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
+    ${policyInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}${tag}     PolicyAction=Monitor    ApplicationSearch=MAIL    PolicyLogSession=1    PolicyEnabled=1
     
     UIPolicies    ${policyInfo}    FilterInfo=${filterInfo}