Skip to content

Commit eec230e

Browse files
grhuangmsftgrhuangmsft
committed
init changes to allow no subscription recording tests-need to use csp partner account in tenant 2e6a0c9f-986d-480e-ad4b-bdfddc047aba
1 parent de3fcf5 commit eec230e

File tree

5 files changed

+78
-65
lines changed

5 files changed

+78
-65
lines changed

‎src/Support/Support.Autorest/test/Get-AzSupportCommunicationsNoSubscription.Tests.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzSupportCommunicationsNo
1717
Describe 'Get-AzSupportCommunicationsNoSubscription' {
1818

1919
It 'Get' {
20-
if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
21-
write-host "cannot get communication operations for tickets with free support plan"
20+
# if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
21+
# write-host "cannot get communication operations for tickets with free support plan"
2222

23-
Mock Get-AzSupportCommunicationsNoSubscription{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.CommunicationDetails"}
23+
# Mock Get-AzSupportCommunicationsNoSubscription{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.CommunicationDetails"}
2424

25-
Get-AzSupportCommunicationsNoSubscription -SupportTicketName $env.Name -CommunicationName $env.CommunicationName
25+
# Get-AzSupportCommunicationsNoSubscription -SupportTicketName $env.Name -CommunicationName $env.CommunicationName
2626

27-
Assert-MockCalled Get-AzSupportCommunicationsNoSubscription -Exactly 1
28-
}
29-
else{
27+
# Assert-MockCalled Get-AzSupportCommunicationsNoSubscription -Exactly 1
28+
# }
29+
# else{
3030
$supportMessage = Get-AzSupportCommunicationsNoSubscription -CommunicationName $env.CommunicationName -SupportTicketName $env.Name
3131

3232
$supportMessage.Body.ToString() | Should -Match $env.Body
33-
}
33+
# }
3434
}
3535

3636
It 'GetViaIdentitySupportTicket' -skip {

‎src/Support/Support.Autorest/test/Get-AzSupportTicketsNoSubscription.Tests.ps1‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,35 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzSupportTicketsNoSubscri
1616

1717
Describe 'Get-AzSupportTicketsNoSubscription' {
1818
It 'List' {
19-
if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
20-
write-host "cannot get support tickets with free support plan"
19+
# if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
20+
# write-host "cannot get support tickets with free support plan"
2121

22-
Mock Get-AzSupportTicketsNoSubscription{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.SupportTicketDetails"}
22+
# Mock Get-AzSupportTicketsNoSubscription{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.SupportTicketDetails"}
2323

24-
Get-AzSupportTicketsNoSubscription
24+
# Get-AzSupportTicketsNoSubscription
2525

26-
Assert-MockCalled Get-AzSupportTicketsNoSubscription -Exactly 1
27-
}
28-
else{
29-
$supportTickets = Get-AzSupportTicketsNoSubscription
26+
# Assert-MockCalled Get-AzSupportTicketsNoSubscription -Exactly 1
27+
# }
28+
# else{
29+
$supportTickets = Get-AzSupportTicketsNoSubscription -Top 5
3030
$supportTickets.Count | Should -BeGreaterThan 1
31-
}
31+
# }
3232
}
3333

3434
It 'Get' {
35-
if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
36-
write-host "cannot get support tickets with free support plan"
35+
# if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
36+
# write-host "cannot get support tickets with free support plan"
3737

38-
Mock Get-AzSupportTicketsNoSubscription{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.SupportTicketDetails"}
38+
# Mock Get-AzSupportTicketsNoSubscription{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.SupportTicketDetails"}
3939

40-
Get-AzSupportTicketsNoSubscription -SupportTicketName $env.Name
40+
# Get-AzSupportTicketsNoSubscription -SupportTicketName $env.Name
4141

42-
Assert-MockCalled Get-AzSupportTicketsNoSubscription -Exactly 2
43-
}
44-
else{
42+
# Assert-MockCalled Get-AzSupportTicketsNoSubscription -Exactly 2
43+
# }
44+
# else{
4545
$supportTicket = Get-AzSupportTicketsNoSubscription -SupportTicketName $env.Name
4646
$supportTicket.Description | Should -Be "test ticket - please ignore and close"
47-
}
47+
# }
4848
}
4949

5050
It 'GetViaIdentity' -skip {

‎src/Support/Support.Autorest/test/New-AzSupportCommunicationsNoSubscription.Tests.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ if(($null -eq $TestName) -or ($TestName -contains 'New-AzSupportCommunicationsNo
1616

1717
Describe 'New-AzSupportCommunicationsNoSubscription' {
1818
It 'CreateExpanded' {
19-
if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
20-
write-host "cannot create communication operations for tickets with free support plan"
19+
# if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
20+
# write-host "cannot create communication operations for tickets with free support plan"
2121

22-
Mock New-AzSupportCommunicationsNoSubscription{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.CommunicationDetails"}
22+
# Mock New-AzSupportCommunicationsNoSubscription{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.CommunicationDetails"}
2323

24-
New-AzSupportCommunicationsNoSubscription -CommunicationName $env.CommunicationName1 -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
24+
# New-AzSupportCommunicationsNoSubscription -CommunicationName $env.CommunicationName1 -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
2525

26-
Assert-MockCalled New-AzSupportCommunicationsNoSubscription -Exactly 1
27-
}
28-
else{
26+
# Assert-MockCalled New-AzSupportCommunicationsNoSubscription -Exactly 1
27+
# }
28+
# else{
2929

3030
$supportMessage = New-AzSupportCommunicationsNoSubscription -CommunicationName $env.CommunicationName1 -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
3131

3232
$supportMessage.Body.ToString() | Should -Match $env.Body
33-
}
33+
# }
3434
}
3535
}

‎src/Support/Support.Autorest/test/Update-AzSupportTicketsNoSubscription.Tests.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ if(($null -eq $TestName) -or ($TestName -contains 'Update-AzSupportTicketsNoSubs
1717
Describe 'Update-AzSupportTicketsNoSubscription' {
1818

1919
It 'UpdateExpanded' {
20-
if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
21-
write-host "cannot update support tickets with free support plan"
20+
# if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
21+
# write-host "cannot update support tickets with free support plan"
2222

23-
Mock Update-AzSupportTicketsNoSubscription{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.SupportTicketDetails"}
23+
# Mock Update-AzSupportTicketsNoSubscription{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.SupportTicketDetails"}
2424

25-
Update-AzSupportTicketsNoSubscription -SupportTicketName $env.Name -AdvancedDiagnosticConsent "Yes"
25+
# Update-AzSupportTicketsNoSubscription -SupportTicketName $env.Name -AdvancedDiagnosticConsent "Yes"
2626

27-
Assert-MockCalled Update-AzSupportTicketsNoSubscription -Exactly 1
28-
}
29-
else{
27+
# Assert-MockCalled Update-AzSupportTicketsNoSubscription -Exactly 1
28+
# }
29+
# else{
3030
$supportTicket = Update-AzSupportTicketsNoSubscription -SupportTicketName $env.Name -AdvancedDiagnosticConsent "Yes"
3131
$supportTicket.AdvancedDiagnosticConsent | Should -Be "Yes"
32-
}
32+
# }
3333
}
3434

3535
It 'UpdateViaIdentityExpanded' -skip {

‎src/Support/Support.Autorest/test/utils.ps1‎

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,30 @@ function setupEnv() {
4242
# Preload subscriptionId and tenant from context, which will be used in test
4343
# as default. You could change them if needed.
4444
$env.SubscriptionId = $sub = (Get-AzContext).Subscription.Id
45+
$env.HasSubscription = $env.SubscriptionId -ne $null
46+
if($env.HasSubscription){
47+
Write-Host "user has subscription, creating test resources in subscription"
48+
}
49+
else{
50+
Write-Host "user does not have subscription, creating test resources in tenant"
51+
}
52+
4553
$env.Tenant = (Get-AzContext).Tenant.Id
4654
$testGuid = [guid]::NewGuid().ToString()
4755
$env.BillingServiceId = "517f2da6-78fd-0498-4e22-ad26996b1dfc"
4856
$env.BillingProblemClassificationId = "d0f16bf7-e011-3f3b-1c26-3147f84e0896"
4957
$env.FileWorkspaceNameSubscription = "test-ps-$(New-Guid)"
5058
$env.FileWorkspaceNameNoSubscription = "test-ps-$(New-Guid)"
5159

52-
New-AzSupportFileWorkspace -Name $env.FileWorkspaceNameSubscription
53-
New-AzSupportFileWorkspacesNoSubscription -Name $env.FileWorkspaceNameNoSubscription
54-
5560
$testFilePath = Join-Path $PSScriptRoot files test2.txt
56-
New-AzSupportFileAndUpload -WorkspaceName $env.FileWorkspaceNameSubscription -FilePath $testFilePath
57-
New-AzSupportFileAndUploadNoSubscription -WorkspaceName $env.FileWorkspaceNameNoSubscription -FilePath $testFilePath
61+
if($env.HasSubscription){
62+
New-AzSupportFileWorkspace -Name $env.FileWorkspaceNameSubscription
63+
New-AzSupportFileAndUpload -WorkspaceName $env.FileWorkspaceNameSubscription -FilePath $testFilePath
64+
}
65+
else{
66+
New-AzSupportFileWorkspacesNoSubscription -Name $env.FileWorkspaceNameNoSubscription
67+
New-AzSupportFileAndUploadNoSubscription -WorkspaceName $env.FileWorkspaceNameNoSubscription -FilePath $testFilePath
68+
}
5869

5970
$testTicketName = "test-$testGuid"
6071
$advancedDiagnosticConsent = "no"
@@ -101,29 +112,31 @@ function setupEnv() {
101112
$env.AddWithCache("Subject", $subject, $UsePreviousConfigForRecord)
102113
$env.AddWithCache("Body", $body, $UsePreviousConfigForRecord)
103114

104-
write-host "creating a support ticket request at subscription level"
105-
$supportTicketSubscription = New-AzSupportTicket -Name $env.Name -AdvancedDiagnosticConsent $env.AdvancedDiagnosticConsent -ContactDetailCountry $env.ContactDetailCountry -ContactDetailFirstName $env.ContactDetailFirstName -ContactDetailLastName $env.ContactDetailLastName -ContactDetailPreferredContactMethod $env.ContactDetailPreferredContactMethod -ContactDetailPreferredSupportLanguage $env.ContactDetailPreferredSupportLanguage -ContactDetailPreferredTimeZone $env.ContactDetailPreferredTimeZone -ContactDetailPrimaryEmailAddress $env.ContactDetailPrimaryEmailAddress -Description $env.Description -ProblemClassificationId $env.ProblemClassificationId -ServiceId $env.ServiceId -Severity $env.Severity -Title $env.Title
106-
107-
write-host "adding a message at subscription level"
108-
if($supportTicketSubscription.SupportPlanDisplayName -eq "Basic support" || $supportTicket.SupportPlanDisplayName -eq "Free"){
109-
write-host "cannot create, update support tickets and add communication operations for tickets with free support plan"
110-
}
111-
else{
112-
New-AzSupportCommunication -Name $env.CommunicationName -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
113-
}
114-
write-host "creating a support ticket request at tenant level"
115-
$supportTicketTenant = New-AzSupportTicketsNoSubscription -SupportTicketName $env.Name -AdvancedDiagnosticConsent $env.AdvancedDiagnosticConsent -ContactDetailCountry $env.ContactDetailCountry -ContactDetailFirstName $env.ContactDetailFirstName -ContactDetailLastName $env.ContactDetailLastName -ContactDetailPreferredContactMethod $env.ContactDetailPreferredContactMethod -ContactDetailPreferredSupportLanguage $env.ContactDetailPreferredSupportLanguage -ContactDetailPreferredTimeZone $env.ContactDetailPreferredTimeZone -ContactDetailPrimaryEmailAddress $env.ContactDetailPrimaryEmailAddress -Description $env.Description -ProblemClassificationId $env.ProblemClassificationId -ServiceId $env.ServiceId -Severity $env.Severity -Title $env.Title
116-
117-
write-host "adding a message at tenant level"
118-
if($supportTicketTenant.SupportPlanDisplayName -eq "Basic support" || $supportTicket.SupportPlanDisplayName -eq "Free"){
119-
write-host "cannot create, update support tickets and add communication operations for tickets with free support plan"
115+
if($env.HasSubscription){
116+
write-host "creating a support ticket request at subscription level"
117+
$supportTicketSubscription = New-AzSupportTicket -Name $env.Name -AdvancedDiagnosticConsent $env.AdvancedDiagnosticConsent -ContactDetailCountry $env.ContactDetailCountry -ContactDetailFirstName $env.ContactDetailFirstName -ContactDetailLastName $env.ContactDetailLastName -ContactDetailPreferredContactMethod $env.ContactDetailPreferredContactMethod -ContactDetailPreferredSupportLanguage $env.ContactDetailPreferredSupportLanguage -ContactDetailPreferredTimeZone $env.ContactDetailPreferredTimeZone -ContactDetailPrimaryEmailAddress $env.ContactDetailPrimaryEmailAddress -Description $env.Description -ProblemClassificationId $env.ProblemClassificationId -ServiceId $env.ServiceId -Severity $env.Severity -Title $env.Title
118+
write-host "adding a message at subscription level"
119+
# if($supportTicketSubscription.SupportPlanDisplayName -eq "Basic support" || $supportTicket.SupportPlanDisplayName -eq "Free"){
120+
# write-host "cannot create, update support tickets and add communication operations for tickets with free support plan"
121+
# }
122+
# else{
123+
New-AzSupportCommunication -Name $env.CommunicationName -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
124+
# }
125+
$env.AddWithCache("SupportPlanSubscription", $supportTicketSubscription.SupportPlanDisplayName.ToString(), $UsePreviousConfigForRecord)
120126
}
121127
else{
122-
New-AzSupportCommunicationsNoSubscription -CommunicationName $env.CommunicationName -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
128+
write-host "creating a support ticket request at tenant level"
129+
$supportTicketTenant = New-AzSupportTicketsNoSubscription -SupportTicketName $env.Name -AdvancedDiagnosticConsent $env.AdvancedDiagnosticConsent -ContactDetailCountry $env.ContactDetailCountry -ContactDetailFirstName $env.ContactDetailFirstName -ContactDetailLastName $env.ContactDetailLastName -ContactDetailPreferredContactMethod $env.ContactDetailPreferredContactMethod -ContactDetailPreferredSupportLanguage $env.ContactDetailPreferredSupportLanguage -ContactDetailPreferredTimeZone $env.ContactDetailPreferredTimeZone -ContactDetailPrimaryEmailAddress $env.ContactDetailPrimaryEmailAddress -Description $env.Description -ProblemClassificationId $env.ProblemClassificationId -ServiceId $env.ServiceId -Severity $env.Severity -Title $env.Title
130+
write-host "adding a message at tenant level"
131+
# if($supportTicketTenant.SupportPlanDisplayName -eq "Basic support" || $supportTicket.SupportPlanDisplayName -eq "Free"){
132+
# write-host "cannot create, update support tickets and add communication operations for tickets with free support plan"
133+
# }
134+
# else{
135+
New-AzSupportCommunicationsNoSubscription -CommunicationName $env.CommunicationName -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
136+
# }
137+
$env.AddWithCache("SupportPlanTenant", $supportTicketTenant.SupportPlanDisplayName.ToString(), $UsePreviousConfigForRecord)
123138
}
124139

125-
$env.AddWithCache("SupportPlanSubscription", $supportTicketSubscription.SupportPlanDisplayName.ToString(), $UsePreviousConfigForRecord)
126-
$env.AddWithCache("SupportPlanTenant", $supportTicketTenant.SupportPlanDisplayName.ToString(), $UsePreviousConfigForRecord)
127140

128141
# For any resources you created for test, you should add it to $env here.
129142
$envFile = 'env.json'

0 commit comments

Comments
 (0)