PR review comments updated

Author: Ajit Navasare (MINDTREE LIMITED)

AzurePowershell.Test.targets

@@ -106,6 +106,7 @@
 			<XUnitTests Include=".\src\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\ServiceBus\Commands.ServiceBus.Test\bin\Debug\Microsoft.Azure.Commands.ServiceBus.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\EventHub\Commands.EventHub.Test\bin\Debug\Microsoft.Azure.Commands.EventHubs.Test.dll"/>
+			<XUnitTests Include=".\src\ResourceManager\Relay\Commands.Relay.Test\bin\Debug\Microsoft.Azure.Commands.Relay.Test.dll"/>
 			<XUnitTests Include="@(AsmXUnitTests)"/>
 		</ItemGroup>
 		<ItemGroup Condition=" '$(scope)' == 'ServiceManagement' ">

src/ResourceManager/RedisCache/Commands.RedisCache/Properties/Resources.Designer.cs

@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.7.0'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.8.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()
@@ -75,7 +75,7 @@ FunctionsToExport = @()
 CmdletsToExport =  'New-AzureRmRelayNamespace', 'Get-AzureRmRelayNamespace','Set-AzureRmRelayNamespace', 'Remove-AzureRmRelayNamespace',
 				   'New-AzureRmWcfRelay', 'Get-AzureRmWcfRelay','Set-AzureRmWcfRelay','Remove-AzureRmWcfRelay',
 				   'New-AzureRmRelayHybridConnection', 'Get-AzureRmRelayHybridConnection','Set-AzureRmRelayHybridConnection','Remove-AzureRmRelayHybridConnection',
-				   'Test-AzureRmCheckNameAvailability','Get-AzureRmRelayOperation',
+				   'Test-AzureRmRelayName','Get-AzureRmRelayOperation',
 				   'New-AzureRmRelayKey', 'Get-AzureRmRelayKey',
 				   'New-AzureRmRelayAuthorizationRule', 'Get-AzureRmRelayAuthorizationRule','Set-AzureRmRelayAuthorizationRule', 'Remove-AzureRmRelayAuthorizationRule'
 
@@ -101,7 +101,7 @@ PrivateData = @{
     PSData = @{
 
         # Tags applied to this module. These help with module discovery in online galleries.
-        Tags = 'Azure','ResourceManager','ARM','Relay'
+        Tags = 'Azure','ResourceManager','ARM','Relay', 'ServiceBus'
 
         # A URL to the license for this module.
         LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'

src/ResourceManager/Relay/AzureRM.Relay.psd1

@@ -19,66 +19,4 @@
 -->
 ## Current Release
 
-## Version 0.0.1
-* Adds commandlets for the Azure Relay
-
-    - New-AzureRmRelayNamespace
-        - Adds a New Relay NameSpace in the existing Resource Group.
-    - Get-AzureRmRelayNamespace
-        - Gets Relay NameSpace/list of NameSpaces of existing Resource Group.
-    - Set-AzureRmRelayNamespace
-        - Updates properties of existing Relay NameSpace.
-    - Remove-AzureRmRelayNamespace
-        - Deletes the existing Relay NameSpace.
-    - New-AzureRmRelayNamespaceAuthorizationRule
-        - Adds a new AuthorizationRule to the existing Relay NameSpace.
-    - Get-AzureRmRelayNamespaceAuthorizationRule
-        - Gets AuthorizationRule / List of AuthorizationRules for the existing Relay NameSpace.
-    - Set-AzureRmRelayNamespaceAuthorizationRule
-        - Updates properties of existing AuthorizationRule of Relay NameSpace.
-    - New-AzureRmRelayNamespaceKey
-        - Generates a new Primary/Secondary Key for AuthorizationRule of existing Relay NameSpace.
-    - Get-AzureRmRelayNamespaceKey
-        - Gets Primary/Secondary Key for AuthorizationRule of existing Relay NameSpace.
-    - Remove-AzureRmRelayNamespaceAuthorizationRule
-        - Deletes the existing AuthorizationRule of Relay NameSpace.
-    - New-AzureRmWcfRelay
-        - Adds a new WcfRelay to the existing NameSpace.
-    - Get-AzureRmWcfRelay
-        - Gets existing Queue/ List of WcfRelay of the existing NameSpace.
-    - Set-AzureRmWcfRelay
-        - Updates properties of existing WcfRelay of NameSpace.
-    - Remove-AzureRmWcfRelay
-        - Deletes existing WcfRelay of NameSpace.
-    - New-AzureRmWcfRelayAuthorizationRule
-        - Adds a new AuthorizationRule to the existing WcfRelay of NameSpace.
-    - Get-AzureRmWcfRelayAuthorizationRule
-        - Gets the AuthorizationRule / List of AuthorizationRules of the WcfRelay. 
-    - Set-AzureRmWcfRelayAuthorizationRule
-        - Updates the AuthorizationRule of the WcfRelay.
-    - New-AzureRmWcfRelayKey
-        - Generates a new Primary/Secondary Key for AuthorizationRule of existing WcfRelay.
-    - Get-AzureRmWcfRelayKey
-        - Gets Primary/Secondary Key for AuthorizationRule of existing WcfRelay.
-    - Remove-AzureRmWcfRelayAuthorizationRule
-        - Deletes the existing AuthorizationRule of WcfRelay.
-    - New-AzureRmRelayHybridConnections
-        - Adds a new HybridConnections to the existing NameSpace.
-    - Get-AzureRmRelayHybridConnections
-        - Gets existing HybridConnections/ List of HybridConnections of the existing NameSpace.
-    - Set-AzureRmRelayHybridConnections
-        - Updates properties of existing HybridConnections of NameSpace.
-    - Remove-AzureRmRelayHybridConnections
-        - Deletes existing HybridConnections of NameSpace.
-    - New-AzureRmRelayHybridConnectionsAuthorizationRule
-        - Adds a new AuthorizationRule to the existing HybridConnections of NameSpace.
-    - Get-AzureRmRelayHybridConnectionsAuthorizationRule
-        - Gets the AuthorizationRule / List of AuthorizationRules of the HybridConnections. 
-    - Set-AzureRmRelayHybridConnectionsAuthorizationRule
-        - Updates the AuthorizationRule of the HybridConnections.
-    - New-AzureRmRelayHybridConnectionsKey
-        - Generates a new Primary/Secondary Key for AuthorizationRule of existing HybridConnections.
-    - Get-AzureRmRelayHybridConnectionsKey
-        - Gets Primary/Secondary Key for AuthorizationRule of existing HybridConnections.
-    - Remove-AzureRmRelayHybridConnectionsAuthorizationRule
-        - Deletes the existing AuthorizationRule of HybridConnections.
+* Adds cmdlets for the Azure Relay which allows users to create and manage all Azure Relay resources.

src/ResourceManager/Relay/ChangeLog.md

@@ -159,15 +159,13 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="ScenarioTests\Common.ps1" />
     <None Include="ScenarioTests\OperationsListTest.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="ScenarioTests\CheckNameAvailabilityTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="ScenarioTests\Common.ps1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="ScenarioTests\RelayNamespaceTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Relay/Commands.Relay.Test/Commands.Relay.Test.csproj

@@ -56,7 +56,7 @@ Tests Relay Namespace CheckNameAvailability operations.
 function CheckNameAvailabilityTests 
 {
 	# Setup    
-	$location = Get-Location
+	$location = "West US"
 	$namespaceName = Get-NamespaceName
 	$namespaceName2 = Get-NamespaceName
 	$resourceGroupName = Get-ResourceGroupName
@@ -70,22 +70,22 @@ function CheckNameAvailabilityTests
 	Write-Debug "ResourceGroup name : $secondResourceGroup"
 	New-AzureRmResourceGroup -Name $secondResourceGroup -Location $location -Force 
 
-	$ResultCheckNameAvailability = Test-AzureRmCheckNameAvailability -Namespace $namespaceName
+	$ResultCheckNameAvailability = Test-AzureRmRelayName -Namespace $namespaceName
 	Assert-True {$ResultCheckNameAvailability.NameAvailable} "The Namespace Name not Available"
 
 	Write-Debug " Create new Relay namespace"
 	Write-Debug "NamespaceName : $namespaceName" 
-	$result = New-AzureRmRelayNamespace -ResourceGroup $resourceGroupName -Name $namespaceName -Location $location
+	$result = New-AzureRmRelayNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName -Location $location
 	Wait-Seconds 15
 
 	# Assert 
 	Assert-True {$result.ProvisioningState -eq "Succeeded"}
 
-	$ReCheckNameAvailability = Test-AzureRmCheckNameAvailability -Namespace $namespaceName
+	$ReCheckNameAvailability = Test-AzureRmRelayName -Namespace $namespaceName
 	Assert-False {$ReCheckNameAvailability.NameAvailable} "The Namespace Name Available failed"  
 
 	Write-Debug " Delete namespaces"
-	Remove-AzureRmRelayNamespace -ResourceGroup $resourceGroupName -Name $namespaceName
+	Remove-AzureRmRelayNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName
 
 	Write-Debug " Delete resourcegroup"
 	Remove-AzureRmResourceGroup -Name $resourceGroupName -Force

src/ResourceManager/Relay/Commands.Relay.Test/ScenarioTests/CheckNameAvailabilityTests.ps1

@@ -20,53 +20,4 @@ Gets a resource group name for testing.
 function Get-ResourceGroupName
 {
     return getAssetName
-}
-
-
-<#
-.SYNOPSIS
-Gets the location for the Website. Default to West US if none found.
-#>
-function Get-Location
-{
-	if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback)
-	{
-		$namespace = "Microsoft.Web"
-		$type = "sites"
-		$location = Get-AzureRmResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type}
-  
-		if ($location -eq $null) 
-		{  
-			return "West US"  
-		} else 
-		{  
-			return $location.Locations[0]  
-		}
-	}
-
-	return "West US"
-}
-
-<#
-.SYNOPSIS
-Gets the location for the Website. Default to West US if none found.
-#>
-function Get-SecondaryLocation
-{
-	if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback)
-	{
-		$namespace = "Microsoft.Web"
-		$type = "sites"
-		$location = Get-AzureRmResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type}
-  
-		if ($location -eq $null) 
-		{  
-			return "East US"  
-		} else 
-		{  
-			return $location.Locations[1]  
-		}
-	}
-
-	return "East US"
 }

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

@@ -32,12 +32,5 @@ public void HybridConnectionsCRUD()
         {
             RelayController.NewInstance.RunPsTest("HybridConnectionsTests");
         }
-
-        //[Fact]
-        //[Trait(Category.AcceptanceType, Category.CheckIn)]
-        //public void HybridConnectionsAuthorizationRulesCRUD()
-        //{
-        //    RelayController.NewInstance.RunPsTest("HybridConnectionsAuthTests");
-        //}
     }
 }

src/ResourceManager/Relay/Commands.Relay.Test/ScenarioTests/HybridConnectionsTests.cs

@@ -57,7 +57,7 @@ Tests HybridConnections Create Get List Remove operations.
 function HybridConnectionsTests
 {
 	# Setup    
-	$location = Get-Location
+	$location = "West US"
 	$resourceGroupName = Get-ResourceGroupName
 	$namespaceName = Get-NamespaceName
 	$HybridConnectionsName = Get-HybridConnectionsName
@@ -71,44 +71,44 @@ function HybridConnectionsTests
 	# Create Relay Namespace
 	Write-Debug "  Create new Relay namespace"
 	Write-Debug " Namespace name : $namespaceName"
-	$result = New-AzureRmRelayNamespace -ResourceGroup $resourceGroupName -Name $namespaceName -Location $location
+	$result = New-AzureRmRelayNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName -Location $location
 	Wait-Seconds 15
 
 	# Assert
 	Assert-True {$result.ProvisioningState -eq "Succeeded"}
 
 	# get the created Relay Namespace 
 	Write-Debug " Get the created namespace within the resource group"
-	$returnedNamespace = Get-AzureRmRelayNamespace -ResourceGroup $resourceGroupName -Name $namespaceName    
+	$returnedNamespace = Get-AzureRmRelayNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName    
 	# Assert
 	Assert-AreEqual $location $returnedNamespace.Location "NameSpace Location Not matched."        
 	Assert-True {$returnedNamespace.Name -eq $namespaceName} "Namespace created earlier is not found."
 
 	# Create a HybridConnections
 	Write-Debug "Create new HybridConnections"
 	$userMetadata = "User Meta data"
-	$result = New-AzureRmRelayHybridConnection -ResourceGroup $resourceGroupName -Namespace $namespaceName -Name $HybridConnectionsName -RequiresClientAuthorization $True -UserMetadata $userMetadata
+	$result = New-AzureRmRelayHybridConnection -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $HybridConnectionsName -RequiresClientAuthorization $True -UserMetadata $userMetadata
 
 
 	Write-Debug " Get the created HybridConnections "
-	$createdHybridConnections = Get-AzureRmRelayHybridConnection -ResourceGroup $resourceGroupName -Namespace $namespaceName -Name $HybridConnectionsName
+	$createdHybridConnections = Get-AzureRmRelayHybridConnection -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $HybridConnectionsName
 
-	$result2 = Set-AzureRmRelayHybridConnection -ResourceGroup $resourceGroupName -Namespace $namespaceName -Name $HybridConnectionsName -UserMetadata "Test UserMetdata"
+	$result2 = Set-AzureRmRelayHybridConnection -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $HybridConnectionsName -UserMetadata "Test UserMetdata"
 
 	#Assert
 	Assert-True {$result2.Name -eq $HybridConnectionsName} "HybridConnections created earlier is not found."
 
 	# Get the Created HybridConnections
 	Write-Debug " Get all the created HybridConnections "
-	$createdHybridConnectionsList = Get-AzureRmRelayHybridConnection -ResourceGroup $resourceGroupName -Namespace $namespaceName
+	$createdHybridConnectionsList = Get-AzureRmRelayHybridConnection -ResourceGroupName $resourceGroupName -Namespace $namespaceName
 
 	#Assert
 	Assert-True {$createdHybridConnectionsList[0].Name -eq $HybridConnectionsName }"HybridConnections created earlier is not found."
 
 	# Update the Created HybridConnections
 	Write-Debug " Update HybridConnections "
 	$createdHybridConnections.UserMetadata = "usermetadata is a placeholder to store user-defined string data for the HybridConnection endpoint.e.g. it can be used to store  descriptive data, such as list of teams and their contact information also user-defined configuration settings can be stored."	   
-	$result1 = Set-AzureRmRelayHybridConnection -ResourceGroup $resourceGroupName -Namespace $namespaceName -Name $HybridConnectionsName -InputObject $createdHybridConnections
+	$result1 = Set-AzureRmRelayHybridConnection -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $HybridConnectionsName -InputObject $createdHybridConnections
 	Wait-Seconds 15
 
 	# Assert
@@ -119,7 +119,7 @@ function HybridConnectionsTests
 	Write-Debug " Delete the HybridConnections"
 	for ($i = 0; $i -lt $createdHybridConnectionsList.Count; $i++)
 	{
-		$delete1 = Remove-AzureRmRelayHybridConnection -ResourceGroup $resourceGroupName -Namespace $namespaceName -Name $HybridConnectionsName		
+		$delete1 = Remove-AzureRmRelayHybridConnection -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $HybridConnectionsName		
 	}
 	Write-Debug " Delete namespaces"
 	Remove-AzureRmRelayNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName

src/ResourceManager/Relay/Commands.Relay.Test/ScenarioTests/HybridConnectionsTests.ps1

@@ -31,13 +31,6 @@ public RelayNamespaceTests(ITestOutputHelper output)
         public void RelayNamespaceCRUD()
         {
             RelayController.NewInstance.RunPsTest("RelayNamespaceTests");
-        }
-
-        //[Fact]
-        //[Trait(Category.AcceptanceType, Category.CheckIn)]
-        //public void RelayNamespaceAuthorizationRulesCRUD()
-        //{
-        //    RelayController.NewInstance.RunPsTest("RelayNamespaceAuthTests");
-        //}
+        }        
     }
 }