SqlAgListener: Fix v6 IPs failing Test-TargetResource (#1444)

- SqlAgListener - Fix IPv6 addresses failing Test-TargetResource after listener creation.
dsccommunity · Jan 17, 2020 · 3c2524e · 3c2524e
1 parent 02a766a
commit 3c2524e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,3 +51,5 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
 - SqlAlwaysOnService
   - When failing to enable AlwaysOn the resource should now fail with an
     error ([issue #1190](https://github.com/dsccommunity/SqlServerDsc/issues/1190)).
+- SqlAgListener
+  - Fix IPv6 addresses failing Test-TargetResource after listener creation.
diff --git a/source/DSCResources/MSFT_SqlAGListener/MSFT_SqlAGListener.psm1 b/source/DSCResources/MSFT_SqlAGListener/MSFT_SqlAGListener.psm1
@@ -69,7 +69,14 @@ function Get-TargetResource
             $ipAddress = @()
             foreach ($currentIpAddress in $presentIpAddress)
             {
-                $ipAddress += "$($currentIpAddress.IPAddress)/$($currentIpAddress.SubnetMask)"
+                if ($currentIpAddress.SubnetMask)
+                {
+                    $ipAddress += "$($currentIpAddress.IPAddress)/$($currentIpAddress.SubnetMask)"
+                }
+                else
+                {
+                    $ipAddress += "$($currentIpAddress.IPAddress)"
+                }
             }
         }
         else

diff --git a/tests/Unit/MSFT_SqlAGListener.Tests.ps1 b/tests/Unit/MSFT_SqlAGListener.Tests.ps1
@@ -435,14 +435,19 @@ try
                                     Add-Member -MemberType NoteProperty -Name IsDHCP -Value $false -PassThru |
                                     Add-Member -MemberType NoteProperty -Name IPAddress -Value '192.168.0.1' -PassThru |
                                     Add-Member -MemberType NoteProperty -Name SubnetMask -Value '255.255.255.0' -PassThru
+                            ),
+                            # TypeName: Microsoft.SqlServer.Management.Smo.AvailabilityGroupListenerIPAddressCollection
+                            (New-Object -TypeName Object |    # TypeName: Microsoft.SqlServer.Management.Smo.AvailabilityGroupListenerIPAddress
+                                    Add-Member -MemberType NoteProperty -Name IsDHCP -Value $false -PassThru |
+                                    Add-Member -MemberType NoteProperty -Name IPAddress -Value 'f00::ba12' -PassThru
                             )
                         )
                     } -PassThru -Force
                 } -Verifiable
 
                 It 'Should return that desired state is present when wanted desired state is to be Present, without DHCP' {
                     $testParameters['Ensure'] = 'Present'
-                    $testParameters['IpAddress'] = '192.168.0.1/255.255.255.0'
+                    $testParameters['IpAddress'] = @('192.168.0.1/255.255.255.0', 'f00::ba12')
                     $testParameters['Port'] = 5030
                     $testParameters['DHCP'] = $false
 
@@ -453,7 +458,7 @@ try
                 }
 
                 It 'Should return that desired state is present when IP address is the only set parameter' {
-                    $testParameters['IpAddress'] = '192.168.0.1/255.255.255.0'
+                    $testParameters['IpAddress'] = @('192.168.0.1/255.255.255.0', 'f00::ba12')
 
                     $result = Test-TargetResource @testParameters
                     $result | Should -Be $true