Merge pull request Azure#10822 from bradrich-msft/master

Add PartnerDatabaseName to New-AzSqlDatabaseSecondary cmdlet

Author: isra-fel

src/Sql/Sql.Test/ScenarioTests/DatabaseReplicationTests.cs

@@ -46,6 +46,13 @@ public void TestCreateSecondaryDatabase()
             RunPowerShellTest("Test-CreateSecondaryDatabase");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestCreateNamedSecondaryDatabase()
+        {
+            RunPowerShellTest("Test-CreateNamedSecondaryDatabase");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetReplicationLink()

src/Sql/Sql.Test/ScenarioTests/DatabaseReplicationTests.ps1

@@ -155,6 +155,48 @@ function Test-CreateSecondaryDatabase()
 	}
 }
 
+<#
+	.SYNOPSIS
+	Tests creating a named secondary database
+#>
+function Test-CreateNamedSecondaryDatabase()
+{
+	# Setup
+    $location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
+	$rg = Create-ResourceGroupForTest $location
+	$server = Create-ServerForTest $rg $location
+	$database = Create-DatabaseForTest $rg $server
+
+	$partRg = Create-ResourceGroupForTest $location
+	$partServer = Create-ServerForTest $partRg $location
+
+	try
+	{
+		# Create Named Readable Secondary
+		$readSecondary = New-AzSqlDatabaseSecondary -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $database.DatabaseName `
+		 -PartnerResourceGroupName $partRg.ResourceGroupName -PartnerServerName $partServer.ServerName -PartnerDatabaseName "secondary" -AllowConnections All
+		Assert-NotNull $readSecondary.LinkId
+		Assert-AreEqual $readSecondary.ResourceGroupName $rg.ResourceGroupName
+		Assert-AreEqual $readSecondary.ServerName $server.ServerName
+		Assert-AreEqual $readSecondary.DatabaseName $database.DatabaseName
+		Assert-AreEqual $readSecondary.Role "Primary"
+		Assert-AreEqual $readSecondary.Location $location
+		Assert-AreEqual $readSecondary.PartnerResourceGroupName $partRg.ResourceGroupName
+		Assert-AreEqual $readSecondary.PartnerServerName $partServer.ServerName
+		Assert-AreEqual $readSecondary.PartnerDatabaseName "secondary"
+		Assert-NotNull $readSecondary.PartnerRole
+		Assert-AreEqual $readSecondary.PartnerLocation $location
+		Assert-NotNull $readSecondary.AllowConnections
+		Assert-NotNull $readSecondary.ReplicationState
+		Assert-NotNull $readSecondary.PercentComplete
+	}
+	finally
+	{
+		Remove-ResourceGroupForTest $rg
+		Remove-ResourceGroupForTest $partRg
+	}
+}
+
 <#
 	.SYNOPSIS
 	Tests getting a secondary database

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests/TestCreateNamedSecondaryDatabase.json

@@ -20,6 +20,7 @@
 ## Upcoming Release
 * Fix vulnerability assessment set baseline cmdlets functionality to work on master db for azure database and limit it on managed instance system databases.
 * Fix an error when creating SQL instance failover group
+* Added PartnerDatabaseName parameter to New-AzSqlDatabaseSecondary cmdlet.
 
 ## Version 2.1.1
 * Update references in .psd1 to use relative path

src/Sql/Sql/ChangeLog.md

@@ -88,6 +88,14 @@ public class NewAzureSqlDatabaseSecondary : AzureSqlDatabaseSecondaryCmdletBase
         [ValidateNotNullOrEmpty]
         public string PartnerServerName { get; set; }
 
+        /// <summary>
+        /// Gets or sets the name of the secondary.
+        /// </summary>
+        [Parameter(Mandatory = false,
+            HelpMessage = "The name of the secondary database to create.")]
+        [ValidateNotNullOrEmpty]
+        public string PartnerDatabaseName { get; set; }
+
         /// <summary>
         /// Gets or sets the read intent of the secondary (ReadOnly is not yet supported).
         /// </summary>
@@ -187,6 +195,7 @@ protected override IEnumerable<AzureReplicationLinkModel> ApplyUserInputToModel(
                 DatabaseName = this.DatabaseName,
                 PartnerResourceGroupName = this.PartnerResourceGroupName,
                 PartnerServerName = this.PartnerServerName,
+                PartnerDatabaseName = string.IsNullOrWhiteSpace(this.PartnerDatabaseName) ? this.DatabaseName : this.PartnerDatabaseName,
                 SecondaryElasticPoolName = this.SecondaryElasticPoolName,
                 AllowConnections = this.AllowConnections,
                 Tags = TagsConversionHelper.CreateTagDictionary(Tags, validate: true),

src/Sql/Sql/Replication/Cmdlet/NewAzureSqlDatabaseSecondary.cs

@@ -32,6 +32,11 @@ public class AzureReplicationLinkModel : AzureSqlDatabaseReplicationModelBase
         /// </summary>
         public string PartnerServerName { get; set; }
 
+        /// <summary>
+        /// Gets or sets the name of the secondary
+        /// </summary>
+        public string PartnerDatabaseName { get; set; }
+
         /// <summary>
         /// Get or sets the AllowConnections setting for the Replication Link
         /// </summary>

src/Sql/Sql/Replication/Model/AzureReplicationLinkModel.cs

@@ -259,7 +259,7 @@ internal AzureReplicationLinkModel CreateLinkWithNewSdk(string resourceGroupName
                         serverName,
                         model.SecondaryElasticPoolName);
 
-            var resp = ReplicationCommunicator.CreateCopy(resourceGroupName, serverName, model.DatabaseName, new Management.Sql.Models.Database
+            var resp = ReplicationCommunicator.CreateCopy(resourceGroupName, serverName, model.PartnerDatabaseName, new Management.Sql.Models.Database
             {
                 Location = model.PartnerLocation,
                 SourceDatabaseId = string.Format(AzureReplicationLinkModel.SourceIdTemplate, _subscription.Id.ToString(),
@@ -348,6 +348,7 @@ private AzureReplicationLinkModel CreateReplicationLinkModelFromReplicationLinkR
             model.LinkId = new Guid(resp.Name);
             model.PartnerResourceGroupName = partnerResourceGroupName;
             model.PartnerServerName = resp.Properties.PartnerServer;
+            model.PartnerDatabaseName = resp.Properties.PartnerDatabase;
             model.ResourceGroupName = resourceGroupName;
             model.ServerName = serverName;
             model.DatabaseName = databaseName;
@@ -385,6 +386,7 @@ private AzureReplicationLinkModel CreateReplicationLinkModelFromResponse(string
             model.LinkId = new Guid(resp.Name);
             model.PartnerResourceGroupName = partnerResourceGroupName;
             model.PartnerServerName = resp.PartnerServer;
+            model.PartnerDatabaseName = resp.PartnerDatabase;
             model.ResourceGroupName = resourceGroupName;
             model.ServerName = serverName;
             model.DatabaseName = databaseName;

src/Sql/Sql/Replication/Services/AzureSqlDatabaseReplicationAdapter.cs

@@ -17,6 +17,7 @@
               <Name>Location</Name>
               <Name>PartnerResourceGroupName</Name>
               <Name>PartnerServerName</Name>
+              <Name>PartnerDatabaseName</Name>
               <Name>PartnerRole</Name>
               <Name>PartnerLocation</Name>
               <Name>AllowConnections</Name>

src/Sql/Sql/Sql.types.ps1xml

@@ -17,15 +17,15 @@ Creates a secondary database for an existing database and starts data replicatio
 ```
 New-AzSqlDatabaseSecondary [-DatabaseName] <String> [-SecondaryServiceObjectiveName <String>]
  [-SecondaryElasticPoolName <String>] [-Tags <Hashtable>] -PartnerResourceGroupName <String>
- -PartnerServerName <String> [-AllowConnections <AllowConnections>] [-AsJob] [-LicenseType <String>]
- [-ServerName] <String> [-ResourceGroupName] <String> [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
- [-Confirm] [<CommonParameters>]
+ -PartnerServerName <String> [-PartnerDatabaseName <String>] [-AllowConnections <AllowConnections>] [-AsJob]
+ [-LicenseType <String>] [-ServerName] <String> [-ResourceGroupName] <String>
+ [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### VcoreBasedDatabase
 ```
 New-AzSqlDatabaseSecondary [-DatabaseName] <String> [-Tags <Hashtable>] -PartnerResourceGroupName <String>
- -PartnerServerName <String> [-AllowConnections <AllowConnections>] [-AsJob]
+ -PartnerServerName <String> [-PartnerDatabaseName <String>] [-AllowConnections <AllowConnections>] [-AsJob]
  -SecondaryComputeGeneration <String> -SecondaryVCore <Int32> [-LicenseType <String>] [-ServerName] <String>
  [-ResourceGroupName] <String> [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
  [<CommonParameters>]
@@ -43,6 +43,11 @@ the primary to the secondary database.
 $database = Get-AzSqlDatabase -DatabaseName $databasename -ResourceGroupName $primaryresourcegroupname -ServerName $primaryservername
 $database | New-AzSqlDatabaseSecondary -PartnerResourceGroupName $secondaryresourcegroupname -PartnerServerName $secondaryservername -AllowConnections "All"
 ```
+### 2: Establish Active Geo-Replication and specify the partner database name to be different than the source database name
+```
+$database = Get-AzSqlDatabase -DatabaseName $databasename -ResourceGroupName $primaryresourcegroupname -ServerName $primaryservername
+$database | New-AzSqlDatabaseSecondary -PartnerResourceGroupName $secondaryresourcegroupname -PartnerServerName $secondaryservername -PartnerDatabaseName $secondarydatabasename -AllowConnections "All"
+```
 
 ## PARAMETERS
 
@@ -125,6 +130,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -PartnerDatabaseName
+The name of the secondary database to create.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -PartnerResourceGroupName
 Specifies the name of the Azure Resource Group to which this cmdlet assigns the secondary database.