From 723b618dd121ead1189448804d985b08cde6904f Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 17 Jun 2019 21:15:28 +0000 Subject: [PATCH] Generated from 3336f62f908c19ec8551950e29bcb47af3b95e0e Delete suppress for merged APIs in readme.md. --- network/resource-manager/v2017_10_01/pom.xml | 4 +- .../EffectiveNetworkSecurityRule.java | 32 +- .../ExpressRouteCircuitPeeringConfig.java | 6 +- .../NetworkSecurityGroupSecurityRule.java | 18 +- .../VirtualNetworkGatewayConnection.java | 2 +- .../ConnectionMonitorQueryResultInner.java | 2 +- .../implementation/SecurityRuleInner.java | 30 +- .../VirtualNetworkGatewayConnectionInner.java | 6 +- ...tworkGatewayConnectionListEntityInner.java | 6 +- .../VirtualNetworkGatewaysInner.java | 98 +----- network/resource-manager/v2018_04_01/pom.xml | 4 +- ...ayWebApplicationFirewallConfiguration.java | 6 +- .../EffectiveNetworkSecurityRule.java | 32 +- .../ExpressRouteCircuitPeeringConfig.java | 6 +- .../NetworkSecurityGroupSecurityRule.java | 18 +- .../VirtualNetworkGatewayConnection.java | 2 +- .../ConnectionMonitorQueryResultInner.java | 2 +- .../ExpressRouteCircuitConnectionInner.java | 4 +- .../ExpressRouteCircuitConnectionsInner.java | 16 +- .../implementation/SecurityRuleInner.java | 30 +- .../VirtualNetworkGatewayConnectionInner.java | 6 +- ...tworkGatewayConnectionListEntityInner.java | 6 +- .../VirtualNetworkGatewaysInner.java | 98 +----- .../implementation/VpnSitesInner.java | 8 +- network/resource-manager/v2018_06_01/pom.xml | 4 +- ...ayWebApplicationFirewallConfiguration.java | 6 +- .../EffectiveNetworkSecurityRule.java | 32 +- .../ExpressRouteCircuitPeeringConfig.java | 6 +- .../NetworkSecurityGroupSecurityRule.java | 18 +- .../network/v2018_06_01/TrafficQuery.java | 6 +- .../VirtualNetworkGatewayConnection.java | 2 +- .../ConnectionMonitorQueryResultInner.java | 2 +- .../ExpressRouteCircuitConnectionInner.java | 4 +- .../ExpressRouteCircuitConnectionsInner.java | 16 +- .../implementation/SecurityRuleInner.java | 30 +- .../VirtualNetworkGatewayConnectionInner.java | 6 +- ...tworkGatewayConnectionListEntityInner.java | 6 +- .../VirtualNetworkGatewaysInner.java | 98 +----- .../implementation/VpnSitesInner.java | 8 +- network/resource-manager/v2018_07_01/pom.xml | 4 +- ...ayWebApplicationFirewallConfiguration.java | 6 +- .../EffectiveNetworkSecurityRule.java | 32 +- .../ExpressRouteCircuitPeeringConfig.java | 6 +- .../NetworkSecurityGroupSecurityRule.java | 18 +- .../network/v2018_07_01/TrafficQuery.java | 6 +- .../VirtualNetworkGatewayConnection.java | 2 +- .../ConnectionMonitorQueryResultInner.java | 2 +- .../ExpressRouteCircuitConnectionInner.java | 4 +- .../ExpressRouteCircuitConnectionsInner.java | 16 +- .../implementation/PublicIPPrefixesInner.java | 16 +- .../implementation/SecurityRuleInner.java | 30 +- .../VirtualNetworkGatewayConnectionInner.java | 6 +- ...tworkGatewayConnectionListEntityInner.java | 6 +- .../VirtualNetworkGatewaysInner.java | 98 +----- .../implementation/VpnSitesInner.java | 8 +- network/resource-manager/v2018_08_01/pom.xml | 4 +- ...ayWebApplicationFirewallConfiguration.java | 18 +- .../ContainerNetworkInterface.java | 6 +- ...ontainerNetworkInterfaceConfiguration.java | 2 +- .../EffectiveNetworkSecurityRule.java | 32 +- .../ExpressRouteCircuitPeeringConfig.java | 6 +- .../v2018_08_01/IPConfigurationProfile.java | 8 +- ...NetworkConfigurationDiagnosticProfile.java | 6 +- .../network/v2018_08_01/NetworkInterface.java | 28 +- .../NetworkSecurityGroupSecurityRule.java | 18 +- .../P2SVpnServerConfiguration.java | 8 +- .../VirtualNetworkGatewayConnection.java | 2 +- .../ConnectionMonitorQueryResultInner.java | 2 +- .../ExpressRouteCircuitConnectionInner.java | 4 +- .../ExpressRouteCircuitConnectionsInner.java | 16 +- .../implementation/ExpressRoutePortInner.java | 4 +- .../ExpressRoutePortsLocationsInner.java | 20 +- .../implementation/NetworkInterfaceImpl.java | 6 - .../implementation/NetworkInterfaceInner.java | 13 +- .../implementation/NetworkProfilesInner.java | 16 +- .../implementation/P2SVpnGatewayInner.java | 4 +- .../P2SVpnServerConfigurationInner.java | 12 +- .../implementation/PublicIPPrefixesInner.java | 16 +- .../implementation/SecurityRuleInner.java | 30 +- .../VirtualNetworkGatewayConnectionInner.java | 6 +- ...tworkGatewayConnectionListEntityInner.java | 6 +- .../VirtualNetworkGatewaysInner.java | 98 +----- .../implementation/VpnSitesInner.java | 8 +- network/resource-manager/v2018_12_01/pom.xml | 4 +- .../DdosProtectionPlansInner.java | 325 ++++++++++++++++++ .../VirtualNetworkGatewaysInner.java | 98 +----- 86 files changed, 806 insertions(+), 966 deletions(-) diff --git a/network/resource-manager/v2017_10_01/pom.xml b/network/resource-manager/v2017_10_01/pom.xml index 03fe16949205..3201ed9c5ea0 100644 --- a/network/resource-manager/v2017_10_01/pom.xml +++ b/network/resource-manager/v2017_10_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.1.0 - ../../../pom.management.xml + 0.0.3-beta + ../../../pom.xml azure-mgmt-network 1.0.0-beta diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/EffectiveNetworkSecurityRule.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/EffectiveNetworkSecurityRule.java index af13ed8ac60d..c3a575741ee6 100644 --- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/EffectiveNetworkSecurityRule.java +++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/EffectiveNetworkSecurityRule.java @@ -43,16 +43,16 @@ public class EffectiveNetworkSecurityRule { /** * The source port ranges. Expected values include a single integer between - * 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an - * asterix (*). + * 0 and 65535, a range using '-' as separator (e.g. 100-400), or an + * asterisk (*). */ @JsonProperty(value = "sourcePortRanges") private List sourcePortRanges; /** * The destination port ranges. Expected values include a single integer - * between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or - * an asterix (*). + * between 0 and 65535, a range using '-' as separator (e.g. 100-400), or + * an asterisk (*). */ @JsonProperty(value = "destinationPortRanges") private List destinationPortRanges; @@ -71,16 +71,16 @@ public class EffectiveNetworkSecurityRule { /** * The source address prefixes. Expected values include CIDR IP ranges, - * Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, - * and the asterix (*). + * Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, + * and the asterisk (*). */ @JsonProperty(value = "sourceAddressPrefixes") private List sourceAddressPrefixes; /** * The destination address prefixes. Expected values include CIDR IP - * ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), - * System Tags, and the asterix (*). + * ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), + * System Tags, and the asterisk (*). */ @JsonProperty(value = "destinationAddressPrefixes") private List destinationAddressPrefixes; @@ -198,7 +198,7 @@ public EffectiveNetworkSecurityRule withDestinationPortRange(String destinationP } /** - * Get the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Get the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @return the sourcePortRanges value */ @@ -207,7 +207,7 @@ public List sourcePortRanges() { } /** - * Set the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Set the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @param sourcePortRanges the sourcePortRanges value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -218,7 +218,7 @@ public EffectiveNetworkSecurityRule withSourcePortRanges(List sourcePort } /** - * Get the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Get the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @return the destinationPortRanges value */ @@ -227,7 +227,7 @@ public List destinationPortRanges() { } /** - * Set the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Set the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @param destinationPortRanges the destinationPortRanges value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -278,7 +278,7 @@ public EffectiveNetworkSecurityRule withDestinationAddressPrefix(String destinat } /** - * Get the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Get the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @return the sourceAddressPrefixes value */ @@ -287,7 +287,7 @@ public List sourceAddressPrefixes() { } /** - * Set the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Set the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @param sourceAddressPrefixes the sourceAddressPrefixes value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -298,7 +298,7 @@ public EffectiveNetworkSecurityRule withSourceAddressPrefixes(List sourc } /** - * Get the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Get the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @return the destinationAddressPrefixes value */ @@ -307,7 +307,7 @@ public List destinationAddressPrefixes() { } /** - * Set the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Set the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @param destinationAddressPrefixes the destinationAddressPrefixes value to set * @return the EffectiveNetworkSecurityRule object itself. diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuitPeeringConfig.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuitPeeringConfig.java index 1b9517850c79..de8b434c9fef 100644 --- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuitPeeringConfig.java +++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuitPeeringConfig.java @@ -22,7 +22,7 @@ public class ExpressRouteCircuitPeeringConfig { private List advertisedPublicPrefixes; /** - * The communities of bgp peering. Spepcified for microsoft peering. + * The communities of bgp peering. Specified for microsoft peering. */ @JsonProperty(value = "advertisedCommunities") private List advertisedCommunities; @@ -75,7 +75,7 @@ public ExpressRouteCircuitPeeringConfig withAdvertisedPublicPrefixes(List advertisedCommunities() { } /** - * Set the communities of bgp peering. Spepcified for microsoft peering. + * Set the communities of bgp peering. Specified for microsoft peering. * * @param advertisedCommunities the advertisedCommunities value to set * @return the ExpressRouteCircuitPeeringConfig object itself. diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkSecurityGroupSecurityRule.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkSecurityGroupSecurityRule.java index d315cb404a37..dcd6bd7f04aa 100644 --- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkSecurityGroupSecurityRule.java +++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkSecurityGroupSecurityRule.java @@ -166,7 +166,7 @@ interface WithAccess { interface WithDirection { /** * Specifies direction. - * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outcoming traffic. Possible values are: 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound' + * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outgoing traffic. Possible values are: 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound' * @return the next definition stage */ WithProtocol withDirection(SecurityRuleDirection direction); @@ -202,7 +202,7 @@ interface WithDescription { interface WithDestinationAddressPrefix { /** * Specifies destinationAddressPrefix. - * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used + * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used * @return the next definition stage */ WithCreate withDestinationAddressPrefix(String destinationAddressPrefix); @@ -238,7 +238,7 @@ interface WithDestinationApplicationSecurityGroups { interface WithDestinationPortRange { /** * Specifies destinationPortRange. - * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next definition stage */ WithCreate withDestinationPortRange(String destinationPortRange); @@ -322,7 +322,7 @@ interface WithProvisioningState { interface WithSourceAddressPrefix { /** * Specifies sourceAddressPrefix. - * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from + * @param sourceAddressPrefix The CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from * @return the next definition stage */ WithCreate withSourceAddressPrefix(String sourceAddressPrefix); @@ -358,7 +358,7 @@ interface WithSourceApplicationSecurityGroups { interface WithSourcePortRange { /** * Specifies sourcePortRange. - * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next definition stage */ WithCreate withSourcePortRange(String sourcePortRange); @@ -412,7 +412,7 @@ interface WithDescription { interface WithDestinationAddressPrefix { /** * Specifies destinationAddressPrefix. - * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used + * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used * @return the next update stage */ Update withDestinationAddressPrefix(String destinationAddressPrefix); @@ -448,7 +448,7 @@ interface WithDestinationApplicationSecurityGroups { interface WithDestinationPortRange { /** * Specifies destinationPortRange. - * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next update stage */ Update withDestinationPortRange(String destinationPortRange); @@ -532,7 +532,7 @@ interface WithProvisioningState { interface WithSourceAddressPrefix { /** * Specifies sourceAddressPrefix. - * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from + * @param sourceAddressPrefix The CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from * @return the next update stage */ Update withSourceAddressPrefix(String sourceAddressPrefix); @@ -568,7 +568,7 @@ interface WithSourceApplicationSecurityGroups { interface WithSourcePortRange { /** * Specifies sourcePortRange. - * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next update stage */ Update withSourcePortRange(String sourcePortRange); diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkGatewayConnection.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkGatewayConnection.java index b48ddaa781cc..5c0a3898f441 100644 --- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkGatewayConnection.java +++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkGatewayConnection.java @@ -146,7 +146,7 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup sourceApplicationSecurityGroups; /** - * The destination address prefix. CIDR or destination IP range. Asterix + * The destination address prefix. CIDR or destination IP range. Asterisk * '*' can also be used to match all source IPs. Default tags such as * 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. */ @@ -118,7 +118,7 @@ public class SecurityRuleInner extends SubResource { /** * The direction of the rule. The direction specifies if rule will be - * evaluated on incoming or outcoming traffic. Possible values are: + * evaluated on incoming or outgoing traffic. Possible values are: * 'Inbound' and 'Outbound'. Possible values include: 'Inbound', * 'Outbound'. */ @@ -186,7 +186,7 @@ public SecurityRuleInner withProtocol(SecurityRuleProtocol protocol) { } /** - * Get the source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Get the source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @return the sourcePortRange value */ @@ -195,7 +195,7 @@ public String sourcePortRange() { } /** - * Set the source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Set the source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @param sourcePortRange the sourcePortRange value to set * @return the SecurityRuleInner object itself. @@ -206,7 +206,7 @@ public SecurityRuleInner withSourcePortRange(String sourcePortRange) { } /** - * Get the destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Get the destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @return the destinationPortRange value */ @@ -215,7 +215,7 @@ public String destinationPortRange() { } /** - * Set the destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Set the destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @param destinationPortRange the destinationPortRange value to set * @return the SecurityRuleInner object itself. @@ -226,7 +226,7 @@ public SecurityRuleInner withDestinationPortRange(String destinationPortRange) { } /** - * Get the CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. + * Get the CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. * * @return the sourceAddressPrefix value */ @@ -235,7 +235,7 @@ public String sourceAddressPrefix() { } /** - * Set the CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. + * Set the CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. * * @param sourceAddressPrefix the sourceAddressPrefix value to set * @return the SecurityRuleInner object itself. @@ -286,7 +286,7 @@ public SecurityRuleInner withSourceApplicationSecurityGroups(List> generateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2017_10_01.VirtualNetworkGateways beginGenerateVpnProfile" }) - @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/generatevpnprofile") - Observable> beginGenerateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2017_10_01.VirtualNetworkGateways getVpnProfilePackageUrl" }) @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getvpnprofilepackageurl") Observable> getVpnProfilePackageUrl(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -1507,7 +1507,7 @@ public Observable> generatevpnclientpackageWithServiceRe Validator.validate(parameters); final String apiVersion = "2017-10-01"; Observable> observable = service.generatevpnclientpackage(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); + return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken() { }.getType()); } /** @@ -1598,6 +1598,7 @@ public Observable> call(Response response) private ServiceResponse beginGeneratevpnclientpackageDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) + .register(202, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -1614,7 +1615,7 @@ private ServiceResponse beginGeneratevpnclientpackageDelegate(Response generateVpnProfileAsync(String resourceGroupName, S * @param virtualNetworkGatewayName The name of the virtual network gateway. * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable for the request + * @return the observable to the String object */ public Observable generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { return generateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1, String>() { @@ -1649,81 +1650,6 @@ public String call(ServiceResponse response) { }); } - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable for the request - */ - public Observable> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (virtualNetworkGatewayName == null) { - throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - if (parameters == null) { - throw new IllegalArgumentException("Parameter parameters is required and cannot be null."); - } - Validator.validate(parameters); - final String apiVersion = "2017-10-01"; - Observable> observable = service.generateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws CloudException thrown if the request is rejected by server - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent - * @return the String object if successful. - */ - public String beginGenerateVpnProfile(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toBlocking().single().body(); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the {@link ServiceFuture} object - */ - public ServiceFuture beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters), serviceCallback); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable to the String object - */ - public Observable beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1, String>() { - @Override - public String call(ServiceResponse response) { - return response.body(); - } - }); - } - /** * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. * @@ -1733,7 +1659,7 @@ public String call(ServiceResponse response) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the String object */ - public Observable> beginGenerateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { + public Observable> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1748,12 +1674,12 @@ public Observable> beginGenerateVpnProfileWithServiceRes } Validator.validate(parameters); final String apiVersion = "2017-10-01"; - return service.beginGenerateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.generateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginGenerateVpnProfileDelegate(response); + ServiceResponse clientResponse = generateVpnProfileDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1762,7 +1688,7 @@ public Observable> call(Response response) }); } - private ServiceResponse beginGenerateVpnProfileDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse generateVpnProfileDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) .register(202, new TypeToken() { }.getType()) diff --git a/network/resource-manager/v2018_04_01/pom.xml b/network/resource-manager/v2018_04_01/pom.xml index 352906ae1360..06692df6b54e 100644 --- a/network/resource-manager/v2018_04_01/pom.xml +++ b/network/resource-manager/v2018_04_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.1.0 - ../../../pom.management.xml + 0.0.3-beta + ../../../pom.xml azure-mgmt-network 1.0.0-beta diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ApplicationGatewayWebApplicationFirewallConfiguration.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ApplicationGatewayWebApplicationFirewallConfiguration.java index 2382682beddf..33c66cee72eb 100644 --- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ApplicationGatewayWebApplicationFirewallConfiguration.java +++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ApplicationGatewayWebApplicationFirewallConfiguration.java @@ -54,7 +54,7 @@ public class ApplicationGatewayWebApplicationFirewallConfiguration { private Boolean requestBodyCheck; /** - * Maxium request body size for WAF. + * Maximum request body size for WAF. */ @JsonProperty(value = "maxRequestBodySize") private Integer maxRequestBodySize; @@ -180,7 +180,7 @@ public ApplicationGatewayWebApplicationFirewallConfiguration withRequestBodyChec } /** - * Get maxium request body size for WAF. + * Get maximum request body size for WAF. * * @return the maxRequestBodySize value */ @@ -189,7 +189,7 @@ public Integer maxRequestBodySize() { } /** - * Set maxium request body size for WAF. + * Set maximum request body size for WAF. * * @param maxRequestBodySize the maxRequestBodySize value to set * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself. diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/EffectiveNetworkSecurityRule.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/EffectiveNetworkSecurityRule.java index 0c81557fca69..b3dcb0afc6f0 100644 --- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/EffectiveNetworkSecurityRule.java +++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/EffectiveNetworkSecurityRule.java @@ -43,16 +43,16 @@ public class EffectiveNetworkSecurityRule { /** * The source port ranges. Expected values include a single integer between - * 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an - * asterix (*). + * 0 and 65535, a range using '-' as separator (e.g. 100-400), or an + * asterisk (*). */ @JsonProperty(value = "sourcePortRanges") private List sourcePortRanges; /** * The destination port ranges. Expected values include a single integer - * between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or - * an asterix (*). + * between 0 and 65535, a range using '-' as separator (e.g. 100-400), or + * an asterisk (*). */ @JsonProperty(value = "destinationPortRanges") private List destinationPortRanges; @@ -71,16 +71,16 @@ public class EffectiveNetworkSecurityRule { /** * The source address prefixes. Expected values include CIDR IP ranges, - * Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, - * and the asterix (*). + * Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, + * and the asterisk (*). */ @JsonProperty(value = "sourceAddressPrefixes") private List sourceAddressPrefixes; /** * The destination address prefixes. Expected values include CIDR IP - * ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), - * System Tags, and the asterix (*). + * ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), + * System Tags, and the asterisk (*). */ @JsonProperty(value = "destinationAddressPrefixes") private List destinationAddressPrefixes; @@ -198,7 +198,7 @@ public EffectiveNetworkSecurityRule withDestinationPortRange(String destinationP } /** - * Get the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Get the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @return the sourcePortRanges value */ @@ -207,7 +207,7 @@ public List sourcePortRanges() { } /** - * Set the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Set the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @param sourcePortRanges the sourcePortRanges value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -218,7 +218,7 @@ public EffectiveNetworkSecurityRule withSourcePortRanges(List sourcePort } /** - * Get the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Get the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @return the destinationPortRanges value */ @@ -227,7 +227,7 @@ public List destinationPortRanges() { } /** - * Set the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Set the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @param destinationPortRanges the destinationPortRanges value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -278,7 +278,7 @@ public EffectiveNetworkSecurityRule withDestinationAddressPrefix(String destinat } /** - * Get the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Get the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @return the sourceAddressPrefixes value */ @@ -287,7 +287,7 @@ public List sourceAddressPrefixes() { } /** - * Set the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Set the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @param sourceAddressPrefixes the sourceAddressPrefixes value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -298,7 +298,7 @@ public EffectiveNetworkSecurityRule withSourceAddressPrefixes(List sourc } /** - * Get the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Get the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @return the destinationAddressPrefixes value */ @@ -307,7 +307,7 @@ public List destinationAddressPrefixes() { } /** - * Set the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Set the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @param destinationAddressPrefixes the destinationAddressPrefixes value to set * @return the EffectiveNetworkSecurityRule object itself. diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitPeeringConfig.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitPeeringConfig.java index 41d5369286b4..ddb25898af13 100644 --- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitPeeringConfig.java +++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitPeeringConfig.java @@ -22,7 +22,7 @@ public class ExpressRouteCircuitPeeringConfig { private List advertisedPublicPrefixes; /** - * The communities of bgp peering. Spepcified for microsoft peering. + * The communities of bgp peering. Specified for microsoft peering. */ @JsonProperty(value = "advertisedCommunities") private List advertisedCommunities; @@ -75,7 +75,7 @@ public ExpressRouteCircuitPeeringConfig withAdvertisedPublicPrefixes(List advertisedCommunities() { } /** - * Set the communities of bgp peering. Spepcified for microsoft peering. + * Set the communities of bgp peering. Specified for microsoft peering. * * @param advertisedCommunities the advertisedCommunities value to set * @return the ExpressRouteCircuitPeeringConfig object itself. diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkSecurityGroupSecurityRule.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkSecurityGroupSecurityRule.java index 42f7c9e9524b..fbb8550d1f6f 100644 --- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkSecurityGroupSecurityRule.java +++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkSecurityGroupSecurityRule.java @@ -166,7 +166,7 @@ interface WithAccess { interface WithDirection { /** * Specifies direction. - * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outcoming traffic. Possible values are: 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound' + * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outgoing traffic. Possible values are: 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound' * @return the next definition stage */ WithProtocol withDirection(SecurityRuleDirection direction); @@ -202,7 +202,7 @@ interface WithDescription { interface WithDestinationAddressPrefix { /** * Specifies destinationAddressPrefix. - * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used + * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used * @return the next definition stage */ WithCreate withDestinationAddressPrefix(String destinationAddressPrefix); @@ -238,7 +238,7 @@ interface WithDestinationApplicationSecurityGroups { interface WithDestinationPortRange { /** * Specifies destinationPortRange. - * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next definition stage */ WithCreate withDestinationPortRange(String destinationPortRange); @@ -322,7 +322,7 @@ interface WithProvisioningState { interface WithSourceAddressPrefix { /** * Specifies sourceAddressPrefix. - * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from + * @param sourceAddressPrefix The CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from * @return the next definition stage */ WithCreate withSourceAddressPrefix(String sourceAddressPrefix); @@ -358,7 +358,7 @@ interface WithSourceApplicationSecurityGroups { interface WithSourcePortRange { /** * Specifies sourcePortRange. - * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next definition stage */ WithCreate withSourcePortRange(String sourcePortRange); @@ -412,7 +412,7 @@ interface WithDescription { interface WithDestinationAddressPrefix { /** * Specifies destinationAddressPrefix. - * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used + * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used * @return the next update stage */ Update withDestinationAddressPrefix(String destinationAddressPrefix); @@ -448,7 +448,7 @@ interface WithDestinationApplicationSecurityGroups { interface WithDestinationPortRange { /** * Specifies destinationPortRange. - * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next update stage */ Update withDestinationPortRange(String destinationPortRange); @@ -532,7 +532,7 @@ interface WithProvisioningState { interface WithSourceAddressPrefix { /** * Specifies sourceAddressPrefix. - * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from + * @param sourceAddressPrefix The CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from * @return the next update stage */ Update withSourceAddressPrefix(String sourceAddressPrefix); @@ -568,7 +568,7 @@ interface WithSourceApplicationSecurityGroups { interface WithSourcePortRange { /** * Specifies sourcePortRange. - * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next update stage */ Update withSourcePortRange(String sourcePortRange); diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkGatewayConnection.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkGatewayConnection.java index 6b46b31d31ce..0ea23c293a0b 100644 --- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkGatewayConnection.java +++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkGatewayConnection.java @@ -146,7 +146,7 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup getDelegate(Response * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent @@ -378,7 +378,7 @@ public ExpressRouteCircuitConnectionInner createOrUpdate(String resourceGroupNam * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object @@ -394,7 +394,7 @@ public ServiceFuture createOrUpdateAsync(Str * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable for the request */ @@ -414,7 +414,7 @@ public ExpressRouteCircuitConnectionInner call(ServiceResponse> createOrU * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent @@ -467,7 +467,7 @@ public ExpressRouteCircuitConnectionInner beginCreateOrUpdate(String resourceGro * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object @@ -483,7 +483,7 @@ public ServiceFuture beginCreateOrUpdateAsyn * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the ExpressRouteCircuitConnectionInner object */ @@ -503,7 +503,7 @@ public ExpressRouteCircuitConnectionInner call(ServiceResponse sourceApplicationSecurityGroups; /** - * The destination address prefix. CIDR or destination IP range. Asterix + * The destination address prefix. CIDR or destination IP range. Asterisk * '*' can also be used to match all source IPs. Default tags such as * 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. */ @@ -118,7 +118,7 @@ public class SecurityRuleInner extends SubResource { /** * The direction of the rule. The direction specifies if rule will be - * evaluated on incoming or outcoming traffic. Possible values are: + * evaluated on incoming or outgoing traffic. Possible values are: * 'Inbound' and 'Outbound'. Possible values include: 'Inbound', * 'Outbound'. */ @@ -186,7 +186,7 @@ public SecurityRuleInner withProtocol(SecurityRuleProtocol protocol) { } /** - * Get the source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Get the source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @return the sourcePortRange value */ @@ -195,7 +195,7 @@ public String sourcePortRange() { } /** - * Set the source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Set the source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @param sourcePortRange the sourcePortRange value to set * @return the SecurityRuleInner object itself. @@ -206,7 +206,7 @@ public SecurityRuleInner withSourcePortRange(String sourcePortRange) { } /** - * Get the destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Get the destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @return the destinationPortRange value */ @@ -215,7 +215,7 @@ public String destinationPortRange() { } /** - * Set the destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Set the destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @param destinationPortRange the destinationPortRange value to set * @return the SecurityRuleInner object itself. @@ -226,7 +226,7 @@ public SecurityRuleInner withDestinationPortRange(String destinationPortRange) { } /** - * Get the CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. + * Get the CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. * * @return the sourceAddressPrefix value */ @@ -235,7 +235,7 @@ public String sourceAddressPrefix() { } /** - * Set the CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. + * Set the CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. * * @param sourceAddressPrefix the sourceAddressPrefix value to set * @return the SecurityRuleInner object itself. @@ -286,7 +286,7 @@ public SecurityRuleInner withSourceApplicationSecurityGroups(List> generateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_04_01.VirtualNetworkGateways beginGenerateVpnProfile" }) - @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/generatevpnprofile") - Observable> beginGenerateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_04_01.VirtualNetworkGateways getVpnProfilePackageUrl" }) @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getvpnprofilepackageurl") Observable> getVpnProfilePackageUrl(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -1523,7 +1523,7 @@ public Observable> generatevpnclientpackageWithServiceRe Validator.validate(parameters); final String apiVersion = "2018-04-01"; Observable> observable = service.generatevpnclientpackage(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); + return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken() { }.getType()); } /** @@ -1614,6 +1614,7 @@ public Observable> call(Response response) private ServiceResponse beginGeneratevpnclientpackageDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) + .register(202, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -1630,7 +1631,7 @@ private ServiceResponse beginGeneratevpnclientpackageDelegate(Response generateVpnProfileAsync(String resourceGroupName, S * @param virtualNetworkGatewayName The name of the virtual network gateway. * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable for the request + * @return the observable to the String object */ public Observable generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { return generateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1, String>() { @@ -1665,81 +1666,6 @@ public String call(ServiceResponse response) { }); } - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable for the request - */ - public Observable> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (virtualNetworkGatewayName == null) { - throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - if (parameters == null) { - throw new IllegalArgumentException("Parameter parameters is required and cannot be null."); - } - Validator.validate(parameters); - final String apiVersion = "2018-04-01"; - Observable> observable = service.generateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws CloudException thrown if the request is rejected by server - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent - * @return the String object if successful. - */ - public String beginGenerateVpnProfile(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toBlocking().single().body(); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the {@link ServiceFuture} object - */ - public ServiceFuture beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters), serviceCallback); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable to the String object - */ - public Observable beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1, String>() { - @Override - public String call(ServiceResponse response) { - return response.body(); - } - }); - } - /** * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. * @@ -1749,7 +1675,7 @@ public String call(ServiceResponse response) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the String object */ - public Observable> beginGenerateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { + public Observable> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1764,12 +1690,12 @@ public Observable> beginGenerateVpnProfileWithServiceRes } Validator.validate(parameters); final String apiVersion = "2018-04-01"; - return service.beginGenerateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.generateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginGenerateVpnProfileDelegate(response); + ServiceResponse clientResponse = generateVpnProfileDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1778,7 +1704,7 @@ public Observable> call(Response response) }); } - private ServiceResponse beginGenerateVpnProfileDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse generateVpnProfileDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) .register(202, new TypeToken() { }.getType()) diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/implementation/VpnSitesInner.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/implementation/VpnSitesInner.java index a0d5fb8c7d17..c52f77afc8d6 100644 --- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/implementation/VpnSitesInner.java +++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/implementation/VpnSitesInner.java @@ -114,7 +114,7 @@ interface VpnSitesService { } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. @@ -128,7 +128,7 @@ public VpnSiteInner getByResourceGroup(String resourceGroupName, String vpnSiteN } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. @@ -141,7 +141,7 @@ public ServiceFuture getByResourceGroupAsync(String resourceGroupN } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. @@ -158,7 +158,7 @@ public VpnSiteInner call(ServiceResponse response) { } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. diff --git a/network/resource-manager/v2018_06_01/pom.xml b/network/resource-manager/v2018_06_01/pom.xml index 888b62d359a7..0e24503cb10d 100644 --- a/network/resource-manager/v2018_06_01/pom.xml +++ b/network/resource-manager/v2018_06_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.1.0 - ../../../pom.management.xml + 0.0.3-beta + ../../../pom.xml azure-mgmt-network 1.0.0-beta diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ApplicationGatewayWebApplicationFirewallConfiguration.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ApplicationGatewayWebApplicationFirewallConfiguration.java index cf6f24f8a8f7..0e1761d4bda3 100644 --- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ApplicationGatewayWebApplicationFirewallConfiguration.java +++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ApplicationGatewayWebApplicationFirewallConfiguration.java @@ -54,7 +54,7 @@ public class ApplicationGatewayWebApplicationFirewallConfiguration { private Boolean requestBodyCheck; /** - * Maxium request body size for WAF. + * Maximum request body size for WAF. */ @JsonProperty(value = "maxRequestBodySize") private Integer maxRequestBodySize; @@ -180,7 +180,7 @@ public ApplicationGatewayWebApplicationFirewallConfiguration withRequestBodyChec } /** - * Get maxium request body size for WAF. + * Get maximum request body size for WAF. * * @return the maxRequestBodySize value */ @@ -189,7 +189,7 @@ public Integer maxRequestBodySize() { } /** - * Set maxium request body size for WAF. + * Set maximum request body size for WAF. * * @param maxRequestBodySize the maxRequestBodySize value to set * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself. diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/EffectiveNetworkSecurityRule.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/EffectiveNetworkSecurityRule.java index 5601e0850c4d..fedad509463b 100644 --- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/EffectiveNetworkSecurityRule.java +++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/EffectiveNetworkSecurityRule.java @@ -43,16 +43,16 @@ public class EffectiveNetworkSecurityRule { /** * The source port ranges. Expected values include a single integer between - * 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an - * asterix (*). + * 0 and 65535, a range using '-' as separator (e.g. 100-400), or an + * asterisk (*). */ @JsonProperty(value = "sourcePortRanges") private List sourcePortRanges; /** * The destination port ranges. Expected values include a single integer - * between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or - * an asterix (*). + * between 0 and 65535, a range using '-' as separator (e.g. 100-400), or + * an asterisk (*). */ @JsonProperty(value = "destinationPortRanges") private List destinationPortRanges; @@ -71,16 +71,16 @@ public class EffectiveNetworkSecurityRule { /** * The source address prefixes. Expected values include CIDR IP ranges, - * Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, - * and the asterix (*). + * Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, + * and the asterisk (*). */ @JsonProperty(value = "sourceAddressPrefixes") private List sourceAddressPrefixes; /** * The destination address prefixes. Expected values include CIDR IP - * ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), - * System Tags, and the asterix (*). + * ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), + * System Tags, and the asterisk (*). */ @JsonProperty(value = "destinationAddressPrefixes") private List destinationAddressPrefixes; @@ -198,7 +198,7 @@ public EffectiveNetworkSecurityRule withDestinationPortRange(String destinationP } /** - * Get the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Get the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @return the sourcePortRanges value */ @@ -207,7 +207,7 @@ public List sourcePortRanges() { } /** - * Set the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Set the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @param sourcePortRanges the sourcePortRanges value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -218,7 +218,7 @@ public EffectiveNetworkSecurityRule withSourcePortRanges(List sourcePort } /** - * Get the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Get the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @return the destinationPortRanges value */ @@ -227,7 +227,7 @@ public List destinationPortRanges() { } /** - * Set the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Set the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @param destinationPortRanges the destinationPortRanges value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -278,7 +278,7 @@ public EffectiveNetworkSecurityRule withDestinationAddressPrefix(String destinat } /** - * Get the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Get the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @return the sourceAddressPrefixes value */ @@ -287,7 +287,7 @@ public List sourceAddressPrefixes() { } /** - * Set the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Set the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @param sourceAddressPrefixes the sourceAddressPrefixes value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -298,7 +298,7 @@ public EffectiveNetworkSecurityRule withSourceAddressPrefixes(List sourc } /** - * Get the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Get the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @return the destinationAddressPrefixes value */ @@ -307,7 +307,7 @@ public List destinationAddressPrefixes() { } /** - * Set the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Set the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @param destinationAddressPrefixes the destinationAddressPrefixes value to set * @return the EffectiveNetworkSecurityRule object itself. diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitPeeringConfig.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitPeeringConfig.java index 26a9a4d01615..ff6f0a668200 100644 --- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitPeeringConfig.java +++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitPeeringConfig.java @@ -22,7 +22,7 @@ public class ExpressRouteCircuitPeeringConfig { private List advertisedPublicPrefixes; /** - * The communities of bgp peering. Spepcified for microsoft peering. + * The communities of bgp peering. Specified for microsoft peering. */ @JsonProperty(value = "advertisedCommunities") private List advertisedCommunities; @@ -75,7 +75,7 @@ public ExpressRouteCircuitPeeringConfig withAdvertisedPublicPrefixes(List advertisedCommunities() { } /** - * Set the communities of bgp peering. Spepcified for microsoft peering. + * Set the communities of bgp peering. Specified for microsoft peering. * * @param advertisedCommunities the advertisedCommunities value to set * @return the ExpressRouteCircuitPeeringConfig object itself. diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroupSecurityRule.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroupSecurityRule.java index d9a514514959..95df6fe21c7e 100644 --- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroupSecurityRule.java +++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroupSecurityRule.java @@ -166,7 +166,7 @@ interface WithAccess { interface WithDirection { /** * Specifies direction. - * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outcoming traffic. Possible values are: 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound' + * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outgoing traffic. Possible values are: 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound' * @return the next definition stage */ WithProtocol withDirection(SecurityRuleDirection direction); @@ -202,7 +202,7 @@ interface WithDescription { interface WithDestinationAddressPrefix { /** * Specifies destinationAddressPrefix. - * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used + * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used * @return the next definition stage */ WithCreate withDestinationAddressPrefix(String destinationAddressPrefix); @@ -238,7 +238,7 @@ interface WithDestinationApplicationSecurityGroups { interface WithDestinationPortRange { /** * Specifies destinationPortRange. - * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next definition stage */ WithCreate withDestinationPortRange(String destinationPortRange); @@ -322,7 +322,7 @@ interface WithProvisioningState { interface WithSourceAddressPrefix { /** * Specifies sourceAddressPrefix. - * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from + * @param sourceAddressPrefix The CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from * @return the next definition stage */ WithCreate withSourceAddressPrefix(String sourceAddressPrefix); @@ -358,7 +358,7 @@ interface WithSourceApplicationSecurityGroups { interface WithSourcePortRange { /** * Specifies sourcePortRange. - * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next definition stage */ WithCreate withSourcePortRange(String sourcePortRange); @@ -412,7 +412,7 @@ interface WithDescription { interface WithDestinationAddressPrefix { /** * Specifies destinationAddressPrefix. - * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used + * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used * @return the next update stage */ Update withDestinationAddressPrefix(String destinationAddressPrefix); @@ -448,7 +448,7 @@ interface WithDestinationApplicationSecurityGroups { interface WithDestinationPortRange { /** * Specifies destinationPortRange. - * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next update stage */ Update withDestinationPortRange(String destinationPortRange); @@ -532,7 +532,7 @@ interface WithProvisioningState { interface WithSourceAddressPrefix { /** * Specifies sourceAddressPrefix. - * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from + * @param sourceAddressPrefix The CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from * @return the next update stage */ Update withSourceAddressPrefix(String sourceAddressPrefix); @@ -568,7 +568,7 @@ interface WithSourceApplicationSecurityGroups { interface WithSourcePortRange { /** * Specifies sourcePortRange. - * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next update stage */ Update withSourcePortRange(String sourcePortRange); diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/TrafficQuery.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/TrafficQuery.java index e7e6df6da5e8..8981d28ad870 100644 --- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/TrafficQuery.java +++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/TrafficQuery.java @@ -41,7 +41,7 @@ public class TrafficQuery { private String destination; /** - * Traffice destination port. Accepted values are '*', port (for example, + * Traffic destination port. Accepted values are '*', port (for example, * 3389) and port range (for example, 80-100). */ @JsonProperty(value = "destinationPort", required = true) @@ -128,7 +128,7 @@ public TrafficQuery withDestination(String destination) { } /** - * Get traffice destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100). + * Get traffic destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100). * * @return the destinationPort value */ @@ -137,7 +137,7 @@ public String destinationPort() { } /** - * Set traffice destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100). + * Set traffic destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100). * * @param destinationPort the destinationPort value to set * @return the TrafficQuery object itself. diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGatewayConnection.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGatewayConnection.java index 10838f36c28c..026640195adc 100644 --- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGatewayConnection.java +++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGatewayConnection.java @@ -146,7 +146,7 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup getDelegate(Response * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent @@ -378,7 +378,7 @@ public ExpressRouteCircuitConnectionInner createOrUpdate(String resourceGroupNam * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object @@ -394,7 +394,7 @@ public ServiceFuture createOrUpdateAsync(Str * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable for the request */ @@ -414,7 +414,7 @@ public ExpressRouteCircuitConnectionInner call(ServiceResponse> createOrU * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent @@ -467,7 +467,7 @@ public ExpressRouteCircuitConnectionInner beginCreateOrUpdate(String resourceGro * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object @@ -483,7 +483,7 @@ public ServiceFuture beginCreateOrUpdateAsyn * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the ExpressRouteCircuitConnectionInner object */ @@ -503,7 +503,7 @@ public ExpressRouteCircuitConnectionInner call(ServiceResponse sourceApplicationSecurityGroups; /** - * The destination address prefix. CIDR or destination IP range. Asterix + * The destination address prefix. CIDR or destination IP range. Asterisk * '*' can also be used to match all source IPs. Default tags such as * 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. */ @@ -118,7 +118,7 @@ public class SecurityRuleInner extends SubResource { /** * The direction of the rule. The direction specifies if rule will be - * evaluated on incoming or outcoming traffic. Possible values are: + * evaluated on incoming or outgoing traffic. Possible values are: * 'Inbound' and 'Outbound'. Possible values include: 'Inbound', * 'Outbound'. */ @@ -186,7 +186,7 @@ public SecurityRuleInner withProtocol(SecurityRuleProtocol protocol) { } /** - * Get the source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Get the source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @return the sourcePortRange value */ @@ -195,7 +195,7 @@ public String sourcePortRange() { } /** - * Set the source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Set the source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @param sourcePortRange the sourcePortRange value to set * @return the SecurityRuleInner object itself. @@ -206,7 +206,7 @@ public SecurityRuleInner withSourcePortRange(String sourcePortRange) { } /** - * Get the destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Get the destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @return the destinationPortRange value */ @@ -215,7 +215,7 @@ public String destinationPortRange() { } /** - * Set the destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Set the destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @param destinationPortRange the destinationPortRange value to set * @return the SecurityRuleInner object itself. @@ -226,7 +226,7 @@ public SecurityRuleInner withDestinationPortRange(String destinationPortRange) { } /** - * Get the CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. + * Get the CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. * * @return the sourceAddressPrefix value */ @@ -235,7 +235,7 @@ public String sourceAddressPrefix() { } /** - * Set the CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. + * Set the CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. * * @param sourceAddressPrefix the sourceAddressPrefix value to set * @return the SecurityRuleInner object itself. @@ -286,7 +286,7 @@ public SecurityRuleInner withSourceApplicationSecurityGroups(List> generateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_06_01.VirtualNetworkGateways beginGenerateVpnProfile" }) - @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/generatevpnprofile") - Observable> beginGenerateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_06_01.VirtualNetworkGateways getVpnProfilePackageUrl" }) @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getvpnprofilepackageurl") Observable> getVpnProfilePackageUrl(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -1681,7 +1681,7 @@ public Observable> generatevpnclientpackageWithServiceRe Validator.validate(parameters); final String apiVersion = "2018-06-01"; Observable> observable = service.generatevpnclientpackage(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); + return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken() { }.getType()); } /** @@ -1772,6 +1772,7 @@ public Observable> call(Response response) private ServiceResponse beginGeneratevpnclientpackageDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) + .register(202, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -1788,7 +1789,7 @@ private ServiceResponse beginGeneratevpnclientpackageDelegate(Response generateVpnProfileAsync(String resourceGroupName, S * @param virtualNetworkGatewayName The name of the virtual network gateway. * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable for the request + * @return the observable to the String object */ public Observable generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { return generateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1, String>() { @@ -1823,81 +1824,6 @@ public String call(ServiceResponse response) { }); } - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable for the request - */ - public Observable> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (virtualNetworkGatewayName == null) { - throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - if (parameters == null) { - throw new IllegalArgumentException("Parameter parameters is required and cannot be null."); - } - Validator.validate(parameters); - final String apiVersion = "2018-06-01"; - Observable> observable = service.generateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws CloudException thrown if the request is rejected by server - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent - * @return the String object if successful. - */ - public String beginGenerateVpnProfile(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toBlocking().single().body(); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the {@link ServiceFuture} object - */ - public ServiceFuture beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters), serviceCallback); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable to the String object - */ - public Observable beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1, String>() { - @Override - public String call(ServiceResponse response) { - return response.body(); - } - }); - } - /** * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. * @@ -1907,7 +1833,7 @@ public String call(ServiceResponse response) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the String object */ - public Observable> beginGenerateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { + public Observable> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1922,12 +1848,12 @@ public Observable> beginGenerateVpnProfileWithServiceRes } Validator.validate(parameters); final String apiVersion = "2018-06-01"; - return service.beginGenerateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.generateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginGenerateVpnProfileDelegate(response); + ServiceResponse clientResponse = generateVpnProfileDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1936,7 +1862,7 @@ public Observable> call(Response response) }); } - private ServiceResponse beginGenerateVpnProfileDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse generateVpnProfileDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) .register(202, new TypeToken() { }.getType()) diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/VpnSitesInner.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/VpnSitesInner.java index adccee320aa6..a65f7d839cd6 100644 --- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/VpnSitesInner.java +++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/VpnSitesInner.java @@ -114,7 +114,7 @@ interface VpnSitesService { } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. @@ -128,7 +128,7 @@ public VpnSiteInner getByResourceGroup(String resourceGroupName, String vpnSiteN } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. @@ -141,7 +141,7 @@ public ServiceFuture getByResourceGroupAsync(String resourceGroupN } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. @@ -158,7 +158,7 @@ public VpnSiteInner call(ServiceResponse response) { } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. diff --git a/network/resource-manager/v2018_07_01/pom.xml b/network/resource-manager/v2018_07_01/pom.xml index bcd4bb8d1ab6..9c88d3ab6904 100644 --- a/network/resource-manager/v2018_07_01/pom.xml +++ b/network/resource-manager/v2018_07_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.1.0 - ../../../pom.management.xml + 0.0.3-beta + ../../../pom.xml azure-mgmt-network 1.0.0-beta diff --git a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/ApplicationGatewayWebApplicationFirewallConfiguration.java b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/ApplicationGatewayWebApplicationFirewallConfiguration.java index 6f88c0600ceb..85c0d2995000 100644 --- a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/ApplicationGatewayWebApplicationFirewallConfiguration.java +++ b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/ApplicationGatewayWebApplicationFirewallConfiguration.java @@ -54,7 +54,7 @@ public class ApplicationGatewayWebApplicationFirewallConfiguration { private Boolean requestBodyCheck; /** - * Maxium request body size for WAF. + * Maximum request body size for WAF. */ @JsonProperty(value = "maxRequestBodySize") private Integer maxRequestBodySize; @@ -180,7 +180,7 @@ public ApplicationGatewayWebApplicationFirewallConfiguration withRequestBodyChec } /** - * Get maxium request body size for WAF. + * Get maximum request body size for WAF. * * @return the maxRequestBodySize value */ @@ -189,7 +189,7 @@ public Integer maxRequestBodySize() { } /** - * Set maxium request body size for WAF. + * Set maximum request body size for WAF. * * @param maxRequestBodySize the maxRequestBodySize value to set * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself. diff --git a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/EffectiveNetworkSecurityRule.java b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/EffectiveNetworkSecurityRule.java index 2ae00290eb3f..0a9730e9ce9b 100644 --- a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/EffectiveNetworkSecurityRule.java +++ b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/EffectiveNetworkSecurityRule.java @@ -43,16 +43,16 @@ public class EffectiveNetworkSecurityRule { /** * The source port ranges. Expected values include a single integer between - * 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an - * asterix (*). + * 0 and 65535, a range using '-' as separator (e.g. 100-400), or an + * asterisk (*). */ @JsonProperty(value = "sourcePortRanges") private List sourcePortRanges; /** * The destination port ranges. Expected values include a single integer - * between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or - * an asterix (*). + * between 0 and 65535, a range using '-' as separator (e.g. 100-400), or + * an asterisk (*). */ @JsonProperty(value = "destinationPortRanges") private List destinationPortRanges; @@ -71,16 +71,16 @@ public class EffectiveNetworkSecurityRule { /** * The source address prefixes. Expected values include CIDR IP ranges, - * Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, - * and the asterix (*). + * Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, + * and the asterisk (*). */ @JsonProperty(value = "sourceAddressPrefixes") private List sourceAddressPrefixes; /** * The destination address prefixes. Expected values include CIDR IP - * ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), - * System Tags, and the asterix (*). + * ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), + * System Tags, and the asterisk (*). */ @JsonProperty(value = "destinationAddressPrefixes") private List destinationAddressPrefixes; @@ -198,7 +198,7 @@ public EffectiveNetworkSecurityRule withDestinationPortRange(String destinationP } /** - * Get the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Get the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @return the sourcePortRanges value */ @@ -207,7 +207,7 @@ public List sourcePortRanges() { } /** - * Set the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Set the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @param sourcePortRanges the sourcePortRanges value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -218,7 +218,7 @@ public EffectiveNetworkSecurityRule withSourcePortRanges(List sourcePort } /** - * Get the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Get the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @return the destinationPortRanges value */ @@ -227,7 +227,7 @@ public List destinationPortRanges() { } /** - * Set the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Set the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @param destinationPortRanges the destinationPortRanges value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -278,7 +278,7 @@ public EffectiveNetworkSecurityRule withDestinationAddressPrefix(String destinat } /** - * Get the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Get the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @return the sourceAddressPrefixes value */ @@ -287,7 +287,7 @@ public List sourceAddressPrefixes() { } /** - * Set the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Set the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @param sourceAddressPrefixes the sourceAddressPrefixes value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -298,7 +298,7 @@ public EffectiveNetworkSecurityRule withSourceAddressPrefixes(List sourc } /** - * Get the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Get the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @return the destinationAddressPrefixes value */ @@ -307,7 +307,7 @@ public List destinationAddressPrefixes() { } /** - * Set the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Set the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @param destinationAddressPrefixes the destinationAddressPrefixes value to set * @return the EffectiveNetworkSecurityRule object itself. diff --git a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/ExpressRouteCircuitPeeringConfig.java b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/ExpressRouteCircuitPeeringConfig.java index 379a7e1f3ee1..469e6d75ec6c 100644 --- a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/ExpressRouteCircuitPeeringConfig.java +++ b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/ExpressRouteCircuitPeeringConfig.java @@ -22,7 +22,7 @@ public class ExpressRouteCircuitPeeringConfig { private List advertisedPublicPrefixes; /** - * The communities of bgp peering. Spepcified for microsoft peering. + * The communities of bgp peering. Specified for microsoft peering. */ @JsonProperty(value = "advertisedCommunities") private List advertisedCommunities; @@ -75,7 +75,7 @@ public ExpressRouteCircuitPeeringConfig withAdvertisedPublicPrefixes(List advertisedCommunities() { } /** - * Set the communities of bgp peering. Spepcified for microsoft peering. + * Set the communities of bgp peering. Specified for microsoft peering. * * @param advertisedCommunities the advertisedCommunities value to set * @return the ExpressRouteCircuitPeeringConfig object itself. diff --git a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/NetworkSecurityGroupSecurityRule.java b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/NetworkSecurityGroupSecurityRule.java index badd3f923340..54d1b212335f 100644 --- a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/NetworkSecurityGroupSecurityRule.java +++ b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/NetworkSecurityGroupSecurityRule.java @@ -166,7 +166,7 @@ interface WithAccess { interface WithDirection { /** * Specifies direction. - * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outcoming traffic. Possible values are: 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound' + * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outgoing traffic. Possible values are: 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound' * @return the next definition stage */ WithProtocol withDirection(SecurityRuleDirection direction); @@ -202,7 +202,7 @@ interface WithDescription { interface WithDestinationAddressPrefix { /** * Specifies destinationAddressPrefix. - * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used + * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used * @return the next definition stage */ WithCreate withDestinationAddressPrefix(String destinationAddressPrefix); @@ -238,7 +238,7 @@ interface WithDestinationApplicationSecurityGroups { interface WithDestinationPortRange { /** * Specifies destinationPortRange. - * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next definition stage */ WithCreate withDestinationPortRange(String destinationPortRange); @@ -322,7 +322,7 @@ interface WithProvisioningState { interface WithSourceAddressPrefix { /** * Specifies sourceAddressPrefix. - * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from + * @param sourceAddressPrefix The CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from * @return the next definition stage */ WithCreate withSourceAddressPrefix(String sourceAddressPrefix); @@ -358,7 +358,7 @@ interface WithSourceApplicationSecurityGroups { interface WithSourcePortRange { /** * Specifies sourcePortRange. - * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next definition stage */ WithCreate withSourcePortRange(String sourcePortRange); @@ -412,7 +412,7 @@ interface WithDescription { interface WithDestinationAddressPrefix { /** * Specifies destinationAddressPrefix. - * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used + * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used * @return the next update stage */ Update withDestinationAddressPrefix(String destinationAddressPrefix); @@ -448,7 +448,7 @@ interface WithDestinationApplicationSecurityGroups { interface WithDestinationPortRange { /** * Specifies destinationPortRange. - * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next update stage */ Update withDestinationPortRange(String destinationPortRange); @@ -532,7 +532,7 @@ interface WithProvisioningState { interface WithSourceAddressPrefix { /** * Specifies sourceAddressPrefix. - * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from + * @param sourceAddressPrefix The CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from * @return the next update stage */ Update withSourceAddressPrefix(String sourceAddressPrefix); @@ -568,7 +568,7 @@ interface WithSourceApplicationSecurityGroups { interface WithSourcePortRange { /** * Specifies sourcePortRange. - * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next update stage */ Update withSourcePortRange(String sourcePortRange); diff --git a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/TrafficQuery.java b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/TrafficQuery.java index 00efd9dcf7a4..e6d3f9fc6f3f 100644 --- a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/TrafficQuery.java +++ b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/TrafficQuery.java @@ -41,7 +41,7 @@ public class TrafficQuery { private String destination; /** - * Traffice destination port. Accepted values are '*', port (for example, + * Traffic destination port. Accepted values are '*', port (for example, * 3389) and port range (for example, 80-100). */ @JsonProperty(value = "destinationPort", required = true) @@ -128,7 +128,7 @@ public TrafficQuery withDestination(String destination) { } /** - * Get traffice destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100). + * Get traffic destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100). * * @return the destinationPort value */ @@ -137,7 +137,7 @@ public String destinationPort() { } /** - * Set traffice destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100). + * Set traffic destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100). * * @param destinationPort the destinationPort value to set * @return the TrafficQuery object itself. diff --git a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/VirtualNetworkGatewayConnection.java b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/VirtualNetworkGatewayConnection.java index 224c376050ed..5f21e327e8d9 100644 --- a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/VirtualNetworkGatewayConnection.java +++ b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/VirtualNetworkGatewayConnection.java @@ -151,7 +151,7 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup getDelegate(Response * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent @@ -378,7 +378,7 @@ public ExpressRouteCircuitConnectionInner createOrUpdate(String resourceGroupNam * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object @@ -394,7 +394,7 @@ public ServiceFuture createOrUpdateAsync(Str * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable for the request */ @@ -414,7 +414,7 @@ public ExpressRouteCircuitConnectionInner call(ServiceResponse> createOrU * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent @@ -467,7 +467,7 @@ public ExpressRouteCircuitConnectionInner beginCreateOrUpdate(String resourceGro * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object @@ -483,7 +483,7 @@ public ServiceFuture beginCreateOrUpdateAsyn * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the ExpressRouteCircuitConnectionInner object */ @@ -503,7 +503,7 @@ public ExpressRouteCircuitConnectionInner call(ServiceResponse beginDeleteDelegate(Response respons * Gets the specified public IP prefix in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param publicIpPrefixName The name of the PublicIPPrefx. + * @param publicIpPrefixName The name of the Public IP Prefix. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent @@ -282,7 +282,7 @@ public PublicIPPrefixInner getByResourceGroup(String resourceGroupName, String p * Gets the specified public IP prefix in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param publicIpPrefixName The name of the PublicIPPrefx. + * @param publicIpPrefixName The name of the Public IP Prefix. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object @@ -295,7 +295,7 @@ public ServiceFuture getByResourceGroupAsync(String resourc * Gets the specified public IP prefix in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param publicIpPrefixName The name of the PublicIPPrefx. + * @param publicIpPrefixName The name of the Public IP Prefix. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PublicIPPrefixInner object */ @@ -312,7 +312,7 @@ public PublicIPPrefixInner call(ServiceResponse response) { * Gets the specified public IP prefix in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param publicIpPrefixName The name of the PublicIPPrefx. + * @param publicIpPrefixName The name of the Public IP Prefix. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PublicIPPrefixInner object */ @@ -346,7 +346,7 @@ public Observable> call(Response getByResourceGroupAsync(String resourc * Gets the specified public IP prefix in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param publicIpPrefixName The name of the PublicIPPrefx. + * @param publicIpPrefixName The name of the Public IP Prefix. * @param expand Expands referenced resources. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PublicIPPrefixInner object @@ -393,7 +393,7 @@ public PublicIPPrefixInner call(ServiceResponse response) { * Gets the specified public IP prefix in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param publicIpPrefixName The name of the PublicIPPrefx. + * @param publicIpPrefixName The name of the Public IP Prefix. * @param expand Expands referenced resources. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PublicIPPrefixInner object diff --git a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/implementation/SecurityRuleInner.java b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/implementation/SecurityRuleInner.java index 528c5dd39f49..521114106381 100644 --- a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/implementation/SecurityRuleInner.java +++ b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/implementation/SecurityRuleInner.java @@ -35,7 +35,7 @@ public class SecurityRuleInner extends SubResource { private SecurityRuleProtocol protocol; /** - * The source port or range. Integer or range between 0 and 65535. Asterix + * The source port or range. Integer or range between 0 and 65535. Asterisk * '*' can also be used to match all ports. */ @JsonProperty(value = "properties.sourcePortRange") @@ -43,13 +43,13 @@ public class SecurityRuleInner extends SubResource { /** * The destination port or range. Integer or range between 0 and 65535. - * Asterix '*' can also be used to match all ports. + * Asterisk '*' can also be used to match all ports. */ @JsonProperty(value = "properties.destinationPortRange") private String destinationPortRange; /** - * The CIDR or source IP range. Asterix '*' can also be used to match all + * The CIDR or source IP range. Asterisk '*' can also be used to match all * source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' * and 'Internet' can also be used. If this is an ingress rule, specifies * where network traffic originates from. @@ -70,7 +70,7 @@ public class SecurityRuleInner extends SubResource { private List sourceApplicationSecurityGroups; /** - * The destination address prefix. CIDR or destination IP range. Asterix + * The destination address prefix. CIDR or destination IP range. Asterisk * '*' can also be used to match all source IPs. Default tags such as * 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. */ @@ -118,7 +118,7 @@ public class SecurityRuleInner extends SubResource { /** * The direction of the rule. The direction specifies if rule will be - * evaluated on incoming or outcoming traffic. Possible values are: + * evaluated on incoming or outgoing traffic. Possible values are: * 'Inbound' and 'Outbound'. Possible values include: 'Inbound', * 'Outbound'. */ @@ -186,7 +186,7 @@ public SecurityRuleInner withProtocol(SecurityRuleProtocol protocol) { } /** - * Get the source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Get the source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @return the sourcePortRange value */ @@ -195,7 +195,7 @@ public String sourcePortRange() { } /** - * Set the source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Set the source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @param sourcePortRange the sourcePortRange value to set * @return the SecurityRuleInner object itself. @@ -206,7 +206,7 @@ public SecurityRuleInner withSourcePortRange(String sourcePortRange) { } /** - * Get the destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Get the destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @return the destinationPortRange value */ @@ -215,7 +215,7 @@ public String destinationPortRange() { } /** - * Set the destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Set the destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @param destinationPortRange the destinationPortRange value to set * @return the SecurityRuleInner object itself. @@ -226,7 +226,7 @@ public SecurityRuleInner withDestinationPortRange(String destinationPortRange) { } /** - * Get the CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. + * Get the CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. * * @return the sourceAddressPrefix value */ @@ -235,7 +235,7 @@ public String sourceAddressPrefix() { } /** - * Set the CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. + * Set the CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. * * @param sourceAddressPrefix the sourceAddressPrefix value to set * @return the SecurityRuleInner object itself. @@ -286,7 +286,7 @@ public SecurityRuleInner withSourceApplicationSecurityGroups(List> generateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_07_01.VirtualNetworkGateways beginGenerateVpnProfile" }) - @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/generatevpnprofile") - Observable> beginGenerateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_07_01.VirtualNetworkGateways getVpnProfilePackageUrl" }) @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getvpnprofilepackageurl") Observable> getVpnProfilePackageUrl(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -1523,7 +1523,7 @@ public Observable> generatevpnclientpackageWithServiceRe Validator.validate(parameters); final String apiVersion = "2018-07-01"; Observable> observable = service.generatevpnclientpackage(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); + return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken() { }.getType()); } /** @@ -1614,6 +1614,7 @@ public Observable> call(Response response) private ServiceResponse beginGeneratevpnclientpackageDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) + .register(202, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -1630,7 +1631,7 @@ private ServiceResponse beginGeneratevpnclientpackageDelegate(Response generateVpnProfileAsync(String resourceGroupName, S * @param virtualNetworkGatewayName The name of the virtual network gateway. * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable for the request + * @return the observable to the String object */ public Observable generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { return generateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1, String>() { @@ -1665,81 +1666,6 @@ public String call(ServiceResponse response) { }); } - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable for the request - */ - public Observable> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (virtualNetworkGatewayName == null) { - throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - if (parameters == null) { - throw new IllegalArgumentException("Parameter parameters is required and cannot be null."); - } - Validator.validate(parameters); - final String apiVersion = "2018-07-01"; - Observable> observable = service.generateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws CloudException thrown if the request is rejected by server - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent - * @return the String object if successful. - */ - public String beginGenerateVpnProfile(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toBlocking().single().body(); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the {@link ServiceFuture} object - */ - public ServiceFuture beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters), serviceCallback); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable to the String object - */ - public Observable beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1, String>() { - @Override - public String call(ServiceResponse response) { - return response.body(); - } - }); - } - /** * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. * @@ -1749,7 +1675,7 @@ public String call(ServiceResponse response) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the String object */ - public Observable> beginGenerateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { + public Observable> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1764,12 +1690,12 @@ public Observable> beginGenerateVpnProfileWithServiceRes } Validator.validate(parameters); final String apiVersion = "2018-07-01"; - return service.beginGenerateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.generateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginGenerateVpnProfileDelegate(response); + ServiceResponse clientResponse = generateVpnProfileDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1778,7 +1704,7 @@ public Observable> call(Response response) }); } - private ServiceResponse beginGenerateVpnProfileDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse generateVpnProfileDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) .register(202, new TypeToken() { }.getType()) diff --git a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/implementation/VpnSitesInner.java b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/implementation/VpnSitesInner.java index 64135dfa5a8c..0eea2e7d595d 100644 --- a/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/implementation/VpnSitesInner.java +++ b/network/resource-manager/v2018_07_01/src/main/java/com/microsoft/azure/management/network/v2018_07_01/implementation/VpnSitesInner.java @@ -114,7 +114,7 @@ interface VpnSitesService { } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. @@ -128,7 +128,7 @@ public VpnSiteInner getByResourceGroup(String resourceGroupName, String vpnSiteN } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. @@ -141,7 +141,7 @@ public ServiceFuture getByResourceGroupAsync(String resourceGroupN } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. @@ -158,7 +158,7 @@ public VpnSiteInner call(ServiceResponse response) { } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. diff --git a/network/resource-manager/v2018_08_01/pom.xml b/network/resource-manager/v2018_08_01/pom.xml index 8de72a675e9b..7fc8815f36f9 100644 --- a/network/resource-manager/v2018_08_01/pom.xml +++ b/network/resource-manager/v2018_08_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.1.0 - ../../../pom.management.xml + 0.0.3-beta + ../../../pom.xml azure-mgmt-network 1.0.0-beta diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ApplicationGatewayWebApplicationFirewallConfiguration.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ApplicationGatewayWebApplicationFirewallConfiguration.java index af4c955eb088..2bde34b10211 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ApplicationGatewayWebApplicationFirewallConfiguration.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ApplicationGatewayWebApplicationFirewallConfiguration.java @@ -54,19 +54,19 @@ public class ApplicationGatewayWebApplicationFirewallConfiguration { private Boolean requestBodyCheck; /** - * Maxium request body size for WAF. + * Maximum request body size for WAF. */ @JsonProperty(value = "maxRequestBodySize") private Integer maxRequestBodySize; /** - * Maxium request body size in Kb for WAF. + * Maximum request body size in Kb for WAF. */ @JsonProperty(value = "maxRequestBodySizeInKb") private Integer maxRequestBodySizeInKb; /** - * Maxium file upload size in Mb for WAF. + * Maximum file upload size in Mb for WAF. */ @JsonProperty(value = "fileUploadLimitInMb") private Integer fileUploadLimitInMb; @@ -198,7 +198,7 @@ public ApplicationGatewayWebApplicationFirewallConfiguration withRequestBodyChec } /** - * Get maxium request body size for WAF. + * Get maximum request body size for WAF. * * @return the maxRequestBodySize value */ @@ -207,7 +207,7 @@ public Integer maxRequestBodySize() { } /** - * Set maxium request body size for WAF. + * Set maximum request body size for WAF. * * @param maxRequestBodySize the maxRequestBodySize value to set * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself. @@ -218,7 +218,7 @@ public ApplicationGatewayWebApplicationFirewallConfiguration withMaxRequestBodyS } /** - * Get maxium request body size in Kb for WAF. + * Get maximum request body size in Kb for WAF. * * @return the maxRequestBodySizeInKb value */ @@ -227,7 +227,7 @@ public Integer maxRequestBodySizeInKb() { } /** - * Set maxium request body size in Kb for WAF. + * Set maximum request body size in Kb for WAF. * * @param maxRequestBodySizeInKb the maxRequestBodySizeInKb value to set * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself. @@ -238,7 +238,7 @@ public ApplicationGatewayWebApplicationFirewallConfiguration withMaxRequestBodyS } /** - * Get maxium file upload size in Mb for WAF. + * Get maximum file upload size in Mb for WAF. * * @return the fileUploadLimitInMb value */ @@ -247,7 +247,7 @@ public Integer fileUploadLimitInMb() { } /** - * Set maxium file upload size in Mb for WAF. + * Set maximum file upload size in Mb for WAF. * * @param fileUploadLimitInMb the fileUploadLimitInMb value to set * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself. diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ContainerNetworkInterface.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ContainerNetworkInterface.java index 24327d327cad..e0e018f97e1e 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ContainerNetworkInterface.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ContainerNetworkInterface.java @@ -26,7 +26,7 @@ public class ContainerNetworkInterface extends SubResource { private ContainerNetworkInterfaceConfiguration containerNetworkInterfaceConfiguration; /** - * Reference to the conatinaer to which this container network interface is + * Reference to the container to which this container network interface is * attached. */ @JsonProperty(value = "properties.container") @@ -83,7 +83,7 @@ public ContainerNetworkInterface withContainerNetworkInterfaceConfiguration(Cont } /** - * Get reference to the conatinaer to which this container network interface is attached. + * Get reference to the container to which this container network interface is attached. * * @return the container value */ @@ -92,7 +92,7 @@ public Container container() { } /** - * Set reference to the conatinaer to which this container network interface is attached. + * Set reference to the container to which this container network interface is attached. * * @param container the container value to set * @return the ContainerNetworkInterface object itself. diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ContainerNetworkInterfaceConfiguration.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ContainerNetworkInterfaceConfiguration.java index 1e98f74e9299..9d59dd778b2f 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ContainerNetworkInterfaceConfiguration.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ContainerNetworkInterfaceConfiguration.java @@ -14,7 +14,7 @@ import com.microsoft.azure.SubResource; /** - * Container network interface configruation child resource. + * Container network interface configuration child resource. */ @JsonFlatten public class ContainerNetworkInterfaceConfiguration extends SubResource { diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/EffectiveNetworkSecurityRule.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/EffectiveNetworkSecurityRule.java index 272800bfaa5c..be1dbb27480e 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/EffectiveNetworkSecurityRule.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/EffectiveNetworkSecurityRule.java @@ -43,16 +43,16 @@ public class EffectiveNetworkSecurityRule { /** * The source port ranges. Expected values include a single integer between - * 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an - * asterix (*). + * 0 and 65535, a range using '-' as separator (e.g. 100-400), or an + * asterisk (*). */ @JsonProperty(value = "sourcePortRanges") private List sourcePortRanges; /** * The destination port ranges. Expected values include a single integer - * between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or - * an asterix (*). + * between 0 and 65535, a range using '-' as separator (e.g. 100-400), or + * an asterisk (*). */ @JsonProperty(value = "destinationPortRanges") private List destinationPortRanges; @@ -71,16 +71,16 @@ public class EffectiveNetworkSecurityRule { /** * The source address prefixes. Expected values include CIDR IP ranges, - * Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, - * and the asterix (*). + * Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, + * and the asterisk (*). */ @JsonProperty(value = "sourceAddressPrefixes") private List sourceAddressPrefixes; /** * The destination address prefixes. Expected values include CIDR IP - * ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), - * System Tags, and the asterix (*). + * ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), + * System Tags, and the asterisk (*). */ @JsonProperty(value = "destinationAddressPrefixes") private List destinationAddressPrefixes; @@ -198,7 +198,7 @@ public EffectiveNetworkSecurityRule withDestinationPortRange(String destinationP } /** - * Get the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Get the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @return the sourcePortRanges value */ @@ -207,7 +207,7 @@ public List sourcePortRanges() { } /** - * Set the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Set the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @param sourcePortRanges the sourcePortRanges value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -218,7 +218,7 @@ public EffectiveNetworkSecurityRule withSourcePortRanges(List sourcePort } /** - * Get the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Get the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @return the destinationPortRanges value */ @@ -227,7 +227,7 @@ public List destinationPortRanges() { } /** - * Set the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as seperator (e.g. 100-400), or an asterix (*). + * Set the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*). * * @param destinationPortRanges the destinationPortRanges value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -278,7 +278,7 @@ public EffectiveNetworkSecurityRule withDestinationAddressPrefix(String destinat } /** - * Get the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Get the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @return the sourceAddressPrefixes value */ @@ -287,7 +287,7 @@ public List sourceAddressPrefixes() { } /** - * Set the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Set the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @param sourceAddressPrefixes the sourceAddressPrefixes value to set * @return the EffectiveNetworkSecurityRule object itself. @@ -298,7 +298,7 @@ public EffectiveNetworkSecurityRule withSourceAddressPrefixes(List sourc } /** - * Get the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Get the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @return the destinationAddressPrefixes value */ @@ -307,7 +307,7 @@ public List destinationAddressPrefixes() { } /** - * Set the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AureLoadBalancer, Internet), System Tags, and the asterix (*). + * Set the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*). * * @param destinationAddressPrefixes the destinationAddressPrefixes value to set * @return the EffectiveNetworkSecurityRule object itself. diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ExpressRouteCircuitPeeringConfig.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ExpressRouteCircuitPeeringConfig.java index 9d9cfbeffc83..c93f38b0d08b 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ExpressRouteCircuitPeeringConfig.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/ExpressRouteCircuitPeeringConfig.java @@ -22,7 +22,7 @@ public class ExpressRouteCircuitPeeringConfig { private List advertisedPublicPrefixes; /** - * The communities of bgp peering. Spepcified for microsoft peering. + * The communities of bgp peering. Specified for microsoft peering. */ @JsonProperty(value = "advertisedCommunities") private List advertisedCommunities; @@ -75,7 +75,7 @@ public ExpressRouteCircuitPeeringConfig withAdvertisedPublicPrefixes(List advertisedCommunities() { } /** - * Set the communities of bgp peering. Spepcified for microsoft peering. + * Set the communities of bgp peering. Specified for microsoft peering. * * @param advertisedCommunities the advertisedCommunities value to set * @return the ExpressRouteCircuitPeeringConfig object itself. diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/IPConfigurationProfile.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/IPConfigurationProfile.java index ae6727a1b2c2..298193df21bc 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/IPConfigurationProfile.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/IPConfigurationProfile.java @@ -19,8 +19,8 @@ @JsonFlatten public class IPConfigurationProfile extends SubResource { /** - * The reference of the subnet resource to create a contatainer network - * interface ip configruation. + * The reference of the subnet resource to create a container network + * interface ip configuration. */ @JsonProperty(value = "properties.subnet") private SubnetInner subnet; @@ -50,7 +50,7 @@ public class IPConfigurationProfile extends SubResource { private String etag; /** - * Get the reference of the subnet resource to create a contatainer network interface ip configruation. + * Get the reference of the subnet resource to create a container network interface ip configuration. * * @return the subnet value */ @@ -59,7 +59,7 @@ public SubnetInner subnet() { } /** - * Set the reference of the subnet resource to create a contatainer network interface ip configruation. + * Set the reference of the subnet resource to create a container network interface ip configuration. * * @param subnet the subnet value to set * @return the IPConfigurationProfile object itself. diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/NetworkConfigurationDiagnosticProfile.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/NetworkConfigurationDiagnosticProfile.java index 24e1d6834390..b9e73138b6fe 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/NetworkConfigurationDiagnosticProfile.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/NetworkConfigurationDiagnosticProfile.java @@ -41,7 +41,7 @@ public class NetworkConfigurationDiagnosticProfile { private String destination; /** - * Traffice destination port. Accepted values are '*', port (for example, + * Traffic destination port. Accepted values are '*', port (for example, * 3389) and port range (for example, 80-100). */ @JsonProperty(value = "destinationPort", required = true) @@ -128,7 +128,7 @@ public NetworkConfigurationDiagnosticProfile withDestination(String destination) } /** - * Get traffice destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100). + * Get traffic destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100). * * @return the destinationPort value */ @@ -137,7 +137,7 @@ public String destinationPort() { } /** - * Set traffice destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100). + * Set traffic destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100). * * @param destinationPort the destinationPort value to set * @return the NetworkConfigurationDiagnosticProfile object itself. diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/NetworkInterface.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/NetworkInterface.java index c78fce7aebf2..257016fc16e0 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/NetworkInterface.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/NetworkInterface.java @@ -253,30 +253,18 @@ interface WithTapConfigurations { WithCreate withTapConfigurations(List tapConfigurations); } - /** - * The stage of the networkinterface definition allowing to specify VirtualMachine. - */ - interface WithVirtualMachine { - /** - * Specifies virtualMachine. - * @param virtualMachine The reference of a virtual machine - * @return the next definition stage - */ - WithCreate withVirtualMachine(SubResource virtualMachine); - } - /** * 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, Resource.DefinitionWithTags, DefinitionStages.WithDnsSettings, DefinitionStages.WithEnableAcceleratedNetworking, DefinitionStages.WithEnableIPForwarding, DefinitionStages.WithEtag, DefinitionStages.WithIpConfigurations, DefinitionStages.WithMacAddress, DefinitionStages.WithNetworkSecurityGroup, DefinitionStages.WithPrimary, DefinitionStages.WithProvisioningState, DefinitionStages.WithResourceGuid, DefinitionStages.WithTapConfigurations, DefinitionStages.WithVirtualMachine { + interface WithCreate extends Creatable, Resource.DefinitionWithTags, DefinitionStages.WithDnsSettings, DefinitionStages.WithEnableAcceleratedNetworking, DefinitionStages.WithEnableIPForwarding, DefinitionStages.WithEtag, DefinitionStages.WithIpConfigurations, DefinitionStages.WithMacAddress, DefinitionStages.WithNetworkSecurityGroup, DefinitionStages.WithPrimary, DefinitionStages.WithProvisioningState, DefinitionStages.WithResourceGuid, DefinitionStages.WithTapConfigurations { } } /** * The template for a NetworkInterface update operation, containing all the settings that can be modified. */ - interface Update extends Appliable, Resource.UpdateWithTags, UpdateStages.WithDnsSettings, UpdateStages.WithEnableAcceleratedNetworking, UpdateStages.WithEnableIPForwarding, UpdateStages.WithEtag, UpdateStages.WithIpConfigurations, UpdateStages.WithMacAddress, UpdateStages.WithNetworkSecurityGroup, UpdateStages.WithPrimary, UpdateStages.WithProvisioningState, UpdateStages.WithResourceGuid, UpdateStages.WithTapConfigurations, UpdateStages.WithVirtualMachine { + interface Update extends Appliable, Resource.UpdateWithTags, UpdateStages.WithDnsSettings, UpdateStages.WithEnableAcceleratedNetworking, UpdateStages.WithEnableIPForwarding, UpdateStages.WithEtag, UpdateStages.WithIpConfigurations, UpdateStages.WithMacAddress, UpdateStages.WithNetworkSecurityGroup, UpdateStages.WithPrimary, UpdateStages.WithProvisioningState, UpdateStages.WithResourceGuid, UpdateStages.WithTapConfigurations { } /** @@ -415,17 +403,5 @@ interface WithTapConfigurations { Update withTapConfigurations(List tapConfigurations); } - /** - * The stage of the networkinterface update allowing to specify VirtualMachine. - */ - interface WithVirtualMachine { - /** - * Specifies virtualMachine. - * @param virtualMachine The reference of a virtual machine - * @return the next update stage - */ - Update withVirtualMachine(SubResource virtualMachine); - } - } } diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/NetworkSecurityGroupSecurityRule.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/NetworkSecurityGroupSecurityRule.java index 21f35fb1b174..6f65b88f5631 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/NetworkSecurityGroupSecurityRule.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/NetworkSecurityGroupSecurityRule.java @@ -166,7 +166,7 @@ interface WithAccess { interface WithDirection { /** * Specifies direction. - * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outcoming traffic. Possible values are: 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound' + * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outgoing traffic. Possible values are: 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound' * @return the next definition stage */ WithProtocol withDirection(SecurityRuleDirection direction); @@ -202,7 +202,7 @@ interface WithDescription { interface WithDestinationAddressPrefix { /** * Specifies destinationAddressPrefix. - * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used + * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used * @return the next definition stage */ WithCreate withDestinationAddressPrefix(String destinationAddressPrefix); @@ -238,7 +238,7 @@ interface WithDestinationApplicationSecurityGroups { interface WithDestinationPortRange { /** * Specifies destinationPortRange. - * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next definition stage */ WithCreate withDestinationPortRange(String destinationPortRange); @@ -322,7 +322,7 @@ interface WithProvisioningState { interface WithSourceAddressPrefix { /** * Specifies sourceAddressPrefix. - * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from + * @param sourceAddressPrefix The CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from * @return the next definition stage */ WithCreate withSourceAddressPrefix(String sourceAddressPrefix); @@ -358,7 +358,7 @@ interface WithSourceApplicationSecurityGroups { interface WithSourcePortRange { /** * Specifies sourcePortRange. - * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next definition stage */ WithCreate withSourcePortRange(String sourcePortRange); @@ -412,7 +412,7 @@ interface WithDescription { interface WithDestinationAddressPrefix { /** * Specifies destinationAddressPrefix. - * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used + * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used * @return the next update stage */ Update withDestinationAddressPrefix(String destinationAddressPrefix); @@ -448,7 +448,7 @@ interface WithDestinationApplicationSecurityGroups { interface WithDestinationPortRange { /** * Specifies destinationPortRange. - * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next update stage */ Update withDestinationPortRange(String destinationPortRange); @@ -532,7 +532,7 @@ interface WithProvisioningState { interface WithSourceAddressPrefix { /** * Specifies sourceAddressPrefix. - * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from + * @param sourceAddressPrefix The CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from * @return the next update stage */ Update withSourceAddressPrefix(String sourceAddressPrefix); @@ -568,7 +568,7 @@ interface WithSourceApplicationSecurityGroups { interface WithSourcePortRange { /** * Specifies sourcePortRange. - * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports + * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports * @return the next update stage */ Update withSourcePortRange(String sourcePortRange); diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/P2SVpnServerConfiguration.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/P2SVpnServerConfiguration.java index 6345ca2e0808..a4fc27307778 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/P2SVpnServerConfiguration.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/P2SVpnServerConfiguration.java @@ -194,7 +194,7 @@ interface WithP2SVpnServerConfigurationPropertiesEtag { interface WithP2SVpnServerConfigurationPropertiesName { /** * Specifies p2SVpnServerConfigurationPropertiesName. - * @param p2SVpnServerConfigurationPropertiesName The name of the P2SVpnServerConfiguration that is unique within a VirtualWan in a resource group. This name can be used to access the resource along with Paren VirtualWan resource name + * @param p2SVpnServerConfigurationPropertiesName The name of the P2SVpnServerConfiguration that is unique within a VirtualWan in a resource group. This name can be used to access the resource along with Parent VirtualWan resource name * @return the next definition stage */ WithCreate withP2SVpnServerConfigurationPropertiesName(String p2SVpnServerConfigurationPropertiesName); @@ -242,7 +242,7 @@ interface WithRadiusServerAddress { interface WithRadiusServerSecret { /** * Specifies radiusServerSecret. - * @param radiusServerSecret The radius secret property of the P2SVpnServerConfiguration resource for for point to site client connection + * @param radiusServerSecret The radius secret property of the P2SVpnServerConfiguration resource for point to site client connection * @return the next definition stage */ WithCreate withRadiusServerSecret(String radiusServerSecret); @@ -356,7 +356,7 @@ interface WithP2SVpnServerConfigurationPropertiesEtag { interface WithP2SVpnServerConfigurationPropertiesName { /** * Specifies p2SVpnServerConfigurationPropertiesName. - * @param p2SVpnServerConfigurationPropertiesName The name of the P2SVpnServerConfiguration that is unique within a VirtualWan in a resource group. This name can be used to access the resource along with Paren VirtualWan resource name + * @param p2SVpnServerConfigurationPropertiesName The name of the P2SVpnServerConfiguration that is unique within a VirtualWan in a resource group. This name can be used to access the resource along with Parent VirtualWan resource name * @return the next update stage */ Update withP2SVpnServerConfigurationPropertiesName(String p2SVpnServerConfigurationPropertiesName); @@ -404,7 +404,7 @@ interface WithRadiusServerAddress { interface WithRadiusServerSecret { /** * Specifies radiusServerSecret. - * @param radiusServerSecret The radius secret property of the P2SVpnServerConfiguration resource for for point to site client connection + * @param radiusServerSecret The radius secret property of the P2SVpnServerConfiguration resource for point to site client connection * @return the next update stage */ Update withRadiusServerSecret(String radiusServerSecret); diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/VirtualNetworkGatewayConnection.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/VirtualNetworkGatewayConnection.java index 7c38dc5da738..847286e0979b 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/VirtualNetworkGatewayConnection.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/VirtualNetworkGatewayConnection.java @@ -156,7 +156,7 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup getDelegate(Response * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent @@ -378,7 +378,7 @@ public ExpressRouteCircuitConnectionInner createOrUpdate(String resourceGroupNam * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object @@ -394,7 +394,7 @@ public ServiceFuture createOrUpdateAsync(Str * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable for the request */ @@ -414,7 +414,7 @@ public ExpressRouteCircuitConnectionInner call(ServiceResponse> createOrU * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent @@ -467,7 +467,7 @@ public ExpressRouteCircuitConnectionInner beginCreateOrUpdate(String resourceGro * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object @@ -483,7 +483,7 @@ public ServiceFuture beginCreateOrUpdateAsyn * @param circuitName The name of the express route circuit. * @param peeringName The name of the peering. * @param connectionName The name of the express route circuit connection. - * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit circuit connection operation. + * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the ExpressRouteCircuitConnectionInner object */ @@ -503,7 +503,7 @@ public ExpressRouteCircuitConnectionInner call(ServiceResponse nextPage(String nextPageLink) { } /** - * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retriving a specific peering location. + * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location. * * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation @@ -109,7 +109,7 @@ public Observable>> call(St } /** - * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retriving a specific peering location. + * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location. * * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PagedList<ExpressRoutePortsLocationInner> object @@ -125,7 +125,7 @@ public Page call(ServiceResponse>> call(Se } /** - * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retriving a specific peering location. + * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location. * * @throws IllegalArgumentException thrown if parameters fail the validation * @return the PagedList<ExpressRoutePortsLocationInner> object wrapped in {@link ServiceResponse} if successful. @@ -254,7 +254,7 @@ private ServiceResponse getDelegate(Response nextPage(String nextPageLink) { } /** - * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retriving a specific peering location. + * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceFuture the ServiceFuture object tracking the Retrofit calls @@ -294,7 +294,7 @@ public Observable>> call(St } /** - * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retriving a specific peering location. + * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @throws IllegalArgumentException thrown if parameters fail the validation @@ -311,7 +311,7 @@ public Page call(ServiceResponse>> call(Se } /** - * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retriving a specific peering location. + * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @throws IllegalArgumentException thrown if parameters fail the validation diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/NetworkInterfaceImpl.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/NetworkInterfaceImpl.java index 6d11e3c6ae8a..47768b4dd99f 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/NetworkInterfaceImpl.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/NetworkInterfaceImpl.java @@ -209,10 +209,4 @@ public NetworkInterfaceImpl withTapConfigurations(List> deleteWithServiceResponseAsync(String r * Gets the specified network profile in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param networkProfileName The name of the PublicIPPrefx. + * @param networkProfileName The name of the Public IP Prefix. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent @@ -185,7 +185,7 @@ public NetworkProfileInner getByResourceGroup(String resourceGroupName, String n * Gets the specified network profile in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param networkProfileName The name of the PublicIPPrefx. + * @param networkProfileName The name of the Public IP Prefix. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object @@ -198,7 +198,7 @@ public ServiceFuture getByResourceGroupAsync(String resourc * Gets the specified network profile in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param networkProfileName The name of the PublicIPPrefx. + * @param networkProfileName The name of the Public IP Prefix. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the NetworkProfileInner object */ @@ -215,7 +215,7 @@ public NetworkProfileInner call(ServiceResponse response) { * Gets the specified network profile in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param networkProfileName The name of the PublicIPPrefx. + * @param networkProfileName The name of the Public IP Prefix. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the NetworkProfileInner object */ @@ -249,7 +249,7 @@ public Observable> call(Response getByResourceGroupAsync(String resourc * Gets the specified network profile in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param networkProfileName The name of the PublicIPPrefx. + * @param networkProfileName The name of the Public IP Prefix. * @param expand Expands referenced resources. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the NetworkProfileInner object @@ -296,7 +296,7 @@ public NetworkProfileInner call(ServiceResponse response) { * Gets the specified network profile in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param networkProfileName The name of the PublicIPPrefx. + * @param networkProfileName The name of the Public IP Prefix. * @param expand Expands referenced resources. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the NetworkProfileInner object diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/P2SVpnGatewayInner.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/P2SVpnGatewayInner.java index 2e338f4d0203..1b5870d3b31e 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/P2SVpnGatewayInner.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/P2SVpnGatewayInner.java @@ -56,7 +56,7 @@ public class P2SVpnGatewayInner extends Resource { private AddressSpace vpnClientAddressPool; /** - * All P2S vpnclients' connection health status. + * All P2S VPN clients' connection health status. */ @JsonProperty(value = "properties.vpnClientConnectionHealth", access = JsonProperty.Access.WRITE_ONLY) private VpnClientConnectionHealth vpnClientConnectionHealth; @@ -175,7 +175,7 @@ public P2SVpnGatewayInner withVpnClientAddressPool(AddressSpace vpnClientAddress } /** - * Get all P2S vpnclients' connection health status. + * Get all P2S VPN clients' connection health status. * * @return the vpnClientConnectionHealth value */ diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/P2SVpnServerConfigurationInner.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/P2SVpnServerConfigurationInner.java index ec0636df6bd0..04bfa1f17435 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/P2SVpnServerConfigurationInner.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/P2SVpnServerConfigurationInner.java @@ -27,7 +27,7 @@ public class P2SVpnServerConfigurationInner extends SubResource { /** * The name of the P2SVpnServerConfiguration that is unique within a * VirtualWan in a resource group. This name can be used to access the - * resource along with Paren VirtualWan resource name. + * resource along with Parent VirtualWan resource name. */ @JsonProperty(value = "properties.name") private String p2SVpnServerConfigurationPropertiesName; @@ -77,7 +77,7 @@ public class P2SVpnServerConfigurationInner extends SubResource { /** * The radius secret property of the P2SVpnServerConfiguration resource for - * for point to site client connection. + * point to site client connection. */ @JsonProperty(value = "properties.radiusServerSecret") private String radiusServerSecret; @@ -116,7 +116,7 @@ public class P2SVpnServerConfigurationInner extends SubResource { private String etag; /** - * Get the name of the P2SVpnServerConfiguration that is unique within a VirtualWan in a resource group. This name can be used to access the resource along with Paren VirtualWan resource name. + * Get the name of the P2SVpnServerConfiguration that is unique within a VirtualWan in a resource group. This name can be used to access the resource along with Parent VirtualWan resource name. * * @return the p2SVpnServerConfigurationPropertiesName value */ @@ -125,7 +125,7 @@ public String p2SVpnServerConfigurationPropertiesName() { } /** - * Set the name of the P2SVpnServerConfiguration that is unique within a VirtualWan in a resource group. This name can be used to access the resource along with Paren VirtualWan resource name. + * Set the name of the P2SVpnServerConfiguration that is unique within a VirtualWan in a resource group. This name can be used to access the resource along with Parent VirtualWan resource name. * * @param p2SVpnServerConfigurationPropertiesName the p2SVpnServerConfigurationPropertiesName value to set * @return the P2SVpnServerConfigurationInner object itself. @@ -276,7 +276,7 @@ public P2SVpnServerConfigurationInner withRadiusServerAddress(String radiusServe } /** - * Get the radius secret property of the P2SVpnServerConfiguration resource for for point to site client connection. + * Get the radius secret property of the P2SVpnServerConfiguration resource for point to site client connection. * * @return the radiusServerSecret value */ @@ -285,7 +285,7 @@ public String radiusServerSecret() { } /** - * Set the radius secret property of the P2SVpnServerConfiguration resource for for point to site client connection. + * Set the radius secret property of the P2SVpnServerConfiguration resource for point to site client connection. * * @param radiusServerSecret the radiusServerSecret value to set * @return the P2SVpnServerConfigurationInner object itself. diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/PublicIPPrefixesInner.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/PublicIPPrefixesInner.java index 810da0bb8374..f402cb27fc9a 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/PublicIPPrefixesInner.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/PublicIPPrefixesInner.java @@ -268,7 +268,7 @@ private ServiceResponse beginDeleteDelegate(Response respons * Gets the specified public IP prefix in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param publicIpPrefixName The name of the PublicIPPrefx. + * @param publicIpPrefixName The name of the Public IP Prefix. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent @@ -282,7 +282,7 @@ public PublicIPPrefixInner getByResourceGroup(String resourceGroupName, String p * Gets the specified public IP prefix in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param publicIpPrefixName The name of the PublicIPPrefx. + * @param publicIpPrefixName The name of the Public IP Prefix. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object @@ -295,7 +295,7 @@ public ServiceFuture getByResourceGroupAsync(String resourc * Gets the specified public IP prefix in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param publicIpPrefixName The name of the PublicIPPrefx. + * @param publicIpPrefixName The name of the Public IP Prefix. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PublicIPPrefixInner object */ @@ -312,7 +312,7 @@ public PublicIPPrefixInner call(ServiceResponse response) { * Gets the specified public IP prefix in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param publicIpPrefixName The name of the PublicIPPrefx. + * @param publicIpPrefixName The name of the Public IP Prefix. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PublicIPPrefixInner object */ @@ -346,7 +346,7 @@ public Observable> call(Response getByResourceGroupAsync(String resourc * Gets the specified public IP prefix in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param publicIpPrefixName The name of the PublicIPPrefx. + * @param publicIpPrefixName The name of the Public IP Prefix. * @param expand Expands referenced resources. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PublicIPPrefixInner object @@ -393,7 +393,7 @@ public PublicIPPrefixInner call(ServiceResponse response) { * Gets the specified public IP prefix in a specified resource group. * * @param resourceGroupName The name of the resource group. - * @param publicIpPrefixName The name of the PublicIPPrefx. + * @param publicIpPrefixName The name of the Public IP Prefix. * @param expand Expands referenced resources. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PublicIPPrefixInner object diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/SecurityRuleInner.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/SecurityRuleInner.java index 3076ca031b38..0bc95c2afcd5 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/SecurityRuleInner.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/SecurityRuleInner.java @@ -35,7 +35,7 @@ public class SecurityRuleInner extends SubResource { private SecurityRuleProtocol protocol; /** - * The source port or range. Integer or range between 0 and 65535. Asterix + * The source port or range. Integer or range between 0 and 65535. Asterisk * '*' can also be used to match all ports. */ @JsonProperty(value = "properties.sourcePortRange") @@ -43,13 +43,13 @@ public class SecurityRuleInner extends SubResource { /** * The destination port or range. Integer or range between 0 and 65535. - * Asterix '*' can also be used to match all ports. + * Asterisk '*' can also be used to match all ports. */ @JsonProperty(value = "properties.destinationPortRange") private String destinationPortRange; /** - * The CIDR or source IP range. Asterix '*' can also be used to match all + * The CIDR or source IP range. Asterisk '*' can also be used to match all * source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' * and 'Internet' can also be used. If this is an ingress rule, specifies * where network traffic originates from. @@ -70,7 +70,7 @@ public class SecurityRuleInner extends SubResource { private List sourceApplicationSecurityGroups; /** - * The destination address prefix. CIDR or destination IP range. Asterix + * The destination address prefix. CIDR or destination IP range. Asterisk * '*' can also be used to match all source IPs. Default tags such as * 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. */ @@ -118,7 +118,7 @@ public class SecurityRuleInner extends SubResource { /** * The direction of the rule. The direction specifies if rule will be - * evaluated on incoming or outcoming traffic. Possible values are: + * evaluated on incoming or outgoing traffic. Possible values are: * 'Inbound' and 'Outbound'. Possible values include: 'Inbound', * 'Outbound'. */ @@ -186,7 +186,7 @@ public SecurityRuleInner withProtocol(SecurityRuleProtocol protocol) { } /** - * Get the source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Get the source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @return the sourcePortRange value */ @@ -195,7 +195,7 @@ public String sourcePortRange() { } /** - * Set the source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Set the source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @param sourcePortRange the sourcePortRange value to set * @return the SecurityRuleInner object itself. @@ -206,7 +206,7 @@ public SecurityRuleInner withSourcePortRange(String sourcePortRange) { } /** - * Get the destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Get the destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @return the destinationPortRange value */ @@ -215,7 +215,7 @@ public String destinationPortRange() { } /** - * Set the destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports. + * Set the destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports. * * @param destinationPortRange the destinationPortRange value to set * @return the SecurityRuleInner object itself. @@ -226,7 +226,7 @@ public SecurityRuleInner withDestinationPortRange(String destinationPortRange) { } /** - * Get the CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. + * Get the CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. * * @return the sourceAddressPrefix value */ @@ -235,7 +235,7 @@ public String sourceAddressPrefix() { } /** - * Set the CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. + * Set the CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. * * @param sourceAddressPrefix the sourceAddressPrefix value to set * @return the SecurityRuleInner object itself. @@ -286,7 +286,7 @@ public SecurityRuleInner withSourceApplicationSecurityGroups(List> generateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_08_01.VirtualNetworkGateways beginGenerateVpnProfile" }) - @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/generatevpnprofile") - Observable> beginGenerateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_08_01.VirtualNetworkGateways getVpnProfilePackageUrl" }) @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getvpnprofilepackageurl") Observable> getVpnProfilePackageUrl(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -1681,7 +1681,7 @@ public Observable> generatevpnclientpackageWithServiceRe Validator.validate(parameters); final String apiVersion = "2018-08-01"; Observable> observable = service.generatevpnclientpackage(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); + return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken() { }.getType()); } /** @@ -1772,6 +1772,7 @@ public Observable> call(Response response) private ServiceResponse beginGeneratevpnclientpackageDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) + .register(202, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -1788,7 +1789,7 @@ private ServiceResponse beginGeneratevpnclientpackageDelegate(Response generateVpnProfileAsync(String resourceGroupName, S * @param virtualNetworkGatewayName The name of the virtual network gateway. * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable for the request + * @return the observable to the String object */ public Observable generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { return generateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1, String>() { @@ -1823,81 +1824,6 @@ public String call(ServiceResponse response) { }); } - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable for the request - */ - public Observable> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (virtualNetworkGatewayName == null) { - throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - if (parameters == null) { - throw new IllegalArgumentException("Parameter parameters is required and cannot be null."); - } - Validator.validate(parameters); - final String apiVersion = "2018-08-01"; - Observable> observable = service.generateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws CloudException thrown if the request is rejected by server - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent - * @return the String object if successful. - */ - public String beginGenerateVpnProfile(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toBlocking().single().body(); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the {@link ServiceFuture} object - */ - public ServiceFuture beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters), serviceCallback); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable to the String object - */ - public Observable beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1, String>() { - @Override - public String call(ServiceResponse response) { - return response.body(); - } - }); - } - /** * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. * @@ -1907,7 +1833,7 @@ public String call(ServiceResponse response) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the String object */ - public Observable> beginGenerateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { + public Observable> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1922,12 +1848,12 @@ public Observable> beginGenerateVpnProfileWithServiceRes } Validator.validate(parameters); final String apiVersion = "2018-08-01"; - return service.beginGenerateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.generateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginGenerateVpnProfileDelegate(response); + ServiceResponse clientResponse = generateVpnProfileDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1936,7 +1862,7 @@ public Observable> call(Response response) }); } - private ServiceResponse beginGenerateVpnProfileDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse generateVpnProfileDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) .register(202, new TypeToken() { }.getType()) diff --git a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/VpnSitesInner.java b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/VpnSitesInner.java index ee299b055c80..d62031c8e0eb 100644 --- a/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/VpnSitesInner.java +++ b/network/resource-manager/v2018_08_01/src/main/java/com/microsoft/azure/management/network/v2018_08_01/implementation/VpnSitesInner.java @@ -114,7 +114,7 @@ interface VpnSitesService { } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. @@ -128,7 +128,7 @@ public VpnSiteInner getByResourceGroup(String resourceGroupName, String vpnSiteN } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. @@ -141,7 +141,7 @@ public ServiceFuture getByResourceGroupAsync(String resourceGroupN } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. @@ -158,7 +158,7 @@ public VpnSiteInner call(ServiceResponse response) { } /** - * Retrieves the details of a VPNsite. + * Retrieves the details of a VPN site. * * @param resourceGroupName The resource group name of the VpnSite. * @param vpnSiteName The name of the VpnSite being retrieved. diff --git a/network/resource-manager/v2018_12_01/pom.xml b/network/resource-manager/v2018_12_01/pom.xml index ecbf4b930ea5..2f2e76a8d637 100644 --- a/network/resource-manager/v2018_12_01/pom.xml +++ b/network/resource-manager/v2018_12_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.1.0 - ../../../pom.management.xml + 0.0.3-beta + ../../../pom.xml azure-mgmt-network 1.0.0-beta diff --git a/network/resource-manager/v2018_12_01/src/main/java/com/microsoft/azure/management/network/v2018_12_01/implementation/DdosProtectionPlansInner.java b/network/resource-manager/v2018_12_01/src/main/java/com/microsoft/azure/management/network/v2018_12_01/implementation/DdosProtectionPlansInner.java index fa8cbabdda06..9cc17d154a2b 100644 --- a/network/resource-manager/v2018_12_01/src/main/java/com/microsoft/azure/management/network/v2018_12_01/implementation/DdosProtectionPlansInner.java +++ b/network/resource-manager/v2018_12_01/src/main/java/com/microsoft/azure/management/network/v2018_12_01/implementation/DdosProtectionPlansInner.java @@ -16,6 +16,7 @@ import com.microsoft.azure.AzureServiceFuture; import com.microsoft.azure.CloudException; import com.microsoft.azure.ListOperationCallback; +import com.microsoft.azure.management.network.v2018_12_01.TagsObject; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.rest.ServiceCallback; @@ -24,12 +25,14 @@ import com.microsoft.rest.Validator; import java.io.IOException; import java.util.List; +import java.util.Map; import okhttp3.ResponseBody; import retrofit2.http.Body; import retrofit2.http.GET; import retrofit2.http.Header; import retrofit2.http.Headers; import retrofit2.http.HTTP; +import retrofit2.http.PATCH; import retrofit2.http.Path; import retrofit2.http.PUT; import retrofit2.http.Query; @@ -84,6 +87,14 @@ interface DdosProtectionPlansService { @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans/{ddosProtectionPlanName}") Observable> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("ddosProtectionPlanName") String ddosProtectionPlanName, @Path("subscriptionId") String subscriptionId, @Body DdosProtectionPlanInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_12_01.DdosProtectionPlans updateTags" }) + @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans/{ddosProtectionPlanName}") + Observable> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("ddosProtectionPlanName") String ddosProtectionPlanName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent); + + @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_12_01.DdosProtectionPlans beginUpdateTags" }) + @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans/{ddosProtectionPlanName}") + Observable> beginUpdateTags(@Path("resourceGroupName") String resourceGroupName, @Path("ddosProtectionPlanName") String ddosProtectionPlanName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent); + @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_12_01.DdosProtectionPlans list" }) @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/ddosProtectionPlans") Observable> list(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -505,6 +516,320 @@ private ServiceResponse beginCreateOrUpdateDelegate(Res .build(response); } + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @throws CloudException thrown if the request is rejected by server + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent + * @return the DdosProtectionPlanInner object if successful. + */ + public DdosProtectionPlanInner updateTags(String resourceGroupName, String ddosProtectionPlanName) { + return updateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName).toBlocking().last().body(); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the {@link ServiceFuture} object + */ + public ServiceFuture updateTagsAsync(String resourceGroupName, String ddosProtectionPlanName, final ServiceCallback serviceCallback) { + return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName), serviceCallback); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable for the request + */ + public Observable updateTagsAsync(String resourceGroupName, String ddosProtectionPlanName) { + return updateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName).map(new Func1, DdosProtectionPlanInner>() { + @Override + public DdosProtectionPlanInner call(ServiceResponse response) { + return response.body(); + } + }); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable for the request + */ + public Observable> updateTagsWithServiceResponseAsync(String resourceGroupName, String ddosProtectionPlanName) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (ddosProtectionPlanName == null) { + throw new IllegalArgumentException("Parameter ddosProtectionPlanName is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + final String apiVersion = "2018-12-01"; + final Map tags = null; + TagsObject parameters = new TagsObject(); + parameters.withTags(null); + Observable> observable = service.updateTags(resourceGroupName, ddosProtectionPlanName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent()); + return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType()); + } + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @param tags Resource tags. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @throws CloudException thrown if the request is rejected by server + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent + * @return the DdosProtectionPlanInner object if successful. + */ + public DdosProtectionPlanInner updateTags(String resourceGroupName, String ddosProtectionPlanName, Map tags) { + return updateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, tags).toBlocking().last().body(); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @param tags Resource tags. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the {@link ServiceFuture} object + */ + public ServiceFuture updateTagsAsync(String resourceGroupName, String ddosProtectionPlanName, Map tags, final ServiceCallback serviceCallback) { + return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, tags), serviceCallback); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @param tags Resource tags. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable for the request + */ + public Observable updateTagsAsync(String resourceGroupName, String ddosProtectionPlanName, Map tags) { + return updateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, tags).map(new Func1, DdosProtectionPlanInner>() { + @Override + public DdosProtectionPlanInner call(ServiceResponse response) { + return response.body(); + } + }); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @param tags Resource tags. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable for the request + */ + public Observable> updateTagsWithServiceResponseAsync(String resourceGroupName, String ddosProtectionPlanName, Map tags) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (ddosProtectionPlanName == null) { + throw new IllegalArgumentException("Parameter ddosProtectionPlanName is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + Validator.validate(tags); + final String apiVersion = "2018-12-01"; + TagsObject parameters = new TagsObject(); + parameters.withTags(tags); + Observable> observable = service.updateTags(resourceGroupName, ddosProtectionPlanName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent()); + return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType()); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @throws CloudException thrown if the request is rejected by server + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent + * @return the DdosProtectionPlanInner object if successful. + */ + public DdosProtectionPlanInner beginUpdateTags(String resourceGroupName, String ddosProtectionPlanName) { + return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName).toBlocking().single().body(); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the {@link ServiceFuture} object + */ + public ServiceFuture beginUpdateTagsAsync(String resourceGroupName, String ddosProtectionPlanName, final ServiceCallback serviceCallback) { + return ServiceFuture.fromResponse(beginUpdateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName), serviceCallback); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable to the DdosProtectionPlanInner object + */ + public Observable beginUpdateTagsAsync(String resourceGroupName, String ddosProtectionPlanName) { + return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName).map(new Func1, DdosProtectionPlanInner>() { + @Override + public DdosProtectionPlanInner call(ServiceResponse response) { + return response.body(); + } + }); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable to the DdosProtectionPlanInner object + */ + public Observable> beginUpdateTagsWithServiceResponseAsync(String resourceGroupName, String ddosProtectionPlanName) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (ddosProtectionPlanName == null) { + throw new IllegalArgumentException("Parameter ddosProtectionPlanName is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + final String apiVersion = "2018-12-01"; + final Map tags = null; + TagsObject parameters = new TagsObject(); + parameters.withTags(null); + return service.beginUpdateTags(resourceGroupName, ddosProtectionPlanName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = beginUpdateTagsDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @param tags Resource tags. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @throws CloudException thrown if the request is rejected by server + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent + * @return the DdosProtectionPlanInner object if successful. + */ + public DdosProtectionPlanInner beginUpdateTags(String resourceGroupName, String ddosProtectionPlanName, Map tags) { + return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, tags).toBlocking().single().body(); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @param tags Resource tags. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the {@link ServiceFuture} object + */ + public ServiceFuture beginUpdateTagsAsync(String resourceGroupName, String ddosProtectionPlanName, Map tags, final ServiceCallback serviceCallback) { + return ServiceFuture.fromResponse(beginUpdateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, tags), serviceCallback); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @param tags Resource tags. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable to the DdosProtectionPlanInner object + */ + public Observable beginUpdateTagsAsync(String resourceGroupName, String ddosProtectionPlanName, Map tags) { + return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, tags).map(new Func1, DdosProtectionPlanInner>() { + @Override + public DdosProtectionPlanInner call(ServiceResponse response) { + return response.body(); + } + }); + } + + /** + * Update a DDoS protection plan tags. + * + * @param resourceGroupName The name of the resource group. + * @param ddosProtectionPlanName The name of the DDoS protection plan. + * @param tags Resource tags. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable to the DdosProtectionPlanInner object + */ + public Observable> beginUpdateTagsWithServiceResponseAsync(String resourceGroupName, String ddosProtectionPlanName, Map tags) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (ddosProtectionPlanName == null) { + throw new IllegalArgumentException("Parameter ddosProtectionPlanName is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + Validator.validate(tags); + final String apiVersion = "2018-12-01"; + TagsObject parameters = new TagsObject(); + parameters.withTags(tags); + return service.beginUpdateTags(resourceGroupName, ddosProtectionPlanName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = beginUpdateTagsDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse beginUpdateTagsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + .register(200, new TypeToken() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + /** * Gets all DDoS protection plans in a subscription. * diff --git a/network/resource-manager/v2018_12_01/src/main/java/com/microsoft/azure/management/network/v2018_12_01/implementation/VirtualNetworkGatewaysInner.java b/network/resource-manager/v2018_12_01/src/main/java/com/microsoft/azure/management/network/v2018_12_01/implementation/VirtualNetworkGatewaysInner.java index 3f38d0cf6414..55355141e2c8 100644 --- a/network/resource-manager/v2018_12_01/src/main/java/com/microsoft/azure/management/network/v2018_12_01/implementation/VirtualNetworkGatewaysInner.java +++ b/network/resource-manager/v2018_12_01/src/main/java/com/microsoft/azure/management/network/v2018_12_01/implementation/VirtualNetworkGatewaysInner.java @@ -42,6 +42,10 @@ import retrofit2.Response; import rx.functions.Func1; import rx.Observable; +import com.microsoft.azure.LongRunningFinalState; +import com.microsoft.azure.LongRunningOperationOptions; +import com.microsoft.azure.LongRunningFinalState; +import com.microsoft.azure.LongRunningOperationOptions; /** * An instance of this class provides access to all the operations defined @@ -133,10 +137,6 @@ interface VirtualNetworkGatewaysService { @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/generatevpnprofile") Observable> generateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_12_01.VirtualNetworkGateways beginGenerateVpnProfile" }) - @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/generatevpnprofile") - Observable> beginGenerateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_12_01.VirtualNetworkGateways getVpnProfilePackageUrl" }) @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getvpnprofilepackageurl") Observable> getVpnProfilePackageUrl(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -1681,7 +1681,7 @@ public Observable> generatevpnclientpackageWithServiceRe Validator.validate(parameters); final String apiVersion = "2018-12-01"; Observable> observable = service.generatevpnclientpackage(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); + return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken() { }.getType()); } /** @@ -1772,6 +1772,7 @@ public Observable> call(Response response) private ServiceResponse beginGeneratevpnclientpackageDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) + .register(202, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -1788,7 +1789,7 @@ private ServiceResponse beginGeneratevpnclientpackageDelegate(Response generateVpnProfileAsync(String resourceGroupName, S * @param virtualNetworkGatewayName The name of the virtual network gateway. * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable for the request + * @return the observable to the String object */ public Observable generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { return generateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1, String>() { @@ -1823,81 +1824,6 @@ public String call(ServiceResponse response) { }); } - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable for the request - */ - public Observable> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (virtualNetworkGatewayName == null) { - throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - if (parameters == null) { - throw new IllegalArgumentException("Parameter parameters is required and cannot be null."); - } - Validator.validate(parameters); - final String apiVersion = "2018-12-01"; - Observable> observable = service.generateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws CloudException thrown if the request is rejected by server - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent - * @return the String object if successful. - */ - public String beginGenerateVpnProfile(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toBlocking().single().body(); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the {@link ServiceFuture} object - */ - public ServiceFuture beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters), serviceCallback); - } - - /** - * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. - * - * @param resourceGroupName The name of the resource group. - * @param virtualNetworkGatewayName The name of the virtual network gateway. - * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable to the String object - */ - public Observable beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { - return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1, String>() { - @Override - public String call(ServiceResponse response) { - return response.body(); - } - }); - } - /** * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication. * @@ -1907,7 +1833,7 @@ public String call(ServiceResponse response) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the String object */ - public Observable> beginGenerateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { + public Observable> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1922,12 +1848,12 @@ public Observable> beginGenerateVpnProfileWithServiceRes } Validator.validate(parameters); final String apiVersion = "2018-12-01"; - return service.beginGenerateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.generateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginGenerateVpnProfileDelegate(response); + ServiceResponse clientResponse = generateVpnProfileDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1936,7 +1862,7 @@ public Observable> call(Response response) }); } - private ServiceResponse beginGenerateVpnProfileDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse generateVpnProfileDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) .register(202, new TypeToken() { }.getType())