WS2016 DFL/FFL Support

Adding WS2016 DFL/FFL support to tests
ExchangeAnalyzer · Dec 6, 2018 · 29377c4 · 29377c4
1 parent bda62c5
commit 29377c4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/Tests/AD001.ps1 b/Tests/AD001.ps1
@@ -68,7 +68,12 @@ Function Run-AD001()
                         Oldest = ($ExchangeServers | Sort AdminDisplayVersion -Descending)[-1].AdminDisplayVersion
                         }
 
-    if ($ExchangeVersions.Newest -like "Version 15.1*")
+    if ($ExchangeVersions.Newest -like "Version 15.2*")
+    {
+        $MinFunctionalLevel = 6
+        $MinFunctionalLevelText = "Windows Server 2012 R2"
+    }
+    elseif ($ExchangeVersions.Newest -like "Version 15.1*")
     {
         $MinFunctionalLevel = 3
         $MinFunctionalLevelText = "Windows Server 2008"
@@ -84,6 +89,10 @@ Function Run-AD001()
         $MaxFunctionalLevel = 5
         $MaxFunctionalLevelText = "Windows Server 2012"
     }
+    elseif ($ExchangeVersions.Oldest -like "Version 15.0*")
+    {
+        $MaxFunctionalLevel = 6
+        $MaxFunctionalLevelText = "Windows Server 2012 R2"
     else
     {
         $MaxFunctionalLevel = 7
@@ -109,6 +118,7 @@ Function Run-AD001()
             4 {$dleveltext = "Windows Server 2008 R2"}
             5 {$dleveltext = "Windows Server 2012"}
             6 {$dleveltext = "Windows Server 2012 R2"}
+            7 {$dleveltext = "Windows Server 2016"}
         }
 
         if ($dlevel -ge $MinFunctionalLevel -and $dlevel -le $MaxFunctionalLevel)

diff --git a/Tests/AD002.ps1 b/Tests/AD002.ps1
@@ -56,7 +56,12 @@ Function Run-AD002()
                         Oldest = ($ExchangeServers | Sort AdminDisplayVersion -Descending)[-1].AdminDisplayVersion
                         }
 
-    if ($ExchangeVersions.Newest -like "Version 15.1*")
+    elseif ($ExchangeVersions.Newest -like "Version 15.2*")
+    {
+        $MinFunctionalLevel = 6
+        $MinFunctionalLevelText = "Windows Server 2012 R2"
+    }
+    elseif ($ExchangeVersions.Newest -like "Version 15.1*")
     {
         $MinFunctionalLevel = 3
         $MinFunctionalLevelText = "Windows Server 2008"
@@ -72,10 +77,14 @@ Function Run-AD002()
         $MaxFunctionalLevel = 5
         $MaxFunctionalLevelText = "Windows Server 2012"
     }
-    else
+    elseif ($ExchangeVersions.Oldest -like "Version 15.0*")
     {
         $MaxFunctionalLevel = 6
         $MaxFunctionalLevelText = "Windows Server 2012 R2"
+    else
+    {
+        $MaxFunctionalLevel = 7
+        $MaxFunctionalLevelText = "Windows Server 2016"
     }
 
     Write-Verbose "The Forest Functional level must be:"
@@ -96,6 +105,7 @@ Function Run-AD002()
             4 {$fleveltext = "Windows Server 2008 R2"}
             5 {$fleveltext = "Windows Server 2012"}
             6 {$fleveltext = "Windows Server 2012 R2"}
+            7 {$fleveltext = "Windows Server 2016"}
         }
 
         if ($flevel -ge $MinFunctionalLevel -and $dlevel -le $MaxFunctionalLevel)