Increase performance of Get-AzureSqlDatabase.

Regenerated MockSessions file for tests.

Updated some tests.

Updated help documentation to contain correct server versions.

Fixed New-AzureSqlDatabaseServer not reporting server version and state.

Author: akromm-zz

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Resources/MockSessions.xml

@@ -33,23 +33,35 @@ namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Server.Cmdl
     [TestClass]
     public class ServerCmdletTests : TestBase
     {
+        // String ID for server version 2.
+        public const string ServerVersion2 = "2.0";
+
+        // String ID for server version 12.
+        public const string ServerVersion12 = "12.0";
+
+        // The default server version
+        public const string DefaultServerVersion = ServerVersion12;
+
         [TestCleanup]
         public void CleanupTest()
         {
             // Save the mock session results
             MockServerHelper.SaveDefaultSessionCollection();
         }
 
-        private static void VerifyServer(SqlDatabaseServerContext server, string adminLogin, string location)
+        /// <summary>
+        /// Verifys the server object to make sure the fields match what is provided
+        /// </summary>
+        /// <param name="server">The server object to validate</param>
+        /// <param name="adminLogin">The expected administration login</param>
+        /// <param name="location">The expected server location</param>
+        /// <param name="version">The expected server verions</param>
+        /// <param name="state">The expected state of the server</param>
+        private static void VerifyServer(SqlDatabaseServerContext server, string adminLogin, string location, string version, string state)
         {
             Assert.AreEqual(adminLogin, server.AdministratorLogin, "Expecting server login to match.");
             Assert.AreEqual(location, server.Location, "Expecting matching location.");
             Assert.AreEqual(10, server.ServerName.Length, "Expecting a valid server name.");
-        }
-
-        private static void VerifyServer(SqlDatabaseServerContext server, string adminLogin, string location, string version, string state)
-        {
-            VerifyServer(server, adminLogin, location);
             Assert.AreEqual(version, server.Version, "Server version doesn't match");
             Assert.AreEqual(state, server.State, "Server state does not match");
         }
@@ -190,14 +202,18 @@ public void AzureSqlDatabaseServerTests()
                     VerifyServer(
                         server,
                         (string)powershell.Runspace.SessionStateProxy.GetVariable("login"),
-                        (string)powershell.Runspace.SessionStateProxy.GetVariable("location"));
+                        (string)powershell.Runspace.SessionStateProxy.GetVariable("location"),
+                        ServerVersion12,
+                        "Ready");
 
                     SqlDatabaseServerContext server2 = newServerResult2.Single().BaseObject as SqlDatabaseServerContext;
                     Assert.IsNotNull(server2, "Expecting a SqlDatabaseServerContext object");
                     VerifyServer(
                         server,
                         (string)powershell.Runspace.SessionStateProxy.GetVariable("login"),
-                        (string)powershell.Runspace.SessionStateProxy.GetVariable("location"));
+                        (string)powershell.Runspace.SessionStateProxy.GetVariable("location"),
+                        ServerVersion12,
+                        "Ready");
 
                     // Validate Get-AzureSqlDatabaseServer results
                     server = getServerResult.Single().BaseObject as SqlDatabaseServerContext;
@@ -206,7 +222,7 @@ public void AzureSqlDatabaseServerTests()
                         server,
                         (string)powershell.Runspace.SessionStateProxy.GetVariable("login"),
                         (string)powershell.Runspace.SessionStateProxy.GetVariable("location"),
-                        "2.0",
+                        ServerVersion12,
                         "Ready");
 
                     server = setServerResult.Single().BaseObject as SqlDatabaseServerContext;
@@ -215,7 +231,7 @@ public void AzureSqlDatabaseServerTests()
                         server,
                         (string)powershell.Runspace.SessionStateProxy.GetVariable("login"),
                         (string)powershell.Runspace.SessionStateProxy.GetVariable("location"),
-                        "2.0",
+                        ServerVersion12,
                         "Ready");
 
                     server2 = setServerResult2.Single().BaseObject as SqlDatabaseServerContext;
@@ -224,7 +240,7 @@ public void AzureSqlDatabaseServerTests()
                         server2,
                         (string)powershell.Runspace.SessionStateProxy.GetVariable("login"),
                         (string)powershell.Runspace.SessionStateProxy.GetVariable("location"),
-                        "2.0",
+                        ServerVersion12,
                         "Ready");
 
                     // Validate Remove-AzureSqlDatabaseServer results
@@ -319,7 +335,9 @@ public void AzureSqlDatabaseServerV2Tests()
                 VerifyServer(
                     server,
                     (string)powershell.Runspace.SessionStateProxy.GetVariable("login"),
-                    (string)powershell.Runspace.SessionStateProxy.GetVariable("location"));
+                    (string)powershell.Runspace.SessionStateProxy.GetVariable("location"),
+                    ServerVersion2,
+                    "Ready");
 
 
                 // Validate Get-AzureSqlDatabaseServer results
@@ -329,8 +347,8 @@ public void AzureSqlDatabaseServerV2Tests()
                     server,
                     (string)powershell.Runspace.SessionStateProxy.GetVariable("login"),
                     (string)powershell.Runspace.SessionStateProxy.GetVariable("location"),
-                    "2.0",
-                    null);
+                    ServerVersion2,
+                    "Ready");
 
                 powershell.Streams.ClearStreams();
             }

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Server/Cmdlet/ServerCmdletTests.cs

@@ -2192,7 +2192,7 @@ Business Edition values: 10, 20, 30, 40, 50, 100, or 150</maml:para>
 			<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
 				<maml:name>Version</maml:name>
 				<maml:description>
-					<maml:para>Specifies the type of SQL Database Server to create. Accepts values 1.0 or 2.0.</maml:para>
+					<maml:para>Specifies the type of SQL Database Server to create. Accepts values 2.0 or 12.0.</maml:para>
 				</maml:description>
 				<command:parameterValue required="true" variableLength="false">Single</command:parameterValue>
 			</command:parameter>
@@ -2259,7 +2259,7 @@ Business Edition values: 10, 20, 30, 40, 50, 100, or 150</maml:para>
 		<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
 			<maml:name>Version</maml:name>
 			<maml:description>
-				<maml:para>Specifies the type of SQL Database Server to create. Accepts values 1.0 or 2.0.</maml:para>
+				<maml:para>Specifies the type of SQL Database Server to create. Accepts values 2.0 or 12.0.</maml:para>
 			</maml:description>
 			<command:parameterValue required="true" variableLength="false">Single</command:parameterValue>
 			<dev:type>

src/ServiceManagement/Sql/Commands.SqlDatabase/Microsoft.WindowsAzure.Commands.SqlDatabase.dll-Help.xml

@@ -121,6 +121,9 @@
     <value>Invalid Parameter combination: Both "DatabaseName" and "DatabaseDeletionDate" need to be specified to get a restorable dropped database.</value>
     <comment>Parameter validation</comment>
   </data>
+  <data name="CreateServerServerNotFound" xml:space="preserve">
+    <value>Unable to retrieve newly created server '{0}' from the service.</value>
+  </data>
   <data name="CredentialNotSpecified" xml:space="preserve">
     <value>The Sql Authenticate Credential was not specified.</value>
     <comment>Parameter validation</comment>

src/ServiceManagement/Sql/Commands.SqlDatabase/Properties/Resources.Designer.cs

@@ -21,6 +21,9 @@
 using System;
 using System.Management.Automation;
 using Hyak.Common.TransientFaultHandling;
+using System.Collections.Generic;
+using System.Linq;
+using System.Globalization;
 
 namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Server.Cmdlet
 {
@@ -119,14 +122,27 @@ internal SqlDatabaseServerContext NewAzureSqlDatabaseServerProcess(
                     Version = version.HasValue ? version.Value.ToString("F1") : null
                 });
 
+            IEnumerable<Management.Sql.Models.Server> servers = sqlManagementClient.Servers.List().Servers;
+            var newServer = servers.Where(s => s.Name == response.ServerName).FirstOrDefault();
+
+            if (newServer == null)
+            {
+                throw new ItemNotFoundException(string.Format(
+                    CultureInfo.InvariantCulture,
+                    Resources.CreateServerServerNotFound,
+                    response.ServerName));
+            }
+
             SqlDatabaseServerContext operationContext = new SqlDatabaseServerContext()
             {
                 OperationStatus = Services.Constants.OperationSuccess,
                 OperationDescription = CommandRuntime.ToString(),
                 OperationId = response.RequestId,
-                ServerName = response.ServerName,
+                ServerName = newServer.Name,
                 Location = location,
                 AdministratorLogin = adminLogin,
+                State = newServer.State,
+                Version = newServer.Version
             };
 
             return operationContext;

src/ServiceManagement/Sql/Commands.SqlDatabase/Properties/Resources.resx

@@ -329,11 +329,20 @@ public void RemoveDatabase(string databaseName)
 
         #region Service Objective Operations
 
-        /// <summary>
-        /// Retrieves the list of all service objectives on the server.
-        /// </summary>
-        /// <returns>An array of all service objectives on the server.</returns>
-        public ServiceObjective[] GetServiceObjectives()
+        private ServiceObjective[] objectivesCache;
+        private ServiceObjective[] Objectives
+        {
+            get
+            {
+                if (objectivesCache == null)
+                {
+                    PopulateSloCache();
+                }
+                return objectivesCache;
+            }
+        }
+
+        private void PopulateSloCache()
         {
             this.clientRequestId = SqlDatabaseCmdletBase.GenerateClientTracingId();
 
@@ -345,9 +354,17 @@ public ServiceObjective[] GetServiceObjectives()
             ServiceObjectiveListResponse response = sqlManagementClient.ServiceObjectives.List(
                 this.serverName);
 
-            // Construct the resulting Database object
-            ServiceObjective[] serviceObjectives = response.Select(serviceObjective => CreateServiceObjectiveFromResponse(serviceObjective)).ToArray();
-            return serviceObjectives;
+            // Populate the cache;
+            objectivesCache = response.Select(serviceObjective => CreateServiceObjectiveFromResponse(serviceObjective)).ToArray();
+        }
+
+        /// <summary>
+        /// Retrieves the list of all service objectives on the server.
+        /// </summary>
+        /// <returns>An array of all service objectives on the server.</returns>
+        public ServiceObjective[] GetServiceObjectives()
+        {
+            return Objectives;
         }
 
         /// <summary>
@@ -359,9 +376,8 @@ public ServiceObjective[] GetServiceObjectives()
         /// </returns>
         public ServiceObjective GetServiceObjective(string serviceObjectiveName)
         {
-            ServiceObjective serviceObjective = GetServiceObjectives()
-                .Where(s => s.Name == serviceObjectiveName)
-                .FirstOrDefault();
+            var serviceObjective = Objectives.Where(s => s.Name == serviceObjectiveName).FirstOrDefault();
+
             if (serviceObjective == null)
             {
                 throw new InvalidOperationException(
@@ -383,19 +399,18 @@ public ServiceObjective GetServiceObjective(string serviceObjectiveName)
         /// </returns>
         public ServiceObjective GetServiceObjective(ServiceObjective serviceObjectiveToRefresh)
         {
-            this.clientRequestId = SqlDatabaseCmdletBase.GenerateClientTracingId();
-
-            // Get the SQL management client
-            SqlManagementClient sqlManagementClient = AzureSession.ClientFactory.CreateClient<SqlManagementClient>(subscription, AzureEnvironment.Endpoint.ServiceManagement);
-            this.AddTracingHeaders(sqlManagementClient);
-
-            // Retrieve the specified database
-            ServiceObjectiveGetResponse response = sqlManagementClient.ServiceObjectives.Get(
-                this.serverName,
-                serviceObjectiveToRefresh.Id.ToString());
+            var serviceObjective = Objectives.Where(s => s.Id == serviceObjectiveToRefresh.Id).FirstOrDefault();
+            
+            if (serviceObjective == null)
+            {
+                throw new InvalidOperationException(
+                    string.Format(
+                        CultureInfo.InvariantCulture,
+                        Resources.ServiceObjectiveNotFound,
+                        this.ServerName,
+                        serviceObjectiveToRefresh.Id));
+            }
 
-            // Construct the resulting Database object
-            ServiceObjective serviceObjective = CreateServiceObjectiveFromResponse(response.ServiceObjective);
             return serviceObjective;
         }