Skip to content

Commit 5bdf31c

Browse files
author
Mahak Jain
committed
Removed artifact dependency
1 parent f869685 commit 5bdf31c

File tree

7 files changed

+1414
-126
lines changed

7 files changed

+1414
-126
lines changed

‎src/AlertsManagement/AlertsManagement.Test/ScenarioTests/ActionRuleTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
1818
using Xunit;
1919
using Microsoft.Azure.ServiceManagement.Common.Models;
20+
using Xunit.Abstractions;
2021

2122
namespace Microsoft.Azure.Commands.AlertsManagement.Test.ScenarioTests
2223
{

‎src/AlertsManagement/AlertsManagement.Test/ScenarioTests/ActionRuleTests.ps1

Lines changed: 66 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -27,54 +27,78 @@ function Test-GetActionRulesFilteredByParameters
2727

2828
function Test-CreateUpdateAndDeleteSuppressionRule
2929
{
30-
$resourceGroupName = "ActionRules-Powershell-Test"
31-
$actionRuleName = "ScenarioTest-Suppression-ActionRule"
32-
33-
$createdActionRule = Set-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab","/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs" -SeverityCondition "Equals:Sev0,Sev1" -MonitorCondition "NotEquals:Resolved" -Description "Test description" -Status "Enabled" -ActionRuleType "Suppression" -ReccurenceType "Weekly" -SuppressionStartTime "06/26/2018 06:00:00" -SuppressionEndTime "07/27/2018 06:00:00" -ReccurentValue 1,4,6
34-
35-
Assert-NotNull $createdActionRule
36-
37-
# Update Status of Action Rule
38-
$updatedActionRule = Update-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Status "Disabled"
39-
Assert-NotNull $updatedActionRule
40-
Assert-AreEqual "Disabled" $updatedActionRule.Status
41-
42-
# Delete Action Rule
43-
$isDeleted = Remove-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName
30+
try
31+
{
32+
$resourceGroupName = Get-TestResourceGroupName "suppression"
33+
$location = Get-ProviderLocation ResourceManagement
34+
$actionRuleName = Get-TestActionRuleName "suppression"
35+
36+
#Create Resource Group
37+
New-AzResourceGroup -Name $resourceGroupName -Location $location -Force
38+
39+
$createdActionRule = Set-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab","/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs" -SeverityCondition "Equals:Sev0,Sev1" -MonitorCondition "NotEquals:Resolved" -Description "Test description" -Status "Enabled" -ActionRuleType "Suppression" -ReccurenceType "Weekly" -SuppressionStartTime "06/26/2018 06:00:00" -SuppressionEndTime "07/27/2018 06:00:00" -ReccurentValue 1,4,6
40+
41+
Assert-NotNull $createdActionRule
42+
43+
# Update Status of Action Rule
44+
$updatedActionRule = Update-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Status "Disabled"
45+
Assert-NotNull $updatedActionRule
46+
Assert-AreEqual "Disabled" $updatedActionRule.Status
47+
}
48+
finally
49+
{
50+
CleanUp $resourceGroupName $actionRuleName
51+
}
4452
}
4553

4654
function Test-CreateUpdateAndDeleteActionGroupRule
4755
{
48-
$resourceGroupName = "ActionRules-Powershell-Test"
49-
$actionRuleName = "ScenarioTest-ActionGroup-ActionRule"
50-
51-
$createdActionRule = Set-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab","/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs" -SeverityCondition "Equals:Sev0,Sev1" -MonitorCondition "NotEquals:Resolved" -Description "Test description" -Status "Enabled" -ActionRuleType "ActionGroup" -ActionGroupId "/subscriptions/1e3ff1c0-771a-4119-a03b-be82a51e232d/resourceGroups/alertscorrelationrg/providers/Microsoft.insights/actiongroups/testAG"
52-
53-
Assert-NotNull $createdActionRule
54-
55-
# Update Status of Action Rule
56-
$updatedActionRule = Update-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Status "Disabled"
57-
Assert-NotNull $updatedActionRule
58-
Assert-AreEqual "Disabled" $updatedActionRule.Status
59-
60-
# Delete Action Rule
61-
$isDeleted = Remove-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName
56+
try
57+
{
58+
$resourceGroupName = Get-TestResourceGroupName "actiongroup"
59+
$location = Get-ProviderLocation ResourceManagement
60+
$actionRuleName = Get-TestActionRuleName "actiongroup"
61+
62+
#Create Resource Group
63+
New-AzResourceGroup -Name $resourceGroupName -Location $location -Force
64+
65+
$createdActionRule = Set-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab","/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs" -SeverityCondition "Equals:Sev0,Sev1" -MonitorCondition "NotEquals:Resolved" -Description "Test description" -Status "Enabled" -ActionRuleType "ActionGroup" -ActionGroupId "/subscriptions/1e3ff1c0-771a-4119-a03b-be82a51e232d/resourceGroups/alertscorrelationrg/providers/Microsoft.insights/actiongroups/testAG"
66+
67+
Assert-NotNull $createdActionRule
68+
69+
# Update Status of Action Rule
70+
$updatedActionRule = Update-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Status "Disabled"
71+
Assert-NotNull $updatedActionRule
72+
Assert-AreEqual "Disabled" $updatedActionRule.Status
73+
}
74+
finally
75+
{
76+
CleanUp $resourceGroupName $actionRuleName
77+
}
6278
}
6379

6480
function Test-CreateUpdateAndDeleteDiagnosticsRule
6581
{
66-
$resourceGroupName = "ActionRules-Powershell-Test"
67-
$actionRuleName = "ScenarioTest-Diagnostics-ActionRule"
68-
69-
$createdActionRule = Set-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab","/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs" -SeverityCondition "Equals:Sev0,Sev1" -MonitorCondition "NotEquals:Resolved" -Description "Test description" -Status "Enabled" -ActionRuleType "Diagnostics"
70-
71-
Assert-NotNull $createdActionRule
72-
73-
# Update Status of Action Rule
74-
$updatedActionRule = Update-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Status "Disabled"
75-
Assert-NotNull $updatedActionRule
76-
Assert-AreEqual "Disabled" $updatedActionRule.Status
77-
78-
# Delete Action Rule
79-
$isDeleted = Remove-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName
82+
try
83+
{
84+
$resourceGroupName = Get-TestResourceGroupName "diag"
85+
$location = Get-ProviderLocation ResourceManagement
86+
$actionRuleName = Get-TestActionRuleName "diag"
87+
88+
#Create Resource Group
89+
New-AzResourceGroup -Name $resourceGroupName -Location $location -Force
90+
91+
$createdActionRule = Set-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab","/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs" -SeverityCondition "Equals:Sev0,Sev1" -MonitorCondition "NotEquals:Resolved" -Description "Test description" -Status "Enabled" -ActionRuleType "Diagnostics"
92+
93+
Assert-NotNull $createdActionRule
94+
95+
# Update Status of Action Rule
96+
$updatedActionRule = Update-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Status "Disabled"
97+
Assert-NotNull $updatedActionRule
98+
Assert-AreEqual "Disabled" $updatedActionRule.Status
99+
}
100+
finally
101+
{
102+
CleanUp $resourceGroupName $actionRuleName
103+
}
80104
}

‎src/AlertsManagement/AlertsManagement.Test/ScenarioTests/Common.ps1

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# ----------------------------------------------------------------------------------
2+
#
3+
# Copyright Microsoft Corporation
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
# ----------------------------------------------------------------------------------
14+
15+
<#
16+
.SYNOPSIS
17+
Gets valid resource group name
18+
#>
19+
function Get-TestResourceGroupName($action)
20+
{
21+
return "pstestrg" + $action
22+
}
23+
24+
<#
25+
.SYNOPSIS
26+
Gets valid action rule name
27+
#>
28+
function Get-TestActionRuleName($action)
29+
{
30+
return "pstestar" + $action
31+
}
32+
33+
<#
34+
.SYNOPSIS
35+
Gets the default location for a provider
36+
#>
37+
function Get-ProviderLocation($provider)
38+
{
39+
# A Dogfood data center for ADF cmdlet mock testing
40+
"eastus"
41+
}
42+
43+
<#
44+
.SYNOPSIS
45+
Cleans the created resources
46+
#>
47+
function CleanUp($rgname, $actionRuleName)
48+
{
49+
if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback) {
50+
Remove-AzActionRule -ResourceGroupName $rgname -Name $actionRuleName
51+
Remove-AzResourceGroup -Name $rgname -Force
52+
}
53+
}

‎src/AlertsManagement/AlertsManagement.Test/ScenarioTests/TestController.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2626
using Microsoft.Azure.Management.AlertsManagement;
2727
using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory;
28+
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
29+
using Microsoft.Azure.ServiceManagement.Common.Models;
2830

2931
namespace Microsoft.Azure.Commands.AlertsManagement.Test.ScenarioTests
3032
{
@@ -93,7 +95,9 @@ public void RunPsTestWorkflow(
9395
_helper.SetupModules(AzureModule.AzureResourceManager,
9496
_helper.RMProfileModule,
9597
_helper.GetRMModulePath("AzureRM.AlertsManagement.psd1"),
96-
"ScenarioTests\\" + callingClassName + ".ps1");
98+
"ScenarioTests\\Common.ps1",
99+
"ScenarioTests\\" + callingClassName + ".ps1",
100+
"AzureRM.Resources.ps1");
97101
try
98102
{
99103
var psScripts = scriptBuilder?.Invoke();

0 commit comments

Comments
 (0)