Making -ResourceGroupName parameter optional for Get-AzureRmSqlServer cmdlet

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ImportExportTests.cs

@@ -27,14 +27,14 @@ public ImportExportTests(ITestOutputHelper output) : base(output)
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.Sql)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestExportDatabase()
         {
             RunPowerShellTest("Test-ExportDatabase");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.Sql)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestImportDatabase()
         {
             RunPowerShellTest("Test-ImportDatabase");

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

@@ -85,29 +85,37 @@ function Test-GetServer
 {
 	# Setup
 	$rg = Create-ResourceGroupForTest
+	$rg1 = Create-ResourceGroupForTest
 	$server1 = Create-ServerForTest $rg
 	$server2 = Create-ServerForTest $rg
+	$server3 = Create-ServerForTest $rg1
 
 	try
 	{
 		# Test using parameters
 		$resp1 = Get-AzureRmSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $server1.ServerName
 		Assert-AreEqual $server1.ServerName $resp1.ServerName
-		Assert-AreEqual $server1.ServerVersion $resp1.ServerVersion
 		Assert-AreEqual $server1.SqlAdministratorLogin $resp1.SqlAdministratorLogin
 
 		# Test piping
 		$resp2 = $server2 | Get-AzureRmSqlServer
 		Assert-AreEqual $server2.ServerName $resp2.ServerName
-		Assert-AreEqual $server2.ServerVersion $resp2.ServerVersion
 		Assert-AreEqual $server2.SqlAdministratorLogin $resp2.SqlAdministratorLogin
-
+		
 		$all = Get-AzureRmSqlServer -ResourceGroupName $rg.ResourceGroupName
-		Assert-AreEqual $all.Count 2
+		Assert-AreEqual 2 $all.Count
+
+		# Test getting all servers in all resource groups
+		$all2 = Get-AzureRmSqlServer
+
+		# It is possible that there were existing servers in the subscription when the test was recorded, so make sure
+		# that the servers that we created are retrieved and ignore the other ones.
+		($server1, $server2, $server3) | ForEach-Object { Assert-True {$_.ServerName -in $all2.ServerName} }
 	}
 	finally
 	{
 		Remove-ResourceGroupForTest $rg
+		Remove-ResourceGroupForTest $rg1
 	}
 }
 

src/ResourceManager/Sql/Commands.Sql.Test/UnitTests/AzureSqlCmdletBaseAttributeTests.cs

@@ -15,6 +15,7 @@
 using Microsoft.Azure.Commands.Sql.Common;
 using Microsoft.Azure.Commands.Sql.Test.Utilities;
 using Microsoft.Azure.ServiceManagemenet.Common.Models;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -28,12 +29,14 @@ public AzureSqlCmdletBaseAttributeTests(ITestOutputHelper output)
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAzureSqlCmdletBaseAttributes()
         {
             UnitTestHelper.CheckCmdletParameterAttributes(typeof(AzureSqlCmdletBase<object, object>), "ResourceGroupName", true, true);
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAzureSqlDatabaseCmdletBaseAttributes()
         {
             UnitTestHelper.CheckCmdletParameterAttributes(typeof(AzureSqlDatabaseCmdletBase<object, object>), "DatabaseName", true, true);

src/ResourceManager/Sql/Commands.Sql/Common/AzureSqlCmdletBase.cs

@@ -58,7 +58,7 @@ protected virtual string GetResourceId(M model)
             Position = 0,
             HelpMessage = "The name of the resource group.")]
         [ValidateNotNullOrEmpty]
-        public string ResourceGroupName { get; set; }
+        public virtual string ResourceGroupName { get; set; }
 
         /// <summary>
         /// The ModelAdapter object used by this cmdlet

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

@@ -219,7 +219,7 @@ internal ICollection<AzureReplicationLinkModel> ListLinks(string resourceGroupNa
         private void CheckPartnerResourceGroupValid(string partnerResourceGroupName)
         {
             // checking if the resource group is valid as a partner resource group
-            ServerCommunicator.List(partnerResourceGroupName);
+            ServerCommunicator.ListByResourceGroup(partnerResourceGroupName);
         }
 
         /// <summary>

src/ResourceManager/Sql/Commands.Sql/Server/Cmdlet/GetAzureSqlServer.cs

@@ -28,6 +28,16 @@ namespace Microsoft.Azure.Commands.Sql.Server.Cmdlet
     [Cmdlet(VerbsCommon.Get, "AzureRmSqlServer", ConfirmImpact = ConfirmImpact.None, SupportsShouldProcess = true)]
     public class GetAzureSqlServer : AzureSqlServerCmdletBase, IModuleAssemblyInitializer
     {
+        /// <summary>
+        /// Gets or sets the name of the resource group to use.
+        /// </summary>
+        [Parameter(Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            Position = 0,
+            HelpMessage = "The name of the resource group.")]
+        [ValidateNotNullOrEmpty]
+        public override string ResourceGroupName { get; set; }
+
         /// <summary>
         /// Gets or sets the name of the database server to use.
         /// </summary>
@@ -38,7 +48,7 @@ public class GetAzureSqlServer : AzureSqlServerCmdletBase, IModuleAssemblyInitia
         [Alias("Name")]
         [ValidateNotNullOrEmpty]
         public string ServerName { get; set; }
-
+        
         /// <summary>
         /// Gets a server from the service.
         /// </summary>
@@ -47,14 +57,22 @@ protected override IEnumerable<AzureSqlServerModel> GetEntity()
         {
             ICollection<AzureSqlServerModel> results = null;
 
-            if (this.MyInvocation.BoundParameters.ContainsKey("ServerName"))
+            if (MyInvocation.BoundParameters.ContainsKey("ServerName") && MyInvocation.BoundParameters.ContainsKey("ResourceGroupName"))
             {
                 results = new List<AzureSqlServerModel>();
                 results.Add(ModelAdapter.GetServer(this.ResourceGroupName, this.ServerName));
             }
+            else if (MyInvocation.BoundParameters.ContainsKey("ResourceGroupName"))
+            {
+                results = ModelAdapter.ListServersByResourceGroup(this.ResourceGroupName);
+            }
+            else if (!MyInvocation.BoundParameters.ContainsKey("ServerName"))
+            {
+                results = ModelAdapter.ListServers();
+            }
             else
             {
-                results = ModelAdapter.GetServers(this.ResourceGroupName);
+                throw new PSArgumentException("When specifying the serverName parameter the ResourceGroup parameter must also be used");
             }
 
             return results;

src/ResourceManager/Sql/Commands.Sql/Server/Services/AzureSqlServerAdapter.cs

@@ -61,20 +61,34 @@ public AzureSqlServerAdapter(IAzureContext context)
         public AzureSqlServerModel GetServer(string resourceGroupName, string serverName)
         {
             var resp = Communicator.Get(resourceGroupName, serverName);
-            return CreateServerModelFromResponse(resourceGroupName, resp);
+            return CreateServerModelFromResponse(resp);
+        }
+
+        /// <summary>
+        /// Gets a list of all the servers in a subscription
+        /// </summary>
+        /// <param name="resourceGroupName">The name of the resource group</param>
+        /// <returns>A list of all the servers</returns>
+        public List<AzureSqlServerModel> ListServers()
+        {
+            var resp = Communicator.List();
+            return resp.Select((s) =>
+            {
+                return CreateServerModelFromResponse(s);
+            }).ToList();
         }
 
         /// <summary>
         /// Gets a list of all the servers in a resource group
         /// </summary>
         /// <param name="resourceGroupName">The name of the resource group</param>
         /// <returns>A list of all the servers</returns>
-        public List<AzureSqlServerModel> GetServers(string resourceGroupName)
+        public List<AzureSqlServerModel> ListServersByResourceGroup(string resourceGroupName)
         {
-            var resp = Communicator.List(resourceGroupName);
+            var resp = Communicator.ListByResourceGroup(resourceGroupName);
             return resp.Select((s) =>
             {
-                return CreateServerModelFromResponse(resourceGroupName, s);
+                return CreateServerModelFromResponse(s);
             }).ToList();
         }
 
@@ -94,7 +108,7 @@ public AzureSqlServerModel UpsertServer(AzureSqlServerModel model)
                 Version = model.ServerVersion,
             });
 
-            return CreateServerModelFromResponse(model.ResourceGroupName, resp);
+            return CreateServerModelFromResponse(resp);
         }
 
         /// <summary>
@@ -113,11 +127,16 @@ public void RemoveServer(string resourceGroupName, string serverName)
         /// <param name="resourceGroupName">The resource group the server is in</param>
         /// <param name="resp">The management client server response to convert</param>
         /// <returns>The converted server model</returns>
-        private static AzureSqlServerModel CreateServerModelFromResponse(string resourceGroupName, Management.Sql.Models.Server resp)
+        private static AzureSqlServerModel CreateServerModelFromResponse(Management.Sql.Models.Server resp)
         {
             AzureSqlServerModel server = new AzureSqlServerModel();
 
-            server.ResourceGroupName = resourceGroupName;
+            // Extract the resource group name from the ID.
+            // ID is in the form:
+            // /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgName/providers/Microsoft.Sql/servers/serverName
+            string[] segments = resp.Id.Split('/');
+            server.ResourceGroupName = segments[4];
+
             server.ServerName = resp.Name;
             server.ServerVersion = resp.Version;
             server.SqlAdministratorLogin = resp.AdministratorLogin;

src/ResourceManager/Sql/Commands.Sql/Server/Services/AzureSqlServerCommunicator.cs

@@ -69,13 +69,21 @@ public Management.Sql.Models.Server Get(string resourceGroupName, string serverN
         }
 
         /// <summary>
-        /// Lists Azure Sql Database Servers
+        /// Lists Azure Sql Servers in a resource group
         /// </summary>
-        public IList<Management.Sql.Models.Server> List(string resourceGroupName)
+        public IList<Management.Sql.Models.Server> ListByResourceGroup(string resourceGroupName)
         {
             return GetCurrentSqlClient().Servers.ListByResourceGroup(resourceGroupName).ToList();
         }
 
+        /// <summary>
+        /// Lists Azure Sql Servers
+        /// </summary>
+        public IList<Management.Sql.Models.Server> List()
+        {
+            return GetCurrentSqlClient().Servers.List().ToList();
+        }
+
         /// <summary>
         /// Creates or updates a Azure Sql Database SErver
         /// </summary>