Skip to content

Commit d6b7b40

Browse files
audunnaudunn
authored
[NetAppFiles]bump to 2023-07-01 (#24012)
* bump to 2023-07-01 * regen sdk, update help * update help * inner exception * support name with parentObjectParameterSet in piping for get * throw cloudexception * fix test * fix test
1 parent 737c092 commit d6b7b40

File tree

225 files changed

+26740
-21975
lines changed

Some content is hidden

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

225 files changed

+26740
-21975
lines changed

‎src/NetAppFiles/NetAppFiles.Management.Sdk/Custom/AccountBackupsOperations.cs

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@ internal AccountBackupsOperations(NetAppManagementClient client)
7373

7474

7575

76-
77-
if (this.Client.SubscriptionId == null)
78-
{
79-
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
80-
}
81-
if (this.Client.SubscriptionId != null)
82-
{
83-
if (this.Client.SubscriptionId.Length < 1)
84-
{
85-
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MinLength, "Client.SubscriptionId", 1);
86-
}
87-
}
76+
//Its a guid now (Arm-id)
77+
//if (this.Client.SubscriptionId == null)
78+
//{
79+
// throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
80+
//}
81+
//if (this.Client.SubscriptionId != null)
82+
//{
83+
// if (this.Client.SubscriptionId.Length < 1)
84+
// {
85+
// throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MinLength, "Client.SubscriptionId", 1);
86+
// }
87+
//}
8888
if (resourceGroupName == null)
8989
{
9090
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "resourceGroupName");
@@ -135,6 +135,7 @@ internal AccountBackupsOperations(NetAppManagementClient client)
135135
var _baseUrl = this.Client.BaseUri.AbsoluteUri;
136136
var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/accountBackups").ToString();
137137
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
138+
//_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Microsoft.Rest.Serialization.SafeJsonConvert.SerializeObject(this.Client.SubscriptionId, this.Client.SerializationSettings).Trim('"')));
138139
_url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
139140
_url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
140141

@@ -312,17 +313,17 @@ internal AccountBackupsOperations(NetAppManagementClient client)
312313

313314

314315

315-
if (this.Client.SubscriptionId == null)
316-
{
317-
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
318-
}
319-
if (this.Client.SubscriptionId != null)
320-
{
321-
if (this.Client.SubscriptionId.Length < 1)
322-
{
323-
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MinLength, "Client.SubscriptionId", 1);
324-
}
325-
}
316+
//if (this.Client.SubscriptionId == null)
317+
//{
318+
// throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
319+
//}
320+
//if (this.Client.SubscriptionId != null)
321+
//{
322+
// if (this.Client.SubscriptionId.Length < 1)
323+
// {
324+
// throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MinLength, "Client.SubscriptionId", 1);
325+
// }
326+
//}
326327
if (resourceGroupName == null)
327328
{
328329
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "resourceGroupName");
@@ -385,6 +386,7 @@ internal AccountBackupsOperations(NetAppManagementClient client)
385386
var _baseUrl = this.Client.BaseUri.AbsoluteUri;
386387
var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/accountBackups/{backupName}").ToString();
387388
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
389+
//_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Microsoft.Rest.Serialization.SafeJsonConvert.SerializeObject(this.Client.SubscriptionId, this.Client.SerializationSettings).Trim('"')));
388390
_url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
389391
_url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
390392
_url = _url.Replace("{backupName}", System.Uri.EscapeDataString(backupName));
@@ -585,17 +587,17 @@ internal AccountBackupsOperations(NetAppManagementClient client)
585587

586588

587589

588-
if (this.Client.SubscriptionId == null)
589-
{
590-
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
591-
}
592-
if (this.Client.SubscriptionId != null)
593-
{
594-
if (this.Client.SubscriptionId.Length < 1)
595-
{
596-
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MinLength, "Client.SubscriptionId", 1);
597-
}
598-
}
590+
//if (this.Client.SubscriptionId == null)
591+
//{
592+
// throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
593+
//}
594+
//if (this.Client.SubscriptionId != null)
595+
//{
596+
// if (this.Client.SubscriptionId.Length < 1)
597+
// {
598+
// throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MinLength, "Client.SubscriptionId", 1);
599+
// }
600+
//}
599601
if (resourceGroupName == null)
600602
{
601603
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "resourceGroupName");
@@ -658,6 +660,7 @@ internal AccountBackupsOperations(NetAppManagementClient client)
658660
var _baseUrl = this.Client.BaseUri.AbsoluteUri;
659661
var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/accountBackups/{backupName}").ToString();
660662
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
663+
//_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Microsoft.Rest.Serialization.SafeJsonConvert.SerializeObject(this.Client.SubscriptionId, this.Client.SerializationSettings).Trim('"')));
661664
_url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
662665
_url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
663666
_url = _url.Replace("{backupName}", System.Uri.EscapeDataString(backupName));

‎src/NetAppFiles/NetAppFiles.Management.Sdk/Custom/BackupsOperations.cs

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ internal partial class BackupsOperations : Microsoft.Rest.IServiceOperations<Net
218218

219219
var _baseUrl = this.Client.BaseUri.AbsoluteUri;
220220
var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/backups/{backupName}").ToString();
221-
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
221+
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Microsoft.Rest.Serialization.SafeJsonConvert.SerializeObject(this.Client.SubscriptionId, this.Client.SerializationSettings).Trim('"')));
222222
_url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
223223
_url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
224224
_url = _url.Replace("{poolName}", System.Uri.EscapeDataString(poolName));
@@ -565,7 +565,7 @@ internal partial class BackupsOperations : Microsoft.Rest.IServiceOperations<Net
565565

566566
var _baseUrl = this.Client.BaseUri.AbsoluteUri;
567567
var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/backups/{backupName}").ToString();
568-
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
568+
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Microsoft.Rest.Serialization.SafeJsonConvert.SerializeObject(this.Client.SubscriptionId, this.Client.SerializationSettings).Trim('"')));
569569
_url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
570570
_url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
571571
_url = _url.Replace("{poolName}", System.Uri.EscapeDataString(poolName));
@@ -887,7 +887,7 @@ internal partial class BackupsOperations : Microsoft.Rest.IServiceOperations<Net
887887

888888
var _baseUrl = this.Client.BaseUri.AbsoluteUri;
889889
var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/backups/{backupName}/restoreFiles").ToString();
890-
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
890+
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Microsoft.Rest.Serialization.SafeJsonConvert.SerializeObject(this.Client.SubscriptionId, this.Client.SerializationSettings).Trim('"')));
891891
_url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
892892
_url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
893893
_url = _url.Replace("{poolName}", System.Uri.EscapeDataString(poolName));
@@ -1221,7 +1221,7 @@ internal partial class BackupsOperations : Microsoft.Rest.IServiceOperations<Net
12211221

12221222
var _baseUrl = this.Client.BaseUri.AbsoluteUri;
12231223
var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/backups/{backupName}").ToString();
1224-
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
1224+
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Microsoft.Rest.Serialization.SafeJsonConvert.SerializeObject(this.Client.SubscriptionId, this.Client.SerializationSettings).Trim('"')));
12251225
_url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
12261226
_url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
12271227
_url = _url.Replace("{poolName}", System.Uri.EscapeDataString(poolName));
@@ -1525,7 +1525,7 @@ internal partial class BackupsOperations : Microsoft.Rest.IServiceOperations<Net
15251525

15261526
var _baseUrl = this.Client.BaseUri.AbsoluteUri;
15271527
var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/backupStatus").ToString();
1528-
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
1528+
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Microsoft.Rest.Serialization.SafeJsonConvert.SerializeObject(this.Client.SubscriptionId, this.Client.SerializationSettings).Trim('"')));
15291529
_url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
15301530
_url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
15311531
_url = _url.Replace("{poolName}", System.Uri.EscapeDataString(poolName));
@@ -1706,17 +1706,7 @@ internal partial class BackupsOperations : Microsoft.Rest.IServiceOperations<Net
17061706

17071707

17081708

1709-
if (this.Client.SubscriptionId == null)
1710-
{
1711-
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
1712-
}
1713-
if (this.Client.SubscriptionId != null)
1714-
{
1715-
if (this.Client.SubscriptionId.Length < 1)
1716-
{
1717-
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MinLength, "Client.SubscriptionId", 1);
1718-
}
1719-
}
1709+
17201710
if (resourceGroupName == null)
17211711
{
17221712
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "resourceGroupName");
@@ -1818,7 +1808,7 @@ internal partial class BackupsOperations : Microsoft.Rest.IServiceOperations<Net
18181808

18191809
var _baseUrl = this.Client.BaseUri.AbsoluteUri;
18201810
var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/backups/{backupName}").ToString();
1821-
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
1811+
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Microsoft.Rest.Serialization.SafeJsonConvert.SerializeObject(this.Client.SubscriptionId, this.Client.SerializationSettings).Trim('"')));
18221812
_url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
18231813
_url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
18241814
_url = _url.Replace("{poolName}", System.Uri.EscapeDataString(poolName));
@@ -2098,7 +2088,7 @@ internal partial class BackupsOperations : Microsoft.Rest.IServiceOperations<Net
20982088

20992089
var _baseUrl = this.Client.BaseUri.AbsoluteUri;
21002090
var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/backups").ToString();
2101-
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
2091+
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Microsoft.Rest.Serialization.SafeJsonConvert.SerializeObject(this.Client.SubscriptionId, this.Client.SerializationSettings).Trim('"')));
21022092
_url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
21032093
_url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
21042094
_url = _url.Replace("{poolName}", System.Uri.EscapeDataString(poolName));

0 commit comments

Comments
 (0)