Skip to content

Commit 5736274

Browse files
author
SDKAuto
committed
CodeGen from PR 13814 in Azure/azure-rest-api-specs
Merge d72c9fff3ad979a09f78709e449ce251710fee4e into a9bba35673e7a6e9d3f9331f9e8856830a071d3b
1 parent 5b5d822 commit 5736274

40 files changed

+866
-759
lines changed

sdk/netapp/azure-resourcemanager-netapp/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Release History
22

3-
## 1.0.0-beta.3 (Unreleased)
3+
## 1.0.0-beta.1 (2021-05-10)
44

5+
- Azure Resource Manager NetAppFiles client library for Java. This package contains Microsoft Azure SDK for NetAppFiles Management SDK. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-netapp-2021-02-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
56

67
## 1.0.0-beta.2 (2021-03-15)
78

sdk/netapp/azure-resourcemanager-netapp/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Azure Resource Manager NetAppFiles client library for Java.
44

5-
This package contains Microsoft Azure SDK for NetAppFiles Management SDK. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-netapp-2020-12-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
5+
This package contains Microsoft Azure SDK for NetAppFiles Management SDK. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-netapp-2021-02-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
66

77
## We'd love to hear your feedback
88

@@ -32,7 +32,7 @@ Various documentation is available to help you get started
3232
<dependency>
3333
<groupId>com.azure.resourcemanager</groupId>
3434
<artifactId>azure-resourcemanager-netapp</artifactId>
35-
<version>1.0.0-beta.2</version>
35+
<version>1.0.0-beta.3</version>
3636
</dependency>
3737
```
3838
[//]: # ({x-version-update-end})

sdk/netapp/azure-resourcemanager-netapp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<packaging>jar</packaging>
1414

1515
<name>Microsoft Azure SDK for NetAppFiles Management</name>
16-
<description>This package contains Microsoft Azure SDK for NetAppFiles Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-netapp-2020-12-01.</description>
16+
<description>This package contains Microsoft Azure SDK for NetAppFiles Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-netapp-2021-02-01.</description>
1717
<url>https://github.com/Azure/azure-sdk-for-java</url>
1818

1919
<licenses>

sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/NetAppFilesManager.java

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import com.azure.resourcemanager.netapp.implementation.SnapshotPoliciesImpl;
3333
import com.azure.resourcemanager.netapp.implementation.SnapshotsImpl;
3434
import com.azure.resourcemanager.netapp.implementation.VaultsImpl;
35-
import com.azure.resourcemanager.netapp.implementation.VolumeBackupStatusImpl;
3635
import com.azure.resourcemanager.netapp.implementation.VolumesImpl;
3736
import com.azure.resourcemanager.netapp.models.AccountBackups;
3837
import com.azure.resourcemanager.netapp.models.Accounts;
@@ -44,7 +43,6 @@
4443
import com.azure.resourcemanager.netapp.models.SnapshotPolicies;
4544
import com.azure.resourcemanager.netapp.models.Snapshots;
4645
import com.azure.resourcemanager.netapp.models.Vaults;
47-
import com.azure.resourcemanager.netapp.models.VolumeBackupStatus;
4846
import com.azure.resourcemanager.netapp.models.Volumes;
4947
import java.time.Duration;
5048
import java.time.temporal.ChronoUnit;
@@ -68,12 +66,10 @@ public final class NetAppFilesManager {
6866

6967
private SnapshotPolicies snapshotPolicies;
7068

71-
private VolumeBackupStatus volumeBackupStatus;
69+
private Backups backups;
7270

7371
private AccountBackups accountBackups;
7472

75-
private Backups backups;
76-
7773
private BackupPolicies backupPolicies;
7874

7975
private Vaults vaults;
@@ -202,7 +198,7 @@ public NetAppFilesManager authenticate(TokenCredential credential, AzureProfile
202198
.append("-")
203199
.append("com.azure.resourcemanager.netapp")
204200
.append("/")
205-
.append("1.0.0-beta.2");
201+
.append("1.0.0-beta.1");
206202
if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
207203
userAgentBuilder
208204
.append(" (")
@@ -229,6 +225,7 @@ public NetAppFilesManager authenticate(TokenCredential credential, AzureProfile
229225
.add(
230226
new BearerTokenAuthenticationPolicy(
231227
credential, profile.getEnvironment().getManagementEndpoint() + "/.default"));
228+
policies.addAll(this.policies);
232229
HttpPolicyProviders.addAfterRetryPolicies(policies);
233230
policies.add(new HttpLoggingPolicy(httpLogOptions));
234231
HttpPipeline httpPipeline =
@@ -296,12 +293,12 @@ public SnapshotPolicies snapshotPolicies() {
296293
return snapshotPolicies;
297294
}
298295

299-
/** @return Resource collection API of VolumeBackupStatus. */
300-
public VolumeBackupStatus volumeBackupStatus() {
301-
if (this.volumeBackupStatus == null) {
302-
this.volumeBackupStatus = new VolumeBackupStatusImpl(clientObject.getVolumeBackupStatus(), this);
296+
/** @return Resource collection API of Backups. */
297+
public Backups backups() {
298+
if (this.backups == null) {
299+
this.backups = new BackupsImpl(clientObject.getBackups(), this);
303300
}
304-
return volumeBackupStatus;
301+
return backups;
305302
}
306303

307304
/** @return Resource collection API of AccountBackups. */
@@ -312,14 +309,6 @@ public AccountBackups accountBackups() {
312309
return accountBackups;
313310
}
314311

315-
/** @return Resource collection API of Backups. */
316-
public Backups backups() {
317-
if (this.backups == null) {
318-
this.backups = new BackupsImpl(clientObject.getBackups(), this);
319-
}
320-
return backups;
321-
}
322-
323312
/** @return Resource collection API of BackupPolicies. */
324313
public BackupPolicies backupPolicies() {
325314
if (this.backupPolicies == null) {

sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/AccountBackupsClient.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
import com.azure.core.annotation.ReturnType;
88
import com.azure.core.annotation.ServiceMethod;
9+
import com.azure.core.http.rest.PagedIterable;
910
import com.azure.core.http.rest.Response;
1011
import com.azure.core.management.polling.PollResult;
1112
import com.azure.core.util.Context;
1213
import com.azure.core.util.polling.SyncPoller;
1314
import com.azure.resourcemanager.netapp.fluent.models.BackupInner;
14-
import com.azure.resourcemanager.netapp.fluent.models.BackupsListInner;
1515

1616
/** An instance of this class provides access to all the operations defined in AccountBackupsClient. */
1717
public interface AccountBackupsClient {
@@ -25,8 +25,8 @@ public interface AccountBackupsClient {
2525
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
2626
* @return list of Backups.
2727
*/
28-
@ServiceMethod(returns = ReturnType.SINGLE)
29-
BackupsListInner list(String resourceGroupName, String accountName);
28+
@ServiceMethod(returns = ReturnType.COLLECTION)
29+
PagedIterable<BackupInner> list(String resourceGroupName, String accountName);
3030

3131
/**
3232
* List all Backups for a Netapp Account.
@@ -39,25 +39,25 @@ public interface AccountBackupsClient {
3939
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
4040
* @return list of Backups.
4141
*/
42-
@ServiceMethod(returns = ReturnType.SINGLE)
43-
Response<BackupsListInner> listWithResponse(String resourceGroupName, String accountName, Context context);
42+
@ServiceMethod(returns = ReturnType.COLLECTION)
43+
PagedIterable<BackupInner> list(String resourceGroupName, String accountName, Context context);
4444

4545
/**
46-
* Get Backup for a Netapp Account.
46+
* Gets the specified backup for a Netapp Account.
4747
*
4848
* @param resourceGroupName The name of the resource group.
4949
* @param accountName The name of the NetApp account.
5050
* @param backupName The name of the backup.
5151
* @throws IllegalArgumentException thrown if parameters fail the validation.
5252
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
5353
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
54-
* @return backup for a Netapp Account.
54+
* @return the specified backup for a Netapp Account.
5555
*/
5656
@ServiceMethod(returns = ReturnType.SINGLE)
5757
BackupInner get(String resourceGroupName, String accountName, String backupName);
5858

5959
/**
60-
* Get Backup for a Netapp Account.
60+
* Gets the specified backup for a Netapp Account.
6161
*
6262
* @param resourceGroupName The name of the resource group.
6363
* @param accountName The name of the NetApp account.
@@ -66,14 +66,14 @@ public interface AccountBackupsClient {
6666
* @throws IllegalArgumentException thrown if parameters fail the validation.
6767
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
6868
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
69-
* @return backup for a Netapp Account.
69+
* @return the specified backup for a Netapp Account.
7070
*/
7171
@ServiceMethod(returns = ReturnType.SINGLE)
7272
Response<BackupInner> getWithResponse(
7373
String resourceGroupName, String accountName, String backupName, Context context);
7474

7575
/**
76-
* Delete Backup for a Netapp Account.
76+
* Delete the specified Backup for a Netapp Account.
7777
*
7878
* @param resourceGroupName The name of the resource group.
7979
* @param accountName The name of the NetApp account.
@@ -87,7 +87,7 @@ Response<BackupInner> getWithResponse(
8787
SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String accountName, String backupName);
8888

8989
/**
90-
* Delete Backup for a Netapp Account.
90+
* Delete the specified Backup for a Netapp Account.
9191
*
9292
* @param resourceGroupName The name of the resource group.
9393
* @param accountName The name of the NetApp account.
@@ -103,7 +103,7 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
103103
String resourceGroupName, String accountName, String backupName, Context context);
104104

105105
/**
106-
* Delete Backup for a Netapp Account.
106+
* Delete the specified Backup for a Netapp Account.
107107
*
108108
* @param resourceGroupName The name of the resource group.
109109
* @param accountName The name of the NetApp account.
@@ -116,7 +116,7 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
116116
void delete(String resourceGroupName, String accountName, String backupName);
117117

118118
/**
119-
* Delete Backup for a Netapp Account.
119+
* Delete the specified Backup for a Netapp Account.
120120
*
121121
* @param resourceGroupName The name of the resource group.
122122
* @param accountName The name of the NetApp account.

sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/BackupPoliciesClient.java

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,39 @@ BackupPolicyInner create(
139139
BackupPolicyInner create(
140140
String resourceGroupName, String accountName, String backupPolicyName, BackupPolicyInner body, Context context);
141141

142+
/**
143+
* Patch a backup policy for Netapp Account.
144+
*
145+
* @param resourceGroupName The name of the resource group.
146+
* @param accountName The name of the NetApp account.
147+
* @param backupPolicyName Backup policy Name which uniquely identify backup policy.
148+
* @param body Backup policy object supplied in the body of the operation.
149+
* @throws IllegalArgumentException thrown if parameters fail the validation.
150+
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
151+
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
152+
* @return backup policy information.
153+
*/
154+
@ServiceMethod(returns = ReturnType.SINGLE)
155+
SyncPoller<PollResult<BackupPolicyInner>, BackupPolicyInner> beginUpdate(
156+
String resourceGroupName, String accountName, String backupPolicyName, BackupPolicyPatch body);
157+
158+
/**
159+
* Patch a backup policy for Netapp Account.
160+
*
161+
* @param resourceGroupName The name of the resource group.
162+
* @param accountName The name of the NetApp account.
163+
* @param backupPolicyName Backup policy Name which uniquely identify backup policy.
164+
* @param body Backup policy object supplied in the body of the operation.
165+
* @param context The context to associate with this operation.
166+
* @throws IllegalArgumentException thrown if parameters fail the validation.
167+
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
168+
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
169+
* @return backup policy information.
170+
*/
171+
@ServiceMethod(returns = ReturnType.SINGLE)
172+
SyncPoller<PollResult<BackupPolicyInner>, BackupPolicyInner> beginUpdate(
173+
String resourceGroupName, String accountName, String backupPolicyName, BackupPolicyPatch body, Context context);
174+
142175
/**
143176
* Patch a backup policy for Netapp Account.
144177
*
@@ -169,7 +202,7 @@ BackupPolicyInner update(
169202
* @return backup policy information.
170203
*/
171204
@ServiceMethod(returns = ReturnType.SINGLE)
172-
Response<BackupPolicyInner> updateWithResponse(
205+
BackupPolicyInner update(
173206
String resourceGroupName, String accountName, String backupPolicyName, BackupPolicyPatch body, Context context);
174207

175208
/**

sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/BackupsClient.java

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,43 @@
1212
import com.azure.core.util.Context;
1313
import com.azure.core.util.polling.SyncPoller;
1414
import com.azure.resourcemanager.netapp.fluent.models.BackupInner;
15+
import com.azure.resourcemanager.netapp.fluent.models.BackupStatusInner;
1516
import com.azure.resourcemanager.netapp.models.BackupPatch;
1617

1718
/** An instance of this class provides access to all the operations defined in BackupsClient. */
1819
public interface BackupsClient {
20+
/**
21+
* Get the status of the backup for a volume.
22+
*
23+
* @param resourceGroupName The name of the resource group.
24+
* @param accountName The name of the NetApp account.
25+
* @param poolName The name of the capacity pool.
26+
* @param volumeName The name of the volume.
27+
* @throws IllegalArgumentException thrown if parameters fail the validation.
28+
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
29+
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
30+
* @return the status of the backup for a volume.
31+
*/
32+
@ServiceMethod(returns = ReturnType.SINGLE)
33+
BackupStatusInner getStatus(String resourceGroupName, String accountName, String poolName, String volumeName);
34+
35+
/**
36+
* Get the status of the backup for a volume.
37+
*
38+
* @param resourceGroupName The name of the resource group.
39+
* @param accountName The name of the NetApp account.
40+
* @param poolName The name of the capacity pool.
41+
* @param volumeName The name of the volume.
42+
* @param context The context to associate with this operation.
43+
* @throws IllegalArgumentException thrown if parameters fail the validation.
44+
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
45+
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
46+
* @return the status of the backup for a volume.
47+
*/
48+
@ServiceMethod(returns = ReturnType.SINGLE)
49+
Response<BackupStatusInner> getStatusWithResponse(
50+
String resourceGroupName, String accountName, String poolName, String volumeName, Context context);
51+
1952
/**
2053
* List all backups for a volume.
2154
*
@@ -49,7 +82,7 @@ PagedIterable<BackupInner> list(
4982
String resourceGroupName, String accountName, String poolName, String volumeName, Context context);
5083

5184
/**
52-
* Get a particular backup of the volume.
85+
* Gets the specified backup of the volume.
5386
*
5487
* @param resourceGroupName The name of the resource group.
5588
* @param accountName The name of the NetApp account.
@@ -59,14 +92,14 @@ PagedIterable<BackupInner> list(
5992
* @throws IllegalArgumentException thrown if parameters fail the validation.
6093
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
6194
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
62-
* @return a particular backup of the volume.
95+
* @return the specified backup of the volume.
6396
*/
6497
@ServiceMethod(returns = ReturnType.SINGLE)
6598
BackupInner get(
6699
String resourceGroupName, String accountName, String poolName, String volumeName, String backupName);
67100

68101
/**
69-
* Get a particular backup of the volume.
102+
* Gets the specified backup of the volume.
70103
*
71104
* @param resourceGroupName The name of the resource group.
72105
* @param accountName The name of the NetApp account.
@@ -77,7 +110,7 @@ BackupInner get(
77110
* @throws IllegalArgumentException thrown if parameters fail the validation.
78111
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
79112
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
80-
* @return a particular backup of the volume.
113+
* @return the specified backup of the volume.
81114
*/
82115
@ServiceMethod(returns = ReturnType.SINGLE)
83116
Response<BackupInner> getWithResponse(

sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/NetAppManagementClient.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ public interface NetAppManagementClient {
9595
SnapshotPoliciesClient getSnapshotPolicies();
9696

9797
/**
98-
* Gets the VolumeBackupStatusClient object to access its operations.
98+
* Gets the BackupsClient object to access its operations.
9999
*
100-
* @return the VolumeBackupStatusClient object.
100+
* @return the BackupsClient object.
101101
*/
102-
VolumeBackupStatusClient getVolumeBackupStatus();
102+
BackupsClient getBackups();
103103

104104
/**
105105
* Gets the AccountBackupsClient object to access its operations.
@@ -108,13 +108,6 @@ public interface NetAppManagementClient {
108108
*/
109109
AccountBackupsClient getAccountBackups();
110110

111-
/**
112-
* Gets the BackupsClient object to access its operations.
113-
*
114-
* @return the BackupsClient object.
115-
*/
116-
BackupsClient getBackups();
117-
118111
/**
119112
* Gets the BackupPoliciesClient object to access its operations.
120113
*

0 commit comments

Comments
 (0)