Merge Network changes into AutoRest

src/ResourceManagement/Network/Microsoft.Azure.Management.Network/Generated/LocalNetworkGatewaysOperations.cs

@@ -525,10 +525,6 @@ internal LocalNetworkGatewaysOperations(NetworkManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
             }
-            if (parameters != null)
-            {
-                parameters.Validate();
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");

src/ResourceManagement/Network/Microsoft.Azure.Management.Network/Generated/Models/LocalNetworkGateway.cs

@@ -32,13 +32,13 @@ public LocalNetworkGateway() { }
         /// <summary>
         /// Initializes a new instance of the LocalNetworkGateway class.
         /// </summary>
-        /// <param name="localNetworkAddressSpace">Local network site address
-        /// space.</param>
         /// <param name="id">Resource ID.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
         /// <param name="location">Resource location.</param>
         /// <param name="tags">Resource tags.</param>
+        /// <param name="localNetworkAddressSpace">Local network site address
+        /// space.</param>
         /// <param name="gatewayIpAddress">IP address of local network
         /// gateway.</param>
         /// <param name="bgpSettings">Local network gateway's BGP speaker
@@ -50,7 +50,7 @@ public LocalNetworkGateway() { }
         /// 'Deleting', and 'Failed'.</param>
         /// <param name="etag">A unique read-only string that changes whenever
         /// the resource is updated.</param>
-        public LocalNetworkGateway(AddressSpace localNetworkAddressSpace, string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), string gatewayIpAddress = default(string), BgpSettings bgpSettings = default(BgpSettings), string resourceGuid = default(string), string provisioningState = default(string), string etag = default(string))
+        public LocalNetworkGateway(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), AddressSpace localNetworkAddressSpace = default(AddressSpace), string gatewayIpAddress = default(string), BgpSettings bgpSettings = default(BgpSettings), string resourceGuid = default(string), string provisioningState = default(string), string etag = default(string))
             : base(id, name, type, location, tags)
         {
             LocalNetworkAddressSpace = localNetworkAddressSpace;
@@ -100,19 +100,6 @@ public LocalNetworkGateway() { }
         [JsonProperty(PropertyName = "etag")]
         public string Etag { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (LocalNetworkAddressSpace == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "LocalNetworkAddressSpace");
-            }
-        }
     }
 }
 

src/ResourceManagement/Network/Microsoft.Azure.Management.Network/Generated/Models/VirtualNetworkGateway.cs

@@ -32,6 +32,11 @@ public VirtualNetworkGateway() { }
         /// <summary>
         /// Initializes a new instance of the VirtualNetworkGateway class.
         /// </summary>
+        /// <param name="id">Resource ID.</param>
+        /// <param name="name">Resource name.</param>
+        /// <param name="type">Resource type.</param>
+        /// <param name="location">Resource location.</param>
+        /// <param name="tags">Resource tags.</param>
         /// <param name="ipConfigurations">IP configurations for virtual
         /// network gateway.</param>
         /// <param name="gatewayType">The type of this virtual network gateway.
@@ -40,11 +45,6 @@ public VirtualNetworkGateway() { }
         /// <param name="vpnType">The type of this virtual network gateway.
         /// Possible values are: 'PolicyBased' and 'RouteBased'. Possible
         /// values include: 'PolicyBased', 'RouteBased'</param>
-        /// <param name="id">Resource ID.</param>
-        /// <param name="name">Resource name.</param>
-        /// <param name="type">Resource type.</param>
-        /// <param name="location">Resource location.</param>
-        /// <param name="tags">Resource tags.</param>
         /// <param name="enableBgp">Whether BGP is enabled for this virtual
         /// network gateway or not.</param>
         /// <param name="activeActive">ActiveActive flag</param>
@@ -67,7 +67,7 @@ public VirtualNetworkGateway() { }
         /// 'Deleting', and 'Failed'.</param>
         /// <param name="etag">Gets a unique read-only string that changes
         /// whenever the resource is updated.</param>
-        public VirtualNetworkGateway(IList<VirtualNetworkGatewayIPConfiguration> ipConfigurations, string gatewayType, string vpnType, string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), bool? enableBgp = default(bool?), bool? activeActive = default(bool?), SubResource gatewayDefaultSite = default(SubResource), VirtualNetworkGatewaySku sku = default(VirtualNetworkGatewaySku), VpnClientConfiguration vpnClientConfiguration = default(VpnClientConfiguration), BgpSettings bgpSettings = default(BgpSettings), string resourceGuid = default(string), string provisioningState = default(string), string etag = default(string))
+        public VirtualNetworkGateway(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), IList<VirtualNetworkGatewayIPConfiguration> ipConfigurations = default(IList<VirtualNetworkGatewayIPConfiguration>), string gatewayType = default(string), string vpnType = default(string), bool? enableBgp = default(bool?), bool? activeActive = default(bool?), SubResource gatewayDefaultSite = default(SubResource), VirtualNetworkGatewaySku sku = default(VirtualNetworkGatewaySku), VpnClientConfiguration vpnClientConfiguration = default(VpnClientConfiguration), BgpSettings bgpSettings = default(BgpSettings), string resourceGuid = default(string), string provisioningState = default(string), string etag = default(string))
             : base(id, name, type, location, tags)
         {
             IpConfigurations = ipConfigurations;
@@ -168,41 +168,6 @@ public VirtualNetworkGateway() { }
         [JsonProperty(PropertyName = "etag")]
         public string Etag { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (IpConfigurations == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "IpConfigurations");
-            }
-            if (GatewayType == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "GatewayType");
-            }
-            if (VpnType == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "VpnType");
-            }
-            if (IpConfigurations != null)
-            {
-                foreach (var element in IpConfigurations)
-                {
-                    if (element != null)
-                    {
-                        element.Validate();
-                    }
-                }
-            }
-            if (Sku != null)
-            {
-                Sku.Validate();
-            }
-        }
     }
 }
 

src/ResourceManagement/Network/Microsoft.Azure.Management.Network/Generated/Models/VirtualNetworkGatewayConnection.cs

@@ -223,18 +223,6 @@ public virtual void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "ConnectionType");
             }
-            if (VirtualNetworkGateway1 != null)
-            {
-                VirtualNetworkGateway1.Validate();
-            }
-            if (VirtualNetworkGateway2 != null)
-            {
-                VirtualNetworkGateway2.Validate();
-            }
-            if (LocalNetworkGateway2 != null)
-            {
-                LocalNetworkGateway2.Validate();
-            }
             if (IpsecPolicies != null)
             {
                 foreach (var element in IpsecPolicies)

src/ResourceManagement/Network/Microsoft.Azure.Management.Network/Generated/Models/VirtualNetworkGatewayIpConfiguration.cs

@@ -32,13 +32,13 @@ public VirtualNetworkGatewayIPConfiguration() { }
         /// Initializes a new instance of the
         /// VirtualNetworkGatewayIPConfiguration class.
         /// </summary>
-        /// <param name="subnet">The reference of the subnet resource.</param>
-        /// <param name="publicIPAddress">The reference of the public IP
-        /// resource.</param>
         /// <param name="id">Resource ID.</param>
         /// <param name="privateIPAllocationMethod">The private IP allocation
         /// method. Possible values are: 'Static' and 'Dynamic'. Possible
         /// values include: 'Static', 'Dynamic'</param>
+        /// <param name="subnet">The reference of the subnet resource.</param>
+        /// <param name="publicIPAddress">The reference of the public IP
+        /// resource.</param>
         /// <param name="provisioningState">The provisioning state of the
         /// public IP resource. Possible values are: 'Updating', 'Deleting',
         /// and 'Failed'.</param>
@@ -47,7 +47,7 @@ public VirtualNetworkGatewayIPConfiguration() { }
         /// resource.</param>
         /// <param name="etag">A unique read-only string that changes whenever
         /// the resource is updated.</param>
-        public VirtualNetworkGatewayIPConfiguration(SubResource subnet, SubResource publicIPAddress, string id = default(string), string privateIPAllocationMethod = default(string), string provisioningState = default(string), string name = default(string), string etag = default(string))
+        public VirtualNetworkGatewayIPConfiguration(string id = default(string), string privateIPAllocationMethod = default(string), SubResource subnet = default(SubResource), SubResource publicIPAddress = default(SubResource), string provisioningState = default(string), string name = default(string), string etag = default(string))
             : base(id)
         {
             PrivateIPAllocationMethod = privateIPAllocationMethod;
@@ -99,23 +99,6 @@ public VirtualNetworkGatewayIPConfiguration() { }
         [JsonProperty(PropertyName = "etag")]
         public string Etag { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (Subnet == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "Subnet");
-            }
-            if (PublicIPAddress == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "PublicIPAddress");
-            }
-        }
     }
 }
 

src/ResourceManagement/Network/Microsoft.Azure.Management.Network/Generated/Models/VirtualNetworkGatewaySku.cs

@@ -11,7 +11,6 @@ namespace Microsoft.Azure.Management.Network.Models
     using Azure;
     using Management;
     using Network;
-    using Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -37,7 +36,7 @@ public VirtualNetworkGatewaySku() { }
         /// values include: 'Basic', 'HighPerformance', 'Standard',
         /// 'UltraPerformance'</param>
         /// <param name="capacity">The capacity.</param>
-        public VirtualNetworkGatewaySku(string name, string tier, int? capacity = default(int?))
+        public VirtualNetworkGatewaySku(string name = default(string), string tier = default(string), int? capacity = default(int?))
         {
             Name = name;
             Tier = tier;
@@ -68,23 +67,6 @@ public VirtualNetworkGatewaySku() { }
         [JsonProperty(PropertyName = "capacity")]
         public int? Capacity { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (Name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "Name");
-            }
-            if (Tier == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "Tier");
-            }
-        }
     }
 }
 

src/ResourceManagement/Network/Microsoft.Azure.Management.Network/Generated/VirtualNetworkGatewaysOperations.cs

@@ -840,10 +840,6 @@ internal VirtualNetworkGatewaysOperations(NetworkManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
             }
-            if (parameters != null)
-            {
-                parameters.Validate();
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");