Merge pull request #144 from Microsoft/staging

Fix found issues

Author: Jiajun Wang

ProtocolTestManager/Plugins/FileServerPlugin/FileServerPlugin/FileServerValueDetector.cs

@@ -584,7 +584,8 @@ public List<string> GetHiddenProperties(List<CaseSelectRule> rules)
                 string ruleName = rule.Name;
 
                 // SMB2 and FSA have many rules, put them in the beginning to reduce IF statement checker.
-                if (ruleName.StartsWith("Feature.SMB2") && rule.Status == RuleStatus.Selected)
+                if ((ruleName.StartsWith("Feature.Others.SMB2") || ruleName.StartsWith("Feature.Cluster Required.SMB2")) &&
+                    rule.Status == RuleStatus.Selected)
                 {
                     smb2Rules.Add(rule);
                     if (rule.Status == RuleStatus.Selected)
@@ -593,18 +594,19 @@ public List<string> GetHiddenProperties(List<CaseSelectRule> rules)
                     }
 
                 }
-                else if (ruleName.StartsWith("Feature.FSA (File System Algorithms)") && rule.Status == RuleStatus.Selected)
+                else if (ruleName.StartsWith("Feature.Others.FSA (File System Algorithms)") && rule.Status == RuleStatus.Selected)
                 {
                     isFsaSelected = true;
                 }
-                else if ((ruleName == "Feature.File Server Failover"
-                    || ruleName == "Feature.SWN (Service Witness)"
-                    || ruleName == "Feature.FSRVP (File Server Remote VSS)")
+                else if ((ruleName == "Feature.Cluster Required.File Server Failover"
+                    || ruleName == "Feature.Cluster Required.SWN (Service Witness)"
+                    || ruleName == "Feature.Cluster Required.FSRVP (File Server Remote VSS)"
+                    || ruleName == "Feature.Others.FSRVP (File Server Remote VSS)")
                     && rule.Status == RuleStatus.Selected)
                 {
                     isClusterSwnFsrvpSelected = true;
                 }
-                else if (ruleName == "Feature.DFSC (Distributed File System Referral)")
+                else if (ruleName == "Feature.Others.DFSC (Distributed File System Referral)")
                 {
                     if (rule.Status == RuleStatus.Selected)
                     {
@@ -615,14 +617,14 @@ public List<string> GetHiddenProperties(List<CaseSelectRule> rules)
                         hiddenPropertiesList.AddRange(DetectorUtil.GetPropertiesByFile("MS-DFSC_ServerTestSuite.deployment.ptfconfig"));
                     }
                 }
-                else if (ruleName.StartsWith("Feature.RSVD"))
+                else if (ruleName.StartsWith("Feature.Cluster Required.RSVD"))
                 {
                     if (rule.Status == RuleStatus.Selected)
                     {
                         isRsvdSelected = true;
                     }
                 }
-                else if (ruleName == "Feature.SQOS (Storage Quality of Service)")
+                else if (ruleName == "Feature.Cluster Required.SQOS (Storage Quality of Service)")
                 {
                     if (rule.Status == RuleStatus.Selected)
                     {
@@ -633,7 +635,7 @@ public List<string> GetHiddenProperties(List<CaseSelectRule> rules)
                         hiddenPropertiesList.AddRange(DetectorUtil.GetPropertiesByFile("MS-SQOS_ServerTestSuite.deployment.ptfconfig"));
                     }
                 }
-                else if (ruleName.StartsWith("Feature.Auth") && rule.Status == RuleStatus.Selected)
+                else if (ruleName.StartsWith("Feature.Others.Auth") && rule.Status == RuleStatus.Selected)
                 {
                     isAuthSelected = true;
                 }

ProtocolTestManager/Plugins/SMBDPlugin/SMBDPlugin/config.xml

@@ -41,15 +41,15 @@
       </Rule>
 
       <Rule name = "SMB2 over SMBD">
-        <Rule name = "SMB 3.0 or Later">
+        <Rule name = "SMB 30">
           <Rule name = "RDMA Channel">
             <Category name = "Smb2OverRdmaChannel"/>
           </Rule>
           <Rule name = "Multiple Channels">
             <Category name = "Smb2MultipleChannel"/>
           </Rule>
         </Rule>
-        <Rule name = "SMB 3.0.2 or Later">
+        <Rule name = "SMB 302">
           <Rule name = "RDMA Channel Remote Invalidation">
             <Category name = "Smb2OverRdmaChannelInvalidate"/>
           </Rule>

TestSuites/FileServer/docs/FileServerUserGuide.md

@@ -1748,8 +1748,7 @@ Take the share named **SMBBasic** as an example:
 >	![](./image/FileServerUserGuide/image1.png)Note
 
 >	  Prior to creating the cluster, the shared storage needs to be created and added to the failover cluster nodes. For more information about how to do this, please see [5.3.11. Setup SAN Storage Server](#5.3.11)
-
-	![](./image/FileServerUserGuide/image117.png)
+        ![](./image/FileServerUserGuide/image117.png)
 
 4.	Type the computer name of failover cluster nodes.
 
@@ -2380,4 +2379,4 @@ To debug a test case:
 
 3.  When you build the test project, the tests appear in **Test Explorer**. If Test Explorer is not visible, choose **Test** on the Visual Studio menu, choose **Windows**, and then choose **Test Explorer**.
 
-4.  Select your test cases from Test Explorer and run or debug them.
+4.  Select your test cases from Test Explorer and run or debug them.