ServiceBus: added support for ZoneRedundant and DisableLocalAuth to namespace (#15961)

* updates for ZoneRedundant and DisableLocalAuth

* dded support for ZoneRedundant and DisableLocalAuth to namesapace

* updated servicebus nuget version in eventgrid

* updated eventgrid recording

* testign the Eventgird test by adding ref for servicebus

* updated Eventgrid test

* try with ref servicebus project

* reverted changes to eventgrid test project

* updated event gridtest

* Update ChangeLog.md

Co-authored-by: Yunchi Wang <[email protected]>

Author: Ajit Navasare

src/EventGrid/EventGrid.Test/EventGrid.Test.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.Management.EventGrid" Version="6.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.7.0" />
     <PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
-    <PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="3.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="23.0.0" />
   </ItemGroup>
 

src/EventGrid/EventGrid.Test/SessionRecords/Microsoft.Azure.Commands.EventGrid.Tests.ScenarioTests.EventSubscriptionTests/EventGrid_EventSubscription_CustomTopics.json

@@ -67,9 +67,9 @@ function NetworkRuleSetTests {
     $result = Add-AzServiceBusIPRule -ResourceGroup $resourceGroupName -Name $namespaceName -IpMask "3.3.3.3"
 
     Write-Debug "Add a new VirtualNetworkRule to the default NetwrokRuleSet"
-    $result = Add-AzServiceBusVirtualNetworkRule -ResourceGroup $resourceGroupName -Name $namespaceName -SubnetId "/subscriptions/854d368f-1828-428f-8f3c-f2affa9b2f7d/resourcegroups/v-ajnavtest/providers/Microsoft.Network/virtualNetworks/sbehvnettest1/subnets/default"
-    $result = Add-AzServiceBusVirtualNetworkRule -ResourceGroup $resourceGroupName -Name $namespaceName -SubnetId "/subscriptions/854d368f-1828-428f-8f3c-f2affa9b2f7d/resourcegroups/v-ajnavtest/providers/Microsoft.Network/virtualNetworks/sbehvnettest1/subnets/sbdefault"
-    $result = Add-AzServiceBusVirtualNetworkRule -ResourceGroup $resourceGroupName -Name $namespaceName -SubnetId "/subscriptions/854d368f-1828-428f-8f3c-f2affa9b2f7d/resourcegroups/v-ajnavtest/providers/Microsoft.Network/virtualNetworks/sbehvnettest1/subnets/sbdefault01"
+    $result = Add-AzServiceBusVirtualNetworkRule -ResourceGroup $resourceGroupName -Name $namespaceName -SubnetId "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourcegroups/v-ajnavtest/providers/Microsoft.Network/virtualNetworks/sbehvnettest1/subnets/default"
+    $result = Add-AzServiceBusVirtualNetworkRule -ResourceGroup $resourceGroupName -Name $namespaceName -SubnetId "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourcegroups/v-ajnavtest/providers/Microsoft.Network/virtualNetworks/sbehvnettest1/subnets/sbdefault"
+    $result = Add-AzServiceBusVirtualNetworkRule -ResourceGroup $resourceGroupName -Name $namespaceName -SubnetId "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourcegroups/v-ajnavtest/providers/Microsoft.Network/virtualNetworks/sbehvnettest1/subnets/sbdefault01"
 
     Write-Debug "Get NetwrokRuleSet"
     $getResult1 = Get-AzServiceBusNetworkRuleSet -ResourceGroup $resourceGroupName -Name $namespaceName
@@ -96,7 +96,7 @@ function NetworkRuleSetTests {
     Assert-AreEqual $setResult1.VirtualNetworkRules.Count 3 "Set1 - VirtualNetworkRules count did not matched"
 
     Write-Debug "Add a new VirtualNetworkRule to the default NetwrokRuleSet"
-    $result = Remove-AzServiceBusVirtualNetworkRule -ResourceGroup $resourceGroupName -Name $namespaceName -SubnetId "/subscriptions/854d368f-1828-428f-8f3c-f2affa9b2f7d/resourcegroups/v-ajnavtest/providers/Microsoft.Network/virtualNetworks/sbehvnettest1/subnets/default"
+    $result = Remove-AzServiceBusVirtualNetworkRule -ResourceGroup $resourceGroupName -Name $namespaceName -SubnetId "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourcegroups/v-ajnavtest/providers/Microsoft.Network/virtualNetworks/sbehvnettest1/subnets/default"
 
     Write-Debug "Delete NetwrokRuleSet"
     $result = Remove-AzServiceBusNetworkRuleSet -ResourceGroup $resourceGroupName -Name $namespaceName   

src/ServiceBus/ServiceBus.Test/ScenarioTests/NetworkRuleSetTests.ps1

@@ -19,10 +19,12 @@ Tests EventHub Namespace Create List Remove operations.
 #>
 function ServiceBusTests {
     # Setup    
-    $location = Get-Location
+    $location = "East US 2"
     $resourceGroupName = getAssetName "RGName-"
     $namespaceName = getAssetName "Namespace1-"
     $namespaceName2 = getAssetName "Namespace2-"
+    $namespaceName3 = getAssetName "Namespace3-"
+
 
     Write-Debug "Create resource group"    
     New-AzResourceGroup -Name $resourceGroupName -Location $location -Force 
@@ -60,7 +62,16 @@ function ServiceBusTests {
     $allCreatedNamespace = Get-AzServiceBusNamespace
     Assert-True { $allCreatedNamespace.Count -gt 1 }
 
+    # for ZoneRedundant and DisableLocalAuth 
+    Write-Debug "NamespaceName : $namespaceName3"
+    $result = New-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Location $location  -Name $namespaceName3 -SkuName "Premium" -ZoneRedundant -DisableLocalAuth
+    # Assert
+    Assert-AreEqual $result.Name $namespaceName3
+    Assert-True {$result.ZoneRedundant}
+    Assert-True {$result.DisableLocalAuth}
+
     Write-Debug " Delete namespaces"
+    Remove-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName3
     Remove-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName2
     Remove-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName
 

src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusServiceTests.ps1

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="3.0.0" />
   </ItemGroup>
 
 </Project>