Merge pull request #179 from PowerShell/dev

Release of version 1.10.0.0 of xFailOverCluster
dsccommunity · Mar 21, 2018 · 4ae691b · 4ae691b
2 parents 12b59c7 + ab2899f
commit 4ae691b
Show file tree

Hide file tree

Showing 10 changed files with 746 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,16 @@
 
 ## Unreleased
 
+## 1.10.0.0
+
+- Changes to xFailOverCluster
+  - Added xClusterProperty ([issue #169](https://github.com/PowerShell/xFailOverCluster/issues/169)).
+- Changes to xClusterNetwork
+  - Fix the test for the network role never in desired state ([issue #175](https://github.com/PowerShell/xFailOverCluster/issues/175)).
+
 ## 1.9.0.0
 
-- Changes to xFailoverCluster
+- Changes to xFailOverCluster
   - Update Pester syntax to v4
   - Updated year to 2018 in license file and module manifest ([issue #167](https://github.com/PowerShell/xFailOverCluster/issues/167)).
 - Changes to xClusterNetwork

diff --git a/DSCResources/MSFT_xClusterNetwork/MSFT_xClusterNetwork.psm1 b/DSCResources/MSFT_xClusterNetwork/MSFT_xClusterNetwork.psm1
@@ -34,11 +34,25 @@ function Get-TargetResource
         $_.Address -eq $Address -and $_.AddressMask -eq $AddressMask
     }
 
+    <#
+        On Windows Server 2008 R2 and on Windows Server 2012 R2, the property
+        Role is of type System.UInt32. On Windows Server 2016, the property Role
+        is of type Microsoft.FailoverClusters.PowerShell.ClusterNetworkRole.
+    #>
+    if ($NetworkResource.Role -is [System.UInt32])
+    {
+        $role = $NetworkResource.Role
+    }
+    else
+    {
+        $role = $NetworkResource.Role.value__
+    }
+
     @{
         Address     = $Address
         AddressMask = $AddressMask
         Name        = $NetworkResource.Name
-        Role        = $NetworkResource.Role
+        Role        = $role
         Metric      = $NetworkResource.Metric
     }
 }