Update PR comments

Author: khannarheams

src/Network/Network.Test/Network.Test.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="24.0.0-preview" />
     <PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="25.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="2.0.0" />

src/Network/Network.Test/ScenarioTests/NatGatewayTests.cs

@@ -1,5 +1,4 @@
-// <auto-generated>
-// Copyright (c) Microsoft and contributors.  All rights reserved.
+// Copyright (c) Microsoft and contributors.  All rights reserved.
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

src/Network/Network.Test/ScenarioTests/NatGatewayTests.ps1

@@ -1,5 +1,4 @@
-# <auto-generated>
-# Copyright (c) Microsoft and contributors.  All rights reserved.
+# Copyright (c) Microsoft and contributors.  All rights reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -151,22 +150,25 @@ function Test-NatGatewayWithSubnet
         $listNatGateway = Get-AzNatGateway -ResourceGroupName "*" -Name "*";
         Assert-NotNull ($listNatGateway | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
 
-		# Create Subnet
+        # Create Subnet
         $subnet = New-AzVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.1.0/24 -NatGateway $vNatGateway
         New-AzvirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
         $vnet = Get-AzvirtualNetwork -Name $vnetName -ResourceGroupName $rgname
 
-		# Get Subnet
-		$subnet2 = Get-AzvirtualNetwork -Name $vnetName -ResourceGroupName $rgname | Get-AzVirtualNetworkSubnetConfig -Name $subnetName;
+        # Get Subnet
+        $subnet2 = Get-AzvirtualNetwork -Name $vnetName -ResourceGroupName $rgname | Get-AzVirtualNetworkSubnetConfig -Name $subnetName;
+
+        Assert-AreEqual $vNatGateway @($subnet2.NatGateway.Name)
+
+        # Remove Subnet
+        Remove-AzVirtualNetworkSubnetConfig -Name $subnetName -VirtualNetwork $virtualNetwork
 
         # Remove NatGateway
         $job = Remove-AzNatGateway -ResourceGroupName $rgname -Name $rname -PassThru -Force -AsJob;
         $job | Wait-Job;
         $removeNatGateway = $job | Receive-Job;
         Assert-AreEqual $true $removeNatGateway;
 
-		Assert-AreEqual $vNatGateway.Name @($subnet2.NatGateway.Name)
-
         # Get NatGateway should fail
         Assert-ThrowsContains { Get-AzNatGateway -ResourceGroupName $rgname -Name $rname } "not found";
     }

src/Network/Network/NatGateway/GetAzureRMNatGatewayCommand.cs

@@ -100,7 +100,7 @@ public override void Execute()
                 this.Name = resourceIdentifier.ResourceName;
             }
 
-            if (!string.IsNullOrEmpty(this.Name))
+            if (ShouldGetByName(this.ResourceGroupName, this.Name))
             {
                 var vNatGateway = this.NetworkClient.NetworkManagementClient.NatGateways.Get(ResourceGroupName, Name, ExpandResource);
                 var vNatGatewayModel = NetworkResourceManagerProfile.Mapper.Map<CNM.PSNatGateway>(vNatGateway);
@@ -111,7 +111,7 @@ public override void Execute()
             else
             {
                 IPage<NatGateway> vNatGatewayPage;
-                if(!string.IsNullOrEmpty(this.ResourceGroupName))
+                if (ShouldGetByName(this.ResourceGroupName, this.Name))
                 {
                     vNatGatewayPage = this.NetworkClient.NetworkManagementClient.NatGateways.List(this.ResourceGroupName);
                 }
@@ -130,7 +130,7 @@ public override void Execute()
                     vNatGatewayModel.Tag = TagsConversionHelper.CreateTagHashtable(vNatGateway.Tags);
                     psNatGatewayList.Add(vNatGatewayModel);
                 }
-                WriteObject(psNatGatewayList, true);
+                WriteObject(TopLevelWildcardFilter(ResourceGroupName, Name, psNatGatewayList), true);
             }
         }
     }

src/Network/Network/NatGateway/RemoveAzureRMNatGatewayCommand.cs

@@ -39,7 +39,7 @@
 
 namespace Microsoft.Azure.Commands.Network
 {
-    [Cmdlet(VerbsCommon.Remove, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "NatGateway", SupportsShouldProcess = true), OutputType(typeof(bool))]
+    [Cmdlet(VerbsCommon.Remove, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "NatGateway", SupportsShouldProcess = true, DefaultParameterSetName = "BackendSetByResource"), OutputType(typeof(bool))]
     public partial class RemoveAzureRmNatGateway : NetworkBaseCmdlet
     {
         private const string DeleteByNameParameterSet = "DeleteByNameParameterSet";

src/Network/Network/NatGateway/SetAzureRMNatGatewayCommand.cs

@@ -42,7 +42,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
 
-    [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "NatGateway", SupportsShouldProcess = true), OutputType(typeof(PSNatGateway))]
+    [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "NatGateway", SupportsShouldProcess = true, DefaultParameterSetName = "SetByNameParameterSet"), OutputType(typeof(PSNatGateway))]
     public class SetAzureNatGatewayCommand : NetworkBaseCmdlet
     {
         private const string SetByNameParameterSet = "SetByNameParameterSet";

src/Network/Network/Network.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="24.0.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/Network/Network/VirtualNetwork/Subnet/SetAzureVirtualNetworkSubnetConfigCommand.cs

@@ -59,11 +59,6 @@ public override void Execute()
                 {
                     this.RouteTableId = this.RouteTable.Id;
                 }
-
-                if (this.NatGateway != null)
-                {
-                    this.NatGatewayId = this.NatGateway.Id;
-                }
             }
 
             subnet.AddressPrefix = this.AddressPrefix?.ToList();
@@ -80,12 +75,6 @@ public override void Execute()
                 subnet.RouteTable.Id = this.RouteTableId;
             }
 
-            if (!string.IsNullOrEmpty(this.NatGatewayId))
-            {
-                subnet.NatGateway = new PSNatGateway();
-                subnet.NatGateway.Id = this.NatGatewayId;
-            }
-
             if (this.ServiceEndpoint != null)
             {
                 subnet.ServiceEndpoints = new List<PSServiceEndpoint>();