Skip to content

Commit 42848aa

Browse files
author
SDK Automation
committed
Update from master
1 parent 3f2d7db commit 42848aa

File tree

94 files changed

+3333
-620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+3333
-620
lines changed

sdk/network/mgmt-v2019_04_01/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<parent>
1212
<groupId>com.microsoft.azure</groupId>
1313
<artifactId>azure-arm-parent</artifactId>
14-
<version>1.2.0</version>
15-
<relativePath>../../parents/azure-arm-parent</relativePath>
14+
<version>1.1.0</version>
15+
<relativePath>../../../pom.management.xml</relativePath>
1616
</parent>
1717
<artifactId>azure-mgmt-network</artifactId>
1818
<version>1.0.0-beta</version>
@@ -71,6 +71,8 @@
7171
<artifactId>azure-arm-client-runtime</artifactId>
7272
<type>test-jar</type>
7373
<scope>test</scope>
74+
<!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
75+
<version>1.6.5</version>
7476
</dependency>
7577
</dependencies>
7678
<build>

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/ApplicationGatewayOnDemandProbe.java

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
package com.microsoft.azure.management.network.v2019_04_01;
1010

11+
import com.microsoft.azure.SubResource;
1112
import com.fasterxml.jackson.annotation.JsonProperty;
1213

1314
/**
@@ -56,18 +57,18 @@ public class ApplicationGatewayOnDemandProbe {
5657
private ApplicationGatewayProbeHealthResponseMatch match;
5758

5859
/**
59-
* Name of backend pool of application gateway to which probe request will
60-
* be sent.
60+
* Reference of backend pool of application gateway to which probe request
61+
* will be sent.
6162
*/
62-
@JsonProperty(value = "backendPoolName")
63-
private String backendPoolName;
63+
@JsonProperty(value = "backendAddressPool")
64+
private SubResource backendAddressPool;
6465

6566
/**
66-
* Name of backend http setting of application gateway to be used for test
67-
* probe.
67+
* Reference of backend http setting of application gateway to be used for
68+
* test probe.
6869
*/
69-
@JsonProperty(value = "backendHttpSettingName")
70-
private String backendHttpSettingName;
70+
@JsonProperty(value = "backendHttpSettings")
71+
private SubResource backendHttpSettings;
7172

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

192193
/**
193-
* Get name of backend pool of application gateway to which probe request will be sent.
194+
* Get reference of backend pool of application gateway to which probe request will be sent.
194195
*
195-
* @return the backendPoolName value
196+
* @return the backendAddressPool value
196197
*/
197-
public String backendPoolName() {
198-
return this.backendPoolName;
198+
public SubResource backendAddressPool() {
199+
return this.backendAddressPool;
199200
}
200201

201202
/**
202-
* Set name of backend pool of application gateway to which probe request will be sent.
203+
* Set reference of backend pool of application gateway to which probe request will be sent.
203204
*
204-
* @param backendPoolName the backendPoolName value to set
205+
* @param backendAddressPool the backendAddressPool value to set
205206
* @return the ApplicationGatewayOnDemandProbe object itself.
206207
*/
207-
public ApplicationGatewayOnDemandProbe withBackendPoolName(String backendPoolName) {
208-
this.backendPoolName = backendPoolName;
208+
public ApplicationGatewayOnDemandProbe withBackendAddressPool(SubResource backendAddressPool) {
209+
this.backendAddressPool = backendAddressPool;
209210
return this;
210211
}
211212

212213
/**
213-
* Get name of backend http setting of application gateway to be used for test probe.
214+
* Get reference of backend http setting of application gateway to be used for test probe.
214215
*
215-
* @return the backendHttpSettingName value
216+
* @return the backendHttpSettings value
216217
*/
217-
public String backendHttpSettingName() {
218-
return this.backendHttpSettingName;
218+
public SubResource backendHttpSettings() {
219+
return this.backendHttpSettings;
219220
}
220221

221222
/**
222-
* Set name of backend http setting of application gateway to be used for test probe.
223+
* Set reference of backend http setting of application gateway to be used for test probe.
223224
*
224-
* @param backendHttpSettingName the backendHttpSettingName value to set
225+
* @param backendHttpSettings the backendHttpSettings value to set
225226
* @return the ApplicationGatewayOnDemandProbe object itself.
226227
*/
227-
public ApplicationGatewayOnDemandProbe withBackendHttpSettingName(String backendHttpSettingName) {
228-
this.backendHttpSettingName = backendHttpSettingName;
228+
public ApplicationGatewayOnDemandProbe withBackendHttpSettings(SubResource backendHttpSettings) {
229+
this.backendHttpSettings = backendHttpSettings;
229230
return this;
230231
}
231232

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/ApplicationGatewaySslCipherSuite.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,15 @@ public final class ApplicationGatewaySslCipherSuite extends ExpandableStringEnum
9191
/** Static value TLS_RSA_WITH_3DES_EDE_CBC_SHA for ApplicationGatewaySslCipherSuite. */
9292
public static final ApplicationGatewaySslCipherSuite TLS_RSA_WITH_3DES_EDE_CBC_SHA = fromString("TLS_RSA_WITH_3DES_EDE_CBC_SHA");
9393

94+
/** Static value TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA for ApplicationGatewaySslCipherSuite. */
95+
public static final ApplicationGatewaySslCipherSuite TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA = fromString("TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA");
96+
97+
/** Static value TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 for ApplicationGatewaySslCipherSuite. */
98+
public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 = fromString("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256");
99+
100+
/** Static value TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 for ApplicationGatewaySslCipherSuite. */
101+
public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 = fromString("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384");
102+
94103
/**
95104
* Creates or finds a ApplicationGatewaySslCipherSuite from its string representation.
96105
* @param name a name to look for
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/**
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for
4+
* license information.
5+
*
6+
* Code generated by Microsoft (R) AutoRest Code Generator.
7+
*/
8+
9+
package com.microsoft.azure.management.network.v2019_04_01;
10+
11+
import com.microsoft.azure.arm.model.HasInner;
12+
import com.microsoft.azure.management.network.v2019_04_01.implementation.AutoApprovedPrivateLinkServiceInner;
13+
import com.microsoft.azure.arm.resources.models.HasManager;
14+
import com.microsoft.azure.management.network.v2019_04_01.implementation.NetworkManager;
15+
16+
/**
17+
* Type representing AutoApprovedPrivateLinkService.
18+
*/
19+
public interface AutoApprovedPrivateLinkService extends HasInner<AutoApprovedPrivateLinkServiceInner>, HasManager<NetworkManager> {
20+
/**
21+
* @return the privateLinkService value.
22+
*/
23+
String privateLinkService();
24+
25+
}

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/AvailableEndpointServices.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
package com.microsoft.azure.management.network.v2019_04_01;
1010

1111
import rx.Observable;
12-
import com.microsoft.azure.management.network.v2019_04_01.EndpointServiceResult;
12+
import com.microsoft.azure.management.network.v2019_04_01.implementation.AvailableEndpointServicesInner;
13+
import com.microsoft.azure.arm.model.HasInner;
1314

1415
/**
1516
* Type representing AvailableEndpointServices.
1617
*/
17-
public interface AvailableEndpointServices {
18+
public interface AvailableEndpointServices extends HasInner<AvailableEndpointServicesInner> {
1819
/**
1920
* List what values of endpoint services are available for use.
2021
*
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/**
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for
4+
* license information.
5+
*
6+
* Code generated by Microsoft (R) AutoRest Code Generator.
7+
*/
8+
9+
package com.microsoft.azure.management.network.v2019_04_01;
10+
11+
import com.microsoft.azure.arm.model.HasInner;
12+
import com.microsoft.azure.management.network.v2019_04_01.implementation.AvailablePrivateEndpointTypeInner;
13+
import com.microsoft.azure.arm.resources.models.HasManager;
14+
import com.microsoft.azure.management.network.v2019_04_01.implementation.NetworkManager;
15+
16+
/**
17+
* Type representing AvailablePrivateEndpointType.
18+
*/
19+
public interface AvailablePrivateEndpointType extends HasInner<AvailablePrivateEndpointTypeInner>, HasManager<NetworkManager> {
20+
/**
21+
* @return the id value.
22+
*/
23+
String id();
24+
25+
/**
26+
* @return the name value.
27+
*/
28+
String name();
29+
30+
/**
31+
* @return the resourceName value.
32+
*/
33+
String resourceName();
34+
35+
/**
36+
* @return the type value.
37+
*/
38+
String type();
39+
40+
}

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/AvailablePrivateEndpointTypes.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,19 @@ public interface AvailablePrivateEndpointTypes extends HasInner<AvailablePrivate
2020
* Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
2121
*
2222
* @param location The location of the domain name.
23+
* @param resourceGroupName The name of the resource group.
2324
* @throws IllegalArgumentException thrown if parameters fail the validation
2425
* @return the observable for the request
2526
*/
26-
Observable<LocationAvailablePrivateEndpointType> listAsync(final String location);
27+
Observable<AvailablePrivateEndpointType> listByResourceGroupAsync(final String location, final String resourceGroupName);
28+
29+
/**
30+
* Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
31+
*
32+
* @param location The location of the domain name.
33+
* @throws IllegalArgumentException thrown if parameters fail the validation
34+
* @return the observable for the request
35+
*/
36+
Observable<AvailablePrivateEndpointType> listAsync(final String location);
2737

2838
}

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/AvailableResourceGroupDelegations.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
package com.microsoft.azure.management.network.v2019_04_01;
1010

1111
import rx.Observable;
12-
import com.microsoft.azure.management.network.v2019_04_01.LocationAvailableDelegationModel;
12+
import com.microsoft.azure.management.network.v2019_04_01.implementation.AvailableResourceGroupDelegationsInner;
13+
import com.microsoft.azure.arm.model.HasInner;
1314

1415
/**
1516
* Type representing AvailableResourceGroupDelegations.
1617
*/
17-
public interface AvailableResourceGroupDelegations {
18+
public interface AvailableResourceGroupDelegations extends HasInner<AvailableResourceGroupDelegationsInner> {
1819
/**
1920
* Gets all of the available subnet delegations for this resource group in this region.
2021
*

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/BackendAddressPool.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ public interface BackendAddressPool extends HasInner<BackendAddressPoolInner>, I
5151
*/
5252
SubResource outboundRule();
5353

54+
/**
55+
* @return the outboundRules value.
56+
*/
57+
List<SubResource> outboundRules();
58+
5459
/**
5560
* @return the provisioningState value.
5661
*/

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/BastionHostIPConfiguration.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class BastionHostIPConfiguration extends SubResource {
4747
* Name of the resource that is unique within a resource group. This name
4848
* can be used to access the resource.
4949
*/
50-
@JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
50+
@JsonProperty(value = "name")
5151
private String name;
5252

5353
/**
@@ -151,6 +151,17 @@ public String name() {
151151
return this.name;
152152
}
153153

154+
/**
155+
* Set name of the resource that is unique within a resource group. This name can be used to access the resource.
156+
*
157+
* @param name the name value to set
158+
* @return the BastionHostIPConfiguration object itself.
159+
*/
160+
public BastionHostIPConfiguration withName(String name) {
161+
this.name = name;
162+
return this;
163+
}
164+
154165
/**
155166
* Get a unique read-only string that changes whenever the resource is updated.
156167
*

0 commit comments

Comments
 (0)