Skip to content

Commit ec80335

Browse files
Changing to cx subscription for faster execution of MI tests (Azure#24691)
* Changing to cx subscription for faster execution of MI tests * few more tests fixed * More tests recorded and fixed * fixing FOG test * Fixing VA tests * One more try with these tests * revert wrong files * Fixing secretes Co-authored-by: Milan Brkic <[email protected]>
1 parent d67bcf0 commit ec80335

File tree

34 files changed

+12426
-98790
lines changed

34 files changed

+12426
-98790
lines changed

sdk/sqlmanagement/Microsoft.Azure.Management.Sql/tests/InstanceFailoverGroupCrudScenarioTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ public void TestCrudInstanceFailoverGroup()
2626
SqlManagementClient sqlClient = context.GetClient<SqlManagementClient>();
2727

2828
// Names of pre-existing ManagedInstances
29-
string sourceManagedInstanceName = "tdstage-haimb-dont-delete-3";
30-
string targetManagedInstanceName = "threat-detection-test-1";
31-
string sourceResourceGroup = "testclrg";
32-
string targetResourceGroup = "testclrg";
29+
string sourceManagedInstanceName = "mi-primary-wcus";
30+
string targetManagedInstanceName = "mi-tooling-cus";
31+
string sourceResourceGroup = ManagedInstanceTestUtilities.ResourceGroupName;
32+
string targetResourceGroup = ManagedInstanceTestUtilities.ResourceGroupName;
3333

3434
// Create server
3535
var sourceManagedInstance = sqlClient.ManagedInstances.Get(sourceResourceGroup, sourceManagedInstanceName);

sdk/sqlmanagement/Microsoft.Azure.Management.Sql/tests/InstancePoolCrudScenarioTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Sql.Tests
1111
{
1212
public class InstancePoolCrudScenarioTests
1313
{
14-
[Fact]
14+
[Fact(Skip = "Due long running setup")]
1515
public void TestCreateUpdateGetDropInstancePool()
1616
{
1717
using (SqlManagementTestContext context = new SqlManagementTestContext(this))
@@ -114,11 +114,11 @@ public void TestCreateUpdateGetDropInstancePool()
114114

115115
// Create instance 1 in pool
116116
var instance1 = sqlClient.ManagedInstances.CreateOrUpdate(resourceGroupName, "netsdk-instance-in-pool-1-cc", parameters: instanceParams);
117-
SqlManagementTestUtilities.ValidateManagedInstance(instance1, "netsdk-instance-in-pool-1-cc", "cloudsa", tags1, location, instancePool.Id);
117+
SqlManagementTestUtilities.ValidateManagedInstance(instance1, tags: tags1, instancePoolId: instancePool.Id);
118118

119119
// Create instance 2 in pool
120120
var instance2 = sqlClient.ManagedInstances.CreateOrUpdate(resourceGroupName, "netsdk-instance-in-pool-2-cc", parameters: instanceParams);
121-
SqlManagementTestUtilities.ValidateManagedInstance(instance2, "netsdk-instance-in-pool-2-cc", "cloudsa", tags1, location, instancePool.Id);
121+
SqlManagementTestUtilities.ValidateManagedInstance(instance2, tags: tags1, instancePoolId: instancePool.Id);
122122

123123
// Gets instances in an instance pool
124124
var instances = sqlClient.ManagedInstances.ListByInstancePool(resourceGroupName, instancePoolName);

sdk/sqlmanagement/Microsoft.Azure.Management.Sql/tests/ManagedDatabaseCrudScenarioTests.cs

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ public void TestCreateDropManagedDatabase()
2323

2424
// Update with values from a current MI on the region
2525
//
26-
string resourceGroup = "testclrg";
27-
string managedInstanceName = "tdstage-haimb-dont-delete-3";
26+
var resourceGroup = context.CreateResourceGroup(ManagedInstanceTestUtilities.Region);
2827

2928
//Get MI
30-
var managedInstance = sqlClient.ManagedInstances.Get(resourceGroup, managedInstanceName);
29+
var managedInstance = context.CreateManagedInstance(resourceGroup);
3130

3231
Dictionary<string, string> tags = new Dictionary<string, string>()
3332
{
@@ -37,7 +36,7 @@ public void TestCreateDropManagedDatabase()
3736
// Create database only required parameters
3837
//
3938
string mdbName = SqlManagementTestUtilities.GenerateName();
40-
var mdb1 = sqlClient.ManagedDatabases.CreateOrUpdate(resourceGroup, managedInstance.Name, mdbName, new ManagedDatabase()
39+
var mdb1 = sqlClient.ManagedDatabases.CreateOrUpdate(resourceGroup.Name, managedInstance.Name, mdbName, new ManagedDatabase()
4140
{
4241
Location = managedInstance.Location,
4342
});
@@ -53,12 +52,12 @@ public void TestCreateDropManagedDatabase()
5352
Tags = tags,
5453
CreateMode = "Default"
5554
};
56-
var mdb2 = sqlClient.ManagedDatabases.CreateOrUpdate(resourceGroup, managedInstance.Name, mdbName, mdb2Input);
55+
var mdb2 = sqlClient.ManagedDatabases.CreateOrUpdate(resourceGroup.Name, managedInstance.Name, mdbName, mdb2Input);
5756
Assert.NotNull(mdb2);
5857
SqlManagementTestUtilities.ValidateManagedDatabase(mdb2Input, mdb2, mdbName);
5958

60-
sqlClient.ManagedDatabases.Delete(resourceGroup, managedInstance.Name, mdb1.Name);
61-
sqlClient.ManagedDatabases.Delete(resourceGroup, managedInstance.Name, mdb2.Name);
59+
sqlClient.ManagedDatabases.Delete(resourceGroup.Name, managedInstance.Name, mdb1.Name);
60+
sqlClient.ManagedDatabases.Delete(resourceGroup.Name, managedInstance.Name, mdb2.Name);
6261
}
6362
}
6463

@@ -71,17 +70,12 @@ public void TestGetAndListManagedDatabase()
7170
{
7271
SqlManagementClient sqlClient = context.GetClient<SqlManagementClient>();
7372

74-
// Update with values from a current MI on the region
75-
//
76-
string resourceGroup = "testclrg";
77-
string managedInstanceName = "tdstage-haimb-dont-delete-3";
78-
79-
// Get MI
80-
var managedInstance = sqlClient.ManagedInstances.Get(resourceGroup, managedInstanceName);
73+
var resourceGroup = context.CreateResourceGroup(ManagedInstanceTestUtilities.Region);
74+
var managedInstance = context.CreateManagedInstance(resourceGroup);
8175

8276
// Create some small databases to run the get/List tests on.
8377
ManagedDatabase[] mngdDatabases = SqlManagementTestUtilities.CreateManagedDatabasesAsync(
84-
sqlClient, resourceGroup, managedInstance, testPrefix, 4).Result;
78+
sqlClient, resourceGroup.Name, managedInstance, testPrefix, 4).Result;
8579

8680
// Organize into a dictionary for better lookup later
8781
IDictionary<string, ManagedDatabase> inputs = mngdDatabases.ToDictionary(
@@ -92,13 +86,13 @@ public void TestGetAndListManagedDatabase()
9286
//
9387
foreach (var db in inputs)
9488
{
95-
var response = sqlClient.ManagedDatabases.Get(resourceGroup, managedInstance.Name, db.Key);
89+
var response = sqlClient.ManagedDatabases.Get(resourceGroup.Name, managedInstance.Name, db.Key);
9690
SqlManagementTestUtilities.ValidateManagedDatabaseEx(db.Value, response);
9791
}
9892

9993
// List all databases
10094
//
101-
var listResponse = sqlClient.ManagedDatabases.ListByInstance(resourceGroup, managedInstance.Name);
95+
var listResponse = sqlClient.ManagedDatabases.ListByInstance(resourceGroup.Name, managedInstance.Name);
10296

10397
// Check that all created Managed Databases are created
10498
foreach (var db in inputs.Keys)
@@ -111,7 +105,7 @@ public void TestGetAndListManagedDatabase()
111105

112106
foreach (var db in inputs.Keys)
113107
{
114-
sqlClient.ManagedDatabases.Delete(resourceGroup, managedInstance.Name, db);
108+
sqlClient.ManagedDatabases.Delete(resourceGroup.Name, managedInstance.Name, db);
115109
}
116110

117111
}

sdk/sqlmanagement/Microsoft.Azure.Management.Sql/tests/ManagedDatabaseRestoreScenarioTests.cs

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22
using Microsoft.Azure.Management.ResourceManager.Models;
33
using Microsoft.Azure.Management.Sql;
44
using Microsoft.Azure.Management.Sql.Models;
5-
using Microsoft.Azure.Management.Network.Models;
65
using Microsoft.Azure.Test.HttpRecorder;
7-
using Sku = Microsoft.Azure.Management.Sql.Models.Sku;
86
using System;
97
using System.Collections.Generic;
108
using System.Linq;
119
using System.Threading;
1210
using Xunit;
13-
using Microsoft.Rest;
14-
using System.Net;
11+
using Microsoft.Azure.Management.Storage;
12+
using Microsoft.WindowsAzure.Storage.Blob;
13+
using Microsoft.Azure.Management.Storage.Models;
1514

1615
namespace Sql.Tests
1716
{
@@ -26,7 +25,7 @@ public void ShortTermRetentionOnLiveDatabase()
2625
{
2726
SqlManagementClient sqlClient = Context.GetClient<SqlManagementClient>();
2827
ResourceGroup resourceGroup = Context.CreateResourceGroup();
29-
ManagedInstance managedInstance = CreateManagedInstance(Context, sqlClient, resourceGroup, "ShortTermRetentionOnLiveDatabase");
28+
ManagedInstance managedInstance = Context.CreateManagedInstance(resourceGroup);
3029

3130
// Create managed database
3231
//
@@ -38,7 +37,7 @@ public void ShortTermRetentionOnLiveDatabase()
3837
Assert.NotNull(db1);
3938

4039
int basicRetention = 7;
41-
int invalidValue = 3;
40+
int smallValue = 3;
4241
int validValue = 20;
4342

4443
// Attempt to increase retention period to 7 days and verfiy that the operation succeeded.
@@ -48,12 +47,12 @@ public void ShortTermRetentionOnLiveDatabase()
4847
ManagedBackupShortTermRetentionPolicy policy = sqlClient.ManagedBackupShortTermRetentionPolicies.Get(resourceGroup.Name, managedInstance.Name, dbName);
4948
Assert.Equal(basicRetention, policy.RetentionDays);
5049

51-
// Attempt to increase retention period to 3 days and verfiy that the operation fails.
52-
ManagedBackupShortTermRetentionPolicy parameters1 = new ManagedBackupShortTermRetentionPolicy(retentionDays: invalidValue);
50+
// Attempt to decrease retention period to 3 days and verfiy that the operation succeeded.
51+
ManagedBackupShortTermRetentionPolicy parameters1 = new ManagedBackupShortTermRetentionPolicy(retentionDays: smallValue);
5352
sqlClient.ManagedBackupShortTermRetentionPolicies.CreateOrUpdateWithHttpMessagesAsync(resourceGroup.Name, managedInstance.Name, dbName, parameters1);
5453
Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities.Wait(TimeSpan.FromSeconds(3));
5554
policy = sqlClient.ManagedBackupShortTermRetentionPolicies.Get(resourceGroup.Name, managedInstance.Name, dbName);
56-
Assert.Equal(basicRetention, policy.RetentionDays);
55+
Assert.Equal(smallValue, policy.RetentionDays);
5756

5857
// Attempt to increase retention period to 20 days and verfiy that the operation succeeded .
5958
ManagedBackupShortTermRetentionPolicy parameters2 = new ManagedBackupShortTermRetentionPolicy(retentionDays: validValue);
@@ -71,7 +70,7 @@ public void ShortTermRetentionOnDroppedDatabase()
7170
{
7271
SqlManagementClient sqlClient = Context.GetClient<SqlManagementClient>();
7372
ResourceGroup resourceGroup = Context.CreateResourceGroup();
74-
ManagedInstance managedInstance = CreateManagedInstance(Context, sqlClient, resourceGroup, "ShortTermRetentionOnDroppedDatabase");
73+
ManagedInstance managedInstance = Context.CreateManagedInstance(resourceGroup);
7574

7675
// Create managed database
7776
//
@@ -158,7 +157,7 @@ public void RestorableDroppedManagedDatabasesTests()
158157
{
159158
SqlManagementClient sqlClient = Context.GetClient<SqlManagementClient>();
160159
ResourceGroup resourceGroup = Context.CreateResourceGroup();
161-
ManagedInstance managedInstance = CreateManagedInstance(Context, sqlClient, resourceGroup, "RestorableDroppedManagedDatabasesTests");
160+
ManagedInstance managedInstance = Context.CreateManagedInstance(resourceGroup);
162161

163162
// Create managed database
164163
//
@@ -270,11 +269,31 @@ public void ManagedDatabaseExternalBackupRestoreTest()
270269
using (SqlManagementTestContext Context = new SqlManagementTestContext(this))
271270
{
272271
SqlManagementClient sqlClient = Context.GetClient<SqlManagementClient>();
273-
ResourceGroup resourceGroup = Context.CreateResourceGroup();
274-
ManagedInstance managedInstance = CreateManagedInstance(Context, sqlClient, resourceGroup);
272+
StorageManagementClient storageClient = Context.GetClient<StorageManagementClient>();
273+
const string AccountName = "backupscxteam";
274+
275+
string testStorageContainerUri = "https://backupscxteam.blob.core.windows.net/clients";
276+
string testStorageContainerSasToken = string.Empty;
277+
StorageAccountListKeysResult keys =
278+
storageClient.StorageAccounts.ListKeys(ManagedInstanceTestUtilities.ResourceGroupName, AccountName);
279+
string key = keys.Keys.First().Value;
275280

276-
string testStorageContainerUri = "https://misosictest1.blob.core.windows.net/striped-inc";
277-
string testStorageContainerSasToken = "?sv=2018-03-28&ss=bfqt&srt=co&sp=rl&se=2021-10-07T20:57:18Z&st=2019-10-07T12:57:18Z&spr=https&sig=wUFmxnyiCglm9U9%2B3VaPW0YlXFpvn%2BkGc%2B5wesmwWuU%3D";
281+
if (HttpMockServer.Mode == HttpRecorderMode.Record)
282+
{
283+
284+
CloudBlobContainer container = new CloudBlobContainer(
285+
new Uri(testStorageContainerUri),
286+
new Microsoft.WindowsAzure.Storage.Auth.StorageCredentials(AccountName, key));
287+
SharedAccessBlobPolicy sharedAccessPolicy = new SharedAccessBlobPolicy
288+
{
289+
SharedAccessExpiryTime = new DateTimeOffset(DateTime.UtcNow.Add(TimeSpan.FromHours(1))),
290+
Permissions = SharedAccessBlobPermissions.Read | SharedAccessBlobPermissions.List
291+
};
292+
testStorageContainerSasToken = container.GetSharedAccessSignature(sharedAccessPolicy);
293+
}
294+
295+
ResourceGroup resourceGroup = Context.CreateResourceGroup();
296+
ManagedInstance managedInstance = Context.CreateManagedInstance(resourceGroup);
278297
string databaseName = SqlManagementTestUtilities.GenerateName(_testPrefix);
279298

280299
// Start external backup restore.
@@ -333,7 +352,7 @@ public void ManagedDatabaseExternalBackupRestoreTest()
333352
// No need to sleep if we are playing back the recording.
334353
if (HttpMockServer.Mode == HttpRecorderMode.Record)
335354
{
336-
Thread.Sleep(TimeSpan.FromSeconds(30));
355+
Thread.Sleep(TimeSpan.FromSeconds(60));
337356
}
338357

339358
return false;
@@ -373,28 +392,6 @@ public void ManagedDatabaseExternalBackupRestoreTest()
373392

374393
private const string _testPrefix = "manageddatabaserestorescenariotest-";
375394

376-
private ManagedInstance CreateManagedInstance(SqlManagementTestContext context, SqlManagementClient sqlClient, ResourceGroup resourceGroup, string callingMethodName = "CreateManagedInstance")
377-
{
378-
// Create vnet and get the subnet id
379-
VirtualNetwork vnet = ManagedInstanceTestFixture.CreateVirtualNetwork(context, resourceGroup, TestEnvironmentUtilities.DefaultLocationId);
380-
381-
Sku sku = new Sku();
382-
sku.Name = "MIGP8G4";
383-
sku.Tier = "GeneralPurpose";
384-
ManagedInstance managedInstance = sqlClient.ManagedInstances.CreateOrUpdate(resourceGroup.Name,
385-
_testPrefix + SqlManagementTestUtilities.GenerateName(methodName: callingMethodName), new ManagedInstance()
386-
{
387-
AdministratorLogin = SqlManagementTestUtilities.DefaultLogin,
388-
AdministratorLoginPassword = SqlManagementTestUtilities.DefaultPassword,
389-
Sku = sku,
390-
SubnetId = vnet.Subnets[0].Id,
391-
Tags = new Dictionary<string, string>(),
392-
Location = TestEnvironmentUtilities.DefaultLocationId,
393-
});
394-
395-
return managedInstance;
396-
}
397-
398395
private void RetryAction(Func<bool> action, int timeoutInMin = 15)
399396
{
400397
DateTime startTime = DateTime.UtcNow;

0 commit comments

Comments
 (0)