Merge pull request Azure#11111 from ninweninwe/network-january

update disconnect vpn/p2svpn gateway vpn connections

Author: VeryEarly

src/Network/Network/Cortex/P2SVpnGateway/DisconnectAzureP2SVpnGatewayVpnConnection.cs

@@ -49,16 +49,17 @@ public class DisconnectAzureP2SVpnGatewayVpnConnectionCommand : P2SVpnGatewayBas
 
         [Parameter(
             ParameterSetName = CortexParameterSetNames.ByP2SVpnGatewayResourceId,
-            Mandatory = false,
+            Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The Azure resource ID of the P2SVpnGateway to be modified.")]
         [ValidateNotNullOrEmpty]
+        [ResourceIdCompleter("Microsoft.Network/p2sVpnGateways")]
         public string ResourceId { get; set; }
 
         [Alias("P2SVpnGateway")]
         [Parameter(
             ParameterSetName = CortexParameterSetNames.ByP2SVpnGatewayObject,
-            Mandatory = false,
+            Mandatory = true,
             ValueFromPipeline = true,
             HelpMessage = "The P2S vpn gateway object")]
         [ValidateNotNullOrEmpty]
@@ -69,6 +70,14 @@ public class DisconnectAzureP2SVpnGatewayVpnConnectionCommand : P2SVpnGatewayBas
             HelpMessage = "P2S Vpn gateway gateway Vpn connection Id, which is returned by getting P2S Vpn gateway detailed connection health")]
         [ValidateNotNullOrEmpty] 
         public string[] VpnConnectionId { get; set; }
+        
+        [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
+        public SwitchParameter AsJob { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            HelpMessage = "Returns an object representing the item on which this operation is being performed.")]
+        public SwitchParameter PassThru { get; set; }
 
         public override void Execute()
         {

src/Network/Network/VirtualNetworkGateway/DisconnectAzureVirtualNetworkGatewayVpnConnection.cs

@@ -24,10 +24,12 @@ public class DisconnectVirtualNetworkGatewayVpnConnectionCommand : VirtualNetwor
 
         [Alias("VirtualNetworkGatewayId")]
         [Parameter(
-            Mandatory = false,
+            Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             ParameterSetName = ParameterSetNames.ByResourceId,
             HelpMessage = "The resource id of the virtual network gateway Id")]
+        [ResourceIdCompleter("Microsoft.Network/virtualNetworkGateways")]
+        [ValidateNotNullOrEmpty]
         public string ResourceId { get; set; }
 
         [Alias("VirtualNetworkGateway")]
@@ -36,6 +38,7 @@ public class DisconnectVirtualNetworkGatewayVpnConnectionCommand : VirtualNetwor
             ValueFromPipeline = true,
             ParameterSetName = ParameterSetNames.ByFactoryObject,
             HelpMessage = "The virtual network gateway object")]
+        [ValidateNotNullOrEmpty]
         public PSVirtualNetworkGateway InputObject { get; set; }
 
         [Parameter(
@@ -56,6 +59,11 @@ public class DisconnectVirtualNetworkGatewayVpnConnectionCommand : VirtualNetwor
         [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
         public SwitchParameter AsJob { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            HelpMessage = "Returns an object representing the item on which this operation is being performed.")]
+        public SwitchParameter PassThru { get; set; }
+
         public override void Execute()
         {
             if (ParameterSetName.Equals(ParameterSetNames.ByFactoryObject, StringComparison.OrdinalIgnoreCase))

src/Network/Network/help/Disconnect-AzP2sVpnGatewayVpnConnection.md

@@ -71,7 +71,7 @@ P2SConnectionConfigurations    : [
 The p2s vpn gateway object to be modified
 
 ```yaml
-Type: PSP2SVpnGateway
+Type: Microsoft.Azure.Commands.Network.Models.PSP2SVpnGateway
 Parameter Sets: ByP2SVpnGatewayObject
 Aliases: P2SVpnGateway
 
@@ -127,6 +127,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ResourceId
+P2s Virtual network gateway resource Id
+
+```yaml
+Type: System.String
+Parameter Sets: ByP2SVpnGatewayResourceId
+Aliases: ResourceId
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
 
@@ -136,7 +151,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.Commands.Network.Models.PSP2SVpnConnectionHealth
+### Microsoft.Azure.Commands.Network.Models.PSP2SVpnGateway
 
 ## NOTES
 

src/Network/Network/help/Disconnect-AzVirtualNetworkGatewayVpnConnection.md

@@ -11,11 +11,21 @@ schema: 2.0.0
 Disconnect given connected vpn client connections with a given virtual network gateway.
 
 ## SYNTAX
-
+### ByVpnGatewayName (Default)
 ```
 Disconnect-AzVirtualNetworkGatewayVpnConnection -ResourceName <String> -ResourceGroupName <String> -InputObject <PSVirtualNetworkGateway> -ResourceId <ResourceId> -VpnConnectionId <VpnConnectionIds> [-AsJob] [<CommonParameters>]
 ```
 
+### ByVpnGatewayObject
+```
+Disconnect-AzVirtualNetworkGatewayVpnConnection -InputObject <PSP2SVpnGateway> -VpnConnectionId <VpnConnectionId> [<CommonParameters>]
+```
+
+### ByVpnGatewayResourceId
+```
+Disconnect-AzVirtualNetworkGatewayVpnConnection -ResourceId <String> -VpnConnectionId <VpnConnectionId> [<CommonParameters>]
+```
+
 ## DESCRIPTION
 The **Disconnect-AzVirtualNetworkGatewayVpnConnection** cmdlet enables you to disconnect given connected vpn client connection.
 
@@ -34,7 +44,7 @@ Virtual network gateway resource group's name
 
 ```yaml
 Type: System.String
-Parameter Sets: (All)
+Parameter Sets: ByVpnGatewayName
 Aliases:
 
 Required: True
@@ -49,7 +59,7 @@ Virtual network gateway name
 
 ```yaml
 Type: System.String
-Parameter Sets: (All)
+Parameter Sets: ByVpnGatewayName
 Aliases: VirtualNetworkGatewayName
 
 Required: True
@@ -64,10 +74,10 @@ Virtual network gateway resource Id
 
 ```yaml
 Type: System.String
-Parameter Sets: (All)
+Parameter Sets: ByVpnGatewayResourceId
 Aliases: ResourceId
 
-Required: False
+Required: True
 Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)
@@ -94,7 +104,7 @@ Virtual network gateway object
 
 ```yaml
 Type: Microsoft.Azure.Commands.Network.Models.PSVirtualNetworkGateway
-Parameter Sets: (All)
+Parameter Sets: ByVpnGatewayObject
 Aliases: VirtualNetworkGateway
 
 Required: False
@@ -128,7 +138,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.Commands.Network.Models.PSGatewayRoute
+### Microsoft.Azure.Commands.Network.Models.PSVirtualNetworkGateway
 
 ## NOTES