From d382a3199ed6e511e68f8b87de717c5e9ebf53a9 Mon Sep 17 00:00:00 2001 From: Chrissy LeMaire Date: Wed, 22 May 2019 21:09:36 +0000 Subject: [PATCH] CmsReg -> Reg, Mass Alias Removal (#5575) * CmsReg - > Reg Now supports mroe than Cms, kinda * bye aliases * CmsReg -> Reg * CmsReg -> Reg * fix dat * updates * ugh * remove that message --- dbatools.psd1 | 217 ++--------------- dbatools.psm1 | 226 ++---------------- ...aCmsRegServer.ps1 => Add-DbaRegServer.ps1} | 22 +- ...verGroup.ps1 => Add-DbaRegServerGroup.ps1} | 20 +- functions/ConvertTo-DbaTimeline.ps1 | 2 +- ...CmsRegServer.ps1 => Copy-DbaRegServer.ps1} | 16 +- functions/Export-DbaInstance.ps1 | 4 +- ...sRegServer.ps1 => Export-DbaRegServer.ps1} | 16 +- functions/Find-DbaAgentJob.ps1 | 2 +- functions/Find-DbaInstance.ps1 | 2 +- functions/Get-DbaBackupHistory.ps1 | 2 +- functions/Get-DbaBuildReference.ps1 | 2 +- functions/Get-DbaDbRestoreHistory.ps1 | 2 +- functions/Get-DbaDbccMemoryStatus.ps1 | 2 +- functions/Get-DbaLinkedServer.ps1 | 2 +- functions/Get-DbaMaxMemory.ps1 | 2 +- functions/Get-DbaMemoryCondition.ps1 | 2 +- ...aCmsRegServer.ps1 => Get-DbaRegServer.ps1} | 22 +- ...verGroup.ps1 => Get-DbaRegServerGroup.ps1} | 16 +- ...verStore.ps1 => Get-DbaRegServerStore.ps1} | 8 +- functions/Get-DbaServerInstallDate.ps1 | 2 +- functions/Get-DbaStartupProcedure.ps1 | 2 +- functions/Get-DbaTcpPort.ps1 | 2 +- functions/Get-DbaUptime.ps1 | 2 +- ...sRegServer.ps1 => Import-DbaRegServer.ps1} | 36 +-- functions/Install-DbaWhoIsActive.ps1 | 2 +- functions/Invoke-DbaQuery.ps1 | 2 +- functions/Invoke-DbatoolsRenameHelper.ps1 | 206 +++++++++++++++- ...CmsRegServer.ps1 => Move-DbaRegServer.ps1} | 18 +- ...erGroup.ps1 => Move-DbaRegServerGroup.ps1} | 18 +- ...sRegServer.ps1 => Remove-DbaRegServer.ps1} | 14 +- ...Group.ps1 => Remove-DbaRegServerGroup.ps1} | 12 +- functions/Resolve-DbaNetworkName.ps1 | 4 +- functions/Set-DbaMaxMemory.ps1 | 2 +- functions/Start-DbaMigration.ps1 | 2 +- functions/Test-DbaBuild.ps1 | 2 +- functions/Test-DbaDbCollation.ps1 | 2 +- functions/Test-DbaDbCompatibility.ps1 | 2 +- functions/Test-DbaMaxMemory.ps1 | 4 +- functions/Test-DbaTempDbConfig.ps1 | 2 +- functions/Watch-DbaDbLogin.ps1 | 2 +- ...r.Tests.ps1 => Add-DbaRegServer.Tests.ps1} | 10 +- ...ts.ps1 => Add-DbaRegServerGroup.Tests.ps1} | 8 +- ....Tests.ps1 => Copy-DbaRegServer.Tests.ps1} | 2 +- ...ests.ps1 => Export-DbaRegServer.Tests.ps1} | 22 +- ...r.Tests.ps1 => Get-DbaRegServer.Tests.ps1} | 12 +- ...ts.ps1 => Get-DbaRegServerGroup.Tests.ps1} | 8 +- ...ts.ps1 => Get-DbaRegServerStore.Tests.ps1} | 2 +- ...ests.ps1 => Import-DbaRegServer.Tests.ps1} | 28 +-- ....Tests.ps1 => Move-DbaRegServer.Tests.ps1} | 18 +- ...s.ps1 => Move-DbaRegServerGroup.Tests.ps1} | 16 +- ...ests.ps1 => Remove-DbaRegServer.Tests.ps1} | 10 +- ...ps1 => Remove-DbaRegServerGroup.Tests.ps1} | 14 +- 53 files changed, 448 insertions(+), 627 deletions(-) rename functions/{Add-DbaCmsRegServer.ps1 => Add-DbaRegServer.ps1} (83%) rename functions/{Add-DbaCmsRegServerGroup.ps1 => Add-DbaRegServerGroup.ps1} (80%) rename functions/{Copy-DbaCmsRegServer.ps1 => Copy-DbaRegServer.ps1} (95%) rename functions/{Export-DbaCmsRegServer.ps1 => Export-DbaRegServer.ps1} (88%) rename functions/{Get-DbaCmsRegServer.ps1 => Get-DbaRegServer.ps1} (90%) rename functions/{Get-DbaCmsRegServerGroup.ps1 => Get-DbaRegServerGroup.ps1} (90%) rename functions/{Get-DbaCmsRegServerStore.ps1 => Get-DbaRegServerStore.ps1} (93%) rename functions/{Import-DbaCmsRegServer.ps1 => Import-DbaRegServer.ps1} (68%) rename functions/{Move-DbaCmsRegServer.ps1 => Move-DbaRegServer.ps1} (84%) rename functions/{Move-DbaCmsRegServerGroup.ps1 => Move-DbaRegServerGroup.ps1} (84%) rename functions/{Remove-DbaCmsRegServer.ps1 => Remove-DbaRegServer.ps1} (86%) rename functions/{Remove-DbaCmsRegServerGroup.ps1 => Remove-DbaRegServerGroup.ps1} (88%) rename tests/{Add-DbaCmsRegServer.Tests.ps1 => Add-DbaRegServer.Tests.ps1} (71%) rename tests/{Add-DbaCmsRegServerGroup.Tests.ps1 => Add-DbaRegServerGroup.Tests.ps1} (70%) rename tests/{Copy-DbaCmsRegServer.Tests.ps1 => Copy-DbaRegServer.Tests.ps1} (93%) rename tests/{Export-DbaCmsRegServer.Tests.ps1 => Export-DbaRegServer.Tests.ps1} (62%) rename tests/{Get-DbaCmsRegServer.Tests.ps1 => Get-DbaRegServer.Tests.ps1} (83%) rename tests/{Get-DbaCmsRegServerGroup.Tests.ps1 => Get-DbaRegServerGroup.Tests.ps1} (85%) rename tests/{Get-DbaCmsRegServerStore.Tests.ps1 => Get-DbaRegServerStore.Tests.ps1} (93%) rename tests/{Import-DbaCmsRegServer.Tests.ps1 => Import-DbaRegServer.Tests.ps1} (61%) rename tests/{Move-DbaCmsRegServer.Tests.ps1 => Move-DbaRegServer.Tests.ps1} (61%) rename tests/{Move-DbaCmsRegServerGroup.Tests.ps1 => Move-DbaRegServerGroup.Tests.ps1} (61%) rename tests/{Remove-DbaCmsRegServer.Tests.ps1 => Remove-DbaRegServer.Tests.ps1} (71%) rename tests/{Remove-DbaCmsRegServerGroup.Tests.ps1 => Remove-DbaRegServerGroup.Tests.ps1} (60%) diff --git a/dbatools.psd1 b/dbatools.psd1 index dba80a0086..fbac0f1c1d 100644 --- a/dbatools.psd1 +++ b/dbatools.psd1 @@ -88,7 +88,7 @@ 'Copy-DbaXESession', 'Copy-DbaBackupDevice', 'Copy-DbaServerTrigger', - 'Copy-DbaCmsRegServer', + 'Copy-DbaRegServer', 'Copy-DbaSysDbUserObject', 'Copy-DbaAgentProxy', 'Copy-DbaAgentAlert', @@ -333,7 +333,7 @@ 'Get-DbaXESmartTarget', 'Remove-DbaXESmartTarget', 'Stop-DbaXESmartTarget', - 'Get-DbaCmsRegServerGroup', + 'Get-DbaRegServerGroup', 'New-DbaDbUser', 'Measure-DbaDiskSpaceRequirement', 'New-DbaXESmartCsvWriter', @@ -445,16 +445,16 @@ 'Invoke-DbaDbDbccUpdateUsage', 'Get-DbaDbIdentity', 'Set-DbaDbIdentity', - 'Get-DbaCmsRegServerStore', - 'Get-DbaCmsRegServer', - 'Add-DbaCmsRegServer', - 'Add-DbaCmsRegServerGroup', - 'Export-DbaCmsRegServer', - 'Import-DbaCmsRegServer', - 'Move-DbaCmsRegServer', - 'Move-DbaCmsRegServerGroup', - 'Remove-DbaCmsRegServer', - 'Remove-DbaCmsRegServerGroup', + 'Get-DbaRegServerStore', + 'Get-DbaRegServer', + 'Add-DbaRegServer', + 'Add-DbaRegServerGroup', + 'Export-DbaRegServer', + 'Import-DbaRegServer', + 'Move-DbaRegServer', + 'Move-DbaRegServerGroup', + 'Remove-DbaRegServer', + 'Remove-DbaRegServerGroup', 'New-DbaDbDataGeneratorConfig', 'Invoke-DbaDbDataGenerator', 'Get-DbaRandomizedValue', @@ -636,200 +636,13 @@ # Aliases to export from this module # Aliases are stored in dbatools.psm1 - # KEEP Detach-DbaDatabase, Dismount-DbaDatabase and Start-SqlMigration FOREVER - # Also keep Get-DbaRegisteredServer and Write-DbaDataTable, prolly + # The five listed below are intentional AliasesToExport = @( - 'Add-DbaRegisteredServer', - 'Add-DbaRegisteredServerGroup', + 'Get-DbaRegisteredServer', 'Attach-DbaDatabase', - 'Backup-DbaDatabaseCertificate', - 'Backup-DbaDatabaseMasterKey', - 'Clear-DbaSqlConnectionPool', - 'Connect-DbaServer', - 'Copy-DbaAgentCategory', - 'Copy-DbaAgentProxyAccount', - 'Copy-DbaAgentSharedSchedule', - 'Copy-DbaCentralManagementServer', - 'Copy-DbaDatabaseAssembly', - 'Copy-DbaDatabaseMail', - 'Copy-DbaExtendedEvent', - 'Copy-DbaQueryStoreConfig', - 'Copy-DbaSqlDataCollector', - 'Copy-DbaSqlPolicyManagement', - 'Copy-DbaSqlServerAgent', - 'Copy-DbaTableData', - 'Copy-SqlAgentCategory', - 'Copy-SqlAlert', - 'Copy-SqlAudit', - 'Copy-SqlAuditSpecification', - 'Copy-SqlBackupDevice', - 'Copy-SqlCentralManagementServer', - 'Copy-SqlCredential', - 'Copy-SqlCustomError', - 'Copy-SqlDatabase', - 'Copy-SqlDatabaseAssembly', - 'Copy-SqlDatabaseMail', - 'Copy-SqlDataCollector', - 'Copy-SqlEndpoint', - 'Copy-SqlExtendedEvent', - 'Copy-SqlJob', - 'Copy-SqlJobServer', - 'Copy-SqlLinkedServer', - 'Copy-SqlLogin', - 'Copy-SqlOperator', - 'Copy-SqlPolicyManagement', - 'Copy-SqlProxyAccount', - 'Copy-SqlResourceGovernor', - 'Copy-SqlServerAgent', - 'Copy-SqlServerTrigger', - 'Copy-SqlSharedSchedule', - 'Copy-SqlSpConfigure', - 'Copy-SqlSsisCatalog', - 'Copy-SqlSysDbUserObjects', - 'Copy-SqlUserDefinedMessage', 'Detach-DbaDatabase', - 'Expand-DbaTLogResponsibly', - 'Expand-SqlTLogResponsibly', - 'Export-DbaDacpac', - 'Export-DbaRegisteredServer', - 'Export-SqlLogin', - 'Export-SqlSpConfigure', - 'Export-SqlUser', - 'Find-DbaDatabaseGrowthEvent', - 'Find-SqlDuplicateIndex', - 'Find-SqlUnusedIndex', - 'Get-DbaCmsRegServerName', - 'Get-DbaConfig', - 'Get-DbaConfigValue', - 'Get-DbaDatabaseAssembly', - 'Get-DbaDatabaseCertificate', - 'Get-DbaDatabaseEncryption', - 'Get-DbaDatabaseFile', - 'Get-DbaDatabaseFreeSpace', - 'Get-DbaDatabaseMasterKey', - 'Get-DbaDatabasePartitionFunction', - 'Get-DbaDatabasePartitionScheme', - 'Get-DbaDatabaseSnapshot', - 'Get-DbaDatabaseSpace', - 'Get-DbaDatabaseState', - 'Get-DbaDatabaseUdf', - 'Get-DbaDatabaseUser', - 'Get-DbaDatabaseView', - 'Get-DbaDbQueryStoreOptions', - 'Get-DbaDistributor', - 'Get-DbaInstance', - 'Get-DbaJobCategory', - 'Get-DbaLog', - 'Get-DbaLogShippingError', - 'Get-DbaOrphanUser', - 'Get-DbaPolicy', - 'Get-DbaQueryStoreConfig', - 'Get-DbaRegisteredServer', - 'Get-DbaRegisteredServerGroup', - 'Get-DbaRegisteredServerStore', - 'Get-DbaRestoreHistory', - 'Get-DbaRoleMember', - 'Get-DbaSqlBuildReference', - 'Get-DbaSqlFeature', - 'Get-DbaSqlInstanceProperty', - 'Get-DbaSqlInstanceUserOption', - 'Get-DbaSqlManagementObject', - 'Get-DbaSqlModule', - 'Get-DbaSqlProductKey', - 'Get-DbaSqlRegistryRoot', - 'Get-DbaSqlService', - 'Get-DbaTable', - 'Get-DbaTraceFile', - 'Get-DbaUserLevelPermission', - 'Get-DbaXEventSession', - 'Get-DbaXEventSessionTarget', - 'Get-DiskSpace', - 'Get-SqlMaxMemory', - 'Get-SqlRegisteredServerName', - 'Get-SqlServerKey', - 'Import-DbaCsvToSql', - 'Import-DbaRegisteredServer', - 'Import-SqlSpConfigure', - 'Install-SqlWhoIsActive', - 'Invoke-DbaCmd', - 'Invoke-DbaDatabaseClone', - 'Invoke-DbaDatabaseShrink', - 'Invoke-DbaDatabaseUpgrade', - 'Invoke-DbaLogShipping', - 'Invoke-DbaLogShippingRecovery', - 'Invoke-DbaSqlQuery', - 'Move-DbaRegisteredServer', - 'Move-DbaRegisteredServerGroup', - 'New-DbaDatabaseCertificate', - 'New-DbaDatabaseMasterKey', - 'New-DbaDatabaseSnapshot', - 'New-DbaPublishProfile', - 'New-DbaSqlConnectionString', - 'New-DbaSqlConnectionStringBuilder', - 'New-DbaSqlDirectory', - 'Out-DbaDataTable', - 'Publish-DbaDacpac', - 'Read-DbaXEventFile', - 'Register-DbaConfig', - 'Remove-DbaDatabaseCertificate', - 'Remove-DbaDatabaseMasterKey', - 'Remove-DbaDatabaseSnapshot', - 'Remove-DbaOrphanUser', - 'Remove-DbaRegisteredServer', - 'Remove-DbaRegisteredServerGroup', - 'Remove-SqlDatabaseSafely', - 'Remove-SqlOrphanUser', - 'Repair-DbaOrphanUser', - 'Repair-SqlOrphanUser', - 'Reset-SqlAdmin', - 'Reset-SqlSaPassword', - 'Restart-DbaSqlService', - 'Restore-DbaDatabaseCertificate', - 'Restore-DbaDatabaseSnapshot', - 'Restore-HallengrenBackup', - 'Restore-SqlBackupFromDirectory', - 'Set-DbaConfig', - 'Set-DbaDatabaseOwner', - 'Set-DbaDatabaseState', - 'Set-DbaDbQueryStoreOptions', - 'Set-DbaJobOwner', - 'Set-DbaQueryStoreConfig', - 'Set-DbaTempDbConfiguration', - 'Set-SqlMaxMemory', - 'Set-SqlTempDbConfiguration', - 'Show-DbaDatabaseList', - 'Show-SqlDatabaseList', - 'Show-SqlMigrationConstraint', - 'Show-SqlServerFileSystem', - 'Show-SqlWhoIsActive', - 'Start-DbaSqlService', 'Start-SqlMigration', - 'Stop-DbaSqlService', - 'Sync-DbaSqlLoginPermission', - 'Sync-SqlLoginPermissions', - 'Test-DbaDatabaseCollation', - 'Test-DbaDatabaseCompatibility', - 'Test-DbaDatabaseOwner', - 'Test-DbaFullRecoveryModel', - 'Test-DbaJobOwner', - 'Test-DbaLogShippingStatus', - 'Test-DbaRecoveryModel', - 'Test-DbaSqlBuild', - 'Test-DbaSqlManagementObject', - 'Test-DbaSqlPath', - 'Test-DbaTempDbConfiguration', - 'Test-DbaValidLogin', - 'Test-DbaVirtualLogFile', - 'Test-SqlConnection', - 'Test-SqlDiskAllocation', - 'Test-SqlMigrationConstraint', - 'Test-SqlNetworkLatency', - 'Test-SqlPath', - 'Test-SqlTempDbConfiguration', - 'Update-DbaSqlServiceAccount', - 'Watch-DbaXEventSession', - 'Watch-SqlDbLogin', - 'Write-DbaDbTableData' + 'Write-DbaDataTable' ) # List of all modules packaged with this module diff --git a/dbatools.psm1 b/dbatools.psm1 index 9fc8764d2d..51ba8d36c7 100644 --- a/dbatools.psm1 +++ b/dbatools.psm1 @@ -304,206 +304,12 @@ Write-ImportTime -Text "Script: Asynchronous TEPP Cache" Write-ImportTime -Text "Script: Maintenance" #region Aliases -# I renamed this function to be more accurate - 1ms -# changed to a script var so it can be used in the Rename-DbatoolsCommand -$script:Renames = @{ - 'Add-DbaRegisteredServer' = 'Add-DbaCmsRegServer' - 'Add-DbaRegisteredServerGroup' = 'Add-DbaCmsRegServerGroup' - 'Backup-DbaDatabaseCertificate' = 'Backup-DbaDbCertificate' - 'Backup-DbaDatabaseMasterKey' = 'Backup-DbaDbMasterKey' - 'Clear-DbaSqlConnectionPool' = 'Clear-DbaConnectionPool' - 'Connect-DbaServer' = 'Connect-DbaInstance' - 'Copy-DbaAgentCategory' = 'Copy-DbaAgentJobCategory' - 'Copy-DbaAgentProxyAccount' = 'Copy-DbaAgentProxy' - 'Copy-DbaAgentSharedSchedule' = 'Copy-DbaAgentSchedule' - 'Copy-DbaCentralManagementServer' = 'Copy-DbaCmsRegServer' - 'Copy-DbaDatabaseAssembly' = 'Copy-DbaDbAssembly' - 'Copy-DbaDatabaseMail' = 'Copy-DbaDbMail' - 'Copy-DbaExtendedEvent' = 'Copy-DbaXESession' - 'Copy-DbaQueryStoreConfig' = 'Copy-DbaDbQueryStoreOption' - 'Copy-DbaSqlDataCollector' = 'Copy-DbaDataCollector' - 'Copy-DbaSqlPolicyManagement' = 'Copy-DbaPolicyManagement' - 'Copy-DbaSqlServerAgent' = 'Copy-DbaAgentServer' - 'Copy-DbaTableData' = 'Copy-DbaDbTableData' - 'Copy-SqlAgentCategory' = 'Copy-DbaAgentJobCategory' - 'Copy-SqlAlert' = 'Copy-DbaAgentAlert' - 'Copy-SqlAudit' = 'Copy-DbaServerAudit' - 'Copy-SqlAuditSpecification' = 'Copy-DbaServerAuditSpecification' - 'Copy-SqlBackupDevice' = 'Copy-DbaBackupDevice' - 'Copy-SqlCentralManagementServer' = 'Copy-DbaCmsRegServer' - 'Copy-SqlCredential' = 'Copy-DbaCredential' - 'Copy-SqlCustomError' = 'Copy-DbaCustomError' - 'Copy-SqlDatabase' = 'Copy-DbaDatabase' - 'Copy-SqlDatabaseAssembly' = 'Copy-DbaDbAssembly' - 'Copy-SqlDatabaseMail' = 'Copy-DbaDbMail' - 'Copy-SqlDataCollector' = 'Copy-DbaDataCollector' - 'Copy-SqlEndpoint' = 'Copy-DbaEndpoint' - 'Copy-SqlExtendedEvent' = 'Copy-DbaXESession' - 'Copy-SqlJob' = 'Copy-DbaAgentJob' - 'Copy-SqlJobServer' = 'Copy-SqlServerAgent' - 'Copy-SqlLinkedServer' = 'Copy-DbaLinkedServer' - 'Copy-SqlLogin' = 'Copy-DbaLogin' - 'Copy-SqlOperator' = 'Copy-DbaAgentOperator' - 'Copy-SqlPolicyManagement' = 'Copy-DbaPolicyManagement' - 'Copy-SqlProxyAccount' = 'Copy-DbaAgentProxy' - 'Copy-SqlResourceGovernor' = 'Copy-DbaResourceGovernor' - 'Copy-SqlServerAgent' = 'Copy-DbaAgentServer' - 'Copy-SqlServerTrigger' = 'Copy-DbaServerTrigger' - 'Copy-SqlSharedSchedule' = 'Copy-DbaAgentSchedule' - 'Copy-SqlSpConfigure' = 'Copy-DbaSpConfigure' - 'Copy-SqlSsisCatalog' = 'Copy-DbaSsisCatalog' - 'Copy-SqlSysDbUserObjects' = 'Copy-DbaSysDbUserObject' - 'Copy-SqlUserDefinedMessage' = 'Copy-SqlCustomError' - 'Expand-DbaTLogResponsibly' = 'Expand-DbaDbLogFile' - 'Expand-SqlTLogResponsibly' = 'Expand-DbaDbLogFile' - 'Export-DbaDacpac' = 'Export-DbaDacPackage' - 'Export-DbaRegisteredServer' = 'Export-DbaCmsRegServer' - 'Export-SqlLogin' = 'Export-DbaLogin' - 'Export-SqlSpConfigure' = 'Export-DbaSpConfigure' - 'Export-SqlUser' = 'Export-DbaUser' - 'Find-DbaDatabaseGrowthEvent' = 'Find-DbaDbGrowthEvent' - 'Find-SqlDuplicateIndex' = 'Find-DbaDuplicateIndex' - 'Find-SqlUnusedIndex' = 'Find-DbaDbUnusedIndex' - 'Get-DbaCmsRegServerName' = 'Get-DbaCmsRegServer' - 'Get-DbaConfig' = 'Get-DbatoolsConfig' - 'Get-DbaConfigValue' = 'Get-DbatoolsConfigValue' - 'Get-DbaDatabaseAssembly' = 'Get-DbaDbAssembly' - 'Get-DbaDatabaseCertificate' = 'Get-DbaDbCertificate' - 'Get-DbaDatabaseEncryption' = 'Get-DbaDbEncryption' - 'Get-DbaDatabaseFile' = 'Get-DbaDbFile' - 'Get-DbaDatabaseFreeSpace' = 'Get-DbaDbSpace' - 'Get-DbaDatabaseMasterKey' = 'Get-DbaDbMasterKey' - 'Get-DbaDatabasePartitionFunction' = 'Get-DbaDbPartitionFunction' - 'Get-DbaDatabasePartitionScheme' = 'Get-DbaDbPartitionScheme' - 'Get-DbaDatabaseSnapshot' = 'Get-DbaDbSnapshot' - 'Get-DbaDatabaseSpace' = 'Get-DbaDbSpace' - 'Get-DbaDatabaseState' = 'Get-DbaDbState' - 'Get-DbaDatabaseUdf' = 'Get-DbaDbUdf' - 'Get-DbaDatabaseUser' = 'Get-DbaDbUser' - 'Get-DbaDatabaseView' = 'Get-DbaDbView' - 'Get-DbaDbQueryStoreOptions' = 'Get-DbaDbQueryStoreOption' - 'Get-DbaDistributor' = 'Get-DbaRepDistributor' - 'Get-DbaInstance' = 'Connect-DbaInstance' - 'Get-DbaJobCategory' = 'Get-DbaAgentJobCategory' - 'Get-DbaLog' = 'Get-DbaErrorLog' - 'Get-DbaLogShippingError' = 'Get-DbaDbLogShipError' - 'Get-DbaOrphanUser' = 'Get-DbaDbOrphanUser' - 'Get-DbaPolicy' = 'Get-DbaPbmPolicy' - 'Get-DbaQueryStoreConfig' = 'Get-DbaDbQueryStoreOption' - 'Get-DbaRegisteredServerGroup' = 'Get-DbaCmsRegServerGroup' - 'Get-DbaRegisteredServerStore' = 'Get-DbaCmsRegServerStore' - 'Get-DbaRestoreHistory' = 'Get-DbaDbRestoreHistory' - 'Get-DbaRoleMember' = 'Get-DbaDbRoleMember' - 'Get-DbaSqlBuildReference' = 'Get-DbaBuildReference' - 'Get-DbaSqlFeature' = 'Get-DbaFeature' - 'Get-DbaSqlInstanceProperty' = 'Get-DbaInstanceProperty' - 'Get-DbaSqlInstanceUserOption' = 'Get-DbaInstanceUserOption' - 'Get-DbaSqlManagementObject' = 'Get-DbaManagementObject' - 'Get-DbaSqlModule' = 'Get-DbaModule' - 'Get-DbaSqlProductKey' = 'Get-DbaProductKey' - 'Get-DbaSqlRegistryRoot' = 'Get-DbaRegistryRoot' - 'Get-DbaSqlService' = 'Get-DbaService' - 'Get-DbaTable' = 'Get-DbaDbTable' - 'Get-DbaTraceFile' = 'Get-DbaTrace' - 'Get-DbaUserLevelPermission' = 'Get-DbaUserPermission' - 'Get-DbaXEventSession' = 'Get-DbaXESession' - 'Get-DbaXEventSessionTarget' = 'Get-DbaXESessionTarget' - 'Get-DiskSpace' = 'Get-DbaDiskSpace' - 'Get-SqlMaxMemory' = 'Get-DbaMaxMemory' - 'Get-SqlRegisteredServerName' = 'Get-DbaCmsRegServer' - 'Get-SqlServerKey' = 'Get-DbaProductKey' - 'Import-DbaCsvToSql' = 'Import-DbaCsv' - 'Import-DbaRegisteredServer' = 'Import-DbaCmsRegServer' - 'Import-SqlSpConfigure' = 'Import-DbaSpConfigure' - 'Install-SqlWhoIsActive' = 'Install-DbaWhoIsActive' - 'Invoke-DbaCmd' = 'Invoke-DbaQuery' - 'Invoke-DbaDatabaseClone' = 'Invoke-DbaDbClone' - 'Invoke-DbaDatabaseShrink' = 'Invoke-DbaDbShrink' - 'Invoke-DbaDatabaseUpgrade' = 'Invoke-DbaDbUpgrade' - 'Invoke-DbaLogShipping' = 'Invoke-DbaDbLogShipping' - 'Invoke-DbaLogShippingRecovery' = 'Invoke-DbaDbLogShipRecovery' - 'Invoke-DbaSqlQuery' = 'Invoke-DbaQuery' - 'Move-DbaRegisteredServer' = 'Move-DbaCmsRegServer' - 'Move-DbaRegisteredServerGroup' = 'Move-DbaCmsRegServerGroup' - 'New-DbaDatabaseCertificate' = 'New-DbaDbCertificate' - 'New-DbaDatabaseMasterKey' = 'New-DbaDbMasterKey' - 'New-DbaDatabaseSnapshot' = 'New-DbaDbSnapshot' - 'New-DbaPublishProfile' = 'New-DbaDacProfile' - 'New-DbaSqlConnectionString' = 'New-DbaConnectionString' - 'New-DbaSqlConnectionStringBuilder' = 'New-DbaConnectionStringBuilder' - 'New-DbaSqlDirectory' = 'New-DbaDirectory' - 'Out-DbaDataTable' = 'ConvertTo-DbaDataTable' - 'Publish-DbaDacpac' = 'Publish-DbaDacPackage' - 'Read-DbaXEventFile' = 'Read-DbaXEFile' - 'Register-DbaConfig' = 'Register-DbatoolsConfig' - 'Remove-DbaDatabaseCertificate' = 'Remove-DbaDbCertificate' - 'Remove-DbaDatabaseMasterKey' = 'Remove-DbaDbMasterKey' - 'Remove-DbaDatabaseSnapshot' = 'Remove-DbaDbSnapshot' - 'Remove-DbaOrphanUser' = 'Remove-DbaDbOrphanUser' - 'Remove-DbaRegisteredServer' = 'Remove-DbaCmsRegServer' - 'Remove-DbaRegisteredServerGroup' = 'Remove-DbaCmsRegServerGroup' - 'Remove-SqlDatabaseSafely' = 'Remove-DbaDatabaseSafely' - 'Remove-SqlOrphanUser' = 'Remove-DbaDbOrphanUser' - 'Repair-DbaOrphanUser' = 'Repair-DbaDbOrphanUser' - 'Repair-SqlOrphanUser' = 'Repair-DbaDbOrphanUser' - 'Reset-SqlAdmin' = 'Reset-DbaAdmin' - 'Reset-SqlSaPassword' = 'Reset-SqlAdmin' - 'Restart-DbaSqlService' = 'Restart-DbaService' - 'Restore-DbaDatabaseCertificate' = 'Restore-DbaDbCertificate' - 'Restore-DbaDatabaseSnapshot' = 'Restore-DbaDbSnapshot' - 'Restore-HallengrenBackup' = 'Restore-SqlBackupFromDirectory' - 'Set-DbaConfig' = 'Set-DbatoolsConfig' - 'Set-DbaDatabaseOwner' = 'Set-DbaDbOwner' - 'Set-DbaDatabaseState' = 'Set-DbaDbState' - 'Set-DbaDbQueryStoreOptions' = 'Set-DbaDbQueryStoreOption' - 'Set-DbaJobOwner' = 'Set-DbaAgentJobOwner' - 'Set-DbaQueryStoreConfig' = 'Set-DbaDbQueryStoreOption' - 'Set-DbaTempDbConfiguration' = 'Set-DbaTempdbConfig' - 'Set-SqlMaxMemory' = 'Set-DbaMaxMemory' - 'Set-SqlTempDbConfiguration' = 'Set-DbaTempdbConfig' - 'Show-DbaDatabaseList' = 'Show-DbaDbList' - 'Show-SqlDatabaseList' = 'Show-DbaDbList' - 'Show-SqlMigrationConstraint' = 'Test-SqlMigrationConstraint' - 'Show-SqlServerFileSystem' = 'Show-DbaServerFileSystem' - 'Show-SqlWhoIsActive' = 'Invoke-DbaWhoIsActive' - 'Start-DbaSqlService' = 'Start-DbaService' - 'Start-SqlMigration' = 'Start-DbaMigration' - 'Stop-DbaSqlService' = 'Stop-DbaService' - 'Sync-DbaSqlLoginPermission' = 'Sync-DbaLoginPermission' - 'Sync-SqlLoginPermissions' = 'Sync-DbaLoginPermission' - 'Test-DbaDatabaseCollation' = 'Test-DbaDbCollation' - 'Test-DbaDatabaseCompatibility' = 'Test-DbaDbCompatibility' - 'Test-DbaDatabaseOwner' = 'Test-DbaDbOwner' - 'Test-DbaFullRecoveryModel' = 'Test-DbaDbRecoveryModel' - 'Test-DbaJobOwner' = 'Test-DbaAgentJobOwner' - 'Test-DbaLogShippingStatus' = 'Test-DbaDbLogShipStatus' - 'Test-DbaRecoveryModel' = 'Test-DbaDbRecoveryModel' - 'Test-DbaSqlBuild' = 'Test-DbaBuild' - 'Test-DbaSqlManagementObject' = 'Test-DbaManagementObject' - 'Test-DbaSqlPath' = 'Test-DbaPath' - 'Test-DbaTempDbConfiguration' = 'Test-DbaTempdbConfig' - 'Test-DbaValidLogin' = 'Test-DbaWindowsLogin' - 'Test-DbaVirtualLogFile' = 'Test-DbaDbVirtualLogFile' - 'Test-SqlConnection' = 'Test-DbaConnection' - 'Test-SqlDiskAllocation' = 'Test-DbaDiskAllocation' - 'Test-SqlMigrationConstraint' = 'Test-DbaMigrationConstraint' - 'Test-SqlNetworkLatency' = 'Test-DbaNetworkLatency' - 'Test-SqlPath' = 'Test-DbaPath' - 'Test-SqlTempDbConfiguration' = 'Test-DbaTempdbConfig' - 'Update-DbaSqlServiceAccount' = 'Update-DbaServiceAccount' - 'Watch-DbaXEventSession' = 'Watch-DbaXESession' - 'Watch-SqlDbLogin' = 'Watch-DbaDbLogin' -} -foreach ($_ in $script:renames.GetEnumerator()) { - Set-Alias -Name $_.Key -Value $_.Value -} - - # Leave forever $forever = @{ + 'Get-DbaRegisteredServer' = 'Get-DbaRegServer' 'Attach-DbaDatabase' = 'Mount-DbaDatabase' 'Detach-DbaDatabase' = 'Dismount-DbaDatabase' - 'Get-DbaRegisteredServer' = 'Get-DbaCmsRegServer' + 'Start-SqlMigration' = 'Start-DbaMigration' 'Write-DbaDataTable' = 'Write-DbaDbTableData' } foreach ($_ in $forever.GetEnumerator()) { @@ -534,7 +340,7 @@ $script:xplat = @( 'Copy-DbaResourceGovernor', 'Copy-DbaXESession', 'Copy-DbaServerTrigger', - 'Copy-DbaCmsRegServer', + 'Copy-DbaRegServer', 'Copy-DbaSysDbUserObject', 'Copy-DbaAgentProxy', 'Copy-DbaAgentAlert', @@ -779,7 +585,7 @@ $script:xplat = @( 'Get-DbaXESmartTarget', 'Remove-DbaXESmartTarget', 'Stop-DbaXESmartTarget', - 'Get-DbaCmsRegServerGroup', + 'Get-DbaRegServerGroup', 'New-DbaDbUser', 'Measure-DbaDiskSpaceRequirement', 'New-DbaXESmartCsvWriter', @@ -892,16 +698,16 @@ $script:xplat = @( 'Invoke-DbaDbDbccUpdateUsage', 'Get-DbaDbIdentity', 'Set-DbaDbIdentity', - 'Get-DbaCmsRegServer', - 'Get-DbaCmsRegServerStore', - 'Add-DbaCmsRegServer', - 'Add-DbaCmsRegServerGroup', - 'Export-DbaCmsRegServer', - 'Import-DbaCmsRegServer', - 'Move-DbaCmsRegServer', - 'Move-DbaCmsRegServerGroup', - 'Remove-DbaCmsRegServer', - 'Remove-DbaCmsRegServerGroup', + 'Get-DbaRegServer', + 'Get-DbaRegServerStore', + 'Add-DbaRegServer', + 'Add-DbaRegServerGroup', + 'Export-DbaRegServer', + 'Import-DbaRegServer', + 'Move-DbaRegServer', + 'Move-DbaRegServerGroup', + 'Remove-DbaRegServer', + 'Remove-DbaRegServerGroup', # Config system 'Get-DbatoolsConfig', 'Get-DbatoolsConfigValue', @@ -1140,11 +946,11 @@ if ($script:smoRunspace) { $script:smoRunspace = $null } Write-ImportTime -Text "Waiting for runspaces to finish" -$myInv= $MyInvocation +$myInv = $MyInvocation if ($option.LoadTypes -or ($myInv.Line -like '*.psm1*' -and (-not (Get-TypeData -TypeName Microsoft.SqlServer.Management.Smo.Server) - ))) { + ))) { Update-TypeData -AppendPath (Resolve-Path -Path "$script:PSModuleRoot\xml\dbatools.Types.ps1xml") Write-ImportTime -Text "Loaded type extensions" } diff --git a/functions/Add-DbaCmsRegServer.ps1 b/functions/Add-DbaRegServer.ps1 similarity index 83% rename from functions/Add-DbaCmsRegServer.ps1 rename to functions/Add-DbaRegServer.ps1 index ffd75e5ce7..6674bbaf64 100644 --- a/functions/Add-DbaCmsRegServer.ps1 +++ b/functions/Add-DbaRegServer.ps1 @@ -1,10 +1,10 @@ -function Add-DbaCmsRegServer { +function Add-DbaRegServer { <# .SYNOPSIS Adds registered servers to SQL Server Central Management Server (CMS) .DESCRIPTION - Adds registered servers to SQL Server Central Management Server (CMS). If you need more flexiblity, look into Import-DbaCmsRegServer which + Adds registered servers to SQL Server Central Management Server (CMS). If you need more flexiblity, look into Import-DbaRegServer which accepts multiple kinds of input and allows you to add reg servers from different CMSes. .PARAMETER SqlInstance @@ -50,26 +50,26 @@ function Add-DbaCmsRegServer { License: MIT https://opensource.org/licenses/MIT .LINK - https://dbatools.io/Add-DbaCmsRegServer + https://dbatools.io/Add-DbaRegServer .EXAMPLE - PS C:\> Add-DbaCmsRegServer -SqlInstance sql2008 -ServerName sql01 + PS C:\> Add-DbaRegServer -SqlInstance sql2008 -ServerName sql01 Creates a registered server on sql2008's CMS which points to the SQL Server, sql01. When scrolling in CMS, the name "sql01" will be visible. .EXAMPLE - PS C:\> Add-DbaCmsRegServer -SqlInstance sql2008 -ServerName sql01 -Name "The 2008 Clustered Instance" -Description "HR's Dedicated SharePoint instance" + PS C:\> Add-DbaRegServer -SqlInstance sql2008 -ServerName sql01 -Name "The 2008 Clustered Instance" -Description "HR's Dedicated SharePoint instance" Creates a registered server on sql2008's CMS which points to the SQL Server, sql01. When scrolling in CMS, "The 2008 Clustered Instance" will be visible. Clearly this is hard to explain ;) .EXAMPLE - PS C:\> Add-DbaCmsRegServer -SqlInstance sql2008 -ServerName sql01 -Group hr\Seattle + PS C:\> Add-DbaRegServer -SqlInstance sql2008 -ServerName sql01 -Group hr\Seattle Creates a registered server on sql2008's CMS which points to the SQL Server, sql01. When scrolling in CMS, the name "sql01" will be visible within the Seattle group which is in the hr group. .EXAMPLE - PS C:\> Get-DbaCmsRegServerGroup -SqlInstance sql2008 -Group hr\Seattle | Add-DbaCmsRegServer -ServerName sql01111 + PS C:\> Get-DbaRegServerGroup -SqlInstance sql2008 -Group hr\Seattle | Add-DbaRegServer -ServerName sql01111 Creates a registered server on sql2008's CMS which points to the SQL Server, sql01. When scrolling in CMS, the name "sql01" will be visible within the Seattle group which is in the hr group. @@ -102,12 +102,12 @@ function Add-DbaCmsRegServer { foreach ($instance in $SqlInstance) { if (($Group)) { if ($Group -is [Microsoft.SqlServer.Management.RegisteredServers.ServerGroup]) { - $InputObject += Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group.Name + $InputObject += Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group.Name } else { - $InputObject += Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group + $InputObject += Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group } } else { - $InputObject += Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Id 1 + $InputObject += Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Id 1 } if (-not $InputObject) { @@ -131,7 +131,7 @@ function Add-DbaCmsRegServer { $newserver.Description = $Description $newserver.Create() - Get-DbaCmsRegServer -SqlInstance $server -Name $Name -ServerName $ServerName + Get-DbaRegServer -SqlInstance $server -Name $Name -ServerName $ServerName } catch { Stop-Function -Message "Failed to add $ServerName on $($parentserver.SqlInstance)" -ErrorRecord $_ -Continue } diff --git a/functions/Add-DbaCmsRegServerGroup.ps1 b/functions/Add-DbaRegServerGroup.ps1 similarity index 80% rename from functions/Add-DbaCmsRegServerGroup.ps1 rename to functions/Add-DbaRegServerGroup.ps1 index 776676fa59..1db03f1d71 100644 --- a/functions/Add-DbaCmsRegServerGroup.ps1 +++ b/functions/Add-DbaRegServerGroup.ps1 @@ -1,10 +1,10 @@ -function Add-DbaCmsRegServerGroup { +function Add-DbaRegServerGroup { <# .SYNOPSIS Adds registered server groups to SQL Server Central Management Server (CMS) .DESCRIPTION - Adds registered server groups to SQL Server Central Management Server (CMS). If you need more flexibility, look into Import-DbaCmsRegServer which accepts multiple kinds of input and allows you to add reg servers and groups from different CMS. + Adds registered server groups to SQL Server Central Management Server (CMS). If you need more flexibility, look into Import-DbaRegServer which accepts multiple kinds of input and allows you to add reg servers and groups from different CMS. .PARAMETER SqlInstance The target SQL Server instance @@ -22,7 +22,7 @@ function Add-DbaCmsRegServerGroup { The SQL Server Central Management Server group. If no groups are specified, the new group will be created at the root. .PARAMETER InputObject - Allows results from Get-DbaCmsRegServerGroup to be piped in + Allows results from Get-DbaRegServerGroup to be piped in .PARAMETER WhatIf Shows what would happen if the command were to run. No actions are actually performed. @@ -46,20 +46,20 @@ function Add-DbaCmsRegServerGroup { License: MIT https://opensource.org/licenses/MIT .LINK - https://dbatools.io/Add-DbaCmsRegServerGroup + https://dbatools.io/Add-DbaRegServerGroup .EXAMPLE - PS C:\> Add-DbaCmsRegServerGroup -SqlInstance sql2012 -Name HR + PS C:\> Add-DbaRegServerGroup -SqlInstance sql2012 -Name HR Creates a registered server group called HR, in the root of sql2012's CMS .EXAMPLE - PS C:\> Add-DbaCmsRegServerGroup -SqlInstance sql2012, sql2014 -Name sub-folder -Group HR + PS C:\> Add-DbaRegServerGroup -SqlInstance sql2012, sql2014 -Name sub-folder -Group HR Creates a registered server group on sql2012 and sql2014 called sub-folder within the HR group .EXAMPLE - PS C:\> Get-DbaCmsRegServerGroup -SqlInstance sql2012, sql2014 -Group HR | Add-DbaCmsRegServerGroup -Name sub-folder + PS C:\> Get-DbaRegServerGroup -SqlInstance sql2012, sql2014 -Group HR | Add-DbaRegServerGroup -Name sub-folder Creates a registered server group on sql2012 and sql2014 called sub-folder within the HR group of each server @@ -84,9 +84,9 @@ function Add-DbaCmsRegServerGroup { } foreach ($instance in $SqlInstance) { if ((Test-Bound -ParameterName Group)) { - $InputObject += Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group + $InputObject += Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group } else { - $InputObject += Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Id 1 + $InputObject += Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Id 1 } } @@ -104,7 +104,7 @@ function Add-DbaCmsRegServerGroup { $newgroup.Description = $Description $newgroup.Create() - Get-DbaCmsRegServerGroup -SqlInstance $server -Group (Get-RegServerGroupReverseParse -object $newgroup) + Get-DbaRegServerGroup -SqlInstance $server -Group (Get-RegServerGroupReverseParse -object $newgroup) $parentserver.ServerConnection.Disconnect() } catch { Stop-Function -Message "Failed to add $reggroup on $server" -ErrorRecord $_ -Continue diff --git a/functions/ConvertTo-DbaTimeline.ps1 b/functions/ConvertTo-DbaTimeline.ps1 index 492aac3374..e818616d0b 100644 --- a/functions/ConvertTo-DbaTimeline.ps1 +++ b/functions/ConvertTo-DbaTimeline.ps1 @@ -43,7 +43,7 @@ function ConvertTo-DbaTimeline { Creates an output file containing a pretty timeline for all of the agent job history results for sql-1 the whole day of 2018-08-13 .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlcm | Get-DbaBackupHistory -Since '2018-08-13 00:00' | ConvertTo-DbaTimeline | Out-File C:\temp\DbaBackupHistory.html -Encoding ASCII + PS C:\> Get-DbaRegServer -SqlInstance sqlcm | Get-DbaBackupHistory -Since '2018-08-13 00:00' | ConvertTo-DbaTimeline | Out-File C:\temp\DbaBackupHistory.html -Encoding ASCII Creates an output file containing a pretty timeline for the agent job history since 2018-08-13 for all of the registered servers on sqlcm diff --git a/functions/Copy-DbaCmsRegServer.ps1 b/functions/Copy-DbaRegServer.ps1 similarity index 95% rename from functions/Copy-DbaCmsRegServer.ps1 rename to functions/Copy-DbaRegServer.ps1 index 7c3b351016..d97a5a54c4 100644 --- a/functions/Copy-DbaCmsRegServer.ps1 +++ b/functions/Copy-DbaRegServer.ps1 @@ -1,10 +1,10 @@ -function Copy-DbaCmsRegServer { +function Copy-DbaRegServer { <# .SYNOPSIS Migrates SQL Server Central Management groups and server instances from one SQL Server to another. .DESCRIPTION - Copy-DbaCmsRegServer copies all groups, subgroups, and server instances from one SQL Server to another. + Copy-DbaRegServer copies all groups, subgroups, and server instances from one SQL Server to another. .PARAMETER Source Source SQL Server. You must have sysadmin access and server version must be SQL Server version 2000 or higher. @@ -53,20 +53,20 @@ function Copy-DbaCmsRegServer { Requires: sysadmin access on SQL Servers .LINK - https://dbatools.io/Copy-DbaCmsRegServer + https://dbatools.io/Copy-DbaRegServer .EXAMPLE - PS C:\> Copy-DbaCmsRegServer -Source sqlserver2014a -Destination sqlcluster + PS C:\> Copy-DbaRegServer -Source sqlserver2014a -Destination sqlcluster All groups, subgroups, and server instances are copied from sqlserver2014a CMS to sqlcluster CMS. .EXAMPLE - PS C:\> Copy-DbaCmsRegServer -Source sqlserver2014a -Destination sqlcluster -Group Group1,Group3 + PS C:\> Copy-DbaRegServer -Source sqlserver2014a -Destination sqlcluster -Group Group1,Group3 Top-level groups Group1 and Group3 along with their subgroups and server instances are copied from sqlserver to sqlcluster. .EXAMPLE - PS C:\> Copy-DbaCmsRegServer -Source sqlserver2014a -Destination sqlcluster -Group Group1,Group3 -SwitchServerName -SourceSqlCredential $SourceSqlCredential -DestinationSqlCredential $DestinationSqlCredential + PS C:\> Copy-DbaRegServer -Source sqlserver2014a -Destination sqlcluster -Group Group1,Group3 -SwitchServerName -SourceSqlCredential $SourceSqlCredential -DestinationSqlCredential $DestinationSqlCredential Top-level groups Group1 and Group3 along with their subgroups and server instances are copied from sqlserver to sqlcluster. When adding sql instances to sqlcluster, if the server name of the migrating instance is "sqlcluster", it will be switched to "sqlserver". @@ -285,7 +285,7 @@ function Copy-DbaCmsRegServer { try { $sourceServer = Connect-SqlInstance -SqlInstance $Source -SqlCredential $SourceSqlCredential -MinimumVersion 10 - $fromCmStore = Get-DbaCmsRegServerStore -SqlInstance $sourceServer + $fromCmStore = Get-DbaRegServerStore -SqlInstance $sourceServer } catch { Stop-Function -Message "Error occurred while establishing connection to $instance" -Category ConnectionError -ErrorRecord $_ -Target $Source return @@ -300,7 +300,7 @@ function Copy-DbaCmsRegServer { } catch { Stop-Function -Message "Error occurred while establishing connection to $instance" -Category ConnectionError -ErrorRecord $_ -Target $destinstance -Continue } - $toCmStore = Get-DbaCmsRegServerStore -SqlInstance $destServer + $toCmStore = Get-DbaRegServerStore -SqlInstance $destServer $stores = $fromCmStore.DatabaseEngineServerGroup if ($Group) { diff --git a/functions/Export-DbaInstance.ps1 b/functions/Export-DbaInstance.ps1 index cfe86e6df8..d1cfb4f426 100644 --- a/functions/Export-DbaInstance.ps1 +++ b/functions/Export-DbaInstance.ps1 @@ -238,8 +238,8 @@ function Export-DbaInstance { $fileCounter++ Write-Message -Level Verbose -Message "Exporting Central Management Server" Write-ProgressHelper -StepNumber ($stepCounter++) -Message "Exporting Central Management Server" - $null = Get-DbaCmsRegServerGroup -SqlInstance $server | Export-DbaScript -Path "$Path\$fileCounter-regserver.sql" -Append -BatchSeparator 'GO' - $null = Get-DbaCmsRegServer -SqlInstance $server | Export-DbaScript -Path "$Path\$fileCounter-regserver.sql" -Append -BatchSeparator 'GO' + $null = Get-DbaRegServerGroup -SqlInstance $server | Export-DbaScript -Path "$Path\$fileCounter-regserver.sql" -Append -BatchSeparator 'GO' + $null = Get-DbaRegServer -SqlInstance $server | Export-DbaScript -Path "$Path\$fileCounter-regserver.sql" -Append -BatchSeparator 'GO' Get-ChildItem -ErrorAction Ignore -Path "$Path\$fileCounter-regserver.sql" if (-not (Test-Path "$Path\$fileCounter-regserver.sql")) { $fileCounter-- diff --git a/functions/Export-DbaCmsRegServer.ps1 b/functions/Export-DbaRegServer.ps1 similarity index 88% rename from functions/Export-DbaCmsRegServer.ps1 rename to functions/Export-DbaRegServer.ps1 index 18b02236c6..81df0595ea 100644 --- a/functions/Export-DbaCmsRegServer.ps1 +++ b/functions/Export-DbaRegServer.ps1 @@ -1,4 +1,4 @@ -function Export-DbaCmsRegServer { +function Export-DbaRegServer { <# .SYNOPSIS Exports registered servers and registered server groups to file @@ -19,7 +19,7 @@ function Export-DbaCmsRegServer { The path to the exported file. If no path is specified, one will be created. .PARAMETER InputObject - Enables piping from Get-DbaCmsRegServer, Get-DbaCmsRegServerGroup, CSVs and other objects. + Enables piping from Get-DbaRegServer, Get-DbaRegServerGroup, CSVs and other objects. If importing from CSV or other object, a column named ServerName is required. Optional columns include Name, Description and Group. @@ -39,20 +39,20 @@ function Export-DbaCmsRegServer { License: MIT https://opensource.org/licenses/MIT .LINK - https://dbatools.io/Export-DbaCmsRegServer + https://dbatools.io/Export-DbaRegServer .EXAMPLE - PS C:\> Export-DbaCmsRegServer -SqlInstance sql2008 + PS C:\> Export-DbaRegServer -SqlInstance sql2008 Exports all Registered Server and Registered Server Groups on sql2008 to an automatically generated file name in the current directory .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sql2008, sql2012 | Export-DbaCmsRegServer + PS C:\> Get-DbaRegServer -SqlInstance sql2008, sql2012 | Export-DbaRegServer Exports all registered servers on sql2008 and sql2012. Warning - each one will have its own individual file. Consider piping groups. .EXAMPLE - PS C:\> Get-DbaCmsRegServerGroup -SqlInstance sql2008, sql2012 | Export-DbaCmsRegServer + PS C:\> Get-DbaRegServerGroup -SqlInstance sql2008, sql2012 | Export-DbaRegServer Exports all registered servers on sql2008 and sql2012, organized by group. @@ -86,13 +86,13 @@ function Export-DbaCmsRegServer { } process { foreach ($instance in $SqlInstance) { - $InputObject += Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Id 1 + $InputObject += Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Id 1 } foreach ($object in $InputObject) { try { if ($object -is [Microsoft.SqlServer.Management.RegisteredServers.RegisteredServersStore]) { - $object = Get-DbaCmsRegServerGroup -SqlInstance $object.ParentServer -Id 1 + $object = Get-DbaRegServerGroup -SqlInstance $object.ParentServer -Id 1 } if ($object -is [Microsoft.SqlServer.Management.RegisteredServers.RegisteredServer]) { diff --git a/functions/Find-DbaAgentJob.ps1 b/functions/Find-DbaAgentJob.ps1 index 390ffddaad..0fc2353ad0 100644 --- a/functions/Find-DbaAgentJob.ps1 +++ b/functions/Find-DbaAgentJob.ps1 @@ -104,7 +104,7 @@ function Find-DbaAgentJob { Returns all agent job(s) on Dev01 and Dev02 that have failed since July of 2016 (and still have history in msdb) .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance CMSServer -Group Production | Find-DbaAgentJob -Disabled -IsNotScheduled | Format-Table -AutoSize -Wrap + PS C:\> Get-DbaRegServer -SqlInstance CMSServer -Group Production | Find-DbaAgentJob -Disabled -IsNotScheduled | Format-Table -AutoSize -Wrap Queries CMS server to return all SQL instances in the Production folder and then list out all agent jobs that have either been disabled or have no schedule. diff --git a/functions/Find-DbaInstance.ps1 b/functions/Find-DbaInstance.ps1 index ebf527aa7f..26610af195 100644 --- a/functions/Find-DbaInstance.ps1 +++ b/functions/Find-DbaInstance.ps1 @@ -206,7 +206,7 @@ function Find-DbaInstance { Scans localhost for instances using the browser service, traverses all instances for all databases and displays a subset of the important information in a formatted table. - Using this method reguarly is not recommended. Use Get-DbaService or Get-DbaCmsRegServer instead. + Using this method reguarly is not recommended. Use Get-DbaService or Get-DbaRegServer instead. #> [CmdletBinding(DefaultParameterSetName = "Default")] [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseApprovedVerbs", "", Justification = "Internal functions are ignored")] diff --git a/functions/Get-DbaBackupHistory.ps1 b/functions/Get-DbaBackupHistory.ps1 index e5e3c40109..3c5c96a06c 100644 --- a/functions/Get-DbaBackupHistory.ps1 +++ b/functions/Get-DbaBackupHistory.ps1 @@ -126,7 +126,7 @@ function Get-DbaBackupHistory { Returns information about all Full backups for AdventureWorks2014 on sql2014. .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sql2016 | Get-DbaBackupHistory + PS C:\> Get-DbaRegServer -SqlInstance sql2016 | Get-DbaBackupHistory Returns database backup information for every database on every server listed in the Central Management Server on sql2016. diff --git a/functions/Get-DbaBuildReference.ps1 b/functions/Get-DbaBuildReference.ps1 index 98cce179e4..533c7ebe68 100644 --- a/functions/Get-DbaBuildReference.ps1 +++ b/functions/Get-DbaBuildReference.ps1 @@ -66,7 +66,7 @@ function Get-DbaBuildReference { Returns information builds identified by these versions strings .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlserver2014a | Get-DbaBuildReference + PS C:\> Get-DbaRegServer -SqlInstance sqlserver2014a | Get-DbaBuildReference Integrate with other cmdlets to have builds checked for all your registered servers on sqlserver2014a diff --git a/functions/Get-DbaDbRestoreHistory.ps1 b/functions/Get-DbaDbRestoreHistory.ps1 index ac121ae787..69bf79245b 100644 --- a/functions/Get-DbaDbRestoreHistory.ps1 +++ b/functions/Get-DbaDbRestoreHistory.ps1 @@ -67,7 +67,7 @@ function Get-DbaDbRestoreHistory { Returns database restore information for AdventureWorks2014 and pubs database on sql2014, connects using SQL Authentication via sqladmin account. Formats the data as a table. .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sql2016 | Get-DbaDbRestoreHistory + PS C:\> Get-DbaRegServer -SqlInstance sql2016 | Get-DbaDbRestoreHistory Returns database restore information for every database on every server listed in the Central Management Server on sql2016. diff --git a/functions/Get-DbaDbccMemoryStatus.ps1 b/functions/Get-DbaDbccMemoryStatus.ps1 index 813b360dea..d1b69958ab 100644 --- a/functions/Get-DbaDbccMemoryStatus.ps1 +++ b/functions/Get-DbaDbccMemoryStatus.ps1 @@ -38,7 +38,7 @@ function Get-DbaDbccMemoryStatus { Get output of DBCC MEMORYSTATUS for instances "sqlcluster" and "sqlserver2012". Returns results in a single recordset. .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlcluster | Get-DbaDbccMemoryStatus + PS C:\> Get-DbaRegServer -SqlInstance sqlcluster | Get-DbaDbccMemoryStatus Get output of DBCC MEMORYSTATUS for all servers in Server Central Management Server diff --git a/functions/Get-DbaLinkedServer.ps1 b/functions/Get-DbaLinkedServer.ps1 index 9665b622d8..6cde4d0569 100644 --- a/functions/Get-DbaLinkedServer.ps1 +++ b/functions/Get-DbaLinkedServer.ps1 @@ -41,7 +41,7 @@ function Get-DbaLinkedServer { Returns all linked servers for the SQL Server instance DEV01 .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance DEV01 -Group SQLDEV | Get-DbaLinkedServer | Out-GridView + PS C:\> Get-DbaRegServer -SqlInstance DEV01 -Group SQLDEV | Get-DbaLinkedServer | Out-GridView Returns all linked servers for a group of servers from SQL Server Central Management Server (CMS). Send output to GridView. #> diff --git a/functions/Get-DbaMaxMemory.ps1 b/functions/Get-DbaMaxMemory.ps1 index 8b0bcb0c93..eb988d6e7b 100644 --- a/functions/Get-DbaMaxMemory.ps1 +++ b/functions/Get-DbaMaxMemory.ps1 @@ -36,7 +36,7 @@ function Get-DbaMaxMemory { Get memory settings for instances "sqlcluster" and "sqlserver2012". Returns results in megabytes (MB). .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlcluster | Get-DbaMaxMemory | Where-Object { $_.MaxValue -gt $_.Total } + PS C:\> Get-DbaRegServer -SqlInstance sqlcluster | Get-DbaMaxMemory | Where-Object { $_.MaxValue -gt $_.Total } Find all servers in Server Central Management Server that have 'Max Server Memory' set to higher than the total memory of the server (think 2147483647) diff --git a/functions/Get-DbaMemoryCondition.ps1 b/functions/Get-DbaMemoryCondition.ps1 index 2c371db95f..f8a9cbfc09 100644 --- a/functions/Get-DbaMemoryCondition.ps1 +++ b/functions/Get-DbaMemoryCondition.ps1 @@ -36,7 +36,7 @@ function Get-DbaMemoryCondition { Returns the memory conditions for the selected instance .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlserver2014a -Group GroupName | Get-DbaMemoryCondition | Out-GridView + PS C:\> Get-DbaRegServer -SqlInstance sqlserver2014a -Group GroupName | Get-DbaMemoryCondition | Out-GridView Returns the memory conditions for a group of servers from SQL Server Central Management Server (CMS). Send output to GridView. #> diff --git a/functions/Get-DbaCmsRegServer.ps1 b/functions/Get-DbaRegServer.ps1 similarity index 90% rename from functions/Get-DbaCmsRegServer.ps1 rename to functions/Get-DbaRegServer.ps1 index f16407092b..3c36f6928d 100644 --- a/functions/Get-DbaCmsRegServer.ps1 +++ b/functions/Get-DbaRegServer.ps1 @@ -1,4 +1,4 @@ -function Get-DbaCmsRegServer { +function Get-DbaRegServer { <# .SYNOPSIS Gets list of SQL Server objects stored in local registered groups and central management server. @@ -52,35 +52,36 @@ function Get-DbaCmsRegServer { License: MIT https://opensource.org/licenses/MIT .LINK - https://dbatools.io/Get-DbaCmsRegServer + https://dbatools.io/Get-DbaRegServer .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlserver2014a + PS C:\> Get-DbaRegServer -SqlInstance sqlserver2014a Gets a list of servers from the CMS on sqlserver2014a, using Windows Credentials. .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlserver2014a -IncludeSelf + PS C:\> Get-DbaRegServer -SqlInstance sqlserver2014a -IncludeSelf Gets a list of servers from the CMS on sqlserver2014a and includes sqlserver2014a in the output results. .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlserver2014a -SqlCredential $credential | Select-Object -Unique -ExpandProperty ServerName + PS C:\> Get-DbaRegServer -SqlInstance sqlserver2014a -SqlCredential $credential | Select-Object -Unique -ExpandProperty ServerName Returns only the server names from the CMS on sqlserver2014a, using SQL Authentication to authenticate to the server. .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlserver2014a -Group HR, Accounting + PS C:\> Get-DbaRegServer -SqlInstance sqlserver2014a -Group HR, Accounting Gets a list of servers in the HR and Accounting groups from the CMS on sqlserver2014a. .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlserver2014a -Group HR\Development + PS C:\> Get-DbaRegServer -SqlInstance sqlserver2014a -Group HR\Development Returns a list of servers in the HR and sub-group Development from the CMS on sqlserver2014a. #> [CmdletBinding()] + [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingConvertToSecureStringWithPlainText", "")] param ( [parameter(ValueFromPipeline)] [DbaInstanceParameter[]]$SqlInstance, @@ -91,7 +92,6 @@ function Get-DbaCmsRegServer { [object[]]$ExcludeGroup, [int[]]$Id, [switch]$IncludeSelf, - [switch]$ExcludeCmsServer, [switch]$ResolveNetworkName, [switch]$ExcludeLocal, [switch]$EnableException @@ -114,13 +114,13 @@ function Get-DbaCmsRegServer { $servers = @() foreach ($instance in $SqlInstance) { if ($Group) { - $groupservers = Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group -ExcludeGroup $ExcludeGroup + $groupservers = Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group -ExcludeGroup $ExcludeGroup if ($groupservers) { $servers += $groupservers.GetDescendantRegisteredServers() } } else { try { - $serverstore = Get-DbaCmsRegServerStore -SqlInstance $instance -SqlCredential $SqlCredential -EnableException + $serverstore = Get-DbaRegServerStore -SqlInstance $instance -SqlCredential $SqlCredential -EnableException } catch { Stop-Function -Message "Cannot access Central Management Server '$instance'." -ErrorRecord $_ -Continue } @@ -157,7 +157,7 @@ function Get-DbaCmsRegServer { } if ($ExcludeGroup) { - $excluded = Get-DbaCmsRegServer -SqlInstance $serverstore.ParentServer -Group $ExcludeGroup + $excluded = Get-DbaRegServer -SqlInstance $serverstore.ParentServer -Group $ExcludeGroup Write-Message -Level Verbose -Message "Excluding $ExcludeGroup" $servers = $servers | Where-Object { $_.Urn.Value -notin $excluded.Urn.Value } } diff --git a/functions/Get-DbaCmsRegServerGroup.ps1 b/functions/Get-DbaRegServerGroup.ps1 similarity index 90% rename from functions/Get-DbaCmsRegServerGroup.ps1 rename to functions/Get-DbaRegServerGroup.ps1 index 5495e80e6c..34e60172f7 100644 --- a/functions/Get-DbaCmsRegServerGroup.ps1 +++ b/functions/Get-DbaRegServerGroup.ps1 @@ -1,4 +1,4 @@ -function Get-DbaCmsRegServerGroup { +function Get-DbaRegServerGroup { <# .SYNOPSIS Gets list of Server Groups objects stored in SQL Server Central Management Server (CMS). @@ -37,25 +37,25 @@ function Get-DbaCmsRegServerGroup { License: MIT https://opensource.org/licenses/MIT .LINK - https://dbatools.io/Get-DbaCmsRegServerGroup + https://dbatools.io/Get-DbaRegServerGroup .EXAMPLE - PS C:\> Get-DbaCmsRegServerGroup -SqlInstance sqlserver2014a + PS C:\> Get-DbaRegServerGroup -SqlInstance sqlserver2014a Gets the top level groups from the CMS on sqlserver2014a, using Windows Credentials. .EXAMPLE - PS C:\> Get-DbaCmsRegServerGroup -SqlInstance sqlserver2014a -SqlCredential $credential + PS C:\> Get-DbaRegServerGroup -SqlInstance sqlserver2014a -SqlCredential $credential Gets the top level groups from the CMS on sqlserver2014a, using alternative credentials to authenticate to the server. .EXAMPLE - PS C:\> Get-DbaCmsRegServerGroup -SqlInstance sqlserver2014a -Group HR, Accounting + PS C:\> Get-DbaRegServerGroup -SqlInstance sqlserver2014a -Group HR, Accounting Gets the HR and Accounting groups from the CMS on sqlserver2014a. .EXAMPLE - PS C:\> Get-DbaCmsRegServerGroup -SqlInstance sqlserver2014a -Group HR\Development + PS C:\> Get-DbaRegServerGroup -SqlInstance sqlserver2014a -Group HR\Development Returns the sub-group Development of the HR group from the CMS on sqlserver2014a. @@ -74,7 +74,7 @@ function Get-DbaCmsRegServerGroup { process { foreach ($instance in $SqlInstance) { try { - $serverstore = Get-DbaCmsRegServerStore -SqlInstance $instance -SqlCredential $SqlCredential -EnableException + $serverstore = Get-DbaRegServerStore -SqlInstance $instance -SqlCredential $SqlCredential -EnableException } catch { Stop-Function -Message "Cannot access Central Management Server '$instance'" -ErrorRecord $_ -Continue } @@ -130,7 +130,7 @@ function Get-DbaCmsRegServerGroup { } if ($ExcludeGroup) { - $excluded = Get-DbaCmsRegServer -SqlInstance $serverstore.ParentServer -Group $ExcludeGroup + $excluded = Get-DbaRegServer -SqlInstance $serverstore.ParentServer -Group $ExcludeGroup Write-Message -Level Verbose -Message "Excluding $ExcludeGroup" $groups = $groups | Where-Object { $_.Urn.Value -notin $excluded.Urn.Value } } diff --git a/functions/Get-DbaCmsRegServerStore.ps1 b/functions/Get-DbaRegServerStore.ps1 similarity index 93% rename from functions/Get-DbaCmsRegServerStore.ps1 rename to functions/Get-DbaRegServerStore.ps1 index df32868bc3..7e6f0fb540 100644 --- a/functions/Get-DbaCmsRegServerStore.ps1 +++ b/functions/Get-DbaRegServerStore.ps1 @@ -1,4 +1,4 @@ -function Get-DbaCmsRegServerStore { +function Get-DbaRegServerStore { <# .SYNOPSIS Returns a SQL Server Registered Server Store Object @@ -27,15 +27,15 @@ function Get-DbaCmsRegServerStore { License: MIT https://opensource.org/licenses/MIT .LINK - https://dbatools.io/Get-DbaCmsRegServerStore + https://dbatools.io/Get-DbaRegServerStore .EXAMPLE - PS C:\> Get-DbaCmsRegServerStore -SqlInstance sqlserver2014a + PS C:\> Get-DbaRegServerStore -SqlInstance sqlserver2014a Returns a SQL Server Registered Server Store Object from sqlserver2014a .EXAMPLE - PS C:\> Get-DbaCmsRegServerStore -SqlInstance sqlserver2014a -SqlCredential sqladmin + PS C:\> Get-DbaRegServerStore -SqlInstance sqlserver2014a -SqlCredential sqladmin Returns a SQL Server Registered Server Store Object from sqlserver2014a by logging in with the sqladmin login diff --git a/functions/Get-DbaServerInstallDate.ps1 b/functions/Get-DbaServerInstallDate.ps1 index e06aef8665..a18ae5e712 100644 --- a/functions/Get-DbaServerInstallDate.ps1 +++ b/functions/Get-DbaServerInstallDate.ps1 @@ -57,7 +57,7 @@ function Get-DbaServerInstallDate { Returns an object with the Windows Install date and the SQL install date as a string. .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sql2014 | Get-DbaServerInstallDate + PS C:\> Get-DbaRegServer -SqlInstance sql2014 | Get-DbaServerInstallDate Returns an object with SQL Instance install date as a string for every server listed in the Central Management Server on sql2014 diff --git a/functions/Get-DbaStartupProcedure.ps1 b/functions/Get-DbaStartupProcedure.ps1 index 92f0fc34ad..4e45f2b895 100644 --- a/functions/Get-DbaStartupProcedure.ps1 +++ b/functions/Get-DbaStartupProcedure.ps1 @@ -49,7 +49,7 @@ function Get-DbaStartupProcedure { Returns an object with a startup procedure named 'dbo.StartupProc' for the Instance2 instance on SqlBox1 .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sql2014 | Get-DbaStartupProcedure + PS C:\> Get-DbaRegServer -SqlInstance sql2014 | Get-DbaStartupProcedure Returns an object with all startup procedures for every server listed in the Central Management Server on sql2014 diff --git a/functions/Get-DbaTcpPort.ps1 b/functions/Get-DbaTcpPort.ps1 index 40b5b3734c..eab5c4b8be 100644 --- a/functions/Get-DbaTcpPort.ps1 +++ b/functions/Get-DbaTcpPort.ps1 @@ -61,7 +61,7 @@ function Get-DbaTcpPort { Remote sqlwmi is used by default. If this doesn't work, then remoting is used. If neither work, it defaults to T-SQL which can provide only the port. .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sql2014 | Get-DbaTcpPort -ExcludeIpv6 -All + PS C:\> Get-DbaRegServer -SqlInstance sql2014 | Get-DbaTcpPort -ExcludeIpv6 -All Returns an object with server name, IPAddress (just ipv4), port and static ($true/$false) for every server listed in the Central Management Server on sql2014. diff --git a/functions/Get-DbaUptime.ps1 b/functions/Get-DbaUptime.ps1 index 104c3abc50..858b41bb85 100644 --- a/functions/Get-DbaUptime.ps1 +++ b/functions/Get-DbaUptime.ps1 @@ -50,7 +50,7 @@ function Get-DbaUptime { Returns an object with SQL Server start time, uptime as TimeSpan object, uptime as a string, and Windows host boot time, host uptime as TimeSpan objects and host uptime as a string for the sqlexpress instance on host winserver and the default instance on host sql2016 .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sql2014 | Get-DbaUptime + PS C:\> Get-DbaRegServer -SqlInstance sql2014 | Get-DbaUptime Returns an object with SQL Server start time, uptime as TimeSpan object, uptime as a string, and Windows host boot time, host uptime as TimeSpan objects and host uptime as a string for every server listed in the Central Management Server on sql2014 diff --git a/functions/Import-DbaCmsRegServer.ps1 b/functions/Import-DbaRegServer.ps1 similarity index 68% rename from functions/Import-DbaCmsRegServer.ps1 rename to functions/Import-DbaRegServer.ps1 index 0e191a127f..8b7fbab9ae 100644 --- a/functions/Import-DbaCmsRegServer.ps1 +++ b/functions/Import-DbaRegServer.ps1 @@ -1,4 +1,4 @@ -function Import-DbaCmsRegServer { +function Import-DbaRegServer { <# .SYNOPSIS Imports registered servers and registered server groups to SQL Server Central Management Server (CMS) @@ -19,7 +19,7 @@ function Import-DbaCmsRegServer { Optional path to exported reg server XML .PARAMETER InputObject - Enables piping from Get-DbaCmsRegServer, Get-DbaCmsRegServerGroup, CSVs and other objects. + Enables piping from Get-DbaRegServer, Get-DbaRegServerGroup, CSVs and other objects. If importing from CSV or other object, a column named ServerName is required. Optional columns include Name, Description and Group. @@ -39,25 +39,25 @@ function Import-DbaCmsRegServer { License: MIT https://opensource.org/licenses/MIT .LINK - https://dbatools.io/Import-DbaCmsRegServer + https://dbatools.io/Import-DbaRegServer .EXAMPLE - PS C:\> Import-DbaCmsRegServer -SqlInstance sql2012 -Path C:\temp\corp-regservers.xml + PS C:\> Import-DbaRegServer -SqlInstance sql2012 -Path C:\temp\corp-regservers.xml Imports C:\temp\corp-regservers.xml to the CMS on sql2012 .EXAMPLE - PS C:\> Import-DbaCmsRegServer -SqlInstance sql2008 -Group hr\Seattle -Path C:\temp\Seattle.xml + PS C:\> Import-DbaRegServer -SqlInstance sql2008 -Group hr\Seattle -Path C:\temp\Seattle.xml Imports C:\temp\Seattle.xml to Seattle subgroup within the hr group on sql2008 .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sql2008, sql2012 | Import-DbaCmsRegServer -SqlInstance sql2017 + PS C:\> Get-DbaRegServer -SqlInstance sql2008, sql2012 | Import-DbaRegServer -SqlInstance sql2017 Imports all registered servers from sql2008 and sql2012 to sql2017 .EXAMPLE - PS C:\> Get-DbaCmsRegServerGroup -SqlInstance sql2008 -Group hr\Seattle | Import-DbaCmsRegServer -SqlInstance sql2017 -Group Seattle + PS C:\> Get-DbaRegServerGroup -SqlInstance sql2008 -Group hr\Seattle | Import-DbaRegServer -SqlInstance sql2017 -Group Seattle Imports all registered servers from the hr\Seattle group on sql2008 to the Seattle group on sql2017 @@ -85,7 +85,7 @@ function Import-DbaCmsRegServer { if ($Group -is [Microsoft.SqlServer.Management.RegisteredServers.ServerGroup]) { $groupobject = $Group } else { - $groupobject = Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group + $groupobject = Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group } if (-not $groupobject) { Stop-Function -Message "Group $Group cannot be found on $instance" -Target $instance -Continue @@ -95,28 +95,28 @@ function Import-DbaCmsRegServer { foreach ($object in $InputObject) { if ($object -is [Microsoft.SqlServer.Management.RegisteredServers.RegisteredServer]) { - $groupexists = Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $object.Parent.Name + $groupexists = Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $object.Parent.Name if (-not $groupexists) { - $groupexists = Add-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Name $object.Parent.Name + $groupexists = Add-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Name $object.Parent.Name } - Add-DbaCmsRegServer -SqlInstance $instance -SqlCredential $SqlCredential -Name $object.Name -ServerName $object.ServerName -Description $object.Description -Group $groupexists + Add-DbaRegServer -SqlInstance $instance -SqlCredential $SqlCredential -Name $object.Name -ServerName $object.ServerName -Description $object.Description -Group $groupexists } elseif ($object -is [Microsoft.SqlServer.Management.RegisteredServers.ServerGroup]) { foreach ($regserver in $object.RegisteredServers) { - $groupexists = Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $regserver.Parent.Name + $groupexists = Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $regserver.Parent.Name if (-not $groupexists) { - $groupexists = Add-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Name $regserver.Parent.Name + $groupexists = Add-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Name $regserver.Parent.Name } - Add-DbaCmsRegServer -SqlInstance $instance -SqlCredential $SqlCredential -Name $regserver.Name -ServerName $regserver.ServerName -Description $regserver.Description -Group $groupexists + Add-DbaRegServer -SqlInstance $instance -SqlCredential $SqlCredential -Name $regserver.Name -ServerName $regserver.ServerName -Description $regserver.Description -Group $groupexists } } elseif ($object -is [System.IO.FileInfo]) { if ((Test-Bound -ParameterName Group)) { if ($Group -is [Microsoft.SqlServer.Management.RegisteredServers.ServerGroup]) { $reggroups = $Group } else { - $reggroups = Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group + $reggroups = Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group } } else { - $reggroups = Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Id 1 + $reggroups = Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Id 1 } foreach ($file in $object) { @@ -129,7 +129,7 @@ function Import-DbaCmsRegServer { Write-Message -Level Verbose -Message "Importing $file to $($reggroup.Name) on $instance" $urnlist = $reggroup.RegisteredServers.Urn.Value $reggroup.Import($file.FullName) - Get-DbaCmsRegServer -SqlInstance $instance -SqlCredential $SqlCredential | Where-Object { $_.Urn.Value -notin $urnlist } + Get-DbaRegServer -SqlInstance $instance -SqlCredential $SqlCredential | Where-Object { $_.Urn.Value -notin $urnlist } } catch { Stop-Function -Message "Failure attempting to import $file to $instance" -ErrorRecord $_ -Continue } @@ -139,7 +139,7 @@ function Import-DbaCmsRegServer { if (-not $object.ServerName) { Stop-Function -Message "Property 'ServerName' not found in InputObject. No servers added." -Continue } - Add-DbaCmsRegServer -SqlInstance $instance -SqlCredential $SqlCredential -Name $object.Name -ServerName $object.ServerName -Description $object.Description -Group $groupobject + Add-DbaRegServer -SqlInstance $instance -SqlCredential $SqlCredential -Name $object.Name -ServerName $object.ServerName -Description $object.Description -Group $groupobject } } } diff --git a/functions/Install-DbaWhoIsActive.ps1 b/functions/Install-DbaWhoIsActive.ps1 index ffd8496dbd..0ef07a42d1 100644 --- a/functions/Install-DbaWhoIsActive.ps1 +++ b/functions/Install-DbaWhoIsActive.ps1 @@ -63,7 +63,7 @@ function Install-DbaWhoIsActive { Installs sp_WhoisActive to sqlserver2014a's master database from the local file whoisactive_install.sql .EXAMPLE - PS C:\> $instances = Get-DbaCmsRegServer sqlserver + PS C:\> $instances = Get-DbaRegServer sqlserver PS C:\> Install-DbaWhoIsActive -SqlInstance $instances -Database master Installs sp_WhoisActive to all servers within CMS diff --git a/functions/Invoke-DbaQuery.ps1 b/functions/Invoke-DbaQuery.ps1 index e974ae3129..72b001e161 100644 --- a/functions/Invoke-DbaQuery.ps1 +++ b/functions/Invoke-DbaQuery.ps1 @@ -74,7 +74,7 @@ function Invoke-DbaQuery { Runs the sql query 'SELECT foo FROM bar' against the instance 'server\instance' .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance [SERVERNAME] -Group [GROUPNAME] | Invoke-DbaQuery -Query 'SELECT foo FROM bar' + PS C:\> Get-DbaRegServer -SqlInstance [SERVERNAME] -Group [GROUPNAME] | Invoke-DbaQuery -Query 'SELECT foo FROM bar' Runs the sql query 'SELECT foo FROM bar' against all instances in the group [GROUPNAME] on the CMS [SERVERNAME] diff --git a/functions/Invoke-DbatoolsRenameHelper.ps1 b/functions/Invoke-DbatoolsRenameHelper.ps1 index 4fab73758f..360e650a24 100644 --- a/functions/Invoke-DbatoolsRenameHelper.ps1 +++ b/functions/Invoke-DbatoolsRenameHelper.ps1 @@ -66,7 +66,7 @@ function Invoke-DbatoolsRenameHelper { [switch]$EnableException ) begin { - $morerenames = @{ + $paramrenames = @{ ExcludeAllSystemDb = 'ExcludeSystem' ExcludeAllUserDb = 'ExcludeUser' 'Invoke-Sqlcmd2' = 'Invoke-DbaQuery' @@ -84,7 +84,209 @@ function Invoke-DbatoolsRenameHelper { UseLastBackups = 'UseLastBackup' } - $allrenames = $script:renames + $morerenames + $commandrenames = @{ + 'Add-DbaRegisteredServer' = 'Add-DbaRegServer' + 'Add-DbaRegisteredServerGroup' = 'Add-DbaRegServerGroup' + 'Backup-DbaDatabaseCertificate' = 'Backup-DbaDbCertificate' + 'Backup-DbaDatabaseMasterKey' = 'Backup-DbaDbMasterKey' + 'Clear-DbaSqlConnectionPool' = 'Clear-DbaConnectionPool' + 'Connect-DbaServer' = 'Connect-DbaInstance' + 'Copy-DbaAgentCategory' = 'Copy-DbaAgentJobCategory' + 'Copy-DbaAgentProxyAccount' = 'Copy-DbaAgentProxy' + 'Copy-DbaAgentSharedSchedule' = 'Copy-DbaAgentSchedule' + 'Copy-DbaCentralManagementServer' = 'Copy-DbaRegServer' + 'Copy-DbaDatabaseAssembly' = 'Copy-DbaDbAssembly' + 'Copy-DbaDatabaseMail' = 'Copy-DbaDbMail' + 'Copy-DbaExtendedEvent' = 'Copy-DbaXESession' + 'Copy-DbaQueryStoreConfig' = 'Copy-DbaDbQueryStoreOption' + 'Copy-DbaSqlDataCollector' = 'Copy-DbaDataCollector' + 'Copy-DbaSqlPolicyManagement' = 'Copy-DbaPolicyManagement' + 'Copy-DbaSqlServerAgent' = 'Copy-DbaAgentServer' + 'Copy-DbaTableData' = 'Copy-DbaDbTableData' + 'Copy-SqlAgentCategory' = 'Copy-DbaAgentJobCategory' + 'Copy-SqlAlert' = 'Copy-DbaAgentAlert' + 'Copy-SqlAudit' = 'Copy-DbaServerAudit' + 'Copy-SqlAuditSpecification' = 'Copy-DbaServerAuditSpecification' + 'Copy-SqlBackupDevice' = 'Copy-DbaBackupDevice' + 'Copy-SqlCentralManagementServer' = 'Copy-DbaRegServer' + 'Copy-SqlCredential' = 'Copy-DbaCredential' + 'Copy-SqlCustomError' = 'Copy-DbaCustomError' + 'Copy-SqlDatabase' = 'Copy-DbaDatabase' + 'Copy-SqlDatabaseAssembly' = 'Copy-DbaDbAssembly' + 'Copy-SqlDatabaseMail' = 'Copy-DbaDbMail' + 'Copy-SqlDataCollector' = 'Copy-DbaDataCollector' + 'Copy-SqlEndpoint' = 'Copy-DbaEndpoint' + 'Copy-SqlExtendedEvent' = 'Copy-DbaXESession' + 'Copy-SqlJob' = 'Copy-DbaAgentJob' + 'Copy-SqlJobServer' = 'Copy-SqlServerAgent' + 'Copy-SqlLinkedServer' = 'Copy-DbaLinkedServer' + 'Copy-SqlLogin' = 'Copy-DbaLogin' + 'Copy-SqlOperator' = 'Copy-DbaAgentOperator' + 'Copy-SqlPolicyManagement' = 'Copy-DbaPolicyManagement' + 'Copy-SqlProxyAccount' = 'Copy-DbaAgentProxy' + 'Copy-SqlResourceGovernor' = 'Copy-DbaResourceGovernor' + 'Copy-SqlServerAgent' = 'Copy-DbaAgentServer' + 'Copy-SqlServerTrigger' = 'Copy-DbaServerTrigger' + 'Copy-SqlSharedSchedule' = 'Copy-DbaAgentSchedule' + 'Copy-SqlSpConfigure' = 'Copy-DbaSpConfigure' + 'Copy-SqlSsisCatalog' = 'Copy-DbaSsisCatalog' + 'Copy-SqlSysDbUserObjects' = 'Copy-DbaSysDbUserObject' + 'Copy-SqlUserDefinedMessage' = 'Copy-SqlCustomError' + 'Expand-DbaTLogResponsibly' = 'Expand-DbaDbLogFile' + 'Expand-SqlTLogResponsibly' = 'Expand-DbaDbLogFile' + 'Export-DbaDacpac' = 'Export-DbaDacPackage' + 'Export-DbaRegisteredServer' = 'Export-DbaRegServer' + 'Export-SqlLogin' = 'Export-DbaLogin' + 'Export-SqlSpConfigure' = 'Export-DbaSpConfigure' + 'Export-SqlUser' = 'Export-DbaUser' + 'Find-DbaDatabaseGrowthEvent' = 'Find-DbaDbGrowthEvent' + 'Find-SqlDuplicateIndex' = 'Find-DbaDuplicateIndex' + 'Find-SqlUnusedIndex' = 'Find-DbaDbUnusedIndex' + 'Get-DbaRegServerName' = 'Get-DbaRegServer' + 'Get-DbaConfig' = 'Get-DbatoolsConfig' + 'Get-DbaConfigValue' = 'Get-DbatoolsConfigValue' + 'Get-DbaDatabaseAssembly' = 'Get-DbaDbAssembly' + 'Get-DbaDatabaseCertificate' = 'Get-DbaDbCertificate' + 'Get-DbaDatabaseEncryption' = 'Get-DbaDbEncryption' + 'Get-DbaDatabaseFile' = 'Get-DbaDbFile' + 'Get-DbaDatabaseFreeSpace' = 'Get-DbaDbSpace' + 'Get-DbaDatabaseMasterKey' = 'Get-DbaDbMasterKey' + 'Get-DbaDatabasePartitionFunction' = 'Get-DbaDbPartitionFunction' + 'Get-DbaDatabasePartitionScheme' = 'Get-DbaDbPartitionScheme' + 'Get-DbaDatabaseSnapshot' = 'Get-DbaDbSnapshot' + 'Get-DbaDatabaseSpace' = 'Get-DbaDbSpace' + 'Get-DbaDatabaseState' = 'Get-DbaDbState' + 'Get-DbaDatabaseUdf' = 'Get-DbaDbUdf' + 'Get-DbaDatabaseUser' = 'Get-DbaDbUser' + 'Get-DbaDatabaseView' = 'Get-DbaDbView' + 'Get-DbaDbQueryStoreOptions' = 'Get-DbaDbQueryStoreOption' + 'Get-DbaDistributor' = 'Get-DbaRepDistributor' + 'Get-DbaInstance' = 'Connect-DbaInstance' + 'Get-DbaJobCategory' = 'Get-DbaAgentJobCategory' + 'Get-DbaLog' = 'Get-DbaErrorLog' + 'Get-DbaLogShippingError' = 'Get-DbaDbLogShipError' + 'Get-DbaOrphanUser' = 'Get-DbaDbOrphanUser' + 'Get-DbaPolicy' = 'Get-DbaPbmPolicy' + 'Get-DbaQueryStoreConfig' = 'Get-DbaDbQueryStoreOption' + 'Get-DbaRegisteredServerGroup' = 'Get-DbaRegServerGroup' + 'Get-DbaRegisteredServerStore' = 'Get-DbaRegServerStore' + 'Get-DbaRestoreHistory' = 'Get-DbaDbRestoreHistory' + 'Get-DbaRoleMember' = 'Get-DbaDbRoleMember' + 'Get-DbaSqlBuildReference' = 'Get-DbaBuildReference' + 'Get-DbaSqlFeature' = 'Get-DbaFeature' + 'Get-DbaSqlInstanceProperty' = 'Get-DbaInstanceProperty' + 'Get-DbaSqlInstanceUserOption' = 'Get-DbaInstanceUserOption' + 'Get-DbaSqlManagementObject' = 'Get-DbaManagementObject' + 'Get-DbaSqlModule' = 'Get-DbaModule' + 'Get-DbaSqlProductKey' = 'Get-DbaProductKey' + 'Get-DbaSqlRegistryRoot' = 'Get-DbaRegistryRoot' + 'Get-DbaSqlService' = 'Get-DbaService' + 'Get-DbaTable' = 'Get-DbaDbTable' + 'Get-DbaTraceFile' = 'Get-DbaTrace' + 'Get-DbaUserLevelPermission' = 'Get-DbaUserPermission' + 'Get-DbaXEventSession' = 'Get-DbaXESession' + 'Get-DbaXEventSessionTarget' = 'Get-DbaXESessionTarget' + 'Get-DiskSpace' = 'Get-DbaDiskSpace' + 'Get-SqlMaxMemory' = 'Get-DbaMaxMemory' + 'Get-SqlRegisteredServerName' = 'Get-DbaRegServer' + 'Get-SqlServerKey' = 'Get-DbaProductKey' + 'Import-DbaCsvToSql' = 'Import-DbaCsv' + 'Import-DbaRegisteredServer' = 'Import-DbaRegServer' + 'Import-SqlSpConfigure' = 'Import-DbaSpConfigure' + 'Install-SqlWhoIsActive' = 'Install-DbaWhoIsActive' + 'Invoke-DbaCmd' = 'Invoke-DbaQuery' + 'Invoke-DbaDatabaseClone' = 'Invoke-DbaDbClone' + 'Invoke-DbaDatabaseShrink' = 'Invoke-DbaDbShrink' + 'Invoke-DbaDatabaseUpgrade' = 'Invoke-DbaDbUpgrade' + 'Invoke-DbaLogShipping' = 'Invoke-DbaDbLogShipping' + 'Invoke-DbaLogShippingRecovery' = 'Invoke-DbaDbLogShipRecovery' + 'Invoke-DbaSqlQuery' = 'Invoke-DbaQuery' + 'Move-DbaRegisteredServer' = 'Move-DbaRegServer' + 'Move-DbaRegisteredServerGroup' = 'Move-DbaRegServerGroup' + 'New-DbaDatabaseCertificate' = 'New-DbaDbCertificate' + 'New-DbaDatabaseMasterKey' = 'New-DbaDbMasterKey' + 'New-DbaDatabaseSnapshot' = 'New-DbaDbSnapshot' + 'New-DbaPublishProfile' = 'New-DbaDacProfile' + 'New-DbaSqlConnectionString' = 'New-DbaConnectionString' + 'New-DbaSqlConnectionStringBuilder' = 'New-DbaConnectionStringBuilder' + 'New-DbaSqlDirectory' = 'New-DbaDirectory' + 'Out-DbaDataTable' = 'ConvertTo-DbaDataTable' + 'Publish-DbaDacpac' = 'Publish-DbaDacPackage' + 'Read-DbaXEventFile' = 'Read-DbaXEFile' + 'Register-DbaConfig' = 'Register-DbatoolsConfig' + 'Remove-DbaDatabaseCertificate' = 'Remove-DbaDbCertificate' + 'Remove-DbaDatabaseMasterKey' = 'Remove-DbaDbMasterKey' + 'Remove-DbaDatabaseSnapshot' = 'Remove-DbaDbSnapshot' + 'Remove-DbaOrphanUser' = 'Remove-DbaDbOrphanUser' + 'Remove-DbaRegisteredServer' = 'Remove-DbaRegServer' + 'Remove-DbaRegisteredServerGroup' = 'Remove-DbaRegServerGroup' + 'Remove-SqlDatabaseSafely' = 'Remove-DbaDatabaseSafely' + 'Remove-SqlOrphanUser' = 'Remove-DbaDbOrphanUser' + 'Repair-DbaOrphanUser' = 'Repair-DbaDbOrphanUser' + 'Repair-SqlOrphanUser' = 'Repair-DbaDbOrphanUser' + 'Reset-SqlAdmin' = 'Reset-DbaAdmin' + 'Reset-SqlSaPassword' = 'Reset-SqlAdmin' + 'Restart-DbaSqlService' = 'Restart-DbaService' + 'Restore-DbaDatabaseCertificate' = 'Restore-DbaDbCertificate' + 'Restore-DbaDatabaseSnapshot' = 'Restore-DbaDbSnapshot' + 'Restore-HallengrenBackup' = 'Restore-SqlBackupFromDirectory' + 'Set-DbaConfig' = 'Set-DbatoolsConfig' + 'Set-DbaDatabaseOwner' = 'Set-DbaDbOwner' + 'Set-DbaDatabaseState' = 'Set-DbaDbState' + 'Set-DbaDbQueryStoreOptions' = 'Set-DbaDbQueryStoreOption' + 'Set-DbaJobOwner' = 'Set-DbaAgentJobOwner' + 'Set-DbaQueryStoreConfig' = 'Set-DbaDbQueryStoreOption' + 'Set-DbaTempDbConfiguration' = 'Set-DbaTempdbConfig' + 'Set-SqlMaxMemory' = 'Set-DbaMaxMemory' + 'Set-SqlTempDbConfiguration' = 'Set-DbaTempdbConfig' + 'Show-DbaDatabaseList' = 'Show-DbaDbList' + 'Show-SqlDatabaseList' = 'Show-DbaDbList' + 'Show-SqlMigrationConstraint' = 'Test-SqlMigrationConstraint' + 'Show-SqlServerFileSystem' = 'Show-DbaServerFileSystem' + 'Show-SqlWhoIsActive' = 'Invoke-DbaWhoIsActive' + 'Start-DbaSqlService' = 'Start-DbaService' + 'Start-SqlMigration' = 'Start-DbaMigration' + 'Stop-DbaSqlService' = 'Stop-DbaService' + 'Sync-DbaSqlLoginPermission' = 'Sync-DbaLoginPermission' + 'Sync-SqlLoginPermissions' = 'Sync-DbaLoginPermission' + 'Test-DbaDatabaseCollation' = 'Test-DbaDbCollation' + 'Test-DbaDatabaseCompatibility' = 'Test-DbaDbCompatibility' + 'Test-DbaDatabaseOwner' = 'Test-DbaDbOwner' + 'Test-DbaFullRecoveryModel' = 'Test-DbaDbRecoveryModel' + 'Test-DbaJobOwner' = 'Test-DbaAgentJobOwner' + 'Test-DbaLogShippingStatus' = 'Test-DbaDbLogShipStatus' + 'Test-DbaRecoveryModel' = 'Test-DbaDbRecoveryModel' + 'Test-DbaSqlBuild' = 'Test-DbaBuild' + 'Test-DbaSqlManagementObject' = 'Test-DbaManagementObject' + 'Test-DbaSqlPath' = 'Test-DbaPath' + 'Test-DbaTempDbConfiguration' = 'Test-DbaTempdbConfig' + 'Test-DbaValidLogin' = 'Test-DbaWindowsLogin' + 'Test-DbaVirtualLogFile' = 'Test-DbaDbVirtualLogFile' + 'Test-SqlConnection' = 'Test-DbaConnection' + 'Test-SqlDiskAllocation' = 'Test-DbaDiskAllocation' + 'Test-SqlMigrationConstraint' = 'Test-DbaMigrationConstraint' + 'Test-SqlNetworkLatency' = 'Test-DbaNetworkLatency' + 'Test-SqlPath' = 'Test-DbaPath' + 'Test-SqlTempDbConfiguration' = 'Test-DbaTempdbConfig' + 'Update-DbaSqlServiceAccount' = 'Update-DbaServiceAccount' + 'Watch-DbaXEventSession' = 'Watch-DbaXESession' + 'Watch-SqlDbLogin' = 'Watch-DbaDbLogin' + 'Add-DbaCmsRegServer' = 'Add-DbaRegServer' + 'Add-DbaCmsRegServerGroup' = 'Add-DbaRegServerGroup' + 'Copy-DbaCmsRegServer' = 'Copy-DbaRegServer' + 'Export-DbaCmsRegServer' = 'Export-DbaRegServer' + 'Get-DbaCmsRegistryRoot' = 'Get-DbaRegistryRoot' + 'Get-DbaCmsRegServer' = 'Get-DbaRegServer' + 'Get-DbaCmsRegServerGroup' = 'Get-DbaRegServerGroup' + 'Get-DbaCmsRegServerStore' = 'Get-DbaRegServerStore' + 'Import-DbaCmsRegServer' = 'Import-DbaRegServer' + 'Move-DbaCmsRegServer' = 'Move-DbaRegServer' + 'Move-DbaCmsRegServerGroup' = 'Move-DbaRegServerGroup' + 'Remove-DbaCmsRegServer' = 'Remove-DbaRegServer' + 'Remove-DbaCmsRegServerGroup' = 'Remove-DbaRegServerGroup' + } + + $allrenames = $commandrenames + $paramrenames } process { foreach ($fileobject in $InputObject) { diff --git a/functions/Move-DbaCmsRegServer.ps1 b/functions/Move-DbaRegServer.ps1 similarity index 84% rename from functions/Move-DbaCmsRegServer.ps1 rename to functions/Move-DbaRegServer.ps1 index 801171d4b1..284a7d42f9 100644 --- a/functions/Move-DbaCmsRegServer.ps1 +++ b/functions/Move-DbaRegServer.ps1 @@ -1,4 +1,4 @@ -function Move-DbaCmsRegServer { +function Move-DbaRegServer { <# .SYNOPSIS Moves registered servers around SQL Server Central Management Server (CMS) @@ -22,7 +22,7 @@ function Move-DbaCmsRegServer { The new group. If no new group is specified, the default root will used .PARAMETER InputObject - Allows results from Get-DbaCmsRegServer to be piped in + Allows results from Get-DbaRegServer to be piped in .PARAMETER WhatIf Shows what would happen if the command were to run. No actions are actually performed. @@ -46,15 +46,15 @@ function Move-DbaCmsRegServer { License: MIT https://opensource.org/licenses/MIT .LINK - https://dbatools.io/Move-DbaCmsRegServer + https://dbatools.io/Move-DbaRegServer .EXAMPLE - PS C:\> Move-DbaCmsRegServer -SqlInstance sql2012 -Name 'Web SQL Cluster' -NewGroup HR\Prod + PS C:\> Move-DbaRegServer -SqlInstance sql2012 -Name 'Web SQL Cluster' -NewGroup HR\Prod Moves the registered server on sql2012 titled 'Web SQL Cluster' to the Prod group within the HR group .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sql2017 -Name 'Web SQL Cluster' | Move-DbaCmsRegServer -NewGroup Web + PS C:\> Get-DbaRegServer -SqlInstance sql2017 -Name 'Web SQL Cluster' | Move-DbaRegServer -NewGroup Web Moves the registered server 'Web SQL Cluster' on sql2017 to the Web group, also on sql2017 @@ -82,7 +82,7 @@ function Move-DbaCmsRegServer { if (Test-FunctionInterrupt) { return } foreach ($instance in $SqlInstance) { - $InputObject += Get-DbaCmsRegServer -SqlInstance $instance -SqlCredential $SqlCredential -Name $Name -ServerName $ServerName + $InputObject += Get-DbaRegServer -SqlInstance $instance -SqlCredential $SqlCredential -Name $Name -ServerName $ServerName } @@ -96,19 +96,19 @@ function Move-DbaCmsRegServer { $server = $regserver.ParentServer if ((Test-Bound -ParameterName NewGroup)) { - $group = Get-DbaCmsRegServerGroup -SqlInstance $server -Group $NewGroup + $group = Get-DbaRegServerGroup -SqlInstance $server -Group $NewGroup if (-not $group) { Stop-Function -Message "$NewGroup not found on $server" -Continue } } else { - $group = Get-DbaCmsRegServerGroup -SqlInstance $server -Id 1 + $group = Get-DbaRegServerGroup -SqlInstance $server -Id 1 } if ($Pscmdlet.ShouldProcess($regserver.SqlInstance, "Moving $($regserver.Name) to $group")) { try { $null = $parentserver.ServerConnection.ExecuteNonQuery($regserver.ScriptMove($group).GetScript()) - Get-DbaCmsRegServer -SqlInstance $server -Name $regserver.Name -ServerName $regserver.ServerName + Get-DbaRegServer -SqlInstance $server -Name $regserver.Name -ServerName $regserver.ServerName $parentserver.ServerConnection.Disconnect() } catch { Stop-Function -Message "Failed to move $($regserver.Name) to $NewGroup on $($regserver.SqlInstance)" -ErrorRecord $_ -Continue diff --git a/functions/Move-DbaCmsRegServerGroup.ps1 b/functions/Move-DbaRegServerGroup.ps1 similarity index 84% rename from functions/Move-DbaCmsRegServerGroup.ps1 rename to functions/Move-DbaRegServerGroup.ps1 index 7474452c32..fb4e0d393b 100644 --- a/functions/Move-DbaCmsRegServerGroup.ps1 +++ b/functions/Move-DbaRegServerGroup.ps1 @@ -1,4 +1,4 @@ -function Move-DbaCmsRegServerGroup { +function Move-DbaRegServerGroup { <# .SYNOPSIS Moves registered server groups around SQL Server Central Management Server (CMS). @@ -19,7 +19,7 @@ function Move-DbaCmsRegServerGroup { The new location. .PARAMETER InputObject - Allows results from Get-DbaCmsRegServerGroup to be piped in + Allows results from Get-DbaRegServerGroup to be piped in .PARAMETER WhatIf Shows what would happen if the command were to run. No actions are actually performed. @@ -43,15 +43,15 @@ function Move-DbaCmsRegServerGroup { License: MIT https://opensource.org/licenses/MIT .LINK - https://dbatools.io/Move-DbaCmsRegServerGroup + https://dbatools.io/Move-DbaRegServerGroup .EXAMPLE - PS C:\> Move-DbaCmsRegServerGroup -SqlInstance sql2012 -Group HR\Development -NewGroup AD\Prod + PS C:\> Move-DbaRegServerGroup -SqlInstance sql2012 -Group HR\Development -NewGroup AD\Prod Moves the Development group within HR to the Prod group within AD .EXAMPLE - PS C:\> Get-DbaCmsRegServerGroup -SqlInstance sql2017 -Group HR\Development| Move-DbaCmsRegServer -NewGroup Web + PS C:\> Get-DbaRegServerGroup -SqlInstance sql2017 -Group HR\Development| Move-DbaRegServer -NewGroup Web Moves the Development group within HR to the Web group @@ -77,7 +77,7 @@ function Move-DbaCmsRegServerGroup { if (Test-FunctionInterrupt) { return } foreach ($instance in $SqlInstance) { - $InputObject += Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group + $InputObject += Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group } foreach ($regservergroup in $InputObject) { @@ -90,9 +90,9 @@ function Move-DbaCmsRegServerGroup { $server = $regservergroup.ParentServer if ($NewGroup -eq 'Default') { - $groupobject = Get-DbaCmsRegServerGroup -SqlInstance $server -Id 1 + $groupobject = Get-DbaRegServerGroup -SqlInstance $server -Id 1 } else { - $groupobject = Get-DbaCmsRegServerGroup -SqlInstance $server -Group $NewGroup + $groupobject = Get-DbaRegServerGroup -SqlInstance $server -Group $NewGroup } Write-Message -Level Verbose -Message "Found $($groupobject.Name) on $($parentserver.ServerConnection.ServerName)" @@ -108,7 +108,7 @@ function Move-DbaCmsRegServerGroup { $newname = "$newname\$($regservergroup.Name)" Write-Message -Level Verbose -Message "Executing $($regservergroup.ScriptMove($groupobject).GetScript())" $null = $parentserver.ServerConnection.ExecuteNonQuery($regservergroup.ScriptMove($groupobject).GetScript()) - Get-DbaCmsRegServerGroup -SqlInstance $server -Group $newname + Get-DbaRegServerGroup -SqlInstance $server -Group $newname $parentserver.ServerConnection.Disconnect() } catch { Stop-Function -Message "Failed to move $($regserver.Name) to $NewGroup on $($regserver.SqlInstance)" -ErrorRecord $_ -Continue diff --git a/functions/Remove-DbaCmsRegServer.ps1 b/functions/Remove-DbaRegServer.ps1 similarity index 86% rename from functions/Remove-DbaCmsRegServer.ps1 rename to functions/Remove-DbaRegServer.ps1 index 7d681357db..df60eadc72 100644 --- a/functions/Remove-DbaCmsRegServer.ps1 +++ b/functions/Remove-DbaRegServer.ps1 @@ -1,4 +1,4 @@ -function Remove-DbaCmsRegServer { +function Remove-DbaRegServer { <# .SYNOPSIS Removes registered servers found in SQL Server Central Management Server (CMS). @@ -22,7 +22,7 @@ function Remove-DbaCmsRegServer { Specifies one or more groups to include from SQL Server Central Management Server. .PARAMETER InputObject - Allows results from Get-DbaCmsRegServer to be piped in + Allows results from Get-DbaRegServer to be piped in .PARAMETER WhatIf Shows what would happen if the command were to run. No actions are actually performed. @@ -46,20 +46,20 @@ function Remove-DbaCmsRegServer { License: MIT https://opensource.org/licenses/MIT .LINK - https://dbatools.io/Remove-DbaCmsRegServer + https://dbatools.io/Remove-DbaRegServer .EXAMPLE - PS C:\> Remove-DbaCmsRegServer -SqlInstance sql2012 -Group HR, Accounting + PS C:\> Remove-DbaRegServer -SqlInstance sql2012 -Group HR, Accounting Removes all servers from the HR and Accounting groups on sql2012 .EXAMPLE - PS C:\> Remove-DbaCmsRegServer -SqlInstance sql2012 -Group HR\Development + PS C:\> Remove-DbaRegServer -SqlInstance sql2012 -Group HR\Development Removes all servers from the HR and sub-group Development from the CMS on sql2012. .EXAMPLE - PS C:\> Remove-DbaCmsRegServer -SqlInstance sql2012 -Confirm:$false + PS C:\> Remove-DbaRegServer -SqlInstance sql2012 -Confirm:$false Removes all registered servers on sql2012 and turns off all prompting @@ -80,7 +80,7 @@ function Remove-DbaCmsRegServer { process { foreach ($instance in $SqlInstance) { - $InputObject += Get-DbaCmsRegServer -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group -ExcludeGroup $ExcludeGroup -Name $Name -ServerName $ServerName + $InputObject += Get-DbaRegServer -SqlInstance $instance -SqlCredential $SqlCredential -Group $Group -ExcludeGroup $ExcludeGroup -Name $Name -ServerName $ServerName } foreach ($regserver in $InputObject) { diff --git a/functions/Remove-DbaCmsRegServerGroup.ps1 b/functions/Remove-DbaRegServerGroup.ps1 similarity index 88% rename from functions/Remove-DbaCmsRegServerGroup.ps1 rename to functions/Remove-DbaRegServerGroup.ps1 index ed317313c2..d0ae9aa07a 100644 --- a/functions/Remove-DbaCmsRegServerGroup.ps1 +++ b/functions/Remove-DbaRegServerGroup.ps1 @@ -1,4 +1,4 @@ -function Remove-DbaCmsRegServerGroup { +function Remove-DbaRegServerGroup { <# .SYNOPSIS Gets list of Server Groups objects stored in SQL Server Central Management Server (CMS). @@ -16,7 +16,7 @@ function Remove-DbaCmsRegServerGroup { Specifies one or more groups to include from SQL Server Central Management Server. .PARAMETER InputObject - Allows results from Get-DbaCmsRegServerGroup to be piped in + Allows results from Get-DbaRegServerGroup to be piped in .PARAMETER WhatIf Shows what would happen if the command were to run. No actions are actually performed. @@ -40,15 +40,15 @@ function Remove-DbaCmsRegServerGroup { License: MIT https://opensource.org/licenses/MIT .LINK - https://dbatools.io/Remove-DbaCmsRegServerGroup + https://dbatools.io/Remove-DbaRegServerGroup .EXAMPLE - PS C:\> Remove-DbaCmsRegServerGroup -SqlInstance sql2012 -Group HR, Accounting + PS C:\> Remove-DbaRegServerGroup -SqlInstance sql2012 -Group HR, Accounting Removes the HR and Accounting groups on sql2012 .EXAMPLE - PS C:\> Remove-DbaCmsRegServerGroup -SqlInstance sql2012 -Group HR\Development -Confirm:$false + PS C:\> Remove-DbaRegServerGroup -SqlInstance sql2012 -Group HR\Development -Confirm:$false Removes the Development subgroup within the HR group on sql2012 and turns off all prompting @@ -66,7 +66,7 @@ function Remove-DbaCmsRegServerGroup { ) process { foreach ($instance in $SqlInstance) { - $InputObject += Get-DbaCmsRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Name + $InputObject += Get-DbaRegServerGroup -SqlInstance $instance -SqlCredential $SqlCredential -Group $Name } foreach ($regservergroup in $InputObject) { diff --git a/functions/Resolve-DbaNetworkName.ps1 b/functions/Resolve-DbaNetworkName.ps1 index 11f869b8a9..25ce9f36e9 100644 --- a/functions/Resolve-DbaNetworkName.ps1 +++ b/functions/Resolve-DbaNetworkName.ps1 @@ -78,9 +78,9 @@ function Resolve-DbaNetworkName { Returns a custom object displaying InputName, ComputerName, IPAddress, DNSHostName, DNSDomain, Domain, DNSHostEntry, FQDN, DNSHostEntry for the SQL instance sql2016\sqlexpress and sql2014 .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sql2014 | Resolve-DbaNetworkName + PS C:\> Get-DbaRegServer -SqlInstance sql2014 | Resolve-DbaNetworkName - Returns a custom object displaying InputName, ComputerName, IPAddress, DNSHostName, Domain, FQDN for all SQL Servers returned by Get-DbaCmsRegServer + Returns a custom object displaying InputName, ComputerName, IPAddress, DNSHostName, Domain, FQDN for all SQL Servers returned by Get-DbaRegServer #> [CmdletBinding()] diff --git a/functions/Set-DbaMaxMemory.ps1 b/functions/Set-DbaMaxMemory.ps1 index 24d4167c0e..7193e07129 100644 --- a/functions/Set-DbaMaxMemory.ps1 +++ b/functions/Set-DbaMaxMemory.ps1 @@ -57,7 +57,7 @@ function Set-DbaMaxMemory { Explicitly set max memory to 2048 on just one server, "sqlserver1" .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlserver | Test-DbaMaxMemory | Where-Object { $_.MaxValue -gt $_.Total } | Set-DbaMaxMemory + PS C:\> Get-DbaRegServer -SqlInstance sqlserver | Test-DbaMaxMemory | Where-Object { $_.MaxValue -gt $_.Total } | Set-DbaMaxMemory Find all servers in SQL Server Central Management Server that have Max SQL memory set to higher than the total memory of the server (think 2147483647), then pipe those to Set-DbaMaxMemory and use the default recommendation. diff --git a/functions/Start-DbaMigration.ps1 b/functions/Start-DbaMigration.ps1 index a200dd527f..01e7b4ed2c 100644 --- a/functions/Start-DbaMigration.ps1 +++ b/functions/Start-DbaMigration.ps1 @@ -316,7 +316,7 @@ function Start-DbaMigration { if ($Exclude -notcontains 'CentralManagementServer') { Write-Message -Level Verbose -Message "Migrating Central Management Server" - Copy-DbaCmsRegServer -Source $sourceserver -Destination $Destination -DestinationSqlCredential $DestinationSqlCredential -Force:$Force + Copy-DbaRegServer -Source $sourceserver -Destination $Destination -DestinationSqlCredential $DestinationSqlCredential -Force:$Force } if ($Exclude -notcontains 'BackupDevices') { diff --git a/functions/Test-DbaBuild.ps1 b/functions/Test-DbaBuild.ps1 index 12734e70e4..61860aab6c 100644 --- a/functions/Test-DbaBuild.ps1 +++ b/functions/Test-DbaBuild.ps1 @@ -92,7 +92,7 @@ function Test-DbaBuild { Returns information builds identified by these versions strings. .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlserver2014a | Test-DbaBuild -MinimumBuild "12.0.4511" + PS C:\> Get-DbaRegServer -SqlInstance sqlserver2014a | Test-DbaBuild -MinimumBuild "12.0.4511" Integrate with other cmdlets to have builds checked for all your registered servers on sqlserver2014a. diff --git a/functions/Test-DbaDbCollation.ps1 b/functions/Test-DbaDbCollation.ps1 index b767c44db8..5e2ded82e8 100644 --- a/functions/Test-DbaDbCollation.ps1 +++ b/functions/Test-DbaDbCollation.ps1 @@ -53,7 +53,7 @@ function Test-DbaDbCollation { Returns information for database and server collations for all databases except db1 on sqlserver2014a and sql2016. .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sql2016 | Test-DbaDbCollation + PS C:\> Get-DbaRegServer -SqlInstance sql2016 | Test-DbaDbCollation Returns db/server collation information for every database on every server listed in the Central Management Server on sql2016. diff --git a/functions/Test-DbaDbCompatibility.ps1 b/functions/Test-DbaDbCompatibility.ps1 index 409bc4af32..56dced8eea 100644 --- a/functions/Test-DbaDbCompatibility.ps1 +++ b/functions/Test-DbaDbCompatibility.ps1 @@ -53,7 +53,7 @@ function Test-DbaDbCompatibility { Returns detailed information for database and server compatibility level for all databases except db1 on sqlserver2014a and sql2016. .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sql2014 | Test-DbaDbCompatibility + PS C:\> Get-DbaRegServer -SqlInstance sql2014 | Test-DbaDbCompatibility Returns db/server compatibility information for every database on every server listed in the Central Management Server on sql2016. diff --git a/functions/Test-DbaMaxMemory.ps1 b/functions/Test-DbaMaxMemory.ps1 index 470d154959..c1813964f9 100644 --- a/functions/Test-DbaMaxMemory.ps1 +++ b/functions/Test-DbaMaxMemory.ps1 @@ -39,12 +39,12 @@ function Test-DbaMaxMemory { Calculate the 'Max Server Memory' for SQL Server instances sqlcluster and sqlserver2012 .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlcluster | Test-DbaMaxMemory + PS C:\> Get-DbaRegServer -SqlInstance sqlcluster | Test-DbaMaxMemory Calculate the 'Max Server Memory' settings for all servers within the SQL Server Central Management Server "sqlcluster" .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlcluster | Test-DbaMaxMemory | Where-Object { $_.MaxValue -gt $_.Total } | Set-DbaMaxMemory + PS C:\> Get-DbaRegServer -SqlInstance sqlcluster | Test-DbaMaxMemory | Where-Object { $_.MaxValue -gt $_.Total } | Set-DbaMaxMemory Find all servers in CMS that have Max SQL memory set to higher than the total memory of the server (think 2147483647) and set it to recommended value. diff --git a/functions/Test-DbaTempDbConfig.ps1 b/functions/Test-DbaTempDbConfig.ps1 index 20e02260dc..e72d9ff2e9 100644 --- a/functions/Test-DbaTempDbConfig.ps1 +++ b/functions/Test-DbaTempDbConfig.ps1 @@ -53,7 +53,7 @@ function Test-DbaTempdbConfig { Checks tempdb on the localhost machine. All rest results are shown. .EXAMPLE - PS C:\> Get-DbaCmsRegServer -SqlInstance sqlserver2014a | Test-DbaTempdbConfig | Select-Object * | Out-GridView + PS C:\> Get-DbaRegServer -SqlInstance sqlserver2014a | Test-DbaTempdbConfig | Select-Object * | Out-GridView Checks tempdb configuration for a group of servers from SQL Server Central Management Server (CMS). Output includes all columns. Send output to GridView. #> diff --git a/functions/Watch-DbaDbLogin.ps1 b/functions/Watch-DbaDbLogin.ps1 index 40c5b155b1..8971352590 100644 --- a/functions/Watch-DbaDbLogin.ps1 +++ b/functions/Watch-DbaDbLogin.ps1 @@ -97,7 +97,7 @@ function Watch-DbaDbLogin { #> if ($SqlCms) { try { - $servers = Get-DbaCmsRegServerName -SqlInstance $SqlCms -SqlCredential $SqlCredential -EnableException + $servers = Get-DbaRegServerName -SqlInstance $SqlCms -SqlCredential $SqlCredential -EnableException } catch { Stop-Function -Message "The CMS server, $SqlCms, was not accessible." -Target $SqlCms -ErrorRecord $_ return diff --git a/tests/Add-DbaCmsRegServer.Tests.ps1 b/tests/Add-DbaRegServer.Tests.ps1 similarity index 71% rename from tests/Add-DbaCmsRegServer.Tests.ps1 rename to tests/Add-DbaRegServer.Tests.ps1 index e339aa6c7c..aac0fb7b10 100644 --- a/tests/Add-DbaCmsRegServer.Tests.ps1 +++ b/tests/Add-DbaRegServer.Tests.ps1 @@ -20,21 +20,21 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" { $group = "dbatoolsci-group1" $regSrvName = "dbatoolsci-server12" $regSrvDesc = "dbatoolsci-server123" - $groupobject = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group + $groupobject = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group } AfterAll { - Get-DbaCmsRegServer -SqlInstance $script:instance1, $script:instance2 | Where-Object Name -match dbatoolsci | Remove-DbaCmsRegServer -Confirm:$false - Get-DbaCmsRegServerGroup -SqlInstance $script:instance1, $script:instance2 | Where-Object Name -match dbatoolsci | Remove-DbaCmsRegServerGroup -Confirm:$false + Get-DbaRegServer -SqlInstance $script:instance1, $script:instance2 | Where-Object Name -match dbatoolsci | Remove-DbaRegServer -Confirm:$false + Get-DbaRegServerGroup -SqlInstance $script:instance1, $script:instance2 | Where-Object Name -match dbatoolsci | Remove-DbaRegServerGroup -Confirm:$false } It "adds a registered server" { - $results1 = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName + $results1 = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName $results1.Name | Should -Be $srvName $results1.ServerName | Should -Be $srvName $results1.SqlInstance | Should -Not -Be $null } It "adds a registered server with extended properties" { - $results2 = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $RegsrvName -Name $srvName -Group $groupobject -Description $regSrvDesc + $results2 = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $RegsrvName -Name $srvName -Group $groupobject -Description $regSrvDesc $results2.ServerName | Should -Be $regSrvName $results2.Description | Should -Be $regSrvDesc $results2.Name | Should -Be $srvName diff --git a/tests/Add-DbaCmsRegServerGroup.Tests.ps1 b/tests/Add-DbaRegServerGroup.Tests.ps1 similarity index 70% rename from tests/Add-DbaCmsRegServerGroup.Tests.ps1 rename to tests/Add-DbaRegServerGroup.Tests.ps1 index 64fa20ce0c..85af4611df 100644 --- a/tests/Add-DbaCmsRegServerGroup.Tests.ps1 +++ b/tests/Add-DbaRegServerGroup.Tests.ps1 @@ -21,22 +21,22 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" { $description = "group description" } AfterAll { - Get-DbaCmsRegServerGroup -SqlInstance $script:instance1 | Where-Object Name -match dbatoolsci | Remove-DbaCmsRegServerGroup -Confirm:$false + Get-DbaRegServerGroup -SqlInstance $script:instance1 | Where-Object Name -match dbatoolsci | Remove-DbaRegServerGroup -Confirm:$false } It "adds a registered server group" { - $results = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group + $results = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group $results.Name | Should -Be $group $results.SqlInstance | Should -Not -Be $null } It "adds a registered server group with extended properties" { - $results = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group2 -Description $description + $results = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group2 -Description $description $results.Name | Should -Be $group2 $results.Description | Should -Be $description $results.SqlInstance | Should -Not -Be $null } It "supports hella pipe" { - $results = Get-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Id 1 | Add-DbaCmsRegServerGroup -Name dbatoolsci-first | Add-DbaCmsRegServerGroup -Name dbatoolsci-second | Add-DbaCmsRegServerGroup -Name dbatoolsci-third | Add-DbaCmsRegServer -ServerName dbatoolsci-test -Description ridiculous + $results = Get-DbaRegServerGroup -SqlInstance $script:instance1 -Id 1 | Add-DbaRegServerGroup -Name dbatoolsci-first | Add-DbaRegServerGroup -Name dbatoolsci-second | Add-DbaRegServerGroup -Name dbatoolsci-third | Add-DbaRegServer -ServerName dbatoolsci-test -Description ridiculous $results.Group | Should -Be 'dbatoolsci-first\dbatoolsci-second\dbatoolsci-third' } } diff --git a/tests/Copy-DbaCmsRegServer.Tests.ps1 b/tests/Copy-DbaRegServer.Tests.ps1 similarity index 93% rename from tests/Copy-DbaCmsRegServer.Tests.ps1 rename to tests/Copy-DbaRegServer.Tests.ps1 index 3f3997c457..dfce948783 100644 --- a/tests/Copy-DbaCmsRegServer.Tests.ps1 +++ b/tests/Copy-DbaRegServer.Tests.ps1 @@ -44,7 +44,7 @@ Describe "$commandname Integration Tests" -Tags "IntegrationTests" { $groupstore.Drop() } - $results = Copy-DbaCmsRegServer -Source $script:instance2 -Destination $script:instance1 -WarningVariable warn -WarningAction SilentlyContinue -CMSGroup $group + $results = Copy-DbaRegServer -Source $script:instance2 -Destination $script:instance1 -WarningVariable warn -WarningAction SilentlyContinue -CMSGroup $group It "should report success" { $results.Status | Should Be "Successful", "Successful" diff --git a/tests/Export-DbaCmsRegServer.Tests.ps1 b/tests/Export-DbaRegServer.Tests.ps1 similarity index 62% rename from tests/Export-DbaCmsRegServer.Tests.ps1 rename to tests/Export-DbaRegServer.Tests.ps1 index fbec9cb643..1c60869236 100644 --- a/tests/Export-DbaCmsRegServer.Tests.ps1 +++ b/tests/Export-DbaRegServer.Tests.ps1 @@ -20,45 +20,45 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" { $regSrvName = "dbatoolsci-server12" $regSrvDesc = "dbatoolsci-server123" - $newGroup = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group - $newServer = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName -Name $regSrvName -Description $regSrvDesc + $newGroup = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group + $newServer = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName -Name $regSrvName -Description $regSrvDesc $srvName2 = "dbatoolsci-server2" $group2 = "dbatoolsci-group1a" $regSrvName2 = "dbatoolsci-server21" $regSrvDesc2 = "dbatoolsci-server321" - $newGroup2 = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group2 - $newServer2 = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName2 -Name $regSrvName2 -Description $regSrvDesc2 + $newGroup2 = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group2 + $newServer2 = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName2 -Name $regSrvName2 -Description $regSrvDesc2 $regSrvName3 = "dbatoolsci-server3" $srvName3 = "dbatoolsci-server3" $regSrvDesc3 = "dbatoolsci-server3desc" - $newServer3 = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName3 -Name $regSrvName3 -Description $regSrvDesc3 + $newServer3 = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName3 -Name $regSrvName3 -Description $regSrvDesc3 } AfterAll { - Get-DbaCmsRegServer -SqlInstance $script:instance1, $script:instance2 | Where-Object Name -match dbatoolsci | Remove-DbaCmsRegServer -Confirm:$false - Get-DbaCmsRegServerGroup -SqlInstance $script:instance1, $script:instance2 | Where-Object Name -match dbatoolsci | Remove-DbaCmsRegServerGroup -Confirm:$false + Get-DbaRegServer -SqlInstance $script:instance1, $script:instance2 | Where-Object Name -match dbatoolsci | Remove-DbaRegServer -Confirm:$false + Get-DbaRegServerGroup -SqlInstance $script:instance1, $script:instance2 | Where-Object Name -match dbatoolsci | Remove-DbaRegServerGroup -Confirm:$false $results, $results2, $results3 | Remove-Item -ErrorAction Ignore } It -Skip "should create an xml file" { - $results = $newServer | Export-DbaCmsRegServer + $results = $newServer | Export-DbaRegServer $results -is [System.IO.FileInfo] | Should -Be $true $results.Extension -eq '.xml' | Should -Be $true } It "should create a specific xml file when using Path" { - $results2 = $newGroup2 | Export-DbaCmsRegServer -Path C:\temp\dbatoolsci_regserverexport.xml + $results2 = $newGroup2 | Export-DbaRegServer -Path C:\temp\dbatoolsci_regserverexport.xml $results2 -is [System.IO.FileInfo] | Should -Be $true $results2.FullName | Should -Be 'C:\temp\dbatoolsci_regserverexport.xml' Get-Content -Path $results2 -Raw | Should -Match dbatoolsci-group1a } It "creates an importable xml file" { - $results3 = $newServer3 | Export-DbaCmsRegServer -Path C:\temp\dbatoolsci_regserverexport.xml - $results4 = Import-DbaCmsRegServer -SqlInstance $script:instance2 -Path $results3 + $results3 = $newServer3 | Export-DbaRegServer -Path C:\temp\dbatoolsci_regserverexport.xml + $results4 = Import-DbaRegServer -SqlInstance $script:instance2 -Path $results3 $results4.ServerName | Should -Be $newServer3.ServerName $results4.Description | Should -Be $newServer3.Description } diff --git a/tests/Get-DbaCmsRegServer.Tests.ps1 b/tests/Get-DbaRegServer.Tests.ps1 similarity index 83% rename from tests/Get-DbaCmsRegServer.Tests.ps1 rename to tests/Get-DbaRegServer.Tests.ps1 index be4a36b508..851e05e7bf 100644 --- a/tests/Get-DbaCmsRegServer.Tests.ps1 +++ b/tests/Get-DbaRegServer.Tests.ps1 @@ -5,7 +5,7 @@ Write-Host -Object "Running $PSCommandpath" -ForegroundColor Cyan Describe "$CommandName Unit Tests" -Tags "UnitTests" { Context "Validate parameters" { [object[]]$params = (Get-Command $CommandName).Parameters.Keys | Where-Object {$_ -notin ('whatif', 'confirm')} - [object[]]$knownParameters = 'SqlInstance', 'SqlCredential', 'Name', 'ServerName', 'Group', 'ExcludeGroup', 'Id', 'IncludeSelf', 'ExcludeCmsServer', 'ResolveNetworkName', 'ExcludeLocal', 'EnableException' + [object[]]$knownParameters = 'SqlInstance', 'SqlCredential', 'Name', 'ServerName', 'Group', 'ExcludeGroup', 'Id', 'IncludeSelf', 'ResolveNetworkName', 'ExcludeLocal', 'EnableException' $knownParameters += [System.Management.Automation.PSCmdlet]::CommonParameters It "Should only contain our specific parameters" { (@(Compare-Object -ReferenceObject ($knownParameters | Where-Object {$_}) -DifferenceObject $params).Count ) | Should Be 0 @@ -61,20 +61,20 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" { $newServer3.Create() } AfterAll { - Get-DbaCmsRegServer -SqlInstance $script:instance1 | Where-Object Name -match dbatoolsci | Remove-DbaCmsRegServer -Confirm:$false - Get-DbaCmsRegServerGroup -SqlInstance $script:instance1 | Where-Object Name -match dbatoolsci | Remove-DbaCmsRegServerGroup -Confirm:$false + Get-DbaRegServer -SqlInstance $script:instance1 | Where-Object Name -match dbatoolsci | Remove-DbaRegServer -Confirm:$false + Get-DbaRegServerGroup -SqlInstance $script:instance1 | Where-Object Name -match dbatoolsci | Remove-DbaRegServerGroup -Confirm:$false } It "Should return multiple objects" { - $results = Get-DbaCmsRegServer -SqlInstance $script:instance1 -Group $group -ExcludeLocal + $results = Get-DbaRegServer -SqlInstance $script:instance1 -Group $group -ExcludeLocal $results.Count | Should Be 2 } It "Should allow searching subgroups" { - $results = Get-DbaCmsRegServer -SqlInstance $script:instance1 -Group "$group\$group2" -ExcludeLocal + $results = Get-DbaRegServer -SqlInstance $script:instance1 -Group "$group\$group2" -ExcludeLocal $results.Count | Should Be 1 } It "Should return the root server when excluding (see #3529)" { - $results = Get-DbaCmsRegServer -SqlInstance $script:instance1 -ExcludeGroup "$group\$group2" -ExcludeLocal + $results = Get-DbaRegServer -SqlInstance $script:instance1 -ExcludeGroup "$group\$group2" -ExcludeLocal @($results | Where-Object Name -eq $srvName3).Count | Should -Be 1 } diff --git a/tests/Get-DbaCmsRegServerGroup.Tests.ps1 b/tests/Get-DbaRegServerGroup.Tests.ps1 similarity index 85% rename from tests/Get-DbaCmsRegServerGroup.Tests.ps1 rename to tests/Get-DbaRegServerGroup.Tests.ps1 index 241ebc04f4..859de58e96 100644 --- a/tests/Get-DbaCmsRegServerGroup.Tests.ps1 +++ b/tests/Get-DbaRegServerGroup.Tests.ps1 @@ -53,16 +53,16 @@ Describe "$CommandName Integration Tests" -Tags "IntegrationTests" { $newServer2.Create() } AfterAll { - Get-DbaCmsRegServer -SqlInstance $script:instance1 | Where-Object Name -match dbatoolsci | Remove-DbaCmsRegServer -Confirm:$false - Get-DbaCmsRegServerGroup -SqlInstance $script:instance1 | Where-Object Name -match dbatoolsci | Remove-DbaCmsRegServerGroup -Confirm:$false + Get-DbaRegServer -SqlInstance $script:instance1 | Where-Object Name -match dbatoolsci | Remove-DbaRegServer -Confirm:$false + Get-DbaRegServerGroup -SqlInstance $script:instance1 | Where-Object Name -match dbatoolsci | Remove-DbaRegServerGroup -Confirm:$false } It "Should return one group" { - $results = Get-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Group $group + $results = Get-DbaRegServerGroup -SqlInstance $script:instance1 -Group $group $results.Count | Should Be 1 } It "Should allow searching subgroups" { - $results = Get-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Group "$group\$group2" + $results = Get-DbaRegServerGroup -SqlInstance $script:instance1 -Group "$group\$group2" $results.Count | Should Be 1 } diff --git a/tests/Get-DbaCmsRegServerStore.Tests.ps1 b/tests/Get-DbaRegServerStore.Tests.ps1 similarity index 93% rename from tests/Get-DbaCmsRegServerStore.Tests.ps1 rename to tests/Get-DbaRegServerStore.Tests.ps1 index 8ada6809d9..c8f510beeb 100644 --- a/tests/Get-DbaCmsRegServerStore.Tests.ps1 +++ b/tests/Get-DbaRegServerStore.Tests.ps1 @@ -16,7 +16,7 @@ Describe "$CommandName Unit Tests" -Tags "UnitTests" { Describe "$commandname Integration Tests" -Tags "IntegrationTests" { Context "Components are properly retreived" { It "Should return the right values" { - $results = Get-DbaCmsRegServerStore -SqlInstance $script:instance2 + $results = Get-DbaRegServerStore -SqlInstance $script:instance2 $results.InstanceName | Should -Not -Be $null $results.DisplayName | Should -Be "Central Management Servers" } diff --git a/tests/Import-DbaCmsRegServer.Tests.ps1 b/tests/Import-DbaRegServer.Tests.ps1 similarity index 61% rename from tests/Import-DbaCmsRegServer.Tests.ps1 rename to tests/Import-DbaRegServer.Tests.ps1 index 8efad6304f..12c2e204f5 100644 --- a/tests/Import-DbaCmsRegServer.Tests.ps1 +++ b/tests/Import-DbaRegServer.Tests.ps1 @@ -21,44 +21,44 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" { $regSrvName = "dbatoolsci-server12" $regSrvDesc = "dbatoolsci-server123" - $newGroup = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group - $newServer = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName -Name $regSrvName -Description $regSrvDesc -Group $newGroup.Name + $newGroup = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group + $newServer = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName -Name $regSrvName -Description $regSrvDesc -Group $newGroup.Name $srvName2 = "dbatoolsci-server2" $group2 = "dbatoolsci-group1a" $regSrvName2 = "dbatoolsci-server21" $regSrvDesc2 = "dbatoolsci-server321" - $newGroup2 = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group2 - $newServer2 = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName2 -Name $regSrvName2 -Description $regSrvDesc2 + $newGroup2 = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group2 + $newServer2 = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName2 -Name $regSrvName2 -Description $regSrvDesc2 $regSrvName3 = "dbatoolsci-server3" $srvName3 = "dbatoolsci-server3" $regSrvDesc3 = "dbatoolsci-server3desc" - $newServer3 = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName3 -Name $regSrvName3 -Description $regSrvDesc3 + $newServer3 = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName3 -Name $regSrvName3 -Description $regSrvDesc3 } AfterAll { - Get-DbaCmsRegServer -SqlInstance $script:instance1, $script:instance2 | Where-Object Name -match dbatoolsci | Remove-DbaCmsRegServer -Confirm:$false - Get-DbaCmsRegServerGroup -SqlInstance $script:instance1, $script:instance2 | Where-Object Name -match dbatoolsci | Remove-DbaCmsRegServerGroup -Confirm:$false + Get-DbaRegServer -SqlInstance $script:instance1, $script:instance2 | Where-Object Name -match dbatoolsci | Remove-DbaRegServer -Confirm:$false + Get-DbaRegServerGroup -SqlInstance $script:instance1, $script:instance2 | Where-Object Name -match dbatoolsci | Remove-DbaRegServerGroup -Confirm:$false } It "imports group objects" { - $results = $newServer.Parent | Import-DbaCmsRegServer -SqlInstance $script:instance2 + $results = $newServer.Parent | Import-DbaRegServer -SqlInstance $script:instance2 $results.Description | Should -Be $regSrvDesc $results.ServerName | Should -Be $srvName $results.Parent.Name | Should -Be $group } It "imports registered server objects" { - $results2 = $newServer2 | Import-DbaCmsRegServer -SqlInstance $script:instance2 + $results2 = $newServer2 | Import-DbaRegServer -SqlInstance $script:instance2 $results2.ServerName | Should -Be $newServer2.ServerName $results2.Parent.Name | Should -Be $newServer2.Parent.Name } - It "imports a file from Export-DbaCmsRegServer" { - $results3 = $newServer3 | Export-DbaCmsRegServer -Path C:\temp\dbatoolsci_regserverexport.xml - $results4 = Import-DbaCmsRegServer -SqlInstance $script:instance2 -Path $results3 + It "imports a file from Export-DbaRegServer" { + $results3 = $newServer3 | Export-DbaRegServer -Path C:\temp\dbatoolsci_regserverexport.xml + $results4 = Import-DbaRegServer -SqlInstance $script:instance2 -Path $results3 $results4.ServerName | Should -Be @('dbatoolsci-server3', 'dbatoolsci-server1') $results4.Description | Should -Be @('dbatoolsci-server3desc', 'dbatoolsci-server123') } @@ -66,7 +66,7 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" { $object = [pscustomobject]@{ ServerName = 'dbatoolsci-randobject' } - $results = $object | Import-DbaCmsRegServer -SqlInstance $script:instance2 + $results = $object | Import-DbaRegServer -SqlInstance $script:instance2 $results.ServerName | Should -Be 'dbatoolsci-randobject' $results.Name | Should -Be 'dbatoolsci-randobject' } @@ -74,7 +74,7 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" { $object = [pscustomobject]@{ Name = 'dbatoolsci-randobject' } - $results = $object | Import-DbaCmsRegServer -SqlInstance $script:instance2 -WarningAction SilentlyContinue -WarningVariable warn + $results = $object | Import-DbaRegServer -SqlInstance $script:instance2 -WarningAction SilentlyContinue -WarningVariable warn $results | Should -Be $null $warn | Should -Match 'No servers added' } diff --git a/tests/Move-DbaCmsRegServer.Tests.ps1 b/tests/Move-DbaRegServer.Tests.ps1 similarity index 61% rename from tests/Move-DbaCmsRegServer.Tests.ps1 rename to tests/Move-DbaRegServer.Tests.ps1 index 32edae6571..747d96d332 100644 --- a/tests/Move-DbaCmsRegServer.Tests.ps1 +++ b/tests/Move-DbaRegServer.Tests.ps1 @@ -21,36 +21,36 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" { $regSrvName = "dbatoolsci-server12" $regSrvDesc = "dbatoolsci-server123" - $newGroup = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group - $newServer = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName -Name $regSrvName -Description $regSrvDesc -Group $newGroup.Name + $newGroup = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group + $newServer = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName -Name $regSrvName -Description $regSrvDesc -Group $newGroup.Name $srvName2 = "dbatoolsci-server2" $group2 = "dbatoolsci-group1a" $regSrvName2 = "dbatoolsci-server21" $regSrvDesc2 = "dbatoolsci-server321" - $newGroup2 = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group2 - $newServer2 = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName2 -Name $regSrvName2 -Description $regSrvDesc2 + $newGroup2 = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group2 + $newServer2 = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName2 -Name $regSrvName2 -Description $regSrvDesc2 $regSrvName3 = "dbatoolsci-server3" $srvName3 = "dbatoolsci-server3" $regSrvDesc3 = "dbatoolsci-server3desc" - $newServer3 = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName3 -Name $regSrvName3 -Description $regSrvDesc3 + $newServer3 = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName3 -Name $regSrvName3 -Description $regSrvDesc3 } AfterAll { - Get-DbaCmsRegServer -SqlInstance $script:instance1 -Name $regSrvName, $regSrvName2, $regSrvName3 | Remove-DbaCmsRegServer -Confirm:$false - Get-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Group $group, $group2 | Remove-DbaCmsRegServerGroup -Confirm:$false + Get-DbaRegServer -SqlInstance $script:instance1 -Name $regSrvName, $regSrvName2, $regSrvName3 | Remove-DbaRegServer -Confirm:$false + Get-DbaRegServerGroup -SqlInstance $script:instance1 -Group $group, $group2 | Remove-DbaRegServerGroup -Confirm:$false } It "moves a piped server" { - $results = $newServer2 | Move-DbaCmsRegServer -NewGroup $newGroup.Name + $results = $newServer2 | Move-DbaRegServer -NewGroup $newGroup.Name $results.Parent.Name | Should -Be $newGroup.Name $results.Name | Should -Be $regSrvName2 } It "moves a manually specified server" { - $results = Move-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName3 -NewGroup $newGroup2.Name + $results = Move-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName3 -NewGroup $newGroup2.Name $results.Parent.Name | Should -Be $newGroup2.Name $results.Description | Should -Be $regSrvDesc3 } diff --git a/tests/Move-DbaCmsRegServerGroup.Tests.ps1 b/tests/Move-DbaRegServerGroup.Tests.ps1 similarity index 61% rename from tests/Move-DbaCmsRegServerGroup.Tests.ps1 rename to tests/Move-DbaRegServerGroup.Tests.ps1 index 5bcd0fb003..5889c7fd31 100644 --- a/tests/Move-DbaCmsRegServerGroup.Tests.ps1 +++ b/tests/Move-DbaRegServerGroup.Tests.ps1 @@ -21,27 +21,27 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" { $regSrvName = "dbatoolsci-server12" $regSrvDesc = "dbatoolsci-server123" - $newGroup = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group - $newServer = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName -Name $regSrvName -Description $regSrvDesc -Group $newGroup.Name + $newGroup = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group + $newServer = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName -Name $regSrvName -Description $regSrvDesc -Group $newGroup.Name $group2 = "dbatoolsci-group1a" - $newGroup2 = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group2 + $newGroup2 = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group2 $group3 = "dbatoolsci-group1b" - $newGroup3 = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group3 + $newGroup3 = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group3 } AfterAll { - Get-DbaCmsRegServer -SqlInstance $script:instance1 -Name $regSrvName | Remove-DbaCmsRegServer -Confirm:$false - Get-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Group $group, $group2, $group3 | Remove-DbaCmsRegServerGroup -Confirm:$false + Get-DbaRegServer -SqlInstance $script:instance1 -Name $regSrvName | Remove-DbaRegServer -Confirm:$false + Get-DbaRegServerGroup -SqlInstance $script:instance1 -Group $group, $group2, $group3 | Remove-DbaRegServerGroup -Confirm:$false } It "moves a piped group" { - $results = $newGroup2, $newGroup3 | Move-DbaCmsRegServerGroup -NewGroup $newGroup.Name + $results = $newGroup2, $newGroup3 | Move-DbaRegServerGroup -NewGroup $newGroup.Name $results.Parent.Name | Should -Be $newGroup.Name, $newGroup.Name } It "moves a manually specified group" { - $results = Move-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Group "$group\$group3" -NewGroup Default + $results = Move-DbaRegServerGroup -SqlInstance $script:instance1 -Group "$group\$group3" -NewGroup Default $results.Parent.Name | Should -Be 'DatabaseEngineServerGroup' } } diff --git a/tests/Remove-DbaCmsRegServer.Tests.ps1 b/tests/Remove-DbaRegServer.Tests.ps1 similarity index 71% rename from tests/Remove-DbaCmsRegServer.Tests.ps1 rename to tests/Remove-DbaRegServer.Tests.ps1 index e9f788ceb3..63114d481d 100644 --- a/tests/Remove-DbaCmsRegServer.Tests.ps1 +++ b/tests/Remove-DbaRegServer.Tests.ps1 @@ -19,25 +19,25 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" { $srvName = "dbatoolsci-server1" $regSrvName = "dbatoolsci-server12" $regSrvDesc = "dbatoolsci-server123" - $newServer = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName -Name $regSrvName -Description $regSrvDesc + $newServer = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName -Name $regSrvName -Description $regSrvDesc $srvName2 = "dbatoolsci-server2" $regSrvName2 = "dbatoolsci-server21" $regSrvDesc2 = "dbatoolsci-server321" - $newServer2 = Add-DbaCmsRegServer -SqlInstance $script:instance1 -ServerName $srvName2 -Name $regSrvName2 -Description $regSrvDesc2 + $newServer2 = Add-DbaRegServer -SqlInstance $script:instance1 -ServerName $srvName2 -Name $regSrvName2 -Description $regSrvDesc2 } AfterAll { - Get-DbaCmsRegServer -SqlInstance $script:instance1 -Name $regSrvName, $regSrvName2, $regSrvName3 | Remove-DbaCmsRegServer -Confirm:$false + Get-DbaRegServer -SqlInstance $script:instance1 -Name $regSrvName, $regSrvName2, $regSrvName3 | Remove-DbaRegServer -Confirm:$false } It "supports dropping via the pipeline" { - $results = $newServer | Remove-DbaCmsRegServer -Confirm:$false + $results = $newServer | Remove-DbaRegServer -Confirm:$false $results.Name | Should -Be $regSrvName $results.Status | Should -Be 'Dropped' } It "supports dropping manually" { - $results = Remove-DbaCmsRegServer -Confirm:$false -SqlInstance $script:instance1 -Name $regSrvName2 + $results = Remove-DbaRegServer -Confirm:$false -SqlInstance $script:instance1 -Name $regSrvName2 $results.Name | Should -Be $regSrvName2 $results.Status | Should -Be 'Dropped' } diff --git a/tests/Remove-DbaCmsRegServerGroup.Tests.ps1 b/tests/Remove-DbaRegServerGroup.Tests.ps1 similarity index 60% rename from tests/Remove-DbaCmsRegServerGroup.Tests.ps1 rename to tests/Remove-DbaRegServerGroup.Tests.ps1 index 5ff97e8c1f..d3cb70baa5 100644 --- a/tests/Remove-DbaCmsRegServerGroup.Tests.ps1 +++ b/tests/Remove-DbaRegServerGroup.Tests.ps1 @@ -17,31 +17,31 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" { Context "Setup" { BeforeAll { $group = "dbatoolsci-group1" - $newGroup = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group + $newGroup = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group $group2 = "dbatoolsci-group1a" - $newGroup2 = Add-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Name $group2 + $newGroup2 = Add-DbaRegServerGroup -SqlInstance $script:instance1 -Name $group2 - $hellagroup = Get-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Id 1 | Add-DbaCmsRegServerGroup -Name dbatoolsci-first | Add-DbaCmsRegServerGroup -Name dbatoolsci-second | Add-DbaCmsRegServerGroup -Name dbatoolsci-third | Add-DbaCmsRegServer -ServerName dbatoolsci-test -Description ridiculous + $hellagroup = Get-DbaRegServerGroup -SqlInstance $script:instance1 -Id 1 | Add-DbaRegServerGroup -Name dbatoolsci-first | Add-DbaRegServerGroup -Name dbatoolsci-second | Add-DbaRegServerGroup -Name dbatoolsci-third | Add-DbaRegServer -ServerName dbatoolsci-test -Description ridiculous } AfterAll { - Get-DbaCmsRegServerGroup -SqlInstance $script:instance1 | Where-Object Name -match dbatoolsci | Remove-DbaCmsRegServerGroup -Confirm:$false + Get-DbaRegServerGroup -SqlInstance $script:instance1 | Where-Object Name -match dbatoolsci | Remove-DbaRegServerGroup -Confirm:$false } It "supports dropping via the pipeline" { - $results = $newGroup | Remove-DbaCmsRegServerGroup -Confirm:$false + $results = $newGroup | Remove-DbaRegServerGroup -Confirm:$false $results.Name | Should -Be $group $results.Status | Should -Be 'Dropped' } It "supports dropping manually" { - $results = Remove-DbaCmsRegServerGroup -Confirm:$false -SqlInstance $script:instance1 -Name $group2 + $results = Remove-DbaRegServerGroup -Confirm:$false -SqlInstance $script:instance1 -Name $group2 $results.Name | Should -Be $group2 $results.Status | Should -Be 'Dropped' } It "supports hella long group name" { - $results = Get-DbaCmsRegServerGroup -SqlInstance $script:instance1 -Group $hellagroup.Group + $results = Get-DbaRegServerGroup -SqlInstance $script:instance1 -Group $hellagroup.Group $results.Name | Should -Be 'dbatoolsci-third' } }