Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR sdk/network/mgmt-v2020_04_01] Add Firewall Policy sku tier #4280

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[AutoPR sdk/network/mgmt-v2020_04_01] Add Firewall Policy sku tier #4280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sdk/network/mgmt-v2020_04_01/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.3.0</version>
<relativePath>../../parents/azure-arm-parent</relativePath>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-network</artifactId>
<version>1.0.0-beta-1</version>
<version>1.0.0-beta</version>
<packaging>jar</packaging>
<name>Microsoft Azure SDK for Network Management</name>
<description>This package contains Microsoft Network Management SDK.</description>
Expand Down
26 changes: 0 additions & 26 deletions ...ain/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationRuleCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@ public class ApplicationRuleCondition extends FirewallPolicyRuleCondition {
@JsonProperty(value = "protocols")
private List<FirewallPolicyRuleConditionApplicationProtocol> protocols;

/**
* List of Urls for this rule condition.
*/
@JsonProperty(value = "targetUrls")
private List<String> targetUrls;

/**
* List of FQDNs for this rule condition.
*/
Expand Down Expand Up @@ -121,26 +115,6 @@ public ApplicationRuleCondition withProtocols(List<FirewallPolicyRuleConditionAp
return this;
}

/**
* Get list of Urls for this rule condition.
*
* @return the targetUrls value
*/
public List<String> targetUrls() {
return this.targetUrls;
}

/**
* Set list of Urls for this rule condition.
*
* @param targetUrls the targetUrls value to set
* @return the ApplicationRuleCondition object itself.
*/
public ApplicationRuleCondition withTargetUrls(List<String> targetUrls) {
this.targetUrls = targetUrls;
return this;
}

/**
* Get list of FQDNs for this rule condition.
*
Expand Down
91 changes: 2 additions & 89 deletions ...4_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,6 @@ public interface FirewallPolicy extends HasInner<FirewallPolicyInner>, Resource,
*/
List<SubResource> firewalls();

/**
* @return the identity value.
*/
ManagedServiceIdentity identity();

/**
* @return the intrusionSystemMode value.
*/
FirewallPolicyIntrusionSystemMode intrusionSystemMode();

/**
* @return the provisioningState value.
*/
Expand All @@ -76,11 +66,6 @@ public interface FirewallPolicy extends HasInner<FirewallPolicyInner>, Resource,
*/
FirewallPolicyThreatIntelWhitelist threatIntelWhitelist();

/**
* @return the transportSecurity value.
*/
FirewallPolicyTransportSecurity transportSecurity();

/**
* The entirety of the FirewallPolicy definition.
*/
Expand Down Expand Up @@ -115,30 +100,6 @@ interface WithBasePolicy {
WithCreate withBasePolicy(SubResource basePolicy);
}

/**
* The stage of the firewallpolicy definition allowing to specify Identity.
*/
interface WithIdentity {
/**
* Specifies identity.
* @param identity The identity of the firewall policy
* @return the next definition stage
*/
WithCreate withIdentity(ManagedServiceIdentity identity);
}

/**
* The stage of the firewallpolicy definition allowing to specify IntrusionSystemMode.
*/
interface WithIntrusionSystemMode {
/**
* Specifies intrusionSystemMode.
* @param intrusionSystemMode The operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'
* @return the next definition stage
*/
WithCreate withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode);
}

/**
* The stage of the firewallpolicy definition allowing to specify ThreatIntelMode.
*/
Expand All @@ -163,30 +124,18 @@ interface WithThreatIntelWhitelist {
WithCreate withThreatIntelWhitelist(FirewallPolicyThreatIntelWhitelist threatIntelWhitelist);
}

/**
* The stage of the firewallpolicy definition allowing to specify TransportSecurity.
*/
interface WithTransportSecurity {
/**
* Specifies transportSecurity.
* @param transportSecurity TLS Configuration definition
* @return the next definition stage
*/
WithCreate withTransportSecurity(FirewallPolicyTransportSecurity transportSecurity);
}

/**
* The stage of the definition which contains all the minimum required inputs for
* the resource to be created (via {@link WithCreate#create()}), but also allows
* for any other optional settings to be specified.
*/
interface WithCreate extends Creatable<FirewallPolicy>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBasePolicy, DefinitionStages.WithIdentity, DefinitionStages.WithIntrusionSystemMode, DefinitionStages.WithThreatIntelMode, DefinitionStages.WithThreatIntelWhitelist, DefinitionStages.WithTransportSecurity {
interface WithCreate extends Creatable<FirewallPolicy>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBasePolicy, DefinitionStages.WithThreatIntelMode, DefinitionStages.WithThreatIntelWhitelist {
}
}
/**
* The template for a FirewallPolicy update operation, containing all the settings that can be modified.
*/
interface Update extends Appliable<FirewallPolicy>, Resource.UpdateWithTags<Update>, UpdateStages.WithBasePolicy, UpdateStages.WithIdentity, UpdateStages.WithIntrusionSystemMode, UpdateStages.WithThreatIntelMode, UpdateStages.WithThreatIntelWhitelist, UpdateStages.WithTransportSecurity {
interface Update extends Appliable<FirewallPolicy>, Resource.UpdateWithTags<Update>, UpdateStages.WithBasePolicy, UpdateStages.WithThreatIntelMode, UpdateStages.WithThreatIntelWhitelist {
}

/**
Expand All @@ -205,30 +154,6 @@ interface WithBasePolicy {
Update withBasePolicy(SubResource basePolicy);
}

/**
* The stage of the firewallpolicy update allowing to specify Identity.
*/
interface WithIdentity {
/**
* Specifies identity.
* @param identity The identity of the firewall policy
* @return the next update stage
*/
Update withIdentity(ManagedServiceIdentity identity);
}

/**
* The stage of the firewallpolicy update allowing to specify IntrusionSystemMode.
*/
interface WithIntrusionSystemMode {
/**
* Specifies intrusionSystemMode.
* @param intrusionSystemMode The operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'
* @return the next update stage
*/
Update withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode);
}

/**
* The stage of the firewallpolicy update allowing to specify ThreatIntelMode.
*/
Expand All @@ -253,17 +178,5 @@ interface WithThreatIntelWhitelist {
Update withThreatIntelWhitelist(FirewallPolicyThreatIntelWhitelist threatIntelWhitelist);
}

/**
* The stage of the firewallpolicy update allowing to specify TransportSecurity.
*/
interface WithTransportSecurity {
/**
* Specifies transportSecurity.
* @param transportSecurity TLS Configuration definition
* @return the next update stage
*/
Update withTransportSecurity(FirewallPolicyTransportSecurity transportSecurity);
}

}
}
5 changes: 2 additions & 3 deletions ...04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import com.microsoft.azure.arm.resources.models.HasManager;
import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
import java.util.List;
import com.microsoft.azure.SubResource;

/**
* Type representing HubRouteTable.
Expand All @@ -27,7 +26,7 @@ public interface HubRouteTable extends HasInner<HubRouteTableInner>, Indexable,
/**
* @return the associatedConnections value.
*/
List<SubResource> associatedConnections();
List<String> associatedConnections();

/**
* @return the etag value.
Expand All @@ -52,7 +51,7 @@ public interface HubRouteTable extends HasInner<HubRouteTableInner>, Indexable,
/**
* @return the propagatingConnections value.
*/
List<SubResource> propagatingConnections();
List<String> propagatingConnections();

/**
* @return the provisioningState value.
Expand Down
26 changes: 7 additions & 19 deletions ...n/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddress.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

package com.microsoft.azure.management.network.v2020_04_01;

import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkInner;
import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceIPConfigurationInner;
import com.microsoft.azure.SubResource;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.microsoft.rest.serializer.JsonFlatten;

Expand All @@ -22,7 +21,7 @@ public class LoadBalancerBackendAddress {
* Reference to an existing virtual network.
*/
@JsonProperty(value = "properties.virtualNetwork")
private VirtualNetworkInner virtualNetwork;
private SubResource virtualNetwork;

/**
* IP Address belonging to the referenced virtual network.
Expand All @@ -33,8 +32,8 @@ public class LoadBalancerBackendAddress {
/**
* Reference to IP address defined in network interfaces.
*/
@JsonProperty(value = "properties.networkInterfaceIPConfiguration")
private NetworkInterfaceIPConfigurationInner networkInterfaceIPConfiguration;
@JsonProperty(value = "properties.networkInterfaceIPConfiguration", access = JsonProperty.Access.WRITE_ONLY)
private SubResource networkInterfaceIPConfiguration;

/**
* Name of the backend address.
Expand All @@ -47,7 +46,7 @@ public class LoadBalancerBackendAddress {
*
* @return the virtualNetwork value
*/
public VirtualNetworkInner virtualNetwork() {
public SubResource virtualNetwork() {
return this.virtualNetwork;
}

Expand All @@ -57,7 +56,7 @@ public VirtualNetworkInner virtualNetwork() {
* @param virtualNetwork the virtualNetwork value to set
* @return the LoadBalancerBackendAddress object itself.
*/
public LoadBalancerBackendAddress withVirtualNetwork(VirtualNetworkInner virtualNetwork) {
public LoadBalancerBackendAddress withVirtualNetwork(SubResource virtualNetwork) {
this.virtualNetwork = virtualNetwork;
return this;
}
Expand Down Expand Up @@ -87,21 +86,10 @@ public LoadBalancerBackendAddress withIpAddress(String ipAddress) {
*
* @return the networkInterfaceIPConfiguration value
*/
public NetworkInterfaceIPConfigurationInner networkInterfaceIPConfiguration() {
public SubResource networkInterfaceIPConfiguration() {
return this.networkInterfaceIPConfiguration;
}

/**
* Set reference to IP address defined in network interfaces.
*
* @param networkInterfaceIPConfiguration the networkInterfaceIPConfiguration value to set
* @return the LoadBalancerBackendAddress object itself.
*/
public LoadBalancerBackendAddress withNetworkInterfaceIPConfiguration(NetworkInterfaceIPConfigurationInner networkInterfaceIPConfiguration) {
this.networkInterfaceIPConfiguration = networkInterfaceIPConfiguration;
return this;
}

/**
* Get name of the backend address.
*
Expand Down
26 changes: 0 additions & 26 deletions ...01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatRuleCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ public class NatRuleCondition extends FirewallPolicyRuleCondition {
@JsonProperty(value = "sourceIpGroups")
private List<String> sourceIpGroups;

/**
* Terminate TLS connections for this rule.
*/
@JsonProperty(value = "terminateTLS")
private Boolean terminateTLS;

/**
* Get array of FirewallPolicyRuleConditionNetworkProtocols.
*
Expand Down Expand Up @@ -155,24 +149,4 @@ public NatRuleCondition withSourceIpGroups(List<String> sourceIpGroups) {
return this;
}

/**
* Get terminate TLS connections for this rule.
*
* @return the terminateTLS value
*/
public Boolean terminateTLS() {
return this.terminateTLS;
}

/**
* Set terminate TLS connections for this rule.
*
* @param terminateTLS the terminateTLS value to set
* @return the NatRuleCondition object itself.
*/
public NatRuleCondition withTerminateTLS(Boolean terminateTLS) {
this.terminateTLS = terminateTLS;
return this;
}

}
2 changes: 0 additions & 2 deletions ...-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
package com.microsoft.azure.management.network.v2020_04_01;

import com.microsoft.azure.arm.model.HasInner;
import com.microsoft.azure.management.network.v2020_04_01.implementation.ResourceNavigationLinkInner;
import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceAssociationLinkInner;
import com.microsoft.azure.management.network.v2020_04_01.implementation.SubnetInner;
import com.microsoft.azure.arm.model.Indexable;
import com.microsoft.azure.arm.model.Refreshable;
Expand Down
30 changes: 15 additions & 15 deletions ...icrosoft/azure/management/network/v2020_04_01/implementation/BackendAddressPoolInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
*/
@JsonFlatten
public class BackendAddressPoolInner extends SubResource {
/**
* An array of references to IP addresses defined in network interfaces.
*/
@JsonProperty(value = "properties.backendIPConfigurations", access = JsonProperty.Access.WRITE_ONLY)
private List<NetworkInterfaceIPConfigurationInner> backendIPConfigurations;

/**
* An array of backend addresses.
*/
@JsonProperty(value = "properties.loadBalancerBackendAddresses")
private List<LoadBalancerBackendAddress> loadBalancerBackendAddresses;

/**
* An array of references to IP addresses defined in network interfaces.
*/
@JsonProperty(value = "properties.backendIPConfigurations", access = JsonProperty.Access.WRITE_ONLY)
private List<NetworkInterfaceIPConfigurationInner> backendIPConfigurations;

/**
* An array of references to load balancing rules that use this backend
* address pool.
Expand Down Expand Up @@ -79,15 +79,6 @@ public class BackendAddressPoolInner extends SubResource {
@JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
private String type;

/**
* Get an array of references to IP addresses defined in network interfaces.
*
* @return the backendIPConfigurations value
*/
public List<NetworkInterfaceIPConfigurationInner> backendIPConfigurations() {
return this.backendIPConfigurations;
}

/**
* Get an array of backend addresses.
*
Expand All @@ -108,6 +99,15 @@ public BackendAddressPoolInner withLoadBalancerBackendAddresses(List<LoadBalance
return this;
}

/**
* Get an array of references to IP addresses defined in network interfaces.
*
* @return the backendIPConfigurations value
*/
public List<NetworkInterfaceIPConfigurationInner> backendIPConfigurations() {
return this.backendIPConfigurations;
}

/**
* Get an array of references to load balancing rules that use this backend address pool.
*
Expand Down
Loading