Merge pull request Azure#6121 from ArieShout/menxiao/signalr-ps-rg

Updates and fixes according to the SignalR RP changes

Author: cormacpayne

src/ResourceManager/SignalR/Commands.SignalR/Cmdlets/GetAzureRmSignalR.cs

@@ -29,15 +29,15 @@ public class GetAzureRmSignalR : SignalRCmdletBase, IWithResourceId
             Mandatory = false,
             ParameterSetName = ListSignalRServiceParameterSet,
             HelpMessage = "The resource group name.")]
-        [Parameter(Position = 0,
+        [Parameter(
             Mandatory = false,
             ParameterSetName = ResourceGroupParameterSet,
             HelpMessage = "The resource group name. The default one will be used if not specified.")]
         [ResourceGroupCompleter()]
         [ValidateNotNullOrEmpty]
         public override string ResourceGroupName { get; set; }
 
-        [Parameter(Position = 1,
+        [Parameter(Position = 0,
             Mandatory = true,
             ParameterSetName = ResourceGroupParameterSet,
             HelpMessage = "The SignalR service name.")]

src/ResourceManager/SignalR/Commands.SignalR/Cmdlets/GetAzureRmSignalRKey.cs

@@ -33,7 +33,7 @@ public class GetAzureRmSignalRKey : SignalRCmdletBase, IWithInputObject, IWithRe
         [ValidateNotNullOrEmpty]
         public override string ResourceGroupName { get; set; }
 
-        [Parameter(Position = 1,
+        [Parameter(Position = 0,
             Mandatory = true,
             ParameterSetName = ResourceGroupParameterSet,
             HelpMessage = "The SignalR service name.")]

src/ResourceManager/SignalR/Commands.SignalR/Cmdlets/NewAzureRmSignalR.cs

@@ -39,14 +39,13 @@ public sealed class NewAzureRmSignalR : SignalRCmdletBase
 
         [Parameter(
             Mandatory = true,
-            Position = 1,
+            Position = 0,
             HelpMessage = "The SignalR service name.")]
         [ValidateNotNullOrEmpty()]
         public string Name { get; set; }
 
         [Parameter(
             Mandatory = false,
-            Position = 2,
             HelpMessage = "The SignalR service location. The resource group location will be used if not specified.")]
         [LocationCompleter("Microsoft.SignalR/SignalR")]
         [ValidateNotNullOrEmpty()]
@@ -55,9 +54,16 @@ public sealed class NewAzureRmSignalR : SignalRCmdletBase
         [Parameter(
             Mandatory = false,
             HelpMessage = "The SignalR service SKU.")]
-        [PSArgumentCompleter("Basic_DS2")]
+        [PSArgumentCompleter("Free_DS2", "Basic_DS2")]
         public string Sku { get; set; } = DefaultSku;
 
+        [Parameter(
+            Mandatory = false,
+            HelpMessage = "The SignalR service unit count, from 1 to 10. Default to 1.")]
+        [PSArgumentCompleter("1", "2", "3", "4", "5", "6", "7", "8", "9", "10")]
+        [ValidateRange(1, 10)]
+        public int UnitCount { get; set; } = 1;
+
         [Parameter(
             Mandatory = false,
             HelpMessage = "The tags for the SignalR service.")]
@@ -97,22 +103,18 @@ public Parameters(NewAzureRmSignalR cmdlet)
 
             public Task<ResourceConfig<SignalRResource>> CreateConfigAsync()
             {
+                _cmdlet.ResolveResourceGroupName(required: false);
                 _cmdlet.ResourceGroupName = _cmdlet.ResourceGroupName ?? _cmdlet.Name;
-                _cmdlet.ResolveResourceGroupName();
 
                 var resourceGroup = ResourceGroupStrategy.CreateResourceGroupConfig(
                     _cmdlet.ResourceGroupName);
 
                 var result = SignalRStrategy.Strategy.CreateResourceConfig(
                     resourceGroup: resourceGroup,
-                    // The SignalR service accepts only lower case characters. It's a known bug.
-                    // TODO: remove ".ToLower()" as soon as the problem is fixed in SignalR server.
-                    // See also 
-                    // https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md#put-resource
-                    name: _cmdlet.Name.ToLower(),
+                    name: _cmdlet.Name,
                     createModel: engine => new SignalRResource(
                         tags: _cmdlet.Tag,
-                        sku: new ResourceSku(_cmdlet.Sku, capacity: 1), // we only allow capacity 1 in public preview, this may be a parameter in future.
+                        sku: new ResourceSku(_cmdlet.Sku, capacity: _cmdlet.UnitCount),
                         hostNamePrefix: null /* _cmdlet.Name*/)); // hostNamePrefix is just a placeholder and ignored in the resource provider.
 
                 return Task.FromResult(result);

src/ResourceManager/SignalR/Commands.SignalR/Cmdlets/NewAzureRmSignalRKey.cs

@@ -34,7 +34,7 @@ public class NewAzureRmSignalRKey : SignalRCmdletBase, IWithInputObject, IWithRe
         [ValidateNotNullOrEmpty]
         public override string ResourceGroupName { get; set; }
 
-        [Parameter(Position = 1,
+        [Parameter(Position = 0,
             Mandatory = true,
             ParameterSetName = ResourceGroupParameterSet,
             HelpMessage = "The SignalR service name.")]
@@ -55,7 +55,7 @@ public class NewAzureRmSignalRKey : SignalRCmdletBase, IWithInputObject, IWithRe
         [ValidateNotNull]
         public PSSignalRResource InputObject { get; set; }
 
-        [Parameter(Mandatory = true, HelpMessage = "The key type, either Primary or Secondary.")]
+        [Parameter(Mandatory = true, Position = 1, HelpMessage = "The key type, either Primary or Secondary.")]
         [PSArgumentCompleter("Primary", "Secondary")]
         [ValidateSet("Primary", "Secondary", IgnoreCase = true)]
         public string KeyType { get; set; }

src/ResourceManager/SignalR/Commands.SignalR/Cmdlets/RemoveAzureRmSignalR.cs

@@ -33,7 +33,7 @@ public class RemoveAzureRmSignalR : SignalRCmdletBase, IWithInputObject, IWithRe
         [ValidateNotNullOrEmpty]
         public override string ResourceGroupName { get; set; }
 
-        [Parameter(Position = 1,
+        [Parameter(Position = 0,
             Mandatory = true,
             ParameterSetName = ResourceGroupParameterSet,
             HelpMessage = "The SignalR service name.")]

src/ResourceManager/SignalR/Commands.SignalR/help/Get-AzureRmSignalR.md

@@ -14,13 +14,13 @@ Get a specific SignalR service or all the SignalR services in a resource group o
 
 ### ListSignalRServiceParameterSet (Default)
 ```
-Get-AzureRmSignalR [[-ResourceGroupName] <String>] [-DefaultProfile <IAzureContextContainer>]
+Get-AzureRmSignalR [-ResourceGroupName <String>] [-DefaultProfile <IAzureContextContainer>]
  [<CommonParameters>]
 ```
 
 ### ResourceGroupParameterSet
 ```
-Get-AzureRmSignalR [[-ResourceGroupName] <String>] [-Name] <String> [-DefaultProfile <IAzureContextContainer>]
+Get-AzureRmSignalR [-ResourceGroupName <String>] [-Name] <String> [-DefaultProfile <IAzureContextContainer>]
  [<CommonParameters>]
 ```
 
@@ -104,7 +104,7 @@ Parameter Sets: ResourceGroupParameterSet
 Aliases:
 
 Required: True
-Position: 1
+Position: 0
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -119,7 +119,7 @@ Parameter Sets: ListSignalRServiceParameterSet, ResourceGroupParameterSet
 Aliases:
 
 Required: False
-Position: 0
+Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False

src/ResourceManager/SignalR/Commands.SignalR/help/Get-AzureRmSignalRKey.md

@@ -14,8 +14,8 @@ Get the access keys of a SignalR service.
 
 ### ResourceGroupParameterSet (Default)
 ```
-Get-AzureRmSignalRKey [[-ResourceGroupName] <String>] [-Name] <String>
- [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
+Get-AzureRmSignalRKey [-ResourceGroupName <String>] [-Name] <String> [-DefaultProfile <IAzureContextContainer>]
+ [<CommonParameters>]
 ```
 
 ### ResourceIdParameterSet
@@ -94,7 +94,7 @@ Parameter Sets: ResourceGroupParameterSet
 Aliases:
 
 Required: True
-Position: 1
+Position: 0
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -109,7 +109,7 @@ Parameter Sets: ResourceGroupParameterSet
 Aliases:
 
 Required: False
-Position: 0
+Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False

src/ResourceManager/SignalR/Commands.SignalR/help/New-AzureRmSignalR.md

@@ -13,8 +13,8 @@ Create a SignalR service.
 ## SYNTAX
 
 ```
-New-AzureRmSignalR [[-ResourceGroupName] <String>] [-Name] <String> [[-Location] <String>] [-Sku <String>]
- [-Tag <System.Collections.Generic.IDictionary`2[System.String,System.String]>] [-AsJob]
+New-AzureRmSignalR [-ResourceGroupName <String>] [-Name] <String> [-Location <String>] [-Sku <String>]
+ [-UnitCount <Int32>] [-Tag <System.Collections.Generic.IDictionary`2[System.String,System.String]>] [-AsJob]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -79,7 +79,7 @@ Parameter Sets: (All)
 Aliases:
 
 Required: False
-Position: 2
+Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -94,7 +94,7 @@ Parameter Sets: (All)
 Aliases:
 
 Required: True
-Position: 1
+Position: 0
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -109,7 +109,7 @@ Parameter Sets: (All)
 Aliases:
 
 Required: False
-Position: 0
+Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -145,6 +145,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -UnitCount
+The SignalR service unit count, from 1 to 10. Default to 1.
+
+```yaml
+Type: Int32
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: 1
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Confirm
 Prompts you for confirmation before running the cmdlet.
 

src/ResourceManager/SignalR/Commands.SignalR/help/New-AzureRmSignalRKey.md

@@ -14,19 +14,19 @@ Regenerate an access key for a SignalR service.
 
 ### ResourceGroupParameterSet (Default)
 ```
-New-AzureRmSignalRKey [[-ResourceGroupName] <String>] [-Name] <String> -KeyType <String> [-PassThru]
+New-AzureRmSignalRKey [-ResourceGroupName <String>] [-Name] <String> [-KeyType] <String> [-PassThru]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### ResourceIdParameterSet
 ```
-New-AzureRmSignalRKey -ResourceId <String> -KeyType <String> [-PassThru]
+New-AzureRmSignalRKey -ResourceId <String> [-KeyType] <String> [-PassThru]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### InputObjectParameterSet
 ```
-New-AzureRmSignalRKey -InputObject <PSSignalRResource> -KeyType <String> [-PassThru]
+New-AzureRmSignalRKey -InputObject <PSSignalRResource> [-KeyType] <String> [-PassThru]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -84,7 +84,7 @@ Aliases:
 Accepted values: Primary, Secondary
 
 Required: True
-Position: Named
+Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -99,7 +99,7 @@ Parameter Sets: ResourceGroupParameterSet
 Aliases:
 
 Required: True
-Position: 1
+Position: 0
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -129,7 +129,7 @@ Parameter Sets: ResourceGroupParameterSet
 Aliases:
 
 Required: False
-Position: 0
+Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False

src/ResourceManager/SignalR/Commands.SignalR/help/Remove-AzureRmSignalR.md

@@ -14,7 +14,7 @@ Remove a SignalR service.
 
 ### ResourceGroupParameterSet (Default)
 ```
-Remove-AzureRmSignalR [[-ResourceGroupName] <String>] [-Name] <String> [-AsJob] [-PassThru]
+Remove-AzureRmSignalR [-ResourceGroupName <String>] [-Name] <String> [-AsJob] [-PassThru]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -103,7 +103,7 @@ Parameter Sets: ResourceGroupParameterSet
 Aliases:
 
 Required: True
-Position: 1
+Position: 0
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -133,7 +133,7 @@ Parameter Sets: ResourceGroupParameterSet
 Aliases:
 
 Required: False
-Position: 0
+Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False