Merge pull request #5347 from v-Ajnava/EHGeoDR_2017

Event Hubs: GeoDR cmdlets

Author: maddieclayton

src/ResourceManager/EventHub/AzureRM.EventHub.psd1

@@ -72,19 +72,22 @@ NestedModules = @('.\Microsoft.Azure.Commands.EventHub.dll')
 FunctionsToExport = @()
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
-CmdletsToExport = 'New-AzureRmEventHubNamespace', 'Get-AzureRmEventHubNamespace', 
-               'Set-AzureRmEventHubNamespace', 'Remove-AzureRmEventHubNamespace', 
-               'New-AzureRmEventHubAuthorizationRule', 
-               'Get-AzureRmEventHubAuthorizationRule', 
-               'Set-AzureRmEventHubAuthorizationRule', 
-               'Remove-AzureRmEventHubAuthorizationRule', 'Get-AzureRmEventHubKey', 
-               'New-AzureRmEventHubKey', 'New-AzureRmEventHub', 
-               'Get-AzureRmEventHub', 'Set-AzureRmEventHub', 
-               'Remove-AzureRmEventHub', 'New-AzureRmEventHubConsumerGroup', 
-               'Get-AzureRmEventHubConsumerGroup', 
-               'Set-AzureRmEventHubConsumerGroup', 
-               'Remove-AzureRmEventHubConsumerGroup'
 
+CmdletsToExport = 'New-AzureRmEventHubNamespace', 'Get-AzureRmEventHubNamespace',
+               'Set-AzureRmEventHubNamespace', 'Remove-AzureRmEventHubNamespace',
+               'New-AzureRmEventHubAuthorizationRule',
+               'Get-AzureRmEventHubAuthorizationRule',
+               'Set-AzureRmEventHubAuthorizationRule',
+               'Remove-AzureRmEventHubAuthorizationRule', 'Get-AzureRmEventHubKey',
+               'New-AzureRmEventHubKey', 'New-AzureRmEventHub',
+               'Get-AzureRmEventHub', 'Set-AzureRmEventHub',
+               'Remove-AzureRmEventHub', 'New-AzureRmEventHubConsumerGroup',
+               'Get-AzureRmEventHubConsumerGroup',
+               'Set-AzureRmEventHubConsumerGroup',
+               'Remove-AzureRmEventHubConsumerGroup', 'New-AzureRmEventHubGeoDRConfiguration', 'Get-AzureRmEventHubGeoDRConfiguration', 'Remove-AzureRmEventHubGeoDRConfiguration',
+	       'Set-AzureRmEventHubGeoDRConfigurationBreakPair', 'Set-AzureRmEventHubGeoDRConfigurationFailOver',
+	       'Test-AzureRmEventHubName'
+			   
 # Variables to export from this module
 # VariablesToExport = @()
 
@@ -140,5 +143,4 @@ PrivateData = @{
 # Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
 # DefaultCommandPrefix = ''
 
-}
-
+}

src/ResourceManager/EventHub/ChangeLog.md

@@ -19,10 +19,26 @@
 -->
 ## Current Release
 
+* Added below new commands for Geo Disaster Recovery operations. 
+	-Creating a new Alias(Disaster Recovery configuration): 
+		- New-AzureRmEventHubGeoDRConfiguration [-ResourceGroupName] <String> [-Namespace] <String> [-Name] <String> [-PartnerNamespace] <String> [-WhatIf] [-Confirm]
+	-Retrieve Alias(Disaster Recovery configuration) : 
+		- Get-AzureRmEventHubGeoDRConfiguration [-ResourceGroupName] <String> [-Namespace] <String> [[-Name] <String>]
+	-Disabling the Disaster Recovery and stops replicating changes from primary to secondary namespaces
+		- Set-AzureRmEventHubGeoDRConfigurationBreakPair [-ResourceGroupName] <String> [-Namespace] <String> [-Name] <String>
+	-Invoking Disaster Recovery failover and reconfigure the alias to point to the secondary namespace
+		- Set-AzureRmEventHubGeoDRConfigurationFailOver [-ResourceGroupName] <String> [-Namespace] <String> [-Name] <String>
+	-Deleting an Alias(Disaster Recovery configuration)
+		- Remove-AzureRmEventHubGeoDRConfiguration [-ResourceGroupName] <String> [-Namespace] <String> [-Name] <String> [-WhatIf] [-Confirm]
+
+* Added below new commands for checking the Namespace Name and GeoDr Configuration Name - Alias availability. 
+	-Check the Availability of Namespace name or Alias(Disaster Recovery configuration) name: 
+		- Test-AzureRmEventHubName [-ResourceGroupName] <String> [-Namespace] <String> [-AliasName] <String>
+		
 ## Version 0.5.1
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
 * Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
-
+		
 ## Version 0.5.0
 * NOTE: This is a breaking change release. Please see the migration guide (https://aka.ms/azps-migration-guide) for a full list of breaking changes introduced.
 * Add support for online help

src/ResourceManager/EventHub/Commands.EventHub.Test/Commands.EventHubs.Test.csproj

@@ -55,7 +55,8 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.1.0.2\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.EventHub, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.EventHub.2.0.0\lib\net452\Microsoft.Azure.Management.EventHub.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.EventHub.2.0.3\lib\net452\Microsoft.Azure.Management.EventHub.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Test.HttpRecorder">
@@ -68,11 +69,11 @@
       <HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.10\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.7\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.10\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -136,6 +137,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ScenarioTests\ConsumerGroups.cs" />
+    <Compile Include="ScenarioTests\DRConfigurations.cs" />
     <Compile Include="ScenarioTests\Namespace.cs" />
     <Compile Include="ScenarioTests\EventHubsController.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -161,12 +163,12 @@
     <None Include="Resources\NewEventHub.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="ScenarioTests\Common.ps1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="ScenarioTests\ConsumerGroupsTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="ScenarioTests\DRConfigurationTests.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="ScenarioTests\NamespaceTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -176,6 +178,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.ConsumerGroupsTests\ConsumerGroupsCRUD.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.DRConfigurationTests\DRConfigurationsCURD.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.EventHubsTests\EventHubsAuthorizationRulesCRUD.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

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

@@ -12,55 +12,20 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
-<#
-.SYNOPSIS
-Get valid resource group name
-#>
-function Get-ResourceGroupName
-{
-    return "RGName-" + (getAssetName)		
-}
-
-<#
-.SYNOPSIS
-Get valid EventHub name
-#>
-function Get-EventHubName
-{
-    return "EventHub-" + (getAssetName)
-}
-
-<#
-.SYNOPSIS
-Get ConsumerGroup name
-#>
-function Get-ConsumerGroupName
-{
-    return "ConsumerGroup-" + (getAssetName)
-}
-
-<#
-.SYNOPSIS
-Get valid Namespace name
-#>
-function Get-NamespaceName
-{
-    return "Namespace-" + (getAssetName)
-}
-
 <#
 .SYNOPSIS
 Tests New Parameter for ConsumerGroup Create List Remove operations.
 #>
+
 function ConsumerGroupsTests
 { # Setup
 
 
     $location = Get-Location
-	$resourceGroupName = Get-ResourceGroupName
-	$namespaceName = Get-NamespaceName
-	$eventHubName = Get-EventHubName
-	$consumerGroupName = Get-ConsumerGroupName
+	$resourceGroupName = getAssetName "RSG"
+	$namespaceName = getAssetName "Namespace-"
+	$eventHubName = getAssetName "EventHub-"
+	$consumerGroupName = getAssetName "ConsumerGroup-"
 
     Write-Debug "  Create resource group"
     Write-Debug " Resource Group Name : $resourceGroupName"
@@ -71,9 +36,8 @@ function ConsumerGroupsTests
     $result = New-AzureRmEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName -Location $location
 
     Write-Debug " Get the created namespace within the resource group"
-    $createdNamespace = Get-AzureRmEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName
-    
-    Assert-True {$createdNamespace.Name -eq $namespaceName} "Namespace created earlier is not found."
+    $createdNamespace = Get-AzureRmEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName    
+    Assert-AreEqual $createdNamespace.Name $namespaceName "New Namespace: Namespace created earlier is not found."
 
     Write-Debug " Create new eventHub "
 	$msgRetentionInDays = 3
@@ -82,29 +46,34 @@ function ConsumerGroupsTests
 
     Write-Debug " Get the created eventHub "
     $createdEventHub = Get-AzureRmEventHub -ResourceGroup $resourceGroupName -Namespace $namespaceName -Name $result.Name 
-	
-	$createdEventHub = Get-AzureRmEventHub -ResourceGroup $resourceGroupName -Namespace $namespaceName -Name $eventHubName
-    Assert-True {$createdEventHub.Name -eq $eventHubName} "Namespace created earlier is not found."	
+    Assert-AreEqual $createdEventHub.Name $eventHubName "Get Namespace: Namespace created earlier is not found."	
 
 	Write-Debug " Create a new ConsumerGroup "
 	$result_ConsumerGroup = New-AzureRmEventHubConsumerGroup -ResourceGroup $resourceGroupName -Namespace $namespaceName -EventHub $eventHubName -Name $consumerGroupName
+	Assert-AreEqual $result_ConsumerGroup.Name $consumerGroupName "New ConsumerGroup: ConsumerGroup created earlier is not found."	
 
 	Write-Debug " Get created ConsumerGroup "
-	$CreatedConsumerGroup = Get-AzureRmEventHubConsumerGroup -ResourceGroup $resourceGroupName -Namespace $namespaceName -EventHub $eventHubName -Name $result_ConsumerGroup.Name
+	$GetConsumerGroup = Get-AzureRmEventHubConsumerGroup -ResourceGroup $resourceGroupName -Namespace $namespaceName -EventHub $eventHubName -Name $result_ConsumerGroup.Name
+	Assert-AreEqual $GetConsumerGroup.Name $consumerGroupName "Get ConsumerGroup: ConsumerGroup created earlier is not found."	
 
 	Write-Debug " Get all created ConsumerGroup "
-	$CreatedConsumerGroups = Get-AzureRmEventHubConsumerGroup -ResourceGroup $resourceGroupName -Namespace $namespaceName -EventHub $result.Name
-	
+	$ListConsumerGroups = Get-AzureRmEventHubConsumerGroup -ResourceGroup $resourceGroupName -Namespace $namespaceName -EventHub $result.Name
+	Assert-True { $ListConsumerGroups.Count -ge 0 } "List ConsumerGroup: ConsumerGroup created earlier is not found."	
+
 	# Cleanup
 	Write-Debug " Delete created ConsumerGroup "
-	Remove-AzureRmEventHubConsumerGroup -ResourceGroup $resourceGroupName -Namespace $namespaceName -EventHub $result.Name -Name $CreatedConsumerGroup.Name
+	Remove-AzureRmEventHubConsumerGroup -ResourceGroup $resourceGroupName -Namespace $namespaceName -EventHub $result.Name -Name $GetConsumerGroup.Name
+
+	Write-Debug " check the if consumergroup is deleted"
+	$ListConsumerGroups_afterdelete = Get-AzureRmEventHubConsumerGroup -ResourceGroup $resourceGroupName -Namespace $namespaceName -EventHub $result.Name
+	Assert-True { $ListConsumerGroups_afterdelete.Count -lt 2 } "List ConsumerGroup: ConsumerGroup deleted earlier is found."	
 
     Write-Debug " Delete the EventHub"
     $delete1 = Remove-AzureRmEventHub -ResourceGroup $resourceGroupName -Namespace $namespaceName -Name $result.Name  
 
     Write-Debug " Delete namespaces"
     Remove-AzureRmEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName
 
-	Write-Debug " Delete resourcegroup"
+	Write-Debug " Delete resourcegroup" 
 	Remove-AzureRmResourceGroup -Name $resourceGroupName -Force
 }