Add service objective and operations .NET client tests, upgrade to Az…

src/SDKs/SqlManagement/Sql.Tests/AzureRmSqlServerActiveDirectoryAdministratorTest.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.Management.Resources;
-using Microsoft.Azure.Management.Resources.Models;
+using Microsoft.Azure.Management.ResourceManager;
+using Microsoft.Azure.Management.ResourceManager.Models;
 using Microsoft.Azure.Management.Sql;
 using Microsoft.Azure.Management.Sql.Models;
 using Microsoft.Rest.ClientRuntime.Azure.TestFramework;

src/SDKs/SqlManagement/Sql.Tests/BlobAuditingTest.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.Management.Resources;
+using Microsoft.Azure.Management.ResourceManager;
 using Microsoft.Azure.Management.Sql;
 using Microsoft.Azure.Management.Sql.Models;
 using Microsoft.Azure.Test.HttpRecorder;

src/SDKs/SqlManagement/Sql.Tests/CapabilitiesScenarioTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.Management.Resources;
+using Microsoft.Azure.Management.ResourceManager;
 using Microsoft.Azure.Management.Sql;
 using Microsoft.Azure.Management.Sql.Models;
 using Microsoft.Rest.ClientRuntime.Azure.TestFramework;

src/SDKs/SqlManagement/Sql.Tests/DatabaseCopyScenarioTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.Management.Resources;
+using Microsoft.Azure.Management.ResourceManager;
 using Microsoft.Azure.Management.Sql;
 using Microsoft.Azure.Management.Sql.Models;
 using System.Collections.Generic;

src/SDKs/SqlManagement/Sql.Tests/DatabaseCrudScenarioTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.Management.Resources;
+using Microsoft.Azure.Management.ResourceManager;
 using Microsoft.Azure.Management.Sql;
 using Microsoft.Azure.Management.Sql.Models;
 using System;
@@ -298,13 +298,14 @@ public void TestDatabaseTransparentDataEncryptionConfiguration()
                 Assert.NotNull(db1);
 
                 // Get TDE config
+                // Recently changed to be enabled by default
                 var config = sqlClient.Databases.GetTransparentDataEncryptionConfiguration(resourceGroup.Name, server.Name, dbName);
-                Assert.Equal(TransparentDataEncryptionStatus.Disabled, config.Status);
+                Assert.Equal(TransparentDataEncryptionStatus.Enabled, config.Status);
 
                 // Update TDE config
-                config.Status = TransparentDataEncryptionStatus.Enabled;
+                config.Status = TransparentDataEncryptionStatus.Disabled;
                 config = sqlClient.Databases.CreateOrUpdateTransparentDataEncryptionConfiguration(resourceGroup.Name, server.Name, dbName, config);
-                Assert.Equal(TransparentDataEncryptionStatus.Enabled, config.Status);
+                Assert.Equal(TransparentDataEncryptionStatus.Disabled, config.Status);
             });
         }
     }

src/SDKs/SqlManagement/Sql.Tests/DatabaseReplicationLinkScenarioTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.Management.Resources;
+using Microsoft.Azure.Management.ResourceManager;
 using Microsoft.Azure.Management.Sql;
 using Microsoft.Azure.Management.Sql.Models;
 using System;

src/SDKs/SqlManagement/Sql.Tests/DatabaseRestoreScenarioTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.Management.Resources;
+using Microsoft.Azure.Management.ResourceManager;
 using Microsoft.Azure.Management.Sql;
 using Microsoft.Azure.Management.Sql.Models;
 using System;

src/SDKs/SqlManagement/Sql.Tests/ElasticPoolActivityScenarioTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.Management.Resources;
+using Microsoft.Azure.Management.ResourceManager;
 using Microsoft.Azure.Management.Sql;
 using Microsoft.Azure.Management.Sql.Models;
 using System;

src/SDKs/SqlManagement/Sql.Tests/ElasticPoolCrudScenarioTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.Management.Resources;
+using Microsoft.Azure.Management.ResourceManager;
 using Microsoft.Azure.Management.Sql;
 using Microsoft.Azure.Management.Sql.Models;
 using System;

src/SDKs/SqlManagement/Sql.Tests/FailoverGroupCrudScenarioTests.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.Management.Resources;
-using Microsoft.Azure.Management.Resources.Models;
+using Microsoft.Azure.Management.ResourceManager;
+using Microsoft.Azure.Management.ResourceManager.Models;
 using Microsoft.Azure.Management.Sql;
 using Microsoft.Azure.Management.Sql.Models;
 using System;
@@ -23,8 +23,8 @@ public void TestCrudFailoverGroup()
             {
                 // Create primary and partner servers
                 //
-                Server sourceServer = SqlManagementTestUtilities.CreateServer(sqlClient, resourceGroup, testPrefix, SqlManagementTestUtilities.DefaultStagePrimaryLocation);
-                Server targetServer = SqlManagementTestUtilities.CreateServer(sqlClient, resourceGroup, testPrefix, SqlManagementTestUtilities.DefaultStageSecondaryLocation);
+                Server sourceServer = SqlManagementTestUtilities.CreateServer(sqlClient, resourceGroup, testPrefix, SqlManagementTestUtilities.DefaultLocation);
+                Server targetServer = SqlManagementTestUtilities.CreateServer(sqlClient, resourceGroup, testPrefix, SqlManagementTestUtilities.DefaultSecondaryLocation);
 
                 // Create a failover group
                 //
@@ -93,6 +93,8 @@ public void TestCrudFailoverGroup()
                 Assert.Equal(1, failoverGroupsOnSecondary.Count());
 
                 var primaryDatabase = sqlClient.Databases.Get(resourceGroup.Name, sourceServer.Name, databaseName);
+
+                // Potential race condition here.  If this request fails with 404, put a breakpoint on the previous line, wait a beat, then continue.
                 var secondaryDatabase = sqlClient.Databases.Get(resourceGroup.Name, targetServer.Name, databaseName);
                 Assert.NotNull(primaryDatabase.FailoverGroupId);
                 Assert.NotNull(secondaryDatabase.FailoverGroupId);

src/SDKs/SqlManagement/Sql.Tests/FirewallRuleCrudScenarioTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.Management.Resources;
+using Microsoft.Azure.Management.ResourceManager;
 using Microsoft.Azure.Management.Sql;
 using Microsoft.Azure.Management.Sql.Models;
 using System;

src/SDKs/SqlManagement/Sql.Tests/ImportExportScenarioTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.Management.Resources;
+using Microsoft.Azure.Management.ResourceManager;
 using Microsoft.Azure.Management.Sql;
 using Microsoft.Azure.Management.Sql.Models;
 using Microsoft.Azure.Test.HttpRecorder;

src/SDKs/SqlManagement/Sql.Tests/OperationsScenarioTests.cs

@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Azure.Management.ResourceManager;
+using Microsoft.Azure.Management.Sql;
+using Microsoft.Azure.Management.Sql.Models;
+using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
+using System.Collections.Generic;
+using System.Net;
+using Xunit;
+
+namespace Sql.Tests
+{
+    public class OperationsScenarioTests
+    {
+        [Fact]
+        public void TestListOperations()
+        {
+            string suiteName = this.GetType().FullName;
+            using (MockContext context = MockContext.Start(suiteName, "TestListOperations"))
+            {
+                var handler = new RecordedDelegatingHandler { StatusCodeToReturn = HttpStatusCode.OK };
+                var resourceClient = SqlManagementTestUtilities.GetResourceManagementClient(context, handler);
+                var sqlClient = SqlManagementTestUtilities.GetSqlManagementClient(context, handler);
+
+                OperationListResult result = sqlClient.Operations.List();
+
+                foreach(Operation operation in result.Value)
+                {
+                    Assert.NotNull(operation.Display);
+                    Assert.NotNull(operation.Display.Provider);
+                    Assert.NotNull(operation.Display.Resource);
+                    Assert.NotNull(operation.Display.Operation);
+                }
+            }
+        }
+    }
+}

src/SDKs/SqlManagement/Sql.Tests/ServerCrudScenarioTests.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.Management.Resources;
-using Microsoft.Azure.Management.Resources.Models;
+using Microsoft.Azure.Management.ResourceManager;
+using Microsoft.Azure.Management.ResourceManager.Models;
 using Microsoft.Azure.Management.Sql;
 using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
 using System;
@@ -33,36 +33,34 @@ public void TestCreateUpdateGetDropServer()
                     };
 
                 // Create server
-                var v12Server = sqlClient.Servers.CreateOrUpdate(resourceGroup.Name, serverNameV12, new Microsoft.Azure.Management.Sql.Models.Server()
+                var server1 = sqlClient.Servers.CreateOrUpdate(resourceGroup.Name, serverNameV12, new Microsoft.Azure.Management.Sql.Models.Server()
                 {
                     AdministratorLogin = login,
                     AdministratorLoginPassword = password,
                     Version = version12,
                     Tags = tags,
                     Location = SqlManagementTestUtilities.DefaultLocation,
                 });
-                SqlManagementTestUtilities.ValidateServer(v12Server, serverNameV12, login, version12, tags, SqlManagementTestUtilities.DefaultLocation);
+                SqlManagementTestUtilities.ValidateServer(server1, serverNameV12, login, version12, tags, SqlManagementTestUtilities.DefaultLocation);
 
-                // We ignore the request for v2.0 and create v12.0 anyway unless subscription is whitelisted.
-                string serverNameV2 = SqlManagementTestUtilities.GenerateName(testPrefix);
-                string version2 = "2.0";
-                var v2Server = sqlClient.Servers.CreateOrUpdate(resourceGroup.Name, serverNameV2, new Microsoft.Azure.Management.Sql.Models.Server()
+                // Create second server
+                string server2 = SqlManagementTestUtilities.GenerateName(testPrefix);
+                var v2Server = sqlClient.Servers.CreateOrUpdate(resourceGroup.Name, server2, new Microsoft.Azure.Management.Sql.Models.Server()
                 {
                     AdministratorLogin = login,
                     AdministratorLoginPassword = password,
-                    Version = version2,
                     Tags = tags,
                     Location = SqlManagementTestUtilities.DefaultLocation,
                 });
-                SqlManagementTestUtilities.ValidateServer(v2Server, serverNameV2, login, version12, tags, SqlManagementTestUtilities.DefaultLocation);
+                SqlManagementTestUtilities.ValidateServer(v2Server, server2, login, version12, tags, SqlManagementTestUtilities.DefaultLocation);
 
                 // Get first server
-                var getV12Server = sqlClient.Servers.Get(resourceGroup.Name, serverNameV12);
-                SqlManagementTestUtilities.ValidateServer(getV12Server, serverNameV12, login, version12, tags, SqlManagementTestUtilities.DefaultLocation);
+                var getServer1 = sqlClient.Servers.Get(resourceGroup.Name, serverNameV12);
+                SqlManagementTestUtilities.ValidateServer(getServer1, serverNameV12, login, version12, tags, SqlManagementTestUtilities.DefaultLocation);
 
                 // Get second server
-                var getV2Server = sqlClient.Servers.Get(resourceGroup.Name, serverNameV2);
-                SqlManagementTestUtilities.ValidateServer(getV2Server, serverNameV2, login, version12, tags, SqlManagementTestUtilities.DefaultLocation);
+                var getServer2 = sqlClient.Servers.Get(resourceGroup.Name, server2);
+                SqlManagementTestUtilities.ValidateServer(getServer2, server2, login, version12, tags, SqlManagementTestUtilities.DefaultLocation);
 
                 var listServers = sqlClient.Servers.ListByResourceGroup(resourceGroup.Name);
                 Assert.Equal(2, listServers.Count());

src/SDKs/SqlManagement/Sql.Tests/ServiceObjectiveScenarioTests.cs

@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Azure.Management.Sql.Models;
+using Microsoft.Azure.Management.Sql;
+using Xunit;
+
+namespace Sql.Tests
+{
+    public class ServiceObjectiveScenarioTests
+    {
+        [Fact]
+        public void TestGetListServiceObjectives()
+        {
+            string testPrefix = "sqlcrudtest-";
+            string suiteName = this.GetType().FullName;
+
+            SqlManagementTestUtilities.RunTestInNewV12Server(suiteName, "TestGetListServiceObjectives", testPrefix, (resClient, sqlClient, resourceGroup, server) =>
+            {
+                var serviceObjectives = sqlClient.Servers.ListServiceObjectives(resourceGroup.Name, server.Name);
+
+                foreach(ServiceObjective objective in serviceObjectives)
+                {
+                    Assert.NotNull(objective.ServiceObjectiveName);
+                    Assert.NotNull(objective.IsDefault);
+                    Assert.NotNull(objective.IsSystem);
+                    Assert.NotNull(objective.Enabled);
+
+                    // Assert Get finds the service objective from List
+                    Assert.NotNull(sqlClient.Servers.GetServiceObjective(resourceGroup.Name, server.Name, objective.Name));
+                }
+            });
+        }
+    }
+}