Skip to content

Commit

Permalink
Update from master
Browse files Browse the repository at this point in the history
  • Loading branch information
SDK Automation committed May 8, 2020
1 parent 6ea230e commit cdfee10
Show file tree
Hide file tree
Showing 73 changed files with 1,652 additions and 212 deletions.
6 changes: 4 additions & 2 deletions sdk/network/mgmt-v2019_02_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.microsoft.azure.network.v2019_02_01</groupId>
<parent>
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.2.0</version>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-network</artifactId>
Expand Down Expand Up @@ -71,6 +71,8 @@
<artifactId>azure-arm-client-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
<!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
<version>1.6.5</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

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

import com.microsoft.azure.SubResource;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
Expand Down Expand Up @@ -56,18 +57,18 @@ public class ApplicationGatewayOnDemandProbe {
private ApplicationGatewayProbeHealthResponseMatch match;

/**
* Name of backend pool of application gateway to which probe request will
* be sent.
* Reference of backend pool of application gateway to which probe request
* will be sent.
*/
@JsonProperty(value = "backendPoolName")
private String backendPoolName;
@JsonProperty(value = "backendAddressPool")
private SubResource backendAddressPool;

/**
* Name of backend http setting of application gateway to be used for test
* probe.
* Reference of backend http setting of application gateway to be used for
* test probe.
*/
@JsonProperty(value = "backendHttpSettingName")
private String backendHttpSettingName;
@JsonProperty(value = "backendHttpSettings")
private SubResource backendHttpSettings;

/**
* Get the protocol used for the probe. Possible values include: 'Http', 'Https'.
Expand Down Expand Up @@ -190,42 +191,42 @@ public ApplicationGatewayOnDemandProbe withMatch(ApplicationGatewayProbeHealthRe
}

/**
* Get name of backend pool of application gateway to which probe request will be sent.
* Get reference of backend pool of application gateway to which probe request will be sent.
*
* @return the backendPoolName value
* @return the backendAddressPool value
*/
public String backendPoolName() {
return this.backendPoolName;
public SubResource backendAddressPool() {
return this.backendAddressPool;
}

/**
* Set name of backend pool of application gateway to which probe request will be sent.
* Set reference of backend pool of application gateway to which probe request will be sent.
*
* @param backendPoolName the backendPoolName value to set
* @param backendAddressPool the backendAddressPool value to set
* @return the ApplicationGatewayOnDemandProbe object itself.
*/
public ApplicationGatewayOnDemandProbe withBackendPoolName(String backendPoolName) {
this.backendPoolName = backendPoolName;
public ApplicationGatewayOnDemandProbe withBackendAddressPool(SubResource backendAddressPool) {
this.backendAddressPool = backendAddressPool;
return this;
}

/**
* Get name of backend http setting of application gateway to be used for test probe.
* Get reference of backend http setting of application gateway to be used for test probe.
*
* @return the backendHttpSettingName value
* @return the backendHttpSettings value
*/
public String backendHttpSettingName() {
return this.backendHttpSettingName;
public SubResource backendHttpSettings() {
return this.backendHttpSettings;
}

/**
* Set name of backend http setting of application gateway to be used for test probe.
* Set reference of backend http setting of application gateway to be used for test probe.
*
* @param backendHttpSettingName the backendHttpSettingName value to set
* @param backendHttpSettings the backendHttpSettings value to set
* @return the ApplicationGatewayOnDemandProbe object itself.
*/
public ApplicationGatewayOnDemandProbe withBackendHttpSettingName(String backendHttpSettingName) {
this.backendHttpSettingName = backendHttpSettingName;
public ApplicationGatewayOnDemandProbe withBackendHttpSettings(SubResource backendHttpSettings) {
this.backendHttpSettings = backendHttpSettings;
return this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,15 @@ public final class ApplicationGatewaySslCipherSuite extends ExpandableStringEnum
/** Static value TLS_RSA_WITH_3DES_EDE_CBC_SHA for ApplicationGatewaySslCipherSuite. */
public static final ApplicationGatewaySslCipherSuite TLS_RSA_WITH_3DES_EDE_CBC_SHA = fromString("TLS_RSA_WITH_3DES_EDE_CBC_SHA");

/** Static value TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA for ApplicationGatewaySslCipherSuite. */
public static final ApplicationGatewaySslCipherSuite TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA = fromString("TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA");

/** Static value TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 for ApplicationGatewaySslCipherSuite. */
public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 = fromString("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256");

/** Static value TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 for ApplicationGatewaySslCipherSuite. */
public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 = fromString("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384");

/**
* Creates or finds a ApplicationGatewaySslCipherSuite from its string representation.
* @param name a name to look for
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ public interface BackendAddressPool extends HasInner<BackendAddressPoolInner>, I
*/
SubResource outboundRule();

/**
* @return the outboundRules value.
*/
List<SubResource> outboundRules();

/**
* @return the provisioningState value.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.microsoft.azure.arm.resources.models.HasManager;
import com.microsoft.azure.management.network.v2019_02_01.implementation.NetworkManager;
import java.util.List;
import com.microsoft.azure.SubResource;
import com.microsoft.azure.management.network.v2019_02_01.implementation.PublicIPPrefixInner;

/**
Expand All @@ -40,6 +41,11 @@ public interface PublicIPPrefix extends HasInner<PublicIPPrefixInner>, Resource,
*/
List<IpTag> ipTags();

/**
* @return the loadBalancerFrontendIpConfiguration value.
*/
SubResource loadBalancerFrontendIpConfiguration();

/**
* @return the prefixLength value.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
*/

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

import rx.Observable;
import com.microsoft.azure.management.network.v2019_02_01.implementation.ResourceNavigationLinksInner;
import com.microsoft.azure.arm.model.HasInner;

/**
* Type representing ResourceNavigationLinks.
*/
public interface ResourceNavigationLinks extends HasInner<ResourceNavigationLinksInner> {
/**
* Gets a list of resource navigation links for a subnet.
*
* @param resourceGroupName The name of the resource group.
* @param virtualNetworkName The name of the virtual network.
* @param subnetName The name of the subnet.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Observable<ResourceNavigationLinksListResult> getAsync(String resourceGroupName, String virtualNetworkName, String subnetName);

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
*/

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

import com.microsoft.azure.arm.model.HasInner;
import com.microsoft.azure.arm.resources.models.HasManager;
import com.microsoft.azure.management.network.v2019_02_01.implementation.NetworkManager;
import com.microsoft.azure.management.network.v2019_02_01.implementation.ResourceNavigationLinksListResultInner;
import com.microsoft.azure.management.network.v2019_02_01.implementation.ResourceNavigationLinkInner;
import java.util.List;

/**
* Type representing ResourceNavigationLinksListResult.
*/
public interface ResourceNavigationLinksListResult extends HasInner<ResourceNavigationLinksListResultInner>, HasManager<NetworkManager> {
/**
* @return the nextLink value.
*/
String nextLink();

/**
* @return the value value.
*/
List<ResourceNavigationLinkInner> value();

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
*/

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

import rx.Observable;
import com.microsoft.azure.management.network.v2019_02_01.implementation.ServiceAssociationLinksInner;
import com.microsoft.azure.arm.model.HasInner;

/**
* Type representing ServiceAssociationLinks.
*/
public interface ServiceAssociationLinks extends HasInner<ServiceAssociationLinksInner> {
/**
* Gets a list of service association links for a subnet.
*
* @param resourceGroupName The name of the resource group.
* @param virtualNetworkName The name of the virtual network.
* @param subnetName The name of the subnet.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Observable<ServiceAssociationLinksListResult> getAsync(String resourceGroupName, String virtualNetworkName, String subnetName);

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
*/

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

import com.microsoft.azure.arm.model.HasInner;
import com.microsoft.azure.arm.resources.models.HasManager;
import com.microsoft.azure.management.network.v2019_02_01.implementation.NetworkManager;
import com.microsoft.azure.management.network.v2019_02_01.implementation.ServiceAssociationLinksListResultInner;
import com.microsoft.azure.management.network.v2019_02_01.implementation.ServiceAssociationLinkInner;
import java.util.List;

/**
* Type representing ServiceAssociationLinksListResult.
*/
public interface ServiceAssociationLinksListResult extends HasInner<ServiceAssociationLinksListResultInner>, HasManager<NetworkManager> {
/**
* @return the nextLink value.
*/
String nextLink();

/**
* @return the value value.
*/
List<ServiceAssociationLinkInner> value();

}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
import java.util.List;
import com.microsoft.azure.SubResource;
import com.microsoft.azure.management.network.v2019_02_01.implementation.NetworkSecurityGroupInner;
import com.microsoft.azure.management.network.v2019_02_01.implementation.ResourceNavigationLinkInner;
import com.microsoft.azure.management.network.v2019_02_01.implementation.RouteTableInner;
import com.microsoft.azure.management.network.v2019_02_01.implementation.ServiceAssociationLinkInner;
import com.microsoft.azure.management.network.v2019_02_01.implementation.ServiceEndpointPolicyInner;

/**
Expand Down Expand Up @@ -95,7 +97,7 @@ public interface Subnet extends HasInner<SubnetInner>, Indexable, Refreshable<Su
/**
* @return the resourceNavigationLinks value.
*/
List<ResourceNavigationLink> resourceNavigationLinks();
List<ResourceNavigationLinkInner> resourceNavigationLinks();

/**
* @return the routeTable value.
Expand All @@ -105,7 +107,7 @@ public interface Subnet extends HasInner<SubnetInner>, Indexable, Refreshable<Su
/**
* @return the serviceAssociationLinks value.
*/
List<ServiceAssociationLink> serviceAssociationLinks();
List<ServiceAssociationLinkInner> serviceAssociationLinks();

/**
* @return the serviceEndpointPolicies value.
Expand Down Expand Up @@ -263,7 +265,7 @@ interface WithResourceNavigationLinks {
* @param resourceNavigationLinks Gets an array of references to the external resources using subnet
* @return the next definition stage
*/
WithCreate withResourceNavigationLinks(List<ResourceNavigationLink> resourceNavigationLinks);
WithCreate withResourceNavigationLinks(List<ResourceNavigationLinkInner> resourceNavigationLinks);
}

/**
Expand All @@ -287,7 +289,7 @@ interface WithServiceAssociationLinks {
* @param serviceAssociationLinks Gets an array of references to services injecting into this subnet
* @return the next definition stage
*/
WithCreate withServiceAssociationLinks(List<ServiceAssociationLink> serviceAssociationLinks);
WithCreate withServiceAssociationLinks(List<ServiceAssociationLinkInner> serviceAssociationLinks);
}

/**
Expand Down Expand Up @@ -449,7 +451,7 @@ interface WithResourceNavigationLinks {
* @param resourceNavigationLinks Gets an array of references to the external resources using subnet
* @return the next update stage
*/
Update withResourceNavigationLinks(List<ResourceNavigationLink> resourceNavigationLinks);
Update withResourceNavigationLinks(List<ResourceNavigationLinkInner> resourceNavigationLinks);
}

/**
Expand All @@ -473,7 +475,7 @@ interface WithServiceAssociationLinks {
* @param serviceAssociationLinks Gets an array of references to services injecting into this subnet
* @return the next update stage
*/
Update withServiceAssociationLinks(List<ServiceAssociationLink> serviceAssociationLinks);
Update withServiceAssociationLinks(List<ServiceAssociationLinkInner> serviceAssociationLinks);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ interface WithBgpSettings {
interface WithCustomRoutes {
/**
* Specifies customRoutes.
* @param customRoutes The reference of the address space resource which represents the custom routes address space specified by the the customer for virtual network gateway and VpnClient
* @param customRoutes The reference of the address space resource which represents the custom routes address space specified by the customer for virtual network gateway and VpnClient
* @return the next definition stage
*/
WithCreate withCustomRoutes(AddressSpace customRoutes);
Expand Down Expand Up @@ -305,7 +305,7 @@ interface WithBgpSettings {
interface WithCustomRoutes {
/**
* Specifies customRoutes.
* @param customRoutes The reference of the address space resource which represents the custom routes address space specified by the the customer for virtual network gateway and VpnClient
* @param customRoutes The reference of the address space resource which represents the custom routes address space specified by the customer for virtual network gateway and VpnClient
* @return the next update stage
*/
Update withCustomRoutes(AddressSpace customRoutes);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,13 @@ public ApplicationGateway call(ApplicationGatewayInner inner) {
@Override
public PagedList<ApplicationGateway> list() {
ApplicationGatewaysInner client = this.inner();
return this.wrapList(client.listAll());
return this.wrapList(client.list());
}

@Override
public Observable<ApplicationGateway> listAsync() {
ApplicationGatewaysInner client = this.inner();
return client.listAllAsync()
return client.listAsync()
.flatMapIterable(new Func1<Page<ApplicationGatewayInner>, Iterable<ApplicationGatewayInner>>() {
@Override
public Iterable<ApplicationGatewayInner> call(Page<ApplicationGatewayInner> page) {
Expand Down
Loading

0 comments on commit cdfee10

Please sign in to comment.