1.修改关键字 2. 修改增加Case

01-TestCase/tsg_ui/ui_settings/SystemUsageCase.robot

@@ -1,4 +1,5 @@
 *** Settings ***
+Suite Setup       OpenPages    sidebarAdvanced    Advanced/storageQuota
 Force Tags        tsg-ui    settings    VPN Accounts
 Resource          ../../../03-Variable/bifangapivariable.txt
 Resource          ../../../02-Keyword/tsg_ui/setting/Settings.robot
@@ -7,267 +8,134 @@ Library           OperatingSystem
 *** Test Cases ***
 SystemUsageProxyDisabled
     [Tag]    Positive    UI    Proxy    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Proxy_Disabled
+    SystemUsagePolicyVerification    Proxy_Disabled    Disabled
     
 SystemUsageProxyEnabled
     [Tag]    Positive    UI    Proxy    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Proxy_Enabled
+    SystemUsagePolicyVerification    Proxy_Enabled    Enabled
     
 SystemUsageSecurityDisabled
     [Tag]    Positive    UI    Security    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Security_Disabled
+    SystemUsagePolicyVerification    Security_Disabled    Disabled
     
 SystemUsageSecurityEnabled
     [Tag]    Positive    UI    Security    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Security_Enabled
+    SystemUsagePolicyVerification    Security_Enabled    Enabled
     
 SystemUsageWANNATDisabled
     [Tag]    Positive    UI    WANNAT    Settings    SystemUsage    
-    SystemUsagePolicyVerification    WANNAT_Disabled
+    SystemUsagePolicyVerification    WANNAT_Disabled    Disabled
     
 SystemUsageWANNATEnabled
     [Tag]    Positive    UI    WANNAT    Settings    SystemUsage    
-    SystemUsagePolicyVerification    WANNAT_Enabled
+    SystemUsagePolicyVerification    WANNAT_Enabled    Enabled
     
 SystemUsageProxyTCPOptionsDisabled
     [Tag]    Positive    UI    ProxyTCPOptions    Settings    SystemUsage    
-    SystemUsagePolicyVerification    ProxyTCPOptions_Disabled
+    SystemUsagePolicyVerification    ProxyTCPOptions_Disabled    Disabled
     
 SystemUsageProxyTCPOptionsEnabled
     [Tag]    Positive    UI    ProxyTCPOptions    Settings    SystemUsage    
-    SystemUsagePolicyVerification    ProxyTCPOptions_Enabled
-    
-SystemUsageProxySQLDisabled
-    [Tag]    Positive    UI    Proxy    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    Proxy_Disabled    Disabled
-    
-SystemUsageProxySQLEnabled
-    [Tag]    Positive    UI    Proxy    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    Proxy_Enabled    Enabled
-
-SystemUsageSecuritySQLDisabled
-    [Tag]    Positive    UI    Security    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    Security_Disabled    Disabled
-    
-SystemUsageSecuritySQLEnabled
-    [Tag]    Positive    UI    Security    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    Security_Enabled    Enabled    
-
-SystemUsageWANNATSQLDisabled
-    [Tag]    Positive    UI    WANNAT    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    WANNAT_Disabled    Disabled 
-    
-SystemUsageWANNATSQLEnabled
-    [Tag]    Positive    UI    WANNAT    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    WANNAT_Enabled    Enabled
-    
-SystemUsageProxyTCPOptionsSQLDisabled
-    [Tag]    Positive    UI    ProxyTCPOptions    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    ProxyTCPOptions_Disabled    Disabled
-    
-SystemUsageProxyTCPOptionsSQLEnabled
-    [Tag]    Positive    UI    ProxyTCPOptions    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    ProxyTCPOptions_Enabled    Enabled  
+    SystemUsagePolicyVerification    ProxyTCPOptions_Enabled    Enabled
     
 #*******************************************************Objects*************************************************************************
 
 SystemUsageObjectAccountsItems
     [Tag]    Positive    UI    Accounts    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Accounts_Items
+    SystemUsageObjectsVerification    Accounts_Items
     
 SystemUsageObjectAccountsObjects
     [Tag]    Positive    UI    Accounts    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Accounts_Objects
+    SystemUsageObjectsVerification    Accounts_Objects
     
 SystemUsageObjectFQDNsItems
     [Tag]    Positive    UI    FQDNs    Settings    SystemUsage    
-    SystemUsagePolicyVerification    FQDNs_Items
+    SystemUsageObjectsVerification    FQDNs_Items
     
 SystemUsageObjectFQDNsObjects
     [Tag]    Positive    UI    FQDNs    Settings    SystemUsage    
-    SystemUsagePolicyVerification    FQDNs_Objects
+    SystemUsageObjectsVerification    FQDNs_Objects
     
 SystemUsageObjectHTTPSignaturesItems
     [Tag]    Positive    UI    HTTPSignatures    Settings    SystemUsage    
-    SystemUsagePolicyVerification    HTTPSignatures_Items
+    SystemUsageObjectsVerification    HTTPSignatures_Items
     
 SystemUsageObjectHTTPSignaturesObjects
     [Tag]    Positive    UI    HTTPSignatures    Settings    SystemUsage    
-    SystemUsagePolicyVerification    HTTPSignatures_Objects
+    SystemUsageObjectsVerification    HTTPSignatures_Objects
     
 SystemUsageObjectKeywordsItems
     [Tag]    Positive    UI    Keywords    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Keywords_Items
+    SystemUsageObjectsVerification    Keywords_Items
     
 SystemUsageObjectKeywordsObjects
     [Tag]    Positive    UI    Keywords    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Keywords_Objects
+    SystemUsageObjectsVerification    Keywords_Objects
     
 SystemUsageObjectSubscriberIDsItems
     [Tag]    Positive    UI    SubscriberIDs    Settings    SystemUsage    
-    SystemUsagePolicyVerification    SubscriberIDs_Items
+    SystemUsageObjectsVerification    SubscriberIDs_Items
     
 SystemUsageObjectSubscriberIDsObjects 
     [Tag]    Positive    UI    SubscriberIDs    Settings    SystemUsage    
-    SystemUsagePolicyVerification    SubscriberIDs_Objects
+    SystemUsageObjectsVerification    SubscriberIDs_Objects
 
 SystemUsageObjectURLsItems
     [Tag]    Positive    UI    URLs    Settings    SystemUsage    
-    SystemUsagePolicyVerification    URLs_Items
+    SystemUsageObjectsVerification    URLs_Items
     
 SystemUsageObjectURLsObjects
     [Tag]    Positive    UI    URLs    Settings    SystemUsage    
-    SystemUsagePolicyVerification    URLs_Objects
+    SystemUsageObjectsVerification    URLs_Objects
     
 SystemUsageObjectIPAddressesIPV4Items
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_IPV4_Items
+    SystemUsageObjectsVerification    IPAddresses_IPV4_Items
     
 SystemUsageObjectIPAddressesIPV6Items
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_IPV6_Items
+    SystemUsageObjectsVerification    IPAddresses_IPV6_Items
     
 SystemUsageObjectIPAddressesIPObjects
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_IP_Objects
+    SystemUsageObjectsVerification    IPAddresses_IP_Objects
     
 SystemUsageObjectIPAddressesGeographyItems
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_Geography_Items
+    SystemUsageObjectsVerification    IPAddresses_Geography_Items
     
 SystemUsageObjectIPAddressesGeographyObjects
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_Geography_Objects
+    SystemUsageObjectsVerification    IPAddresses_Geography_Objects
     
 SystemUsageObjectIPAddressesIPLearningItems(IPv4)
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_IPLearning_Items(IPv4)
+    SystemUsageObjectsVerification    IPAddresses_IPLearning_Items(IPv4)
     
 SystemUsageObjectIPAddressesIPLearningObjects
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_IPLearning_Objects
+    SystemUsageObjectsVerification    IPAddresses_IPLearning_Objects
     
 SystemUsageObjectApplicationsObjects
     [Tag]    Positive    UI    Applications    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Applications_Objects
+    SystemUsageObjectsVerification    Applications_Objects
     
 SystemUsageObjectApplicationsItems
     [Tag]    Positive    UI    Applications    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Applications_Items
+    SystemUsageObjectsVerification    Applications_Items
     
 SystemUsageObjectApplicationsGroupsObjects
     [Tag]    Positive    UI    Applications    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Applications_Groups_Objects
+    SystemUsageObjectsVerification    Applications_Groups_Objects
     
 SystemUsageObjectApplicationsGroupsItems
     [Tag]    Positive    UI    Applications    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Applications_Groups_Items
+    SystemUsageObjectsVerification    Applications_Groups_Items
     
 SystemUsageObjectApplicationsSelectorsObjects
     [Tag]    Positive    UI    Applications    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Applications_Selectors_Objects
+    SystemUsageObjectsVerification    Applications_Selectors_Objects
     
 SystemUsageObjectApplicationsSelectorsItems
     [Tag]    Positive    UI    Applications    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Applications_Selectors_Items
-    
-SystemUsageObjectSQLAccountsItems
-    [Tag]    Positive    UI    Accounts    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Accounts_Items  
-    
-SystemUsageObjectSQLAccountsObjects
-    [Tag]    Positive    UI    Accounts    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Accounts_Objects
-    
-SystemUsageObjectSQLFQDNsItems
-    [Tag]    Positive    UI    FQDNs    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    FQDNs_Items
-    
-SystemUsageObjectSQLFQDNsObjects
-    [Tag]    Positive    UI    FQDNs    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    FQDNs_Objects
-    
-SystemUsageObjectSQLHTTPSignaturesItems
-    [Tag]    Positive    UI    HTTPSignatures    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    HTTPSignatures_Items
-    
-SystemUsageObjectSQLHTTPSignaturesObjects
-    [Tag]    Positive    UI    HTTPSignatures    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    HTTPSignatures_Objects
-    
-SystemUsageObjectSQLKeywordsItems
-    [Tag]    Positive    UI    Keywords    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Keywords_Items
-    
-SystemUsageObjectSQLKeywordsObjects
-    [Tag]    Positive    UI    Keywords    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Keywords_Objects
-
-SystemUsageObjectSQLSubscriberIDsItems
-    [Tag]    Positive    UI    SubscriberIDs    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    SubscriberIDs_Items
-    
-SystemUsageObjectSQLSubscriberIDsObjects
-    [Tag]    Positive    UI    SubscriberIDs    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    SubscriberIDs_Objects
-    
-SystemUsageObjectSQLURLsItems
-    [Tag]    Positive    UI    URLs    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    URLs_Items
-    
-SystemUsageObjectSQLURLsObjects
-    [Tag]    Positive    UI    URLs    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    URLs_Objects
-    
-SystemUsageObjectSQLIPAddressesIPV4Items
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_IPV4_Items
-    
-SystemUsageObjectSQLIPAddressesIPV6Items
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_IPV6_Items
-    
-SystemUsageObjectSQLIPAddressesIPObjects
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_IP_Objects
-    
-SystemUsageObjectSQLIPAddressesGeographyItems
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_Geography_Items
-    
-SystemUsageObjectSQLIPAddressesGeographyObjects
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_Geography_Objects
-    
-SystemUsageObjectSQLIPAddressesIPLearningItems(IPv4)
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_IPLearning_Items(IPv4)
-    
-SystemUsageObjectSQLIPAddressesIPLearningObjects
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_IPLearning_Objects
-    
-SystemUsageObjectSQLIPApplicationsItems
-    [Tag]    Positive    UI    Applications    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Applications_Items
-    
-SystemUsageObjectSQLIPApplicationsObjects
-    [Tag]    Positive    UI    Applications    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Applications_Objects
-    
-SystemUsageObjectSQLIPApplicationsGroupsObjects
-    [Tag]    Positive    UI    Applications    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Applications_Groups_Objects
-    
-SystemUsageObjectSQLApplicationsGroupsItems
-    [Tag]    Positive    UI    Applications    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Applications_Groups_Items
-    
-SystemUsageObjectSQLApplicationsSelectorsObjects
-    [Tag]    Positive    UI    Applications    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Applications_Selectors_Objects
-    
-SystemUsageObjectSQLApplicationsSelectorsItems
-    [Tag]    Positive    UI    Applications    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Applications_Selectors_Items    
-    
+    SystemUsageObjectsVerification    Applications_Selectors_Items