Merge Network changes into AutoRest

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

@@ -14,6 +14,9 @@ namespace Microsoft.Azure.Management.Network.Models
     using Newtonsoft.Json;
     using System.Linq;
 
+    /// <summary>
+    /// BGP peer status details
+    /// </summary>
     public partial class BgpPeerStatus
     {
         /// <summary>
@@ -38,7 +41,7 @@ public BgpPeerStatus() { }
         /// <param name="messagesSent">The number of BGP messages sent</param>
         /// <param name="messagesReceived">The number of BGP messages
         /// received</param>
-        public BgpPeerStatus(string localAddress = default(string), string neighbor = default(string), int? asn = default(int?), string state = default(string), string connectedDuration = default(string), long? routesReceived = default(long?), long? messagesSent = default(long?), int? messagesReceived = default(int?))
+        public BgpPeerStatus(string localAddress = default(string), string neighbor = default(string), int? asn = default(int?), string state = default(string), string connectedDuration = default(string), long? routesReceived = default(long?), long? messagesSent = default(long?), long? messagesReceived = default(long?))
         {
             LocalAddress = localAddress;
             Neighbor = neighbor;
@@ -97,7 +100,7 @@ public BgpPeerStatus() { }
         /// Gets the number of BGP messages received
         /// </summary>
         [JsonProperty(PropertyName = "messagesReceived")]
-        public int? MessagesReceived { get; protected set; }
+        public long? MessagesReceived { get; protected set; }
 
     }
 }

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

@@ -14,6 +14,9 @@ namespace Microsoft.Azure.Management.Network.Models
     using Newtonsoft.Json;
     using System.Linq;
 
+    /// <summary>
+    /// BGP settings details
+    /// </summary>
     public partial class BgpSettings
     {
         /// <summary>

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

@@ -15,6 +15,9 @@ namespace Microsoft.Azure.Management.Network.Models
     using Newtonsoft.Json;
     using System.Linq;
 
+    /// <summary>
+    /// The virtual network connection reset shared key
+    /// </summary>
     public partial class ConnectionResetSharedKey
     {
         /// <summary>

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

@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Microsoft.Azure.Management.Network.Models
+{
+    using Azure;
+    using Management;
+    using Network;
+
+    /// <summary>
+    /// Defines values for DhGroup.
+    /// </summary>
+    public static class DhGroup
+    {
+        public const string None = "None";
+        public const string DHGroup1 = "DHGroup1";
+        public const string DHGroup2 = "DHGroup2";
+        public const string DHGroup14 = "DHGroup14";
+        public const string DHGroup2048 = "DHGroup2048";
+        public const string ECP256 = "ECP256";
+        public const string ECP384 = "ECP384";
+        public const string DHGroup24 = "DHGroup24";
+    }
+}
+

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

@@ -14,6 +14,9 @@ namespace Microsoft.Azure.Management.Network.Models
     using Newtonsoft.Json;
     using System.Linq;
 
+    /// <summary>
+    /// Gateway routing details
+    /// </summary>
     public partial class GatewayRoute
     {
         /// <summary>

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

@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Microsoft.Azure.Management.Network.Models
+{
+    using Azure;
+    using Management;
+    using Network;
+
+    /// <summary>
+    /// Defines values for IkeEncryption.
+    /// </summary>
+    public static class IkeEncryption
+    {
+        public const string DES = "DES";
+        public const string DES3 = "DES3";
+        public const string AES128 = "AES128";
+        public const string AES192 = "AES192";
+        public const string AES256 = "AES256";
+    }
+}
+

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

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Microsoft.Azure.Management.Network.Models
+{
+    using Azure;
+    using Management;
+    using Network;
+
+    /// <summary>
+    /// Defines values for IkeIntegrity.
+    /// </summary>
+    public static class IkeIntegrity
+    {
+        public const string MD5 = "MD5";
+        public const string SHA1 = "SHA1";
+        public const string SHA256 = "SHA256";
+        public const string SHA384 = "SHA384";
+    }
+}
+

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

@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Microsoft.Azure.Management.Network.Models
+{
+    using Azure;
+    using Management;
+    using Network;
+
+    /// <summary>
+    /// Defines values for IpsecEncryption.
+    /// </summary>
+    public static class IpsecEncryption
+    {
+        public const string None = "None";
+        public const string DES = "DES";
+        public const string DES3 = "DES3";
+        public const string AES128 = "AES128";
+        public const string AES192 = "AES192";
+        public const string AES256 = "AES256";
+        public const string GCMAES128 = "GCMAES128";
+        public const string GCMAES192 = "GCMAES192";
+        public const string GCMAES256 = "GCMAES256";
+    }
+}
+

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

@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Microsoft.Azure.Management.Network.Models
+{
+    using Azure;
+    using Management;
+    using Network;
+
+    /// <summary>
+    /// Defines values for IpsecIntegrity.
+    /// </summary>
+    public static class IpsecIntegrity
+    {
+        public const string MD5 = "MD5";
+        public const string SHA1 = "SHA1";
+        public const string SHA256 = "SHA256";
+        public const string GCMAES128 = "GCMAES128";
+        public const string GCMAES192 = "GCMAES192";
+        public const string GCMAES256 = "GCMAES256";
+    }
+}
+

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

@@ -0,0 +1,162 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Microsoft.Azure.Management.Network.Models
+{
+    using Azure;
+    using Management;
+    using Network;
+    using Rest;
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// An IPSec Policy configuration for a virtual network gateway connection
+    /// </summary>
+    public partial class IpsecPolicy
+    {
+        /// <summary>
+        /// Initializes a new instance of the IpsecPolicy class.
+        /// </summary>
+        public IpsecPolicy() { }
+
+        /// <summary>
+        /// Initializes a new instance of the IpsecPolicy class.
+        /// </summary>
+        /// <param name="saLifeTimeSeconds">The IPSec Security Association
+        /// (also called Quick Mode or Phase 2 SA) lifetime in seconds for a
+        /// site to site VPN tunnel.</param>
+        /// <param name="saDataSizeKilobytes">The IPSec Security Association
+        /// (also called Quick Mode or Phase 2 SA) payload size in KB for a
+        /// site to site VPN tunnel.</param>
+        /// <param name="ipsecEncryption">The IPSec encryption algorithm (IKE
+        /// phase 1). Possible values include: 'None', 'DES', 'DES3', 'AES128',
+        /// 'AES192', 'AES256', 'GCMAES128', 'GCMAES192', 'GCMAES256'</param>
+        /// <param name="ipsecIntegrity">The IPSec integrity algorithm (IKE
+        /// phase 1). Possible values include: 'MD5', 'SHA1', 'SHA256',
+        /// 'GCMAES128', 'GCMAES192', 'GCMAES256'</param>
+        /// <param name="ikeEncryption">The IKE encryption algorithm (IKE phase
+        /// 2). Possible values include: 'DES', 'DES3', 'AES128', 'AES192',
+        /// 'AES256'</param>
+        /// <param name="ikeIntegrity">The IKE integrity algorithm (IKE phase
+        /// 2). Possible values include: 'MD5', 'SHA1', 'SHA256',
+        /// 'SHA384'</param>
+        /// <param name="dhGroup">The DH Groups used in IKE Phase 1 for initial
+        /// SA. Possible values include: 'None', 'DHGroup1', 'DHGroup2',
+        /// 'DHGroup14', 'DHGroup2048', 'ECP256', 'ECP384', 'DHGroup24'</param>
+        /// <param name="pfsGroup">The DH Groups used in IKE Phase 2 for new
+        /// child SA. Possible values include: 'None', 'PFS1', 'PFS2',
+        /// 'PFS2048', 'ECP256', 'ECP384', 'PFS24'</param>
+        public IpsecPolicy(int saLifeTimeSeconds, int saDataSizeKilobytes, string ipsecEncryption, string ipsecIntegrity, string ikeEncryption, string ikeIntegrity, string dhGroup, string pfsGroup)
+        {
+            SaLifeTimeSeconds = saLifeTimeSeconds;
+            SaDataSizeKilobytes = saDataSizeKilobytes;
+            IpsecEncryption = ipsecEncryption;
+            IpsecIntegrity = ipsecIntegrity;
+            IkeEncryption = ikeEncryption;
+            IkeIntegrity = ikeIntegrity;
+            DhGroup = dhGroup;
+            PfsGroup = pfsGroup;
+        }
+
+        /// <summary>
+        /// Gets or sets the IPSec Security Association (also called Quick Mode
+        /// or Phase 2 SA) lifetime in seconds for a site to site VPN tunnel.
+        /// </summary>
+        [JsonProperty(PropertyName = "saLifeTimeSeconds")]
+        public int SaLifeTimeSeconds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the IPSec Security Association (also called Quick Mode
+        /// or Phase 2 SA) payload size in KB for a site to site VPN tunnel.
+        /// </summary>
+        [JsonProperty(PropertyName = "saDataSizeKilobytes")]
+        public int SaDataSizeKilobytes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the IPSec encryption algorithm (IKE phase 1). Possible
+        /// values include: 'None', 'DES', 'DES3', 'AES128', 'AES192',
+        /// 'AES256', 'GCMAES128', 'GCMAES192', 'GCMAES256'
+        /// </summary>
+        [JsonProperty(PropertyName = "ipsecEncryption")]
+        public string IpsecEncryption { get; set; }
+
+        /// <summary>
+        /// Gets or sets the IPSec integrity algorithm (IKE phase 1). Possible
+        /// values include: 'MD5', 'SHA1', 'SHA256', 'GCMAES128', 'GCMAES192',
+        /// 'GCMAES256'
+        /// </summary>
+        [JsonProperty(PropertyName = "ipsecIntegrity")]
+        public string IpsecIntegrity { get; set; }
+
+        /// <summary>
+        /// Gets or sets the IKE encryption algorithm (IKE phase 2). Possible
+        /// values include: 'DES', 'DES3', 'AES128', 'AES192', 'AES256'
+        /// </summary>
+        [JsonProperty(PropertyName = "ikeEncryption")]
+        public string IkeEncryption { get; set; }
+
+        /// <summary>
+        /// Gets or sets the IKE integrity algorithm (IKE phase 2). Possible
+        /// values include: 'MD5', 'SHA1', 'SHA256', 'SHA384'
+        /// </summary>
+        [JsonProperty(PropertyName = "ikeIntegrity")]
+        public string IkeIntegrity { get; set; }
+
+        /// <summary>
+        /// Gets or sets the DH Groups used in IKE Phase 1 for initial SA.
+        /// Possible values include: 'None', 'DHGroup1', 'DHGroup2',
+        /// 'DHGroup14', 'DHGroup2048', 'ECP256', 'ECP384', 'DHGroup24'
+        /// </summary>
+        [JsonProperty(PropertyName = "dhGroup")]
+        public string DhGroup { get; set; }
+
+        /// <summary>
+        /// Gets or sets the DH Groups used in IKE Phase 2 for new child SA.
+        /// Possible values include: 'None', 'PFS1', 'PFS2', 'PFS2048',
+        /// 'ECP256', 'ECP384', 'PFS24'
+        /// </summary>
+        [JsonProperty(PropertyName = "pfsGroup")]
+        public string PfsGroup { get; set; }
+
+        /// <summary>
+        /// Validate the object.
+        /// </summary>
+        /// <exception cref="ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public virtual void Validate()
+        {
+            if (IpsecEncryption == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "IpsecEncryption");
+            }
+            if (IpsecIntegrity == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "IpsecIntegrity");
+            }
+            if (IkeEncryption == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "IkeEncryption");
+            }
+            if (IkeIntegrity == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "IkeIntegrity");
+            }
+            if (DhGroup == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "DhGroup");
+            }
+            if (PfsGroup == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "PfsGroup");
+            }
+        }
+    }
+}
+

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

@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Microsoft.Azure.Management.Network.Models
+{
+    using Azure;
+    using Management;
+    using Network;
+
+    /// <summary>
+    /// Defines values for PfsGroup.
+    /// </summary>
+    public static class PfsGroup
+    {
+        public const string None = "None";
+        public const string PFS1 = "PFS1";
+        public const string PFS2 = "PFS2";
+        public const string PFS2048 = "PFS2048";
+        public const string ECP256 = "ECP256";
+        public const string ECP384 = "ECP384";
+        public const string PFS24 = "PFS24";
+    }
+}
+