Skip to content

Commit 9061a2c

Browse files
author
REDMOND\v-ajnava
committed
Changes regarding the new object creation for New and Set cmdlets
1 parent 46cfcce commit 9061a2c

32 files changed

+1431
-1450
lines changed

‎src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/Common.ps1

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,4 @@ function Get-SecondaryLocation
6969
}
7070

7171
return "EastUS"
72-
}
73-
74-
<#
75-
.SYNOPSIS
76-
update the New Name in resource file
77-
#>
78-
function update-NameInResourceFile ($fileName, $newName )
79-
{
80-
81-
$fpath = '.\.\Resources\'
82-
$fileContent = Get-Content $fpath$fileName -raw | ConvertFrom-Json
83-
84-
$fileContent.Name = $newName
85-
$fileContent.update
86-
$fileContent | ConvertTo-Json | set-content $fpath$fileName
87-
88-
}
72+
}

‎src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/ConsumerGroupsTests.ps1

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,11 @@ function ConsumerGroupsTests
6161
$namespaceName = Get-NamespaceName
6262
$eventHubName = Get-EventHubName
6363
$consumerGroupName = Get-ConsumerGroupName
64-
65-
update-NameInResourceFile "NewEventHub.json" $eventHubName
66-
update-NameInResourceFile "NewConsumerGroup.json" $eventHubName
6764

6865
Write-Debug " Create resource group"
6966
Write-Debug " Resource Group Name : $resourceGroupName"
7067
$Result11 = New-AzureRmResourceGroup -Name $resourceGroupName -Location $location -Force
7168

72-
73-
Write-Debug $Result11
7469
Write-Debug " Create new Evnethub namespace"
7570
Write-Debug " Namespace name : $namespaceName"
7671
$result = New-AzureRmEventHubNamespace -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -Location $location
@@ -96,7 +91,9 @@ function ConsumerGroupsTests
9691
Assert-True {$found -eq 0} "Namespace created earlier is not found."
9792

9893
Write-Debug " Create new eventHub "
99-
$result = New-AzureRmEventHub -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -InputFile .\.\Resources\NewEventHub.json
94+
$msgRetentionInDays = 3
95+
$partionCount = 2
96+
$result = New-AzureRmEventHub -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -Location $location -EventHubName $eventHubName -MessageRetentionInDays $msgRetentionInDays -PartitionCount $partionCount
10097

10198
Write-Debug " Get the created eventHub "
10299
$createdEventHub = Get-AzureRmEventHub -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result.Name
@@ -106,10 +103,10 @@ function ConsumerGroupsTests
106103

107104

108105
Write-Debug " Create a new ConsumerGroup "
109-
$result_ConsumerGroup = New-AzureRmEventHubConsumerGroup -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result.Name -ConsumerGroupName $consumerGroupName -InputFile .\.\Resources\NewConsumerGroup.json
106+
$result_ConsumerGroup = New-AzureRmEventHubConsumerGroup -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -ConsumerGroupName $consumerGroupName
110107

111108
Write-Debug " Get created ConsumerGroup "
112-
$CreatedConsumerGroup = Get-AzureRmEventHubConsumerGroup -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result.Name -ConsumerGroupName $result_ConsumerGroup.Name
109+
$CreatedConsumerGroup = Get-AzureRmEventHubConsumerGroup -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -ConsumerGroupName $result_ConsumerGroup.Name
113110

114111
Write-Debug " Get all created ConsumerGroup "
115112
$CreatedConsumerGroups = Get-AzureRmEventHubConsumerGroup -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result.Name

‎src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/EventHubsController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ public void RunPsTestWorkflow(
138138
private void SetupManagementClients(MockContext context)
139139
{
140140
ResourceManagementClient = GetResourceManagementClient();
141-
EventHubsManagementClient = GetEventHubsManagementClient(context);
141+
EventHubsManagementClient = GetEventHubsManagementClient(context);
142+
helper.SetupManagementClients(EventHubsManagementClient);
142143
helper.SetupManagementClients(ResourceManagementClient,EventHubsManagementClient);
143144
}
144145

‎src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/EventHubsTests.ps1

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ function EventHubsTests
6363
$namespaceName = Get-NamespaceName
6464
$eventHubName = Get-EventHubName
6565

66-
update-NameInResourceFile "NewEventHub.json" $eventHubName
67-
6866
# Create Resource Group
6967
Write-Debug "Create resource group"
7068
Write-Debug " Resource Group Name : $resourceGroupName"
@@ -105,7 +103,10 @@ function EventHubsTests
105103

106104
# Create a EventHub
107105
Write-Debug " Create new eventHub "
108-
$result = New-AzureRmEventHub -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -InputFile .\.\Resources\NewEventHub.json
106+
$msgRetentionInDays = 3
107+
$partionCount = 2
108+
$result = New-AzureRmEventHub -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -Location $location -EventHubName $eventHubName -MessageRetentionInDays $msgRetentionInDays -PartitionCount $partionCount
109+
109110

110111

111112
Write-Debug " Get the created Eventhub "
@@ -167,9 +168,6 @@ function EventHubsAuthTests
167168
$namespaceName = Get-NamespaceName
168169
$eventHubName = Get-EventHubName
169170
$authRuleName = Get-AuthorizationRuleName
170-
update-NameInResourceFile "NewEventHub.json" $eventHubName
171-
update-NameInResourceFile "NewAuthorizationRule.json" $authRuleName
172-
173171

174172
# Create ResourceGroup
175173
Write-Debug " Create resource group"
@@ -209,7 +207,9 @@ function EventHubsAuthTests
209207

210208
# Create New EventHub
211209
Write-Debug " Create new eventHub "
212-
$result_eventHub = New-AzureRmEventHub -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -InputFile .\.\Resources\NewEventHub.json
210+
$msgRetentionInDays = 3
211+
$partionCount = 2
212+
$result_eventHub = New-AzureRmEventHub -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -Location $location -EventHubName $eventHubName -MessageRetentionInDays $msgRetentionInDays -PartitionCount $partionCount
213213

214214
Write-Debug "Get the created eventHub"
215215
$createdEventHub = Get-AzureRmEventHub -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result_eventHub.Name
@@ -219,7 +219,7 @@ function EventHubsAuthTests
219219

220220
# Create Eventhub Authorization Rule
221221
Write-Debug "Create a EventHub Authorization Rule"
222-
$result = New-AzureRmEventHubAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result_eventHub.Name -InputFile .\.\Resources\NewAuthorizationRule.json
222+
$result = New-AzureRmEventHubAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -AuthorizationRuleName $authRuleName -Rights @("Listen","Send")
223223

224224
# Assert
225225
Assert-AreEqual $authRuleName $result.Name
@@ -230,7 +230,7 @@ function EventHubsAuthTests
230230

231231
# Get Created Eventhub Authorization Rule
232232
Write-Debug "Get created authorizationRule"
233-
$createdAuthRule = Get-AzureRmEventHubAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result_eventHub.Name -AuthorizationRule $authRuleName
233+
$createdAuthRule = Get-AzureRmEventHubAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -AuthorizationRule $authRuleName
234234

235235
# Assert
236236
Assert-AreEqual $authRuleName $createdAuthRule.Name
@@ -240,8 +240,7 @@ function EventHubsAuthTests
240240

241241
# Get all Eventhub Authorization Rules
242242
Write-Debug "Get All eventHub AuthorizationRule"
243-
$result = Get-AzureRmEventHubAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result_eventHub.Name
244-
243+
$result = Get-AzureRmEventHubAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName
245244
# Assert
246245
$found = 0
247246
for ($i = 0; $i -lt $result.Count; $i++)
@@ -260,7 +259,7 @@ function EventHubsAuthTests
260259
# Update the Eventhub Authorization Rule
261260
Write-Debug "Update eventHub AuthorizationRule"
262261
$createdAuthRule.Rights.Add("Manage")
263-
$updatedAuthRule = Set-AzureRmEventHubAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result_eventHub.Name -SASRule $createdAuthRule
262+
$updatedAuthRule = Set-AzureRmEventHubAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -AuthorizationRuleName $authRuleName -AuthRuleObj $createdAuthRule
264263
Wait-Seconds 15
265264

266265
# Assert
@@ -271,7 +270,7 @@ function EventHubsAuthTests
271270
Assert-True { $updatedAuthRule.Rights -Contains "Manage" }
272271

273272
# get the Updated Eventhub Authorization Rule
274-
$updatedAuthRule = Get-AzureRmEventHubAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result_eventHub.Name -AuthorizationRule $authRuleName
273+
$updatedAuthRule = Get-AzureRmEventHubAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -AuthorizationRuleName $authRuleName
275274

276275
# Assert
277276
Assert-AreEqual $authRuleName $updatedAuthRule.Name
@@ -282,29 +281,29 @@ function EventHubsAuthTests
282281

283282
# Get the List Keys
284283
Write-Debug "Get Eventhub authorizationRules connectionStrings"
285-
$namespaceListKeys = Get-AzureRmEventHubKey -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result_eventHub.Name -AuthorizationRule $authRuleName
284+
$namespaceListKeys = Get-AzureRmEventHubKey -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -AuthorizationRuleName $authRuleName
286285

287286
Assert-True {$namespaceListKeys.PrimaryConnectionString.Contains($updatedAuthRule.PrimaryKey)}
288287
Assert-True {$namespaceListKeys.SecondaryConnectionString.Contains($updatedAuthRule.SecondaryKey)}
289288

290289
# Regentrate the Keys
291290
$policyKey = "PrimaryKey"
292291

293-
$namespaceRegenerateKeys = New-AzureRmEventHubKey -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result_eventHub.Name -AuthorizationRule $authRuleName -RegenerateKey $policyKey
292+
$namespaceRegenerateKeys = New-AzureRmEventHubKey -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -AuthorizationRuleName $authRuleName -RegenerateKey $policyKey
294293
Assert-True {$namespaceRegenerateKeys.PrimaryKey -ne $namespaceListKeys.PrimaryKey}
295294

296295
$policyKey1 = "SecondaryKey"
297296

298-
$namespaceRegenerateKeys1 = New-AzureRmEventHubKey -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result_eventHub.Name -AuthorizationRule $authRuleName -RegenerateKey $policyKey1
297+
$namespaceRegenerateKeys1 = New-AzureRmEventHubKey -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -AuthorizationRuleName $authRuleName -RegenerateKey $policyKey1
299298
Assert-True {$namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey}
300299

301300

302301
# Cleanup
303302
Write-Debug "Delete the created EventHub AuthorizationRule"
304-
$result = Remove-AzureRmEventHubAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result_eventHub.Name -AuthorizationRule $authRuleName
303+
$result = Remove-AzureRmEventHubAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -AuthorizationRuleName $authRuleName
305304

306305
Write-Debug "Delete the Eventhub"
307-
Remove-AzureRmEventHub -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $result_eventHub.Name
306+
Remove-AzureRmEventHub -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName
308307

309308
Write-Debug "Delete NameSpace"
310309
Remove-AzureRmEventHubNamespace -ResourceGroup $resourceGroupName -NamespaceName $namespaceName

‎src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/NamespaceTests.ps1

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function NamespaceTests
6767

6868
Write-Debug " Create new eventHub namespace"
6969
Write-Debug "NamespaceName : $namespaceName"
70-
$result = New-AzureRmEventHubNamespace -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -Location $location -SkuName "Standard" -SkuCapacity "1" -CreateACSNamespace $FALSE
70+
$result = New-AzureRmEventHubNamespace -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -Location $location -SkuName "Standard" -SkuCapacity "1"
7171
Wait-Seconds 15
7272

7373
# Assert
@@ -158,10 +158,7 @@ function NamespaceAuthTests
158158
$location = Get-Location
159159
$resourceGroupName = Get-ResourceGroupName
160160
$namespaceName = Get-NamespaceName
161-
$authRuleName = Get-AuthorizationRuleName
162-
update-NameInResourceFile "NewAuthorizationRule.json" $authRuleName
163-
update-NameInResourceFile "SetAuthorizationRule.json" $authRuleName
164-
161+
$authRuleName = Get-AuthorizationRuleName
165162

166163
Write-Debug " Create resource group"
167164
Write-Debug "ResourceGroup name : $resourceGroupName"
@@ -193,7 +190,7 @@ function NamespaceAuthTests
193190

194191
Write-Debug "Create a Namespace Authorization Rule"
195192
Write-Debug "Auth Rule name : $authRuleName"
196-
$result = New-AzureRmEventHubNamespaceAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -InputFile .\.\Resources\NewAuthorizationRule.json
193+
$result = New-AzureRmEventHubNamespaceAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRuleName $authRuleName -Rights @("Listen","Send")
197194

198195

199196
Assert-AreEqual $authRuleName $result.Name
@@ -202,7 +199,7 @@ function NamespaceAuthTests
202199
Assert-True { $result.Rights -Contains "Send" }
203200

204201
Write-Debug "Get created authorizationRule"
205-
$createdAuthRule = Get-AzureRmEventHubNamespaceAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRule $authRuleName
202+
$createdAuthRule = Get-AzureRmEventHubNamespaceAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRuleName $authRuleName
206203

207204
Assert-AreEqual $authRuleName $createdAuthRule.Name
208205
Assert-AreEqual 2 $createdAuthRule.Rights.Count
@@ -211,7 +208,7 @@ function NamespaceAuthTests
211208

212209
Write-Debug "Get the default Namespace AuthorizationRule"
213210
$defaultNamespaceAuthRule = "RootManageSharedAccessKey"
214-
$result = Get-AzureRmEventHubNamespaceAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRule $defaultNamespaceAuthRule
211+
$result = Get-AzureRmEventHubNamespaceAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRuleName $defaultNamespaceAuthRule
215212

216213
Assert-AreEqual $defaultNamespaceAuthRule $result.Name
217214
Assert-AreEqual 3 $result.Rights.Count
@@ -250,7 +247,7 @@ function NamespaceAuthTests
250247

251248
Write-Debug "Update Namespace AuthorizationRules"
252249
$createdAuthRule.Rights.Add("Manage")
253-
$updatedAuthRule = Set-AzureRmEventHubNamespaceAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -InputFile .\.\Resources\SetAuthorizationRule.json
250+
$updatedAuthRule = Set-AzureRmEventHubNamespaceAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthRuleObj $createdAuthRule
254251

255252
Assert-AreEqual $authRuleName $updatedAuthRule.Name
256253
Assert-AreEqual 3 $updatedAuthRule.Rights.Count
@@ -260,7 +257,7 @@ function NamespaceAuthTests
260257
Wait-Seconds 15
261258

262259
Write-Debug "Get updated Namespace AuthorizationRules"
263-
$updatedAuthRule = Get-AzureRmEventHubNamespaceAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRule $authRuleName
260+
$updatedAuthRule = Get-AzureRmEventHubNamespaceAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRuleName $authRuleName
264261

265262
Assert-AreEqual $authRuleName $updatedAuthRule.Name
266263
Assert-AreEqual 3 $updatedAuthRule.Rights.Count
@@ -270,26 +267,26 @@ function NamespaceAuthTests
270267

271268

272269
Write-Debug "Get namespace authorizationRules connectionStrings"
273-
$namespaceListKeys = Get-AzureRmEventHubNamespaceKey -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRule $authRuleName
270+
$namespaceListKeys = Get-AzureRmEventHubNamespaceKey -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRuleName $authRuleName
274271

275272
Assert-True {$namespaceListKeys.PrimaryConnectionString.Contains($updatedAuthRule.PrimaryKey)}
276273
Assert-True {$namespaceListKeys.SecondaryConnectionString.Contains($updatedAuthRule.SecondaryKey)}
277274

278275
Write-Debug "Regenrate Authorizationrules Keys"
279276
$policyKey = "PrimaryKey"
280277

281-
$namespaceRegenerateKeys = New-AzureRmEventHubNameSpaceKey -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRule $authRuleName -RegenerateKeys $policyKey
278+
$namespaceRegenerateKeys = New-AzureRmEventHubNameSpaceKey -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRuleName $authRuleName -RegenerateKeys $policyKey
282279
Assert-True {$namespaceRegenerateKeys.PrimaryKey -ne $namespaceListKeys.PrimaryKey}
283280

284281
$policyKey1 = "SecondaryKey"
285282

286-
$namespaceRegenerateKeys1 = New-AzureRmEventHubNameSpaceKey -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRule $authRuleName -RegenerateKeys $policyKey1
283+
$namespaceRegenerateKeys1 = New-AzureRmEventHubNameSpaceKey -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRuleName $authRuleName -RegenerateKeys $policyKey1
287284
Assert-True {$namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey}
288285

289286

290287
# Cleanup
291288
Write-Debug "Delete the created Namespace AuthorizationRule"
292-
$result = Remove-AzureRmEventHubNamespaceAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRule $authRuleName
289+
$result = Remove-AzureRmEventHubNamespaceAuthorizationRule -ResourceGroup $resourceGroupName -NamespaceName $namespaceName -AuthorizationRuleName $authRuleName
293290

294291
Write-Debug " Delete namespaces"
295292
Remove-AzureRmEventHubNamespace -ResourceGroup $resourceGroupName -NamespaceName $namespaceName

0 commit comments

Comments
 (0)