Block BgpPeeringAddress for VirtualNetworkGateway, minor fixes

Author: clamchowder

src/ServiceManagement/Network/Commands.Network/Gateway/NewAzureVirtualNetworkGateway.cs

@@ -45,15 +45,12 @@ public class NewAzureVirtualNetworkGatewayCommand : NetworkCmdletBase
         [Parameter(Position = 6, Mandatory = false, HelpMessage = "Virtual network gateway BGP speaker's ASN")]
         public uint Asn { get; set; }
 
-        [Parameter(Position = 7, Mandatory = false, HelpMessage = "Virtual network gateway BGP speaker's IP/BGP identifier")]
-        public string BgpPeeringAddress { get; set; }
-
-        [Parameter(Position = 8, Mandatory = false, HelpMessage = "Weight for routes learned from this BGP speaker")]
+        [Parameter(Position = 7, Mandatory = false, HelpMessage = "Weight for routes learned from this BGP speaker")]
         public int PeerWeight { get; set; }
 
         public override void ExecuteCmdlet()
         {
-            WriteObject(Client.CreateVirtualNetworkGateway(VNetName, GatewayName, GatewayType, GatewaySKU, Location, VnetId, Asn, BgpPeeringAddress, PeerWeight));
+            WriteObject(Client.CreateVirtualNetworkGateway(VNetName, GatewayName, GatewayType, GatewaySKU, Location, VnetId, Asn, PeerWeight));
         }
     }
 }

src/ServiceManagement/Network/Commands.Network/Gateway/NewAzureVirtualNetworkGatewayConnection.cs

@@ -48,11 +48,11 @@ public class NewAzureVirtualNetworkGatewayConnectionCommand : NetworkCmdletBase
         public string VirtualNetworkGatewayId { get; set; }
 
         [Parameter(Position = 6, Mandatory = false, HelpMessage = "Whether to establish a BGP session over this connection")]
-        public bool EnableBgp { get; set; }
+        public string EnableBgp { get; set; }
 
         public override void ExecuteCmdlet()
         {
-            WriteObject(Client.CreateVirtualNetworkGatewayConnection(ConnectedEntityId, GatewayConnectionName, GatewayConnectionType, RoutingWeight, SharedKey, Guid.Parse(VirtualNetworkGatewayId), EnableBgp));
+            WriteObject(Client.CreateVirtualNetworkGatewayConnection(ConnectedEntityId, GatewayConnectionName, GatewayConnectionType, RoutingWeight, SharedKey, Guid.Parse(VirtualNetworkGatewayId), bool.Parse(EnableBgp)));
         }
     }
 }

src/ServiceManagement/Network/Commands.Network/NetworkClient.cs

@@ -1096,10 +1096,14 @@ public GetVirtualNetworkGatewayContext GetVirtualNetworkGateway(string gatewayId
                 VnetId = response.VnetId,
                 SubnetId = response.SubnetId,
                 EnableBgp = response.EnableBgp.ToString(),
-                Asn = response.BgpSettings.Asn,
-                BgpPeeringAddress = response.BgpSettings.BgpPeeringAddress,
-                PeerWeight = response.BgpSettings.PeerWeight,
             };
+
+            if(response.BgpSettings != null)
+            {
+                gatewayContext.Asn = response.BgpSettings.Asn;
+                gatewayContext.BgpPeeringAddress = response.BgpSettings.BgpPeeringAddress;
+                gatewayContext.PeerWeight = response.BgpSettings.PeerWeight;
+            }
             PopulateOperationContext(response.RequestId, gatewayContext);
 
             return gatewayContext;
@@ -1148,10 +1152,15 @@ public GetLocalNetworkGatewayContext GetLocalNetworkGateway(string gatewayId)
                 GatewayName = response.GatewayName,
                 IpAddress = response.IpAddress,
                 AddressSpace = response.AddressSpace.ToList(),
-                Asn = response.BgpSettings.Asn,
-                BgpPeeringAddress = response.BgpSettings.BgpPeeringAddress,
-                PeerWeight = response.BgpSettings.PeerWeight,
             };
+
+            if(response.BgpSettings != null)
+            {
+                gatewayContext.Asn = response.BgpSettings.Asn;
+                gatewayContext.BgpPeeringAddress = response.BgpSettings.BgpPeeringAddress;
+                gatewayContext.PeerWeight = response.BgpSettings.PeerWeight;
+            }
+
             PopulateOperationContext(response.RequestId, gatewayContext);
 
             return gatewayContext;
@@ -1202,6 +1211,9 @@ public IEnumerable<GetVirtualNetworkGatewayContext> ListVirtualNetworkGateways()
                         VnetId = virtualNetworkGateway.VnetId,
                         SubnetId = virtualNetworkGateway.SubnetId,
                         EnableBgp = virtualNetworkGateway.EnableBgp.ToString(),
+                        Asn = virtualNetworkGateway.BgpSettings != null ? virtualNetworkGateway.BgpSettings.Asn : 0,
+                        BgpPeeringAddress = virtualNetworkGateway.BgpSettings != null ? virtualNetworkGateway.BgpSettings.BgpPeeringAddress : "",
+                        PeerWeight = virtualNetworkGateway.BgpSettings != null ? virtualNetworkGateway.BgpSettings.PeerWeight : 0
                     };
                 });
             PopulateOperationContext(response.RequestId, virtualNetworkGateways);
@@ -1260,7 +1272,7 @@ public SharedKeyContext GetSharedKeyV2(string gatewayId, string connectedentityI
         }
 
         public GatewayGetOperationStatusResponse CreateVirtualNetworkGateway(string vnetName, string gatewayName, string gatewayType, string gatewaySKU, string location, string vnetId,
-            uint Asn, string BgpPeeringAddress, int PeerWeight)
+            uint Asn, int PeerWeight)
         {
             VirtualNetworkGatewayCreateParameters parameters = new VirtualNetworkGatewayCreateParameters()
             {
@@ -1269,9 +1281,9 @@ public GatewayGetOperationStatusResponse CreateVirtualNetworkGateway(string vnet
                 GatewayType = gatewayType,
                 Location = location,
                 VnetId = vnetId,
-                BgpSettings = Asn > 0?new BgpSettings {
+                BgpSettings = (Asn > 0 || PeerWeight > 0)?new BgpSettings {
                     Asn = Asn,
-                    BgpPeeringAddress = BgpPeeringAddress,
+                    BgpPeeringAddress = "", // We don't allow changing the gateway's BgpPeeringAddress
                     PeerWeight = PeerWeight
                 }:null,
             };
@@ -1379,7 +1391,7 @@ public AzureOperationResponse UpdateLocalNetworkGateway(string gatewayId, List<s
             UpdateLocalNetworkGatewayParameters parameters = new UpdateLocalNetworkGatewayParameters()
             {
                 AddressSpace = addressSpace,
-                BgpSettings = Asn > 0?new BgpSettings {
+                BgpSettings = (Asn > 0 || PeerWeight > 0 || ! string.IsNullOrEmpty(BgpPeeringAddress))?new BgpSettings {
                     Asn = Asn,
                     BgpPeeringAddress = BgpPeeringAddress,
                     PeerWeight = PeerWeight,