Merge pull request #450 from SSvilen/databaseressourcefix

xExchMailboxDatabase: Fixing bugs in the resource
dsccommunity · Apr 27, 2020 · 799a9ca · 799a9ca
2 parents fed8381 + 60c26b8
commit 799a9ca
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,18 +7,16 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
 
 ## [Unreleased]
 
-- xExchange
-  - A remote implicing module with all Exchange cmdlets will be created under
-  $env:Temp and reused every time DSC check runs, instead of creating a new
-  module every time.
-
 ### Changed
 
 - xExchange
   - Update CI pipeline files.
   - Fixing xExchSendConnector ExtendedRight functionality by moving the test function
   to the helper module and setting explicit Deny permissions, instead of removing
   the marked as 'Deny' entries.
+  - A remote implicing module with all Exchange cmdlets will be created under
+  $env:Temp and reused every time DSC check runs, instead of creating a new
+  module every time.
   - Added AD Permissions parameter for xExchReceiveConnector.
 
 ## [1.31.0] - 2020-01-27

diff --git a/source/DSCResources/MSFT_xExchMailboxDatabase/MSFT_xExchMailboxDatabase.psm1 b/source/DSCResources/MSFT_xExchMailboxDatabase/MSFT_xExchMailboxDatabase.psm1
@@ -796,7 +796,7 @@ function Set-TargetResource
 
         # setup params
         Add-ToPSBoundParametersFromHashtable -PSBoundParametersIn $PSBoundParameters -ParamsToAdd @{
-            'Name' = $Name
+            'Identity' = $Name
         }
         Remove-FromPSBoundParametersUsingHashtable -PSBoundParametersIn $PSBoundParameters `
             -ParamsToRemove 'Name', 'Server', 'DatabaseCopyCount', 'AllowServiceRestart', 'EdbFilePath', 'LogFolderPath', 'Credential', 'AdServerSettingsPreferredServer', 'SkipInitialDatabaseMount'
@@ -1650,7 +1650,7 @@ function Get-MailboxDatabaseInternal
     )
 
     Add-ToPSBoundParametersFromHashtable -PSBoundParametersIn $PSBoundParameters -ParamsToAdd  @{
-        'Name' = $Name
+        'Identity' = $Name
     }
     Remove-FromPSBoundParametersUsingHashtable -PSBoundParametersIn $PSBoundParameters -ParamsToKeep 'Identity', 'DomainController'
 
@@ -1968,7 +1968,7 @@ function Move-DatabaseOrLogPath
     )
 
     Add-ToPSBoundParametersFromHashtable -PSBoundParametersIn $PSBoundParameters -ParamsToAdd  @{
-        'Name' = $Name
+        'Identity' = $Name
     }
     Remove-FromPSBoundParametersUsingHashtable -PSBoundParametersIn $PSBoundParameters -ParamsToKeep 'Identity', 'DomainController', 'EdbFilePath', 'LogFolderPath'
 
@@ -2285,7 +2285,7 @@ function Mount-DatabaseInternal
     )
 
     Add-ToPSBoundParametersFromHashtable -PSBoundParametersIn $PSBoundParameters -ParamsToAdd  @{
-        'Name' = $Name
+        'Identity' = $Name
     }
     Remove-FromPSBoundParametersUsingHashtable -PSBoundParametersIn $PSBoundParameters -ParamsToKeep 'Identity', 'DomainController'
 

diff --git a/tests/Integration/MSFT_xExchMailboxDatabase.Integration.Tests.ps1 b/tests/Integration/MSFT_xExchMailboxDatabase.Integration.Tests.ps1
@@ -102,9 +102,9 @@ if ($exchangeInstalled)
             RetainDeletedItemsUntilBackup = $false
             IssueWarningQuota             = '27 MB'
             ProhibitSendQuota             = '1GB'
-            ProhibitSendReceiveQuota      = '1.5 GB'
-            RecoverableItemsQuota         = 'uNlImItEd'
-            RecoverableItemsWarningQuota  = '1,000,448'
+            ProhibitSendReceiveQuota      = '1,5 GB'
+            RecoverableItemsQuota         = 'unlimited'
+            RecoverableItemsWarningQuota  = '1000448'
         }
 
         $expectedGetResults = @{
@@ -131,7 +131,7 @@ if ($exchangeInstalled)
             IssueWarningQuota             = '27 MB (28,311,552 bytes)'
             ProhibitSendQuota             = '1 GB (1,073,741,824 bytes)'
             ProhibitSendReceiveQuota      = '1.5 GB (1,610,612,736 bytes)'
-            RecoverableItemsQuota         = 'uNlImItEd'
+            RecoverableItemsQuota         = 'unlimited'
             RecoverableItemsWarningQuota  = '977 KB (1,000,448 bytes)'
         }
 
@@ -160,9 +160,9 @@ if ($exchangeInstalled)
         $testParams.RetainDeletedItemsUntilBackup = $true
         $testParams.IssueWarningQuota = '28 MB'
         $testParams.ProhibitSendQuota = '2GB'
-        $testParams.ProhibitSendReceiveQuota = '2.5 GB'
+        $testParams.ProhibitSendReceiveQuota = '2,5 GB'
         $testParams.RecoverableItemsQuota = '2 GB'
-        $testParams.RecoverableItemsWarningQuota = '1.5 GB'
+        $testParams.RecoverableItemsWarningQuota = '1,5 GB'
 
         $expectedGetResults.AllowFileRestore = $false
         $expectedGetResults.CalendarLoggingQuota = '30 MB (31,457,280 bytes)'
@@ -308,6 +308,8 @@ if ($exchangeInstalled)
             -ExpectedGetResults $expectedGetResults
     }
 
+    # Importing the required commands
+    Get-RemoteExchangeSession -Credential $shellCredentials -CommandsToLoad '*-MailboxDatabase'
     # Clean up the test database
     Initialize-ExchDscDatabase -Database $TestDBName
 }