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