resolve comments

Author: fangl

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/Common.ps1

@@ -501,10 +501,10 @@ Gets the values of the parameters used by the sync group tests
 #>
 function Get-SqlSyncGroupTestEnvironmentParameters ($testSuffix)
 {
-	return @{ 
-			  intervalInSeconds = 300;
-	          conflictResolutionPolicy = "HubWin";
-			  }
+    return @{
+              intervalInSeconds = 300;
+              conflictResolutionPolicy = "HubWin";
+              }
 }
 
 <#
@@ -513,8 +513,8 @@ Gets the values of the parameters used by the sync member tests
 #>
 function Get-SqlSyncMemberTestEnvironmentParameters ($testSuffix)
 {
-	return @{ 
-	          syncDirection = "Bidirectional";
-			  databaseType = "AzureSqlDatabase";
-			  }
+    return @{
+              syncDirection = "Bidirectional";
+              databaseType = "AzureSqlDatabase";
+              }
 }

src/ResourceManager/Sql/Commands.Sql/Data Sync/Cmdlet/NewAzureSqlSyncAgent.cs

@@ -45,15 +45,15 @@ public class NewAzureSqlSyncAgent : AzureSqlSyncAgentCmdletBase
         /// <summary>
         /// Gets or sets the name of the server on which syncDB is hosted
         /// </summary>
-        [Parameter(Mandatory = true,
+        [Parameter(Mandatory = false,
            HelpMessage = "The server on which syncDB is hosted.")]
         [ValidateNotNullOrEmpty]
         public string SyncDatabaseServerName { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the resource group the syncDB belongs to
         /// </summary>
-        [Parameter(Mandatory = true,
+        [Parameter(Mandatory = false,
            HelpMessage = "The resource group syncDB belongs to.")]
         [ValidateNotNullOrEmpty]
         public string SyncDatabaseResourceGroupName { get; set; }
@@ -107,10 +107,17 @@ protected override IEnumerable<AzureSqlSyncAgentModel> ApplyUserInputToModel(IEn
                 SyncAgentName = this.SyncAgentName
             });
 
-            if (MyInvocation.BoundParameters.ContainsKey("SyncDatabaseResourceGroupName")
-                && MyInvocation.BoundParameters.ContainsKey("SyncDatabaseServerName")
-                && MyInvocation.BoundParameters.ContainsKey("SyncDatabaseName"))
+            if (MyInvocation.BoundParameters.ContainsKey("SyncDatabaseName"))
             {
+                if (!MyInvocation.BoundParameters.ContainsKey("SyncDatabaseResourceGroupName"))
+                {
+                    this.SyncDatabaseResourceGroupName = this.ResourceGroupName;
+                }
+                if (!MyInvocation.BoundParameters.ContainsKey("SyncDatabaseServerName"))
+                {
+                    this.SyncDatabaseServerName = this.ServerName;
+                }
+                // "/subscriptions/{id}/" will be added in AzureSqlDataSyncCommunicator
                 this.syncDatabaseId = string.Format("resourceGroups/{0}/providers/Microsoft.Sql/servers/{1}/databases/{2}", 
                     this.SyncDatabaseResourceGroupName, this.SyncDatabaseServerName, this.SyncDatabaseName);
             }