Skip to content

Commit bcbbd1f

Browse files
MSSeduschVeryEarly
andauthored
Fix name of new VM Extension for SAP (#12072)
* Fix name of new VM Extension for SAP * Update Changelog * add secret suppress messages * Update ChangeLog.md Co-authored-by: Yabo Hu <[email protected]>
1 parent a2939fa commit bcbbd1f

23 files changed

+30726
-37539
lines changed

src/Compute/Compute.Test/ScenarioTests/AEMExtensionTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function Log($test, $message)
8686

8787
function Assert-NewExtension($ResourceGroupName, $VMName, $IdentityType) {
8888

89-
$newPublisher = "Microsoft.AzureCAT.AzureEnhancedMonitoring.Edp"
89+
$newPublisher = "Microsoft.AzureCAT.AzureEnhancedMonitoring"
9090
$newTypeWin = "MonitorX64Windows"
9191
$newTypeLnx = "MonitorX64Linux"
9292

@@ -1176,7 +1176,7 @@ function Get-CustomResourceGroupName {
11761176

11771177
function Get-LocationForNewExtension {
11781178
$loc = Get-ComputeVMLocation
1179-
1179+
$loc = "westcentralus"
11801180
return $loc
11811181
}
11821182

@@ -1187,7 +1187,7 @@ function Create-IdentityForNewExtension($ResourceGroupName, $TestName) {
11871187
return $ident
11881188
}
11891189

1190-
function Create-AdvancedVM($rgname, $vmname, $loc, $vmsize, $stotype, $nicCount, $imageType, [Switch] $useMD, $zone)
1190+
function Create-AdvancedVM($rgname, $vmname, $loc, $vmsize, $stotype, $nicCount, $imageType = "Windows", [Switch] $useMD, $zone)
11911191
{
11921192
Write-Verbose "Start Create-AdvancedVM"
11931193

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinux.json

Lines changed: 1191 additions & 1074 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinuxMD.json

Lines changed: 1596 additions & 1310 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinuxMD_DSeries.json

Lines changed: 1660 additions & 1321 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinuxMD_ESeries.json

Lines changed: 4245 additions & 1749 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinuxWAD.json

Lines changed: 1114 additions & 1106 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedWindows.json

Lines changed: 1219 additions & 1968 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedWindowsMD.json

Lines changed: 1424 additions & 2138 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedWindowsWAD.json

Lines changed: 1381 additions & 1852 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicLinux.json

Lines changed: 1595 additions & 1468 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicLinuxWAD.json

Lines changed: 1068 additions & 1564 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicWindows.json

Lines changed: 1387 additions & 1654 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicWindowsWAD.json

Lines changed: 1224 additions & 2244 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestExtensionDowngrade.json

Lines changed: 1567 additions & 3095 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestExtensionReinstall.json

Lines changed: 1576 additions & 3208 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestExtensionUpgrade.json

Lines changed: 1255 additions & 2281 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestNewExtensionDiskAdd.json

Lines changed: 1892 additions & 2169 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestOldExtensionReinstall.json

Lines changed: 1302 additions & 2206 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestWithSystemAssignedIdentity.json

Lines changed: 1345 additions & 1500 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestWithUserAssignedIdentity.json

Lines changed: 1456 additions & 1448 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestWithoutIdentity.json

Lines changed: 1223 additions & 2180 deletions
Large diffs are not rendered by default.

src/Compute/Compute/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
- Additional information about change #1
2020
-->
2121
## Upcoming Release
22+
* Fixed name of new VM Extension for SAP
2223

2324
## Version 4.1.0
2425
* Added HostId parameter to `Update-AzVM` cmdlet

src/Compute/Compute/Extension/AEM/AEMExtensionConstants.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public static class AEMExtensionConstants
2727
public static Dictionary<string, Version> AEMExtensionVersion = new Dictionary<string, Version>() { { OSTypeWindows, new Version(2, 2) }, { OSTypeLinux, new Version(3, 0) } };
2828

2929
public static Dictionary<string, string> AEMExtensionDefaultNamev2 = new Dictionary<string, string>() { { OSTypeWindows, "MonitorX64Windows" }, { OSTypeLinux, "MonitorX64Linux" } };
30-
public static Dictionary<string, string> AEMExtensionPublisherv2 = new Dictionary<string, string>() { { OSTypeWindows, "Microsoft.AzureCAT.AzureEnhancedMonitoring.Edp" }, { OSTypeLinux, "Microsoft.AzureCAT.AzureEnhancedMonitoring.Edp" } };
30+
public static Dictionary<string, string> AEMExtensionPublisherv2 = new Dictionary<string, string>() { { OSTypeWindows, "Microsoft.AzureCAT.AzureEnhancedMonitoring" }, { OSTypeLinux, "Microsoft.AzureCAT.AzureEnhancedMonitoring" } };
31+
public static Dictionary<string, string> AEMExtensionPublisherv2_Test = new Dictionary<string, string>() { { OSTypeWindows, "Microsoft.AzureCAT.AzureEnhancedMonitoring.Edp" }, { OSTypeLinux, "Microsoft.AzureCAT.AzureEnhancedMonitoring.Edp" } };
3132
public static Dictionary<string, string> AEMExtensionTypev2 = new Dictionary<string, string>() { { OSTypeWindows, "MonitorX64Windows" }, { OSTypeLinux, "MonitorX64Linux" } };
3233
public static Dictionary<string, Version> AEMExtensionVersionv2 = new Dictionary<string, Version>() { { OSTypeWindows, new Version(1, 0) }, { OSTypeLinux, new Version(1, 0) } };
3334

0 commit comments

Comments
 (0)