Skip to content

Fix name of new VM Extension for SAP #12072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 8, 2020
Merged

Fix name of new VM Extension for SAP #12072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddcc871
Fix name of new VM Extension for SAP
MSSedusch Jun 5, 2020
61044a4
Update Changelog
MSSedusch Jun 5, 2020
01254b4
add secret suppress messages
MSSedusch Jun 5, 2020
016d8a1
Update ChangeLog.md
VeryEarly Jun 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Compute/Compute.Test/ScenarioTests/AEMExtensionTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function Log($test, $message)

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

$newPublisher = "Microsoft.AzureCAT.AzureEnhancedMonitoring.Edp"
$newPublisher = "Microsoft.AzureCAT.AzureEnhancedMonitoring"
$newTypeWin = "MonitorX64Windows"
$newTypeLnx = "MonitorX64Linux"

Expand Down Expand Up @@ -1176,7 +1176,7 @@ function Get-CustomResourceGroupName {

function Get-LocationForNewExtension {
$loc = Get-ComputeVMLocation

$loc = "westcentralus"
return $loc
}

Expand All @@ -1187,7 +1187,7 @@ function Create-IdentityForNewExtension($ResourceGroupName, $TestName) {
return $ident
}

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

Expand Down
2,265 changes: 1,191 additions & 1,074 deletions ....Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinux.json
View file
Open in desktop

Large diffs are not rendered by default.

2,906 changes: 1,596 additions & 1,310 deletions ...ommands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinuxMD.json
View file
Open in desktop

Large diffs are not rendered by default.

2,981 changes: 1,660 additions & 1,321 deletions ...Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinuxMD_DSeries.json
View file
Open in desktop

Large diffs are not rendered by default.

5,994 changes: 4,245 additions & 1,749 deletions ...Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinuxMD_ESeries.json
View file
Open in desktop

Large diffs are not rendered by default.

2,220 changes: 1,114 additions & 1,106 deletions ...mmands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinuxWAD.json
View file
Open in desktop

Large diffs are not rendered by default.

3,187 changes: 1,219 additions & 1,968 deletions ...ommands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedWindows.json
View file
Open in desktop

Large diffs are not rendered by default.

3,562 changes: 1,424 additions & 2,138 deletions ...mands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedWindowsMD.json
View file
Open in desktop

Large diffs are not rendered by default.

3,233 changes: 1,381 additions & 1,852 deletions ...ands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedWindowsWAD.json
View file
Open in desktop

Large diffs are not rendered by default.

3,063 changes: 1,595 additions & 1,468 deletions ...ure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicLinux.json
View file
Open in desktop

Large diffs are not rendered by default.

2,632 changes: 1,068 additions & 1,564 deletions ....Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicLinuxWAD.json
View file
Open in desktop

Large diffs are not rendered by default.

3,041 changes: 1,387 additions & 1,654 deletions ...e.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicWindows.json
View file
Open in desktop

Large diffs are not rendered by default.

3,468 changes: 1,224 additions & 2,244 deletions ...ommands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicWindowsWAD.json
View file
Open in desktop

Large diffs are not rendered by default.

4,662 changes: 1,567 additions & 3,095 deletions ...t.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestExtensionDowngrade.json
View file
Open in desktop

Large diffs are not rendered by default.

4,784 changes: 1,576 additions & 3,208 deletions ...t.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestExtensionReinstall.json
View file
Open in desktop

Large diffs are not rendered by default.

3,536 changes: 1,255 additions & 2,281 deletions ...oft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestExtensionUpgrade.json
View file
Open in desktop

Large diffs are not rendered by default.

4,061 changes: 1,892 additions & 2,169 deletions ....Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestNewExtensionDiskAdd.json
View file
Open in desktop

Large diffs are not rendered by default.

3,508 changes: 1,302 additions & 2,206 deletions ...zure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestOldExtensionReinstall.json
View file
Open in desktop

Large diffs are not rendered by default.

2,845 changes: 1,345 additions & 1,500 deletions ...Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestWithSystemAssignedIdentity.json
View file
Open in desktop

Large diffs are not rendered by default.

2,904 changes: 1,456 additions & 1,448 deletions ...e.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestWithUserAssignedIdentity.json
View file
Open in desktop

Large diffs are not rendered by default.

3,403 changes: 1,223 additions & 2,180 deletions ...soft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestWithoutIdentity.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/Compute/Compute/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
- Additional information about change #1
-->
## Upcoming Release
* Fixed name of new VM Extension for SAP

## Version 4.1.0
* Added HostId parameter to `Update-AzVM` cmdlet
Expand Down
3 changes: 2 additions & 1 deletion src/Compute/Compute/Extension/AEM/AEMExtensionConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ public static class AEMExtensionConstants
public static Dictionary<string, Version> AEMExtensionVersion = new Dictionary<string, Version>() { { OSTypeWindows, new Version(2, 2) }, { OSTypeLinux, new Version(3, 0) } };

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

Expand Down