Skip to content

Commit

Permalink
Regenerate network with native subresource (#277)
Browse files Browse the repository at this point in the history
* Regenerate network with native subresource

* reverting changes to ApplicationGatewayInner
  • Loading branch information
jianghaolu authored and lenala committed Apr 19, 2018
1 parent 8220712 commit c2c7662
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 45 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

namespace Microsoft.Azure.Management.Network.Fluent.Models
{
using Microsoft.Azure.Management.ResourceManager;
using Microsoft.Azure.Management.ResourceManager.Fluent;
using Newtonsoft.Json;
using System.Collections;
using System.Collections.Generic;
Expand Down Expand Up @@ -35,7 +37,7 @@ public ApplicationGatewayBackendHealthHttpSettings()
/// ApplicationGatewayBackendHttpSettings resource.</param>
/// <param name="servers">List of ApplicationGatewayBackendHealthServer
/// resources.</param>
public ApplicationGatewayBackendHealthHttpSettings(ApplicationGatewayBackendHttpSettingsInner backendHttpSettings = default(ApplicationGatewayBackendHttpSettingsInner), IList<ApplicationGatewayBackendHealthServer> servers = default(IList<ApplicationGatewayBackendHealthServer>))
public ApplicationGatewayBackendHealthHttpSettings(Management.ResourceManager.Fluent.SubResource backendHttpSettings = default(Management.ResourceManager.Fluent.SubResource), IList<ApplicationGatewayBackendHealthServer> servers = default(IList<ApplicationGatewayBackendHealthServer>))
{
BackendHttpSettings = backendHttpSettings;
Servers = servers;
Expand All @@ -52,7 +54,7 @@ public ApplicationGatewayBackendHealthHttpSettings()
/// resource.
/// </summary>
[JsonProperty(PropertyName = "backendHttpSettings")]
public ApplicationGatewayBackendHttpSettingsInner BackendHttpSettings { get; set; }
public Management.ResourceManager.Fluent.SubResource BackendHttpSettings { get; set; }

/// <summary>
/// Gets or sets list of ApplicationGatewayBackendHealthServer
Expand All @@ -61,18 +63,5 @@ public ApplicationGatewayBackendHealthHttpSettings()
[JsonProperty(PropertyName = "servers")]
public IList<ApplicationGatewayBackendHealthServer> Servers { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public virtual void Validate()
{
if (BackendHttpSettings != null)
{
BackendHttpSettings.Validate();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

namespace Microsoft.Azure.Management.Network.Fluent.Models
{
using Microsoft.Azure.Management.ResourceManager;
using Microsoft.Azure.Management.ResourceManager.Fluent;
using Newtonsoft.Json;
using System.Collections;
using System.Collections.Generic;
Expand Down Expand Up @@ -35,7 +37,7 @@ public ApplicationGatewayBackendHealthPool()
/// ApplicationGatewayBackendAddressPool resource.</param>
/// <param name="backendHttpSettingsCollection">List of
/// ApplicationGatewayBackendHealthHttpSettings resources.</param>
public ApplicationGatewayBackendHealthPool(ApplicationGatewayBackendAddressPoolInner backendAddressPool = default(ApplicationGatewayBackendAddressPoolInner), IList<ApplicationGatewayBackendHealthHttpSettings> backendHttpSettingsCollection = default(IList<ApplicationGatewayBackendHealthHttpSettings>))
public ApplicationGatewayBackendHealthPool(Management.ResourceManager.Fluent.SubResource backendAddressPool = default(Management.ResourceManager.Fluent.SubResource), IList<ApplicationGatewayBackendHealthHttpSettings> backendHttpSettingsCollection = default(IList<ApplicationGatewayBackendHealthHttpSettings>))
{
BackendAddressPool = backendAddressPool;
BackendHttpSettingsCollection = backendHttpSettingsCollection;
Expand All @@ -52,7 +54,7 @@ public ApplicationGatewayBackendHealthPool()
/// resource.
/// </summary>
[JsonProperty(PropertyName = "backendAddressPool")]
public ApplicationGatewayBackendAddressPoolInner BackendAddressPool { get; set; }
public Management.ResourceManager.Fluent.SubResource BackendAddressPool { get; set; }

/// <summary>
/// Gets or sets list of ApplicationGatewayBackendHealthHttpSettings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

namespace Microsoft.Azure.Management.Network.Fluent.Models
{
using Microsoft.Azure.Management.ResourceManager;
using Microsoft.Azure.Management.ResourceManager.Fluent;
using Newtonsoft.Json;
using System.Linq;

Expand All @@ -34,7 +36,7 @@ public ApplicationGatewayBackendHealthServer()
/// backend server.</param>
/// <param name="health">Health of backend server. Possible values
/// include: 'Unknown', 'Up', 'Down', 'Partial', 'Draining'</param>
public ApplicationGatewayBackendHealthServer(string address = default(string), NetworkInterfaceIPConfigurationInner ipConfiguration = default(NetworkInterfaceIPConfigurationInner), ApplicationGatewayBackendHealthServerHealth health = default(ApplicationGatewayBackendHealthServerHealth))
public ApplicationGatewayBackendHealthServer(string address = default(string), Management.ResourceManager.Fluent.SubResource ipConfiguration = default(Management.ResourceManager.Fluent.SubResource), ApplicationGatewayBackendHealthServerHealth health = default(ApplicationGatewayBackendHealthServerHealth))
{
Address = address;
IpConfiguration = ipConfiguration;
Expand All @@ -57,7 +59,7 @@ public ApplicationGatewayBackendHealthServer()
/// Gets or sets reference of IP configuration of backend server.
/// </summary>
[JsonProperty(PropertyName = "ipConfiguration")]
public NetworkInterfaceIPConfigurationInner IpConfiguration { get; set; }
public Management.ResourceManager.Fluent.SubResource IpConfiguration { get; set; }

/// <summary>
/// Gets or sets health of backend server. Possible values include:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public ExpressRouteCircuitPeeringInner()
/// resource.</param>
/// <param name="etag">A unique read-only string that changes whenever
/// the resource is updated.</param>
public ExpressRouteCircuitPeeringInner(string id = default(string), ExpressRoutePeeringType peeringType = default(ExpressRoutePeeringType), ExpressRoutePeeringState state = default(ExpressRoutePeeringState), int? azureASN = default(int?), long? peerASN = default(long?), string primaryPeerAddressPrefix = default(string), string secondaryPeerAddressPrefix = default(string), string primaryAzurePort = default(string), string secondaryAzurePort = default(string), string sharedKey = default(string), int? vlanId = default(int?), ExpressRouteCircuitPeeringConfig microsoftPeeringConfig = default(ExpressRouteCircuitPeeringConfig), ExpressRouteCircuitStatsInner stats = default(ExpressRouteCircuitStatsInner), string provisioningState = default(string), string gatewayManagerEtag = default(string), string lastModifiedBy = default(string), RouteFilterInner routeFilter = default(RouteFilterInner), Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig = default(Ipv6ExpressRouteCircuitPeeringConfig), IList<ExpressRouteCircuitConnectionInner> connections = default(IList<ExpressRouteCircuitConnectionInner>), string name = default(string), string etag = default(string))
public ExpressRouteCircuitPeeringInner(string id = default(string), ExpressRoutePeeringType peeringType = default(ExpressRoutePeeringType), ExpressRoutePeeringState state = default(ExpressRoutePeeringState), int? azureASN = default(int?), long? peerASN = default(long?), string primaryPeerAddressPrefix = default(string), string secondaryPeerAddressPrefix = default(string), string primaryAzurePort = default(string), string secondaryAzurePort = default(string), string sharedKey = default(string), int? vlanId = default(int?), ExpressRouteCircuitPeeringConfig microsoftPeeringConfig = default(ExpressRouteCircuitPeeringConfig), ExpressRouteCircuitStatsInner stats = default(ExpressRouteCircuitStatsInner), string provisioningState = default(string), string gatewayManagerEtag = default(string), string lastModifiedBy = default(string), Management.ResourceManager.Fluent.SubResource routeFilter = default(Management.ResourceManager.Fluent.SubResource), Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig = default(Ipv6ExpressRouteCircuitPeeringConfig), IList<ExpressRouteCircuitConnectionInner> connections = default(IList<ExpressRouteCircuitConnectionInner>), string name = default(string), string etag = default(string))
: base(id)
{
PeeringType = peeringType;
Expand Down Expand Up @@ -200,7 +200,7 @@ public ExpressRouteCircuitPeeringInner()
/// Gets or sets the reference of the RouteFilter resource.
/// </summary>
[JsonProperty(PropertyName = "properties.routeFilter")]
public RouteFilterInner RouteFilter { get; set; }
public Management.ResourceManager.Fluent.SubResource RouteFilter { get; set; }

/// <summary>
/// Gets or sets the IPv6 peering configuration.
Expand Down Expand Up @@ -245,10 +245,6 @@ public virtual void Validate()
{
throw new ValidationException(ValidationRules.InclusiveMinimum, "PeerASN", 1);
}
if (RouteFilter != null)
{
RouteFilter.Validate();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public FrontendIPConfigurationInner()
/// the resource is updated.</param>
/// <param name="zones">A list of availability zones denoting the IP
/// allocated for the resource needs to come from.</param>
public FrontendIPConfigurationInner(string id = default(string), IList<Management.ResourceManager.Fluent.SubResource> inboundNatRules = default(IList<Management.ResourceManager.Fluent.SubResource>), IList<Management.ResourceManager.Fluent.SubResource> inboundNatPools = default(IList<Management.ResourceManager.Fluent.SubResource>), IList<Management.ResourceManager.Fluent.SubResource> outboundNatRules = default(IList<Management.ResourceManager.Fluent.SubResource>), IList<Management.ResourceManager.Fluent.SubResource> loadBalancingRules = default(IList<Management.ResourceManager.Fluent.SubResource>), string privateIPAddress = default(string), IPAllocationMethod privateIPAllocationMethod = default(IPAllocationMethod), SubnetInner subnet = default(SubnetInner), SubResource publicIPAddress = default(SubResource), string provisioningState = default(string), string name = default(string), string etag = default(string), IList<string> zones = default(IList<string>))
public FrontendIPConfigurationInner(string id = default(string), IList<Management.ResourceManager.Fluent.SubResource> inboundNatRules = default(IList<Management.ResourceManager.Fluent.SubResource>), IList<Management.ResourceManager.Fluent.SubResource> inboundNatPools = default(IList<Management.ResourceManager.Fluent.SubResource>), IList<Management.ResourceManager.Fluent.SubResource> outboundNatRules = default(IList<Management.ResourceManager.Fluent.SubResource>), IList<Management.ResourceManager.Fluent.SubResource> loadBalancingRules = default(IList<Management.ResourceManager.Fluent.SubResource>), string privateIPAddress = default(string), IPAllocationMethod privateIPAllocationMethod = default(IPAllocationMethod), Management.ResourceManager.Fluent.SubResource subnet = default(Management.ResourceManager.Fluent.SubResource), Management.ResourceManager.Fluent.SubResource publicIPAddress = default(Management.ResourceManager.Fluent.SubResource), string provisioningState = default(string), string name = default(string), string etag = default(string), IList<string> zones = default(IList<string>))
: base(id)
{
InboundNatRules = inboundNatRules;
Expand Down Expand Up @@ -127,13 +127,13 @@ public FrontendIPConfigurationInner()
/// Gets or sets the reference of the subnet resource.
/// </summary>
[JsonProperty(PropertyName = "properties.subnet")]
public SubResource Subnet { get; set; }
public Management.ResourceManager.Fluent.SubResource Subnet { get; set; }

/// <summary>
/// Gets or sets the reference of the Public IP resource.
/// </summary>
[JsonProperty(PropertyName = "properties.publicIPAddress")]
public SubResource PublicIPAddress { get; set; }
public Management.ResourceManager.Fluent.SubResource PublicIPAddress { get; set; }

/// <summary>
/// Gets the provisioning state of the public IP resource. Possible
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public IPConfigurationInner()
/// resource.</param>
/// <param name="etag">A unique read-only string that changes whenever
/// the resource is updated.</param>
public IPConfigurationInner(string id = default(string), string privateIPAddress = default(string), IPAllocationMethod privateIPAllocationMethod = default(IPAllocationMethod), SubnetInner subnet = default(SubnetInner), PublicIPAddressInner publicIPAddress = default(PublicIPAddressInner), string provisioningState = default(string), string name = default(string), string etag = default(string))
public IPConfigurationInner(string id = default(string), string privateIPAddress = default(string), IPAllocationMethod privateIPAllocationMethod = default(IPAllocationMethod), Management.ResourceManager.Fluent.SubResource subnet = default(Management.ResourceManager.Fluent.SubResource), Management.ResourceManager.Fluent.SubResource publicIPAddress = default(Management.ResourceManager.Fluent.SubResource), string provisioningState = default(string), string name = default(string), string etag = default(string))
: base(id)
{
PrivateIPAddress = privateIPAddress;
Expand Down Expand Up @@ -84,13 +84,13 @@ public IPConfigurationInner()
/// Gets or sets the reference of the subnet resource.
/// </summary>
[JsonProperty(PropertyName = "properties.subnet")]
public SubnetInner Subnet { get; set; }
public Management.ResourceManager.Fluent.SubResource Subnet { get; set; }

/// <summary>
/// Gets or sets the reference of the public IP resource.
/// </summary>
[JsonProperty(PropertyName = "properties.publicIPAddress")]
public PublicIPAddressInner PublicIPAddress { get; set; }
public Management.ResourceManager.Fluent.SubResource PublicIPAddress { get; set; }

/// <summary>
/// Gets the provisioning state of the public IP resource. Possible
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

namespace Microsoft.Azure.Management.Network.Fluent.Models
{
using Microsoft.Azure.Management.ResourceManager;
using Microsoft.Azure.Management.ResourceManager.Fluent;
using Newtonsoft.Json;
using System.Linq;

Expand Down Expand Up @@ -40,7 +42,7 @@ public Ipv6ExpressRouteCircuitPeeringConfig()
/// <param name="state">The state of peering. Possible values are:
/// 'Disabled' and 'Enabled'. Possible values include: 'Disabled',
/// 'Enabled'</param>
public Ipv6ExpressRouteCircuitPeeringConfig(string primaryPeerAddressPrefix = default(string), string secondaryPeerAddressPrefix = default(string), ExpressRouteCircuitPeeringConfig microsoftPeeringConfig = default(ExpressRouteCircuitPeeringConfig), RouteFilterInner routeFilter = default(RouteFilterInner), ExpressRouteCircuitPeeringState state = default(ExpressRouteCircuitPeeringState))
public Ipv6ExpressRouteCircuitPeeringConfig(string primaryPeerAddressPrefix = default(string), string secondaryPeerAddressPrefix = default(string), ExpressRouteCircuitPeeringConfig microsoftPeeringConfig = default(ExpressRouteCircuitPeeringConfig), Management.ResourceManager.Fluent.SubResource routeFilter = default(Management.ResourceManager.Fluent.SubResource), ExpressRouteCircuitPeeringState state = default(ExpressRouteCircuitPeeringState))
{
PrimaryPeerAddressPrefix = primaryPeerAddressPrefix;
SecondaryPeerAddressPrefix = secondaryPeerAddressPrefix;
Expand Down Expand Up @@ -77,7 +79,7 @@ public Ipv6ExpressRouteCircuitPeeringConfig()
/// Gets or sets the reference of the RouteFilter resource.
/// </summary>
[JsonProperty(PropertyName = "routeFilter")]
public RouteFilterInner RouteFilter { get; set; }
public Management.ResourceManager.Fluent.SubResource RouteFilter { get; set; }

/// <summary>
/// Gets or sets the state of peering. Possible values are: 'Disabled'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public NetworkInterfaceIPConfigurationInner()
/// resource.</param>
/// <param name="etag">A unique read-only string that changes whenever
/// the resource is updated.</param>
public NetworkInterfaceIPConfigurationInner(string id = default(string), IList<ApplicationGatewayBackendAddressPoolInner> applicationGatewayBackendAddressPools = default(IList<ApplicationGatewayBackendAddressPoolInner>), IList<BackendAddressPoolInner> loadBalancerBackendAddressPools = default(IList<BackendAddressPoolInner>), IList<InboundNatRuleInner> loadBalancerInboundNatRules = default(IList<InboundNatRuleInner>), string privateIPAddress = default(string), IPAllocationMethod privateIPAllocationMethod = default(IPAllocationMethod), IPVersion privateIPAddressVersion = default(IPVersion), SubnetInner subnet = default(SubnetInner), bool? primary = default(bool?), SubResource publicIPAddress = default(SubResource), IList<ApplicationSecurityGroupInner> applicationSecurityGroups = default(IList<ApplicationSecurityGroupInner>), string provisioningState = default(string), string name = default(string), string etag = default(string))
public NetworkInterfaceIPConfigurationInner(string id = default(string), IList<ApplicationGatewayBackendAddressPoolInner> applicationGatewayBackendAddressPools = default(IList<ApplicationGatewayBackendAddressPoolInner>), IList<BackendAddressPoolInner> loadBalancerBackendAddressPools = default(IList<BackendAddressPoolInner>), IList<InboundNatRuleInner> loadBalancerInboundNatRules = default(IList<InboundNatRuleInner>), string privateIPAddress = default(string), IPAllocationMethod privateIPAllocationMethod = default(IPAllocationMethod), IPVersion privateIPAddressVersion = default(IPVersion), Management.ResourceManager.Fluent.SubResource subnet = default(Management.ResourceManager.Fluent.SubResource), bool? primary = default(bool?), Management.ResourceManager.Fluent.SubResource publicIPAddress = default(Management.ResourceManager.Fluent.SubResource), IList<ApplicationSecurityGroupInner> applicationSecurityGroups = default(IList<ApplicationSecurityGroupInner>), string provisioningState = default(string), string name = default(string), string etag = default(string))
: base(id)
{
ApplicationGatewayBackendAddressPools = applicationGatewayBackendAddressPools;
Expand Down Expand Up @@ -138,7 +138,7 @@ public NetworkInterfaceIPConfigurationInner()
/// Gets or sets subnet bound to the IP configuration.
/// </summary>
[JsonProperty(PropertyName = "properties.subnet")]
public SubnetInner Subnet { get; set; }
public Management.ResourceManager.Fluent.SubResource Subnet { get; set; }

/// <summary>
/// Gets whether this is a primary customer address on the network
Expand All @@ -151,7 +151,7 @@ public NetworkInterfaceIPConfigurationInner()
/// Gets or sets public IP address bound to the IP configuration.
/// </summary>
[JsonProperty(PropertyName = "properties.publicIPAddress")]
public SubResource PublicIPAddress { get; set; }
public Management.ResourceManager.Fluent.SubResource PublicIPAddress { get; set; }

/// <summary>
/// Gets or sets application security groups in which the IP
Expand Down
Loading

0 comments on commit c2c7662

Please sign in to comment.