Skip to content

Commit 1cf4a08

Browse files
erich-wangerich-wang
authored
Merge pull request Azure#9822 from v-Ajnava/masterlocalSB
ServiceBus: Fix for issue Azure#9786 : cannot create a rule with Listen only rights
2 parents 5e1371e + 7813849 commit 1cf4a08

File tree

11 files changed

+1678
-1240
lines changed

11 files changed

+1678
-1240
lines changed

‎src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusPaginationTests.ps1

Lines changed: 62 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -16,97 +16,90 @@
1616
.SYNOPSIS
1717
Tests Rule Create List Remove operations.
1818
#>
19-
function ServiceBusPaginationTests
20-
{
19+
function ServiceBusPaginationTests {
2120
# Setup
2221
$location = Get-Location
23-
$resourceGroupName = getAssetName "RGName-"
24-
$namespaceName = getAssetName "Namespace1-"
25-
$nameQueue = getAssetName "Queue-"
26-
$nameTopic = getAssetName "Topic-"
27-
$subName = getAssetName "Subscription-"
28-
$ruleName = getAssetName "Rule-"
29-
$ruleName1 = getAssetName "Rule-"
30-
$count = 0
22+
$resourceGroupName = getAssetName "RGName-"
23+
$namespaceName = getAssetName "Namespace1-"
24+
$nameQueue = getAssetName "Queue-"
25+
$nameTopic = getAssetName "Topic-"
26+
$subName = getAssetName "Subscription-"
27+
$ruleName = getAssetName "Rule-"
28+
$ruleName1 = getAssetName "Rule-"
29+
$count = 0
3130

3231
Write-Debug "Create resource group"
33-
Write-Debug "ResourceGroup name : $resourceGroupName"
32+
Write-Debug "ResourceGroup name : $resourceGroupName"
3433
New-AzResourceGroup -Name $resourceGroupName -Location $location -Force
3534

3635
Write-Debug " Create new Topic namespace"
3736
Write-Debug "NamespaceName : $namespaceName"
3837
$result = New-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Location $location -Name $namespaceName
3938

40-
Try
41-
{
42-
Write-Debug "Get the created namespace within the resource group"
43-
$createdNamespace = Get-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName
39+
Try {
40+
Write-Debug "Get the created namespace within the resource group"
41+
$createdNamespace = Get-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName
4442

45-
Assert-AreEqual $createdNamespace.Name $namespaceName
43+
Assert-AreEqual $createdNamespace.Name $namespaceName
4644

47-
Assert-AreEqual $createdNamespace.Name $namespaceName "Namespace created earlier is not found."
45+
Assert-AreEqual $createdNamespace.Name $namespaceName "Namespace created earlier is not found."
4846

49-
#Create Queue
50-
while($count -lt 50)
51-
{
52-
$queueNameNew = $nameQueue + "_" +$count
53-
New-AzServiceBusQueue -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $queueNameNew
54-
$count = $count + 1
55-
}
47+
#Create Queue
48+
while ($count -lt 50) {
49+
$queueNameNew = $nameQueue + "_" + $count
50+
New-AzServiceBusQueue -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $queueNameNew
51+
$count = $count + 1
52+
}
5653

57-
$get30Queue = Get-AzServiceBusQueue -ResourceGroupName $resourceGroupName -Namespace $namespaceName -MaxCount 30
58-
Assert-AreEqual 30 $get30Queue.Count "Get Queue with MaxCount 30 not returned total 30"
54+
$get30Queue = Get-AzServiceBusQueue -ResourceGroupName $resourceGroupName -Namespace $namespaceName -MaxCount 30
55+
Assert-AreEqual 30 $get30Queue.Count "Get Queue with MaxCount 30 not returned total 30"
5956

60-
#Create Topic
61-
$count = 0
62-
$topicNameNew = $nameTopic + "_" +$count
63-
while($count -lt 50)
64-
{
65-
$topicNameNew = $nameTopic + "_" +$count
66-
New-AzServiceBusTopic -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $topicNameNew -EnablePartitioning $TRUE
67-
$count = $count + 1
68-
}
57+
#Create Topic
58+
$count = 0
59+
$topicNameNew = $nameTopic + "_" + $count
60+
while ($count -lt 50) {
61+
$topicNameNew = $nameTopic + "_" + $count
62+
New-AzServiceBusTopic -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $topicNameNew -EnablePartitioning $TRUE
63+
$count = $count + 1
64+
}
6965

70-
$get30Topic = Get-AzServiceBusTopic -ResourceGroupName $resourceGroupName -Namespace $namespaceName -MaxCount 30
71-
Assert-AreEqual 30 $get30Topic.Count "Get Topic with MaxCount 30 not returned total 30"
66+
$get30Topic = Get-AzServiceBusTopic -ResourceGroupName $resourceGroupName -Namespace $namespaceName -MaxCount 30
67+
Assert-AreEqual 30 $get30Topic.Count "Get Topic with MaxCount 30 not returned total 30"
7268

73-
#Create Subscription
74-
$count = 0
75-
$subscriptionNameNew = $subName + "_" +$count
76-
while($count -lt 50)
77-
{
78-
$subscriptionNameNew = $subName + "_" +$count
79-
New-AzServiceBusSubscription -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $topicNameNew -Name $subscriptionNameNew
80-
$count = $count + 1
81-
}
69+
#Create Subscription
70+
$count = 0
71+
$subscriptionNameNew = $subName + "_" + $count
72+
while ($count -lt 50) {
73+
$subscriptionNameNew = $subName + "_" + $count
74+
New-AzServiceBusSubscription -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $topicNameNew -Name $subscriptionNameNew
75+
$count = $count + 1
76+
}
8277

83-
$get30Sub = Get-AzServiceBusSubscription -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $topicNameNew -MaxCount 30
84-
Assert-AreEqual 30 $get30Sub.Count "Get Subscription with MaxCount 30 not returned total 30"
78+
$get30Sub = Get-AzServiceBusSubscription -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $topicNameNew -MaxCount 30
79+
Assert-AreEqual 30 $get30Sub.Count "Get Subscription with MaxCount 30 not returned total 30"
8580

86-
#Create Rules
87-
$count = 0
88-
$ruleNameNew = $ruleName + "_" +$count
89-
while($count -lt 50)
90-
{
91-
$ruleNameNew = $ruleName + "_" +$count
92-
New-AzServiceBusRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $topicNameNew -Subscription $subscriptionNameNew -Name $ruleNameNew -SqlExpression "myproperty='test'"
93-
$count = $count + 1
94-
}
81+
#Create Rules
82+
$count = 0
83+
$ruleNameNew = $ruleName + "_" + $count
84+
while ($count -lt 50) {
85+
$ruleNameNew = $ruleName + "_" + $count
86+
New-AzServiceBusRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $topicNameNew -Subscription $subscriptionNameNew -Name $ruleNameNew -SqlExpression "myproperty='test'"
87+
$count = $count + 1
88+
}
9589

96-
$get30Rule = Get-AzServiceBusRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $topicNameNew -Subscription $subscriptionNameNew -MaxCount 25
97-
Assert-AreEqual 25 $get30Rule.Count "Get Rules with MaxCount 30 not returned total 30"
98-
}
99-
Finally
100-
{
101-
# Cleanup
102-
# Delete namespace
90+
$get30Rule = Get-AzServiceBusRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $topicNameNew -Subscription $subscriptionNameNew -MaxCount 25
91+
Assert-AreEqual 25 $get30Rule.Count "Get Rules with MaxCount 30 not returned total 30"
92+
}
93+
Finally {
94+
# Cleanup
95+
# Delete namespace
10396

104-
Write-Debug "Delete NameSpace"
105-
Remove-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName
97+
Write-Debug "Delete NameSpace"
98+
Remove-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName
10699

107-
Write-Debug " Delete resourcegroup"
108-
Remove-AzResourceGroup -Name $resourceGroupName -Force
109-
}
100+
Write-Debug " Delete resourcegroup"
101+
Remove-AzResourceGroup -Name $resourceGroupName -Force
102+
}
110103

111104

112105
}

0 commit comments

Comments
 (0)