diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/Helpers/RecoveryServicesManagementTestUtilities.cs b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/Helpers/RecoveryServicesManagementTestUtilities.cs
index 9f99755f0179..8bfc39e5d4fa 100644
--- a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/Helpers/RecoveryServicesManagementTestUtilities.cs
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/Helpers/RecoveryServicesManagementTestUtilities.cs
@@ -39,7 +39,7 @@ public static RecoveryServicesManagementClient GetRecoveryServicesManagementClie
}
return new RecoveryServicesManagementClient(
- "Microsoft.RecoveryServicesBVTD2",
+ "Microsoft.RecoveryServicesseadev01",
(SubscriptionCloudCredentials)environment.Credentials,
environment.BaseUri).WithHandler(HttpMockServer.CreateInstance());
}
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/RecoveryServices.Tests.csproj b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/RecoveryServices.Tests.csproj
index e4b8dd28de07..cfa9d65d8333 100644
--- a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/RecoveryServices.Tests.csproj
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/RecoveryServices.Tests.csproj
@@ -22,6 +22,7 @@
+
@@ -51,6 +52,9 @@
PreserveNewest
+
+
+ PreserveNewest
\ No newline at end of file
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/ScenarioTests/VaultUsageTests.cs b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/ScenarioTests/VaultUsageTests.cs
new file mode 100644
index 000000000000..7bc307d416bc
--- /dev/null
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/ScenarioTests/VaultUsageTests.cs
@@ -0,0 +1,52 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Microsoft.Azure;
+using Microsoft.Azure.Management.RecoveryServices;
+using Microsoft.Azure.Management.RecoveryServices.Models;
+using Microsoft.Azure.Test;
+using System.Net;
+using Xunit;
+
+namespace RecoveryServices.Tests
+{
+ public class VaultUsageTests : RecoveryServicesTestsBase
+ {
+ string resourceGroupName = "testsitegroup";
+ string resourceName = "rsv5";
+
+ [Fact]
+ public void RetrieveVaultUsage()
+ {
+ using (UndoContext context = UndoContext.Current)
+ {
+ context.Start();
+ var rsmClient = GetRecoveryServicesClient(CustomHttpHandler);
+ VaultUsageListResponse response = rsmClient.VaultUsage.List(resourceGroupName, resourceName, RequestHeaders);
+
+ Assert.NotNull(response.Value);
+ Assert.NotEqual(response.Value.Count, 0);
+ foreach (var usage in response.Value)
+ {
+ Assert.NotNull(usage.Name.Value);
+ Assert.NotNull(usage.Name.LocalizedValue);
+ Assert.NotNull(usage.Unit);
+ Assert.NotNull(usage.CurrentValue);
+ Assert.NotNull(usage.Limit);
+ }
+ Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+ }
+ }
+ }
+}
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/CreateAndRetrieveVaultExtendedInfo.json b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/CreateAndRetrieveVaultExtendedInfo.json
index bb29a5167b55..1fa31eed398c 100644
--- a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/CreateAndRetrieveVaultExtendedInfo.json
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/CreateAndRetrieveVaultExtendedInfo.json
@@ -1,8 +1,8 @@
{
"Entries": [
{
- "RequestUri": "/Subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesBVTD2/vaults/rsv5/extendedInformation/vaultExtendedInfo?api-version=2015-08-15",
- "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvMDBhMDdlYTAtYWQ4Yi00OTFjLTlkZTgtNzdiZjEwODgxNDk5L3Jlc291cmNlR3JvdXBzL3Rlc3RzaXRlZ3JvdXAvcHJvdmlkZXJzL01pY3Jvc29mdC5SZWNvdmVyeVNlcnZpY2VzQlZURDIvdmF1bHRzL3JzdjUvZXh0ZW5kZWRJbmZvcm1hdGlvbi92YXVsdEV4dGVuZGVkSW5mbz9hcGktdmVyc2lvbj0yMDE1LTA4LTE1",
+ "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesseadev01/vaults/rsv5/extendedInformation/vaultExtendedInfo?api-version=2015-11-10",
+ "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL3Rlc3RzaXRlZ3JvdXAvcHJvdmlkZXJzL01pY3Jvc29mdC5SZWNvdmVyeVNlcnZpY2Vzc2VhZGV2MDEvdmF1bHRzL3JzdjUvZXh0ZW5kZWRJbmZvcm1hdGlvbi92YXVsdEV4dGVuZGVkSW5mbz9hcGktdmVyc2lvbj0yMDE1LTExLTEw",
"RequestMethod": "PUT",
"RequestBody": "{\r\n \"properties\": {\r\n \"integrityKey\": \"integrity key\",\r\n \"algorithm\": \"none\"\r\n }\r\n}",
"RequestHeaders": {
@@ -13,19 +13,19 @@
"91"
],
"x-ms-client-request-id": [
- "274f20cc-dbc5-4a3a-b9d9-c5e6a0e50ac8"
+ "d2e0b599-2610-4659-a064-b4b5de2d22d0"
],
"x-ms-version": [
"2015-01-01"
],
"User-Agent": [
- "Microsoft.Azure.Management.RecoveryServices.RecoveryServicesManagementClient/5.0.0.0"
+ "Microsoft.Azure.Management.RecoveryServices.RecoveryServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"location\": null,\r\n \"name\": \"vaultExtendedInfo\",\r\n \"etag\": \"e2107110-4780-4874-89cf-bfac46eb44f0\",\r\n \"tags\": null,\r\n \"properties\": {\r\n \"integrityKey\": \"integrity key\",\r\n \"algorithm\": \"none\"\r\n },\r\n \"id\": \"/subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesBVTD2/vaults/rsv5extendedInformation/vaultExtendedInfo\",\r\n \"type\": \"Microsoft.RecoveryServicesBVTD2/vaults/extendedInformation\",\r\n \"sku\": null\r\n}",
+ "ResponseBody": "{\r\n \"location\": null,\r\n \"name\": \"vaultExtendedInfo\",\r\n \"etag\": \"ae2444f5-f73f-4652-8d24-079813d44f95\",\r\n \"tags\": null,\r\n \"properties\": {\r\n \"integrityKey\": \"integrity key\",\r\n \"algorithm\": \"none\"\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesseadev01/vaults/rsv5extendedInformation/vaultExtendedInfo\",\r\n \"type\": \"Microsoft.RecoveryServicesseadev01/vaults/extendedInformation\",\r\n \"sku\": null\r\n}",
"ResponseHeaders": {
"Content-Length": [
- "425"
+ "431"
],
"Content-Type": [
"application/json"
@@ -37,10 +37,10 @@
"no-cache"
],
"x-ms-request-id": [
- "50050f7b-6576-43a2-a7df-049d75bd4fa7"
+ "97d3c846-4907-45d5-a7e0-05455fd59fd3"
],
"x-ms-client-request-id": [
- "274f20cc-dbc5-4a3a-b9d9-c5e6a0e50ac8"
+ "d2e0b599-2610-4659-a064-b4b5de2d22d0"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
@@ -49,16 +49,16 @@
"1199"
],
"x-ms-correlation-request-id": [
- "50050f7b-6576-43a2-a7df-049d75bd4fa7"
+ "97d3c846-4907-45d5-a7e0-05455fd59fd3"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20151117T155530Z:50050f7b-6576-43a2-a7df-049d75bd4fa7"
+ "CENTRALUS:20151214T055928Z:97d3c846-4907-45d5-a7e0-05455fd59fd3"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Tue, 17 Nov 2015 15:55:30 GMT"
+ "Mon, 14 Dec 2015 05:59:28 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -67,25 +67,25 @@
"StatusCode": 200
},
{
- "RequestUri": "/Subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesBVTD2/vaults/rsv5/extendedInformation/vaultExtendedInfo?api-version=2015-08-15",
- "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvMDBhMDdlYTAtYWQ4Yi00OTFjLTlkZTgtNzdiZjEwODgxNDk5L3Jlc291cmNlR3JvdXBzL3Rlc3RzaXRlZ3JvdXAvcHJvdmlkZXJzL01pY3Jvc29mdC5SZWNvdmVyeVNlcnZpY2VzQlZURDIvdmF1bHRzL3JzdjUvZXh0ZW5kZWRJbmZvcm1hdGlvbi92YXVsdEV4dGVuZGVkSW5mbz9hcGktdmVyc2lvbj0yMDE1LTA4LTE1",
+ "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesseadev01/vaults/rsv5/extendedInformation/vaultExtendedInfo?api-version=2015-11-10",
+ "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL3Rlc3RzaXRlZ3JvdXAvcHJvdmlkZXJzL01pY3Jvc29mdC5SZWNvdmVyeVNlcnZpY2Vzc2VhZGV2MDEvdmF1bHRzL3JzdjUvZXh0ZW5kZWRJbmZvcm1hdGlvbi92YXVsdEV4dGVuZGVkSW5mbz9hcGktdmVyc2lvbj0yMDE1LTExLTEw",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
- "274f20cc-dbc5-4a3a-b9d9-c5e6a0e50ac8"
+ "d2e0b599-2610-4659-a064-b4b5de2d22d0"
],
"x-ms-version": [
"2015-01-01"
],
"User-Agent": [
- "Microsoft.Azure.Management.RecoveryServices.RecoveryServicesManagementClient/5.0.0.0"
+ "Microsoft.Azure.Management.RecoveryServices.RecoveryServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"location\": null,\r\n \"name\": \"vaultExtendedInfo\",\r\n \"etag\": \"e2107110-4780-4874-89cf-bfac46eb44f0\",\r\n \"tags\": null,\r\n \"properties\": {\r\n \"integrityKey\": \"integrity key\",\r\n \"algorithm\": \"none\"\r\n },\r\n \"id\": \"/subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesBVTD2/vaults/rsv5extendedInformation/vaultExtendedInfo\",\r\n \"type\": \"Microsoft.RecoveryServicesBVTD2/vaults/extendedInformation\",\r\n \"sku\": null\r\n}",
+ "ResponseBody": "{\r\n \"location\": null,\r\n \"name\": \"vaultExtendedInfo\",\r\n \"etag\": \"ae2444f5-f73f-4652-8d24-079813d44f95\",\r\n \"tags\": null,\r\n \"properties\": {\r\n \"integrityKey\": \"integrity key\",\r\n \"algorithm\": \"none\"\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesseadev01/vaults/rsv5extendedInformation/vaultExtendedInfo\",\r\n \"type\": \"Microsoft.RecoveryServicesseadev01/vaults/extendedInformation\",\r\n \"sku\": null\r\n}",
"ResponseHeaders": {
"Content-Length": [
- "425"
+ "431"
],
"Content-Type": [
"application/json"
@@ -97,10 +97,10 @@
"no-cache"
],
"x-ms-request-id": [
- "c682bfee-47c7-422d-9b94-6c4d5e5c2394"
+ "6fc0bfed-f82e-4a65-8790-dff008d476a3"
],
"x-ms-client-request-id": [
- "274f20cc-dbc5-4a3a-b9d9-c5e6a0e50ac8"
+ "d2e0b599-2610-4659-a064-b4b5de2d22d0"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
@@ -109,16 +109,16 @@
"14999"
],
"x-ms-correlation-request-id": [
- "c682bfee-47c7-422d-9b94-6c4d5e5c2394"
+ "6fc0bfed-f82e-4a65-8790-dff008d476a3"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20151117T155531Z:c682bfee-47c7-422d-9b94-6c4d5e5c2394"
+ "CENTRALUS:20151214T055930Z:6fc0bfed-f82e-4a65-8790-dff008d476a3"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Tue, 17 Nov 2015 15:55:31 GMT"
+ "Mon, 14 Dec 2015 05:59:29 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -129,6 +129,6 @@
],
"Names": {},
"Variables": {
- "SubscriptionId": "00a07ea0-ad8b-491c-9de8-77bf10881499"
+ "SubscriptionId": "f5303a0b-fae4-4cdb-b44d-0e4c032dde26"
}
}
\ No newline at end of file
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/CreateVault.json b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/CreateVault.json
index bfcbc8fe7842..4515da75b547 100644
--- a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/CreateVault.json
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/CreateVault.json
@@ -1,8 +1,8 @@
{
"Entries": [
{
- "RequestUri": "/Subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesBVTD2/vaults/rsv5?api-version=2015-08-15",
- "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvMDBhMDdlYTAtYWQ4Yi00OTFjLTlkZTgtNzdiZjEwODgxNDk5L3Jlc291cmNlR3JvdXBzL3Rlc3RzaXRlZ3JvdXAvcHJvdmlkZXJzL01pY3Jvc29mdC5SZWNvdmVyeVNlcnZpY2VzQlZURDIvdmF1bHRzL3JzdjU/YXBpLXZlcnNpb249MjAxNS0wOC0xNQ==",
+ "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesseadev01/vaults/rsv5?api-version=2015-11-10",
+ "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL3Rlc3RzaXRlZ3JvdXAvcHJvdmlkZXJzL01pY3Jvc29mdC5SZWNvdmVyeVNlcnZpY2Vzc2VhZGV2MDEvdmF1bHRzL3JzdjU/YXBpLXZlcnNpb249MjAxNS0xMS0xMA==",
"RequestMethod": "PUT",
"RequestBody": "{\r\n \"location\": \"westus\",\r\n \"sku\": {\r\n \"name\": \"standard\"\r\n },\r\n \"properties\": {}\r\n}",
"RequestHeaders": {
@@ -19,13 +19,13 @@
"2015-01-01"
],
"User-Agent": [
- "Microsoft.Azure.Management.RecoveryServices.RecoveryServicesManagementClient/5.0.0.0"
+ "Microsoft.Azure.Management.RecoveryServices.RecoveryServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"location\": \"westus\",\r\n \"name\": \"rsv5\",\r\n \"etag\": \"1d4e37cd-5ff3-47c6-a68e-55436cfd3e0e\",\r\n \"tags\": null,\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesBVTD2/vaults/rsv5\",\r\n \"type\": \"Microsoft.RecoveryServicesBVTD2/vaults\",\r\n \"sku\": {\r\n \"name\": \"standard\",\r\n \"tier\": null,\r\n \"size\": null,\r\n \"family\": null,\r\n \"capacity\": null\r\n }\r\n}",
+ "ResponseBody": "{\r\n \"location\": \"westus\",\r\n \"name\": \"rsv5\",\r\n \"etag\": \"1acb266c-37d9-4420-97d4-a03abc324d55\",\r\n \"tags\": null,\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesseadev01/vaults/rsv5\",\r\n \"type\": \"Microsoft.RecoveryServicesseadev01/vaults\",\r\n \"sku\": {\r\n \"name\": \"standard\",\r\n \"tier\": null,\r\n \"size\": null,\r\n \"family\": null,\r\n \"capacity\": null\r\n }\r\n}",
"ResponseHeaders": {
"Content-Length": [
- "410"
+ "416"
],
"Content-Type": [
"application/json"
@@ -37,10 +37,10 @@
"no-cache"
],
"x-ms-request-id": [
- "7f222829-875a-4ee7-91c1-f1b8f2ab3a49"
+ "69486eb6-1c50-4630-a84c-d927654c28b4"
],
"x-ms-client-request-id": [
- "b97cbf61-0a3e-45ba-a3ee-ca33dee4fa77"
+ "b515f137-e2a2-47ba-9d22-83172217788b"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
@@ -49,16 +49,16 @@
"1199"
],
"x-ms-correlation-request-id": [
- "7f222829-875a-4ee7-91c1-f1b8f2ab3a49"
+ "69486eb6-1c50-4630-a84c-d927654c28b4"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20151117T155504Z:7f222829-875a-4ee7-91c1-f1b8f2ab3a49"
+ "CENTRALUS:20151214T055850Z:69486eb6-1c50-4630-a84c-d927654c28b4"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Tue, 17 Nov 2015 15:55:03 GMT"
+ "Mon, 14 Dec 2015 05:58:50 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -69,6 +69,6 @@
],
"Names": {},
"Variables": {
- "SubscriptionId": "00a07ea0-ad8b-491c-9de8-77bf10881499"
+ "SubscriptionId": "f5303a0b-fae4-4cdb-b44d-0e4c032dde26"
}
}
\ No newline at end of file
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/RemoveVault.json b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/RemoveVault.json
index 1695c9bdbce6..cea3f9243d60 100644
--- a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/RemoveVault.json
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/RemoveVault.json
@@ -1,8 +1,8 @@
{
"Entries": [
{
- "RequestUri": "/Subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesBVTD2/vaults/rsv5?api-version=2015-08-15",
- "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvMDBhMDdlYTAtYWQ4Yi00OTFjLTlkZTgtNzdiZjEwODgxNDk5L3Jlc291cmNlR3JvdXBzL3Rlc3RzaXRlZ3JvdXAvcHJvdmlkZXJzL01pY3Jvc29mdC5SZWNvdmVyeVNlcnZpY2VzQlZURDIvdmF1bHRzL3JzdjU/YXBpLXZlcnNpb249MjAxNS0wOC0xNQ==",
+ "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesseadev01/vaults/rsv5?api-version=2015-11-10",
+ "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL3Rlc3RzaXRlZ3JvdXAvcHJvdmlkZXJzL01pY3Jvc29mdC5SZWNvdmVyeVNlcnZpY2Vzc2VhZGV2MDEvdmF1bHRzL3JzdjU/YXBpLXZlcnNpb249MjAxNS0xMS0xMA==",
"RequestMethod": "DELETE",
"RequestBody": "",
"RequestHeaders": {
@@ -13,7 +13,7 @@
"2015-01-01"
],
"User-Agent": [
- "Microsoft.Azure.Management.RecoveryServices.RecoveryServicesManagementClient/5.0.0.0"
+ "Microsoft.Azure.Management.RecoveryServices.RecoveryServicesManagementClient/1.0.0.0"
]
},
"ResponseBody": "",
@@ -28,10 +28,10 @@
"no-cache"
],
"x-ms-request-id": [
- "5f17f666-1d7c-4f3e-ad46-5df2faaad05f"
+ "2e6aa792-b5ee-4416-a302-d70335b90412"
],
"x-ms-client-request-id": [
- "95a07618-a661-4c95-b5d5-66168463c640"
+ "4b4708fa-af17-4a2b-9619-f2a495d41f92"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
@@ -40,16 +40,16 @@
"1198"
],
"x-ms-correlation-request-id": [
- "5f17f666-1d7c-4f3e-ad46-5df2faaad05f"
+ "2e6aa792-b5ee-4416-a302-d70335b90412"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20151117T155552Z:5f17f666-1d7c-4f3e-ad46-5df2faaad05f"
+ "CENTRALUS:20151214T055714Z:2e6aa792-b5ee-4416-a302-d70335b90412"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Tue, 17 Nov 2015 15:55:52 GMT"
+ "Mon, 14 Dec 2015 05:57:14 GMT"
]
},
"StatusCode": 200
@@ -57,6 +57,6 @@
],
"Names": {},
"Variables": {
- "SubscriptionId": "00a07ea0-ad8b-491c-9de8-77bf10881499"
+ "SubscriptionId": "f5303a0b-fae4-4cdb-b44d-0e4c032dde26"
}
}
\ No newline at end of file
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/RetrieveVault.json b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/RetrieveVault.json
index ab88db62bcb3..a776e4a7bd07 100644
--- a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/RetrieveVault.json
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultTests/RetrieveVault.json
@@ -1,25 +1,25 @@
{
"Entries": [
{
- "RequestUri": "/Subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesBVTD2/vaults?api-version=2015-08-15",
- "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvMDBhMDdlYTAtYWQ4Yi00OTFjLTlkZTgtNzdiZjEwODgxNDk5L3Jlc291cmNlR3JvdXBzL3Rlc3RzaXRlZ3JvdXAvcHJvdmlkZXJzL01pY3Jvc29mdC5SZWNvdmVyeVNlcnZpY2VzQlZURDIvdmF1bHRzP2FwaS12ZXJzaW9uPTIwMTUtMDgtMTU=",
+ "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesseadev01/vaults?api-version=2015-11-10",
+ "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL3Rlc3RzaXRlZ3JvdXAvcHJvdmlkZXJzL01pY3Jvc29mdC5SZWNvdmVyeVNlcnZpY2Vzc2VhZGV2MDEvdmF1bHRzP2FwaS12ZXJzaW9uPTIwMTUtMTEtMTA=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
- "3c5cf298-47bd-4d70-9e84-218bf79b2c71"
+ "826f638b-95b5-4677-b84e-e7405f407579"
],
"x-ms-version": [
"2015-01-01"
],
"User-Agent": [
- "Microsoft.Azure.Management.RecoveryServices.RecoveryServicesManagementClient/5.0.0.0"
+ "Microsoft.Azure.Management.RecoveryServices.RecoveryServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"location\": \"westus\",\r\n \"name\": \"rsv5\",\r\n \"etag\": \"1d4e37cd-5ff3-47c6-a68e-55436cfd3e0e\",\r\n \"tags\": null,\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesBVTD2/vaults/rsv5\",\r\n \"type\": \"Microsoft.RecoveryServicesBVTD2/vaults\",\r\n \"sku\": {\r\n \"name\": \"standard\",\r\n \"tier\": null,\r\n \"size\": null,\r\n \"family\": null,\r\n \"capacity\": null\r\n }\r\n },\r\n {\r\n \"location\": \"westus\",\r\n \"name\": \"t4\",\r\n \"etag\": \"c76b9509-ea28-497d-b5b4-d9a50e6337be\",\r\n \"tags\": null,\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesBVTD2/vaults/t4\",\r\n \"type\": \"Microsoft.RecoveryServicesBVTD2/vaults\",\r\n \"sku\": {\r\n \"name\": \"standard\",\r\n \"tier\": null,\r\n \"size\": null,\r\n \"family\": null,\r\n \"capacity\": null\r\n }\r\n },\r\n {\r\n \"location\": \"westus\",\r\n \"name\": \"t5\",\r\n \"etag\": \"cc2ad0c2-eaac-4777-adfc-4e055e00ebc9\",\r\n \"tags\": null,\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesBVTD2/vaults/t5\",\r\n \"type\": \"Microsoft.RecoveryServicesBVTD2/vaults\",\r\n \"sku\": {\r\n \"name\": \"standard\",\r\n \"tier\": null,\r\n \"size\": null,\r\n \"family\": null,\r\n \"capacity\": null\r\n }\r\n },\r\n {\r\n \"location\": \"westus\",\r\n \"name\": \"test\",\r\n \"etag\": \"62e82a14-8105-4337-a1be-6b9dfeec147f\",\r\n \"tags\": null,\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesBVTD2/vaults/test\",\r\n \"type\": \"Microsoft.RecoveryServicesBVTD2/vaults\",\r\n \"sku\": {\r\n \"name\": \"standard\",\r\n \"tier\": null,\r\n \"size\": null,\r\n \"family\": null,\r\n \"capacity\": null\r\n }\r\n },\r\n {\r\n \"location\": \"westus\",\r\n \"name\": \"test51\",\r\n \"etag\": \"f495bf9b-94f0-49d1-aacc-1fdac8aee4d7\",\r\n \"tags\": null,\r\n \"properties\": {\r\n \"sku\": {\r\n \"name\": \"standard\"\r\n },\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesBVTD2/vaults/test51\",\r\n \"type\": \"Microsoft.RecoveryServicesBVTD2/vaults\",\r\n \"sku\": null\r\n }\r\n ]\r\n}",
+ "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"location\": \"westus\",\r\n \"name\": \"rsv5\",\r\n \"etag\": \"1acb266c-37d9-4420-97d4-a03abc324d55\",\r\n \"tags\": null,\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesseadev01/vaults/rsv5\",\r\n \"type\": \"Microsoft.RecoveryServicesseadev01/vaults\",\r\n \"sku\": {\r\n \"name\": \"standard\",\r\n \"tier\": null,\r\n \"size\": null,\r\n \"family\": null,\r\n \"capacity\": null\r\n }\r\n }\r\n ]\r\n}",
"ResponseHeaders": {
"Content-Length": [
- "2019"
+ "428"
],
"Content-Type": [
"application/json"
@@ -31,10 +31,10 @@
"no-cache"
],
"x-ms-request-id": [
- "1fc9a744-ad98-4a79-97ef-0e957965f371"
+ "4184ab65-1982-40cd-a27a-d90bd1d4f58e"
],
"x-ms-client-request-id": [
- "3c5cf298-47bd-4d70-9e84-218bf79b2c71"
+ "826f638b-95b5-4677-b84e-e7405f407579"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
@@ -43,16 +43,16 @@
"14999"
],
"x-ms-correlation-request-id": [
- "1fc9a744-ad98-4a79-97ef-0e957965f371"
+ "4184ab65-1982-40cd-a27a-d90bd1d4f58e"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20151117T155517Z:1fc9a744-ad98-4a79-97ef-0e957965f371"
+ "CENTRALUS:20151214T055942Z:4184ab65-1982-40cd-a27a-d90bd1d4f58e"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Tue, 17 Nov 2015 15:55:17 GMT"
+ "Mon, 14 Dec 2015 05:59:42 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -63,6 +63,6 @@
],
"Names": {},
"Variables": {
- "SubscriptionId": "00a07ea0-ad8b-491c-9de8-77bf10881499"
+ "SubscriptionId": "f5303a0b-fae4-4cdb-b44d-0e4c032dde26"
}
}
\ No newline at end of file
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultUsageTests/RetrieveVaultUsage.json b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultUsageTests/RetrieveVaultUsage.json
new file mode 100644
index 000000000000..9218ef78e104
--- /dev/null
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.VaultUsageTests/RetrieveVaultUsage.json
@@ -0,0 +1,68 @@
+{
+ "Entries": [
+ {
+ "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/testsitegroup/providers/Microsoft.RecoveryServicesseadev01/vaults/rsv5/usages?api-version=2015-11-10",
+ "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL3Rlc3RzaXRlZ3JvdXAvcHJvdmlkZXJzL01pY3Jvc29mdC5SZWNvdmVyeVNlcnZpY2Vzc2VhZGV2MDEvdmF1bHRzL3JzdjUvdXNhZ2VzP2FwaS12ZXJzaW9uPTIwMTUtMTEtMTA=",
+ "RequestMethod": "GET",
+ "RequestBody": "",
+ "RequestHeaders": {
+ "x-ms-client-request-id": [
+ "c87b2028-ed19-45e9-b181-60833a6176b8"
+ ],
+ "x-ms-version": [
+ "2015-01-01"
+ ],
+ "User-Agent": [
+ "Microsoft.Azure.Management.RecoveryServices.RecoveryServicesManagementClient/1.0.0.0"
+ ]
+ },
+ "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"name\": {\r\n \"value\": \"LRSStorageUsage\",\r\n \"localizedValue\": \"Cloud - LRS\"\r\n },\r\n \"unit\": \"Bytes\",\r\n \"currentValue\": 0,\r\n \"limit\": -1,\r\n \"nextResetTime\": null,\r\n \"quotaPeriod\": null\r\n },\r\n {\r\n \"name\": {\r\n \"value\": \"GRSStorageUsage\",\r\n \"localizedValue\": \"Cloud - GRS\"\r\n },\r\n \"unit\": \"Bytes\",\r\n \"currentValue\": 1,\r\n \"limit\": -1,\r\n \"nextResetTime\": null,\r\n \"quotaPeriod\": null\r\n },\r\n {\r\n \"name\": {\r\n \"value\": \"ProtectedInstances\",\r\n \"localizedValue\": \"Protected Instances\"\r\n },\r\n \"unit\": \"Count\",\r\n \"currentValue\": 1,\r\n \"limit\": -1,\r\n \"nextResetTime\": null,\r\n \"quotaPeriod\": null\r\n },\r\n {\r\n \"name\": {\r\n \"value\": \"BackupItems\",\r\n \"localizedValue\": \"Backup Items\"\r\n },\r\n \"unit\": \"Count\",\r\n \"currentValue\": 1,\r\n \"limit\": -1,\r\n \"nextResetTime\": null,\r\n \"quotaPeriod\": null\r\n },\r\n {\r\n \"name\": {\r\n \"value\": \"BackupJobs\",\r\n \"localizedValue\": \"Backup Jobs\"\r\n },\r\n \"unit\": \"Count\",\r\n \"currentValue\": 1,\r\n \"limit\": -1,\r\n \"nextResetTime\": null,\r\n \"quotaPeriod\": null\r\n },\r\n {\r\n \"name\": {\r\n \"value\": \"BackupManagementServers\",\r\n \"localizedValue\": \"Backup Management Servers\"\r\n },\r\n \"unit\": \"Count\",\r\n \"currentValue\": 0,\r\n \"limit\": -1,\r\n \"nextResetTime\": null,\r\n \"quotaPeriod\": null\r\n },\r\n {\r\n \"name\": {\r\n \"value\": \"LRSStorageUsage\",\r\n \"localizedValue\": \"Cloud - LRS\"\r\n },\r\n \"unit\": \"Bytes\",\r\n \"currentValue\": 0,\r\n \"limit\": -1,\r\n \"nextResetTime\": null,\r\n \"quotaPeriod\": null\r\n },\r\n {\r\n \"name\": {\r\n \"value\": \"GRSStorageUsage\",\r\n \"localizedValue\": \"Cloud - GRS\"\r\n },\r\n \"unit\": \"Bytes\",\r\n \"currentValue\": 1,\r\n \"limit\": -1,\r\n \"nextResetTime\": null,\r\n \"quotaPeriod\": null\r\n },\r\n {\r\n \"name\": {\r\n \"value\": \"ProtectedInstances\",\r\n \"localizedValue\": \"Protected Instances\"\r\n },\r\n \"unit\": \"Count\",\r\n \"currentValue\": 1,\r\n \"limit\": -1,\r\n \"nextResetTime\": null,\r\n \"quotaPeriod\": null\r\n },\r\n {\r\n \"name\": {\r\n \"value\": \"BackupItems\",\r\n \"localizedValue\": \"Backup Items\"\r\n },\r\n \"unit\": \"Count\",\r\n \"currentValue\": 1,\r\n \"limit\": -1,\r\n \"nextResetTime\": null,\r\n \"quotaPeriod\": null\r\n },\r\n {\r\n \"name\": {\r\n \"value\": \"BackupJobs\",\r\n \"localizedValue\": \"Backup Jobs\"\r\n },\r\n \"unit\": \"Count\",\r\n \"currentValue\": 1,\r\n \"limit\": -1,\r\n \"nextResetTime\": null,\r\n \"quotaPeriod\": null\r\n },\r\n {\r\n \"name\": {\r\n \"value\": \"BackupManagementServers\",\r\n \"localizedValue\": \"Backup Management Servers\"\r\n },\r\n \"unit\": \"Count\",\r\n \"currentValue\": 0,\r\n \"limit\": -1,\r\n \"nextResetTime\": null,\r\n \"quotaPeriod\": null\r\n }\r\n ]\r\n}",
+ "ResponseHeaders": {
+ "Content-Length": [
+ "1873"
+ ],
+ "Content-Type": [
+ "application/json"
+ ],
+ "Expires": [
+ "-1"
+ ],
+ "Pragma": [
+ "no-cache"
+ ],
+ "x-ms-request-id": [
+ "95d70e07-f7ea-4d87-9efd-fa6bf23da473"
+ ],
+ "x-ms-client-request-id": [
+ "c87b2028-ed19-45e9-b181-60833a6176b8"
+ ],
+ "Strict-Transport-Security": [
+ "max-age=31536000; includeSubDomains"
+ ],
+ "x-ms-ratelimit-remaining-subscription-reads": [
+ "14999"
+ ],
+ "x-ms-correlation-request-id": [
+ "95d70e07-f7ea-4d87-9efd-fa6bf23da473"
+ ],
+ "x-ms-routing-request-id": [
+ "CENTRALUS:20151215T080511Z:95d70e07-f7ea-4d87-9efd-fa6bf23da473"
+ ],
+ "Cache-Control": [
+ "no-cache"
+ ],
+ "Date": [
+ "Tue, 15 Dec 2015 08:05:10 GMT"
+ ],
+ "Server": [
+ "Microsoft-IIS/8.0"
+ ]
+ },
+ "StatusCode": 200
+ }
+ ],
+ "Names": {},
+ "Variables": {
+ "SubscriptionId": "f5303a0b-fae4-4cdb-b44d-0e4c032dde26"
+ }
+}
\ No newline at end of file
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/IRecoveryServicesManagementClient.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/IRecoveryServicesManagementClient.cs
index 8c0f195f9620..91ffab740c82 100644
--- a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/IRecoveryServicesManagementClient.cs
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/IRecoveryServicesManagementClient.cs
@@ -113,6 +113,14 @@ IVaultOperations Vaults
get;
}
+ ///
+ /// Definition of vault operations for the Recovery Services extension.
+ ///
+ IVaultUsageOperations VaultUsage
+ {
+ get;
+ }
+
///
/// The Get Operation Status operation returns the status of
/// thespecified operation. After calling an asynchronous operation,
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/IVaultUsageOperations.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/IVaultUsageOperations.cs
new file mode 100644
index 000000000000..72306cbf84d9
--- /dev/null
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/IVaultUsageOperations.cs
@@ -0,0 +1,56 @@
+//
+// Copyright (c) Microsoft and contributors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Warning: This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if the
+// code is regenerated.
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Azure.Management.RecoveryServices.Models;
+
+namespace Microsoft.Azure.Management.RecoveryServices
+{
+ ///
+ /// Definition of vault operations for the Recovery Services extension.
+ ///
+ public partial interface IVaultUsageOperations
+ {
+ ///
+ /// Get the Vault Usage.
+ ///
+ ///
+ /// The name of the (resource group?) cloud service containing the
+ /// vault collection.
+ ///
+ ///
+ /// The name of the vault to get usage.
+ ///
+ ///
+ /// Request header parameters.
+ ///
+ ///
+ /// Cancellation token.
+ ///
+ ///
+ /// The response model for Vault usage.
+ ///
+ Task ListAsync(string resourceGroupName, string vaultName, CustomRequestHeaders customRequestHeaders, CancellationToken cancellationToken);
+ }
+}
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/CertificateProperties.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/CertificateProperties.cs
deleted file mode 100644
index 307f3d2df3fe..000000000000
--- a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/CertificateProperties.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) Microsoft and contributors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// Warning: This code was generated by a tool.
-//
-// Changes to this file may cause incorrect behavior and will be lost if the
-// code is regenerated.
-
-using System;
-using System.Linq;
-
-namespace Microsoft.Azure.Management.SiteRecovery.Models
-{
- ///
- /// The certificate properties
- ///
- public partial class CertificateProperties
- {
- private string _friendlyName;
-
- ///
- /// Optional. Friendly name of the certificate.
- ///
- public string FriendlyName
- {
- get { return this._friendlyName; }
- set { this._friendlyName = value; }
- }
-
- private string _globalAcsHostName;
-
- ///
- /// Optional. Global ACS Host name.
- ///
- public string GlobalAcsHostName
- {
- get { return this._globalAcsHostName; }
- set { this._globalAcsHostName = value; }
- }
-
- private string _globalAcsNamespace;
-
- ///
- /// Optional. Global ACS Namespace.
- ///
- public string GlobalAcsNamespace
- {
- get { return this._globalAcsNamespace; }
- set { this._globalAcsNamespace = value; }
- }
-
- private string _globalAcsRPRealm;
-
- ///
- /// Optional. Global ACS RP realm.
- ///
- public string GlobalAcsRPRealm
- {
- get { return this._globalAcsRPRealm; }
- set { this._globalAcsRPRealm = value; }
- }
-
- private long _resourceId;
-
- ///
- /// Optional. ASR vault id: resource id
- ///
- public long ResourceId
- {
- get { return this._resourceId; }
- set { this._resourceId = value; }
- }
-
- ///
- /// Initializes a new instance of the CertificateProperties class.
- ///
- public CertificateProperties()
- {
- }
- }
-}
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/CustomRequestHeaders.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/CustomRequestHeaders.cs
deleted file mode 100644
index 947319e9527f..000000000000
--- a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/CustomRequestHeaders.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// Copyright (c) Microsoft and contributors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// Warning: This code was generated by a tool.
-//
-// Changes to this file may cause incorrect behavior and will be lost if the
-// code is regenerated.
-
-using System;
-using System.Linq;
-
-namespace Microsoft.Azure.Management.SiteRecovery.Models
-{
- ///
- /// HTTP Request headers for Site recovery service.
- ///
- public partial class CustomRequestHeaders
- {
- private string _agentAuthenticationHeader;
-
- ///
- /// Optional. String representing a unique code which is used to
- /// validate that the request is originated by an authenticated client.
- ///
- public string AgentAuthenticationHeader
- {
- get { return this._agentAuthenticationHeader; }
- set { this._agentAuthenticationHeader = value; }
- }
-
- private string _clientRequestId;
-
- ///
- /// Optional. ClientRequestId is a unique ID for every request to Azure
- /// Site Recovery. It is useful when diagnosing failures in API calls.
- ///
- public string ClientRequestId
- {
- get { return this._clientRequestId; }
- set { this._clientRequestId = value; }
- }
-
- ///
- /// Initializes a new instance of the CustomRequestHeaders class.
- ///
- public CustomRequestHeaders()
- {
- }
- }
-}
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/ResourceExtendedInformation.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/ResourceExtendedInformation.cs
deleted file mode 100644
index 1494fb369616..000000000000
--- a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/ResourceExtendedInformation.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// Copyright (c) Microsoft and contributors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// Warning: This code was generated by a tool.
-//
-// Changes to this file may cause incorrect behavior and will be lost if the
-// code is regenerated.
-
-using System;
-using System.Linq;
-
-namespace Microsoft.Azure.Management.SiteRecovery.Models
-{
- ///
- /// The definition of a Resource Extended Information object.
- ///
- public partial class ResourceExtendedInformation
- {
- private string _extendedInfo;
-
- ///
- /// Optional. Serialized blob of extended info for the vault.
- ///
- public string ExtendedInfo
- {
- get { return this._extendedInfo; }
- set { this._extendedInfo = value; }
- }
-
- private string _extendedInfoETag;
-
- ///
- /// Optional. ETag for the vault.
- ///
- public string ExtendedInfoETag
- {
- get { return this._extendedInfoETag; }
- set { this._extendedInfoETag = value; }
- }
-
- private string _resourceGroupName;
-
- ///
- /// Optional. Resource group name for the vault.
- ///
- public string ResourceGroupName
- {
- get { return this._resourceGroupName; }
- set { this._resourceGroupName = value; }
- }
-
- private long _resourceId;
-
- ///
- /// Optional. id of the vault.
- ///
- public long ResourceId
- {
- get { return this._resourceId; }
- set { this._resourceId = value; }
- }
-
- private string _resourceName;
-
- ///
- /// Optional. name of the vault.
- ///
- public string ResourceName
- {
- get { return this._resourceName; }
- set { this._resourceName = value; }
- }
-
- private string _resourceType;
-
- ///
- /// Optional. Type of the vault.
- ///
- public string ResourceType
- {
- get { return this._resourceType; }
- set { this._resourceType = value; }
- }
-
- private Guid _subscriptionId;
-
- ///
- /// Optional. subscription id for the vault.
- ///
- public Guid SubscriptionId
- {
- get { return this._subscriptionId; }
- set { this._subscriptionId = value; }
- }
-
- ///
- /// Initializes a new instance of the ResourceExtendedInformation class.
- ///
- public ResourceExtendedInformation()
- {
- }
- }
-}
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/ResourceExtendedInformationArgs.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/ResourceExtendedInformationArgs.cs
deleted file mode 100644
index 43cd0a111c1c..000000000000
--- a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/ResourceExtendedInformationArgs.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) Microsoft and contributors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// Warning: This code was generated by a tool.
-//
-// Changes to this file may cause incorrect behavior and will be lost if the
-// code is regenerated.
-
-using System;
-using System.Linq;
-
-namespace Microsoft.Azure.Management.SiteRecovery.Models
-{
- ///
- /// Vault exteneded information.
- ///
- public partial class ResourceExtendedInformationArgs
- {
- private string _contractVersion;
-
- ///
- /// Required. Contract version for the entity.
- ///
- public string ContractVersion
- {
- get { return this._contractVersion; }
- set { this._contractVersion = value; }
- }
-
- private string _extendedInfo;
-
- ///
- /// Required. Serialized blob for the extended info
- ///
- public string ExtendedInfo
- {
- get { return this._extendedInfo; }
- set { this._extendedInfo = value; }
- }
-
- private string _extendedInfoETag;
-
- ///
- /// Required. ETag for the request
- ///
- public string ExtendedInfoETag
- {
- get { return this._extendedInfoETag; }
- set { this._extendedInfoETag = value; }
- }
-
- ///
- /// Initializes a new instance of the ResourceExtendedInformationArgs
- /// class.
- ///
- public ResourceExtendedInformationArgs()
- {
- }
-
- ///
- /// Initializes a new instance of the ResourceExtendedInformationArgs
- /// class with required arguments.
- ///
- public ResourceExtendedInformationArgs(string contractVersion, string extendedInfo, string extendedInfoETag)
- : this()
- {
- if (contractVersion == null)
- {
- throw new ArgumentNullException("contractVersion");
- }
- if (extendedInfo == null)
- {
- throw new ArgumentNullException("extendedInfo");
- }
- if (extendedInfoETag == null)
- {
- throw new ArgumentNullException("extendedInfoETag");
- }
- this.ContractVersion = contractVersion;
- this.ExtendedInfo = extendedInfo;
- this.ExtendedInfoETag = extendedInfoETag;
- }
- }
-}
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/ResourceExtendedInformationResponse.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/ResourceExtendedInformationResponse.cs
deleted file mode 100644
index 531326f59f91..000000000000
--- a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/ResourceExtendedInformationResponse.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Copyright (c) Microsoft and contributors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// Warning: This code was generated by a tool.
-//
-// Changes to this file may cause incorrect behavior and will be lost if the
-// code is regenerated.
-
-using System;
-using System.Linq;
-using Microsoft.Azure;
-using Microsoft.Azure.Management.SiteRecovery.Models;
-
-namespace Microsoft.Azure.Management.SiteRecovery.Models
-{
- ///
- /// The response model for the resource extended information object
- ///
- public partial class ResourceExtendedInformationResponse : AzureOperationResponse
- {
- private ResourceExtendedInformation _resourceExtendedInformation;
-
- ///
- /// Optional. The resource extended information object
- ///
- public ResourceExtendedInformation ResourceExtendedInformation
- {
- get { return this._resourceExtendedInformation; }
- set { this._resourceExtendedInformation = value; }
- }
-
- ///
- /// Initializes a new instance of the
- /// ResourceExtendedInformationResponse class.
- ///
- public ResourceExtendedInformationResponse()
- {
- }
- }
-}
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/UploadCertificateResponse.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/UploadCertificateResponse.cs
deleted file mode 100644
index 6d7cd0e588d3..000000000000
--- a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/UploadCertificateResponse.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// Copyright (c) Microsoft and contributors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// Warning: This code was generated by a tool.
-//
-// Changes to this file may cause incorrect behavior and will be lost if the
-// code is regenerated.
-
-using System;
-using System.Linq;
-using Microsoft.Azure;
-using Microsoft.Azure.Management.SiteRecovery.Models;
-
-namespace Microsoft.Azure.Management.SiteRecovery.Models
-{
- ///
- /// The response model for the upload certificate response
- ///
- public partial class UploadCertificateResponse : AzureOperationResponse
- {
- private CertificateProperties _properties;
-
- ///
- /// Optional. The certificate properties
- ///
- public CertificateProperties Properties
- {
- get { return this._properties; }
- set { this._properties = value; }
- }
-
- ///
- /// Initializes a new instance of the UploadCertificateResponse class.
- ///
- public UploadCertificateResponse()
- {
- }
- }
-}
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Models/Name.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Models/Name.cs
new file mode 100644
index 000000000000..16c4c3fdac00
--- /dev/null
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Models/Name.cs
@@ -0,0 +1,80 @@
+//
+// Copyright (c) Microsoft and contributors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Warning: This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if the
+// code is regenerated.
+
+using System;
+using System.Linq;
+
+namespace Microsoft.Azure.Management.RecoveryServices.Models
+{
+ ///
+ /// The Name object of Usage.
+ ///
+ public partial class Name
+ {
+ private string _localizedValue;
+
+ ///
+ /// Required. Gets or sets the localized value of usage.
+ ///
+ public string LocalizedValue
+ {
+ get { return this._localizedValue; }
+ set { this._localizedValue = value; }
+ }
+
+ private string _value;
+
+ ///
+ /// Required. Gets or sets the value of usage.
+ ///
+ public string Value
+ {
+ get { return this._value; }
+ set { this._value = value; }
+ }
+
+ ///
+ /// Initializes a new instance of the Name class.
+ ///
+ public Name()
+ {
+ }
+
+ ///
+ /// Initializes a new instance of the Name class with required
+ /// arguments.
+ ///
+ public Name(string value, string localizedValue)
+ : this()
+ {
+ if (value == null)
+ {
+ throw new ArgumentNullException("value");
+ }
+ if (localizedValue == null)
+ {
+ throw new ArgumentNullException("localizedValue");
+ }
+ this.Value = value;
+ this.LocalizedValue = localizedValue;
+ }
+ }
+}
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Models/Usage.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Models/Usage.cs
new file mode 100644
index 000000000000..9978e1d15874
--- /dev/null
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Models/Usage.cs
@@ -0,0 +1,106 @@
+//
+// Copyright (c) Microsoft and contributors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Warning: This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if the
+// code is regenerated.
+
+using System;
+using System.Linq;
+using Microsoft.Azure.Management.RecoveryServices.Models;
+
+namespace Microsoft.Azure.Management.RecoveryServices.Models
+{
+ ///
+ /// The Usage object.
+ ///
+ public partial class Usage
+ {
+ private string _currentValue;
+
+ ///
+ /// Required. Gets or sets the current value of usage.
+ ///
+ public string CurrentValue
+ {
+ get { return this._currentValue; }
+ set { this._currentValue = value; }
+ }
+
+ private string _limit;
+
+ ///
+ /// Required. Gets or sets the limit of usage.
+ ///
+ public string Limit
+ {
+ get { return this._limit; }
+ set { this._limit = value; }
+ }
+
+ private Name _name;
+
+ ///
+ /// Required. Gets or sets the name of usage.
+ ///
+ public Name Name
+ {
+ get { return this._name; }
+ set { this._name = value; }
+ }
+
+ private string _nextResetTime;
+
+ ///
+ /// Optional. Gets or sets the next reset time of usage.
+ ///
+ public string NextResetTime
+ {
+ get { return this._nextResetTime; }
+ set { this._nextResetTime = value; }
+ }
+
+ private string _quotaPeriod;
+
+ ///
+ /// Optional. Gets or sets the quota period of usage.
+ ///
+ public string QuotaPeriod
+ {
+ get { return this._quotaPeriod; }
+ set { this._quotaPeriod = value; }
+ }
+
+ private string _unit;
+
+ ///
+ /// Required. Gets or sets the unit of usage.
+ ///
+ public string Unit
+ {
+ get { return this._unit; }
+ set { this._unit = value; }
+ }
+
+ ///
+ /// Initializes a new instance of the Usage class.
+ ///
+ public Usage()
+ {
+ }
+ }
+}
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/CertificateArgs.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Models/VaultUsageListResponse.cs
similarity index 52%
rename from src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/CertificateArgs.cs
rename to src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Models/VaultUsageListResponse.cs
index 8f47f28d0b68..a67be4e528c8 100644
--- a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Microsoft/Azure/Management/SiteRecovery/Models/CertificateArgs.cs
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/Models/VaultUsageListResponse.cs
@@ -23,45 +23,49 @@
using System.Collections.Generic;
using System.Linq;
using Hyak.Common;
+using Microsoft.Azure;
+using Microsoft.Azure.Management.RecoveryServices.Models;
-namespace Microsoft.Azure.Management.SiteRecovery.Models
+namespace Microsoft.Azure.Management.RecoveryServices.Models
{
///
- /// Certificate to be uploaded to the vault
+ /// The response model for Vault usage.
///
- public partial class CertificateArgs
+ public partial class VaultUsageListResponse : AzureOperationResponse, IEnumerable
{
- private IDictionary _properties;
+ private IList _value;
///
- /// Required. Properties of the certificate.
+ /// Optional. The list of usage for the given vault.
///
- public IDictionary Properties
+ public IList Value
{
- get { return this._properties; }
- set { this._properties = value; }
+ get { return this._value; }
+ set { this._value = value; }
}
///
- /// Initializes a new instance of the CertificateArgs class.
+ /// Initializes a new instance of the VaultUsageListResponse class.
///
- public CertificateArgs()
+ public VaultUsageListResponse()
{
- this.Properties = new LazyDictionary();
+ this.Value = new LazyList();
}
///
- /// Initializes a new instance of the CertificateArgs class with
- /// required arguments.
+ /// Gets the sequence of Value.
///
- public CertificateArgs(IDictionary properties)
- : this()
+ public IEnumerator GetEnumerator()
{
- if (properties == null)
- {
- throw new ArgumentNullException("properties");
- }
- this.Properties = properties;
+ return this.Value.GetEnumerator();
+ }
+
+ ///
+ /// Gets the sequence of Value.
+ ///
+ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+ {
+ return this.GetEnumerator();
}
}
}
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/RecoveryServicesManagementClient.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/RecoveryServicesManagementClient.cs
index a11e5f186fee..2b70bfd0202a 100644
--- a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/RecoveryServicesManagementClient.cs
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/RecoveryServicesManagementClient.cs
@@ -141,6 +141,16 @@ public virtual IVaultOperations Vaults
get { return this._vaults; }
}
+ private IVaultUsageOperations _vaultUsage;
+
+ ///
+ /// Definition of vault operations for the Recovery Services extension.
+ ///
+ public virtual IVaultUsageOperations VaultUsage
+ {
+ get { return this._vaultUsage; }
+ }
+
///
/// Initializes a new instance of the RecoveryServicesManagementClient
/// class.
@@ -152,6 +162,7 @@ public RecoveryServicesManagementClient()
this._resourceGroup = new ResourceGroupsOperations(this);
this._vaultExtendedInfo = new VaultExtendedInfoOperations(this);
this._vaults = new VaultOperations(this);
+ this._vaultUsage = new VaultUsageOperations(this);
this._apiVersion = "2015-01-01";
this._longRunningOperationInitialTimeout = -1;
this._longRunningOperationRetryTimeout = -1;
@@ -240,6 +251,7 @@ public RecoveryServicesManagementClient(HttpClient httpClient)
this._resourceGroup = new ResourceGroupsOperations(this);
this._vaultExtendedInfo = new VaultExtendedInfoOperations(this);
this._vaults = new VaultOperations(this);
+ this._vaultUsage = new VaultUsageOperations(this);
this._apiVersion = "2015-01-01";
this._longRunningOperationInitialTimeout = -1;
this._longRunningOperationRetryTimeout = -1;
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultExtendedInfoOperations.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultExtendedInfoOperations.cs
index 321d86f92aee..2c27b8023b99 100644
--- a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultExtendedInfoOperations.cs
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultExtendedInfoOperations.cs
@@ -139,7 +139,7 @@ public async Task CreateExtendedInfoAsync(string resourc
url = url + Uri.EscapeDataString(resourceName);
url = url + "/extendedInformation/vaultExtendedInfo";
List queryParameters = new List();
- queryParameters.Add("api-version=2015-08-15");
+ queryParameters.Add("api-version=2015-11-10");
if (queryParameters.Count > 0)
{
url = url + "?" + string.Join("&", queryParameters);
@@ -328,7 +328,7 @@ public async Task GetExtendedInfoAsync(stri
url = url + Uri.EscapeDataString(resourceName);
url = url + "/extendedInformation/vaultExtendedInfo";
List queryParameters = new List();
- queryParameters.Add("api-version=2015-08-15");
+ queryParameters.Add("api-version=2015-11-10");
if (queryParameters.Count > 0)
{
url = url + "?" + string.Join("&", queryParameters);
@@ -886,7 +886,7 @@ public async Task UploadCertificateAsync(string resou
url = url + "/certificates/";
url = url + Uri.EscapeDataString(certFriendlyName);
List queryParameters = new List();
- queryParameters.Add("api-version=2015-08-15");
+ queryParameters.Add("api-version=2015-11-10");
if (queryParameters.Count > 0)
{
url = url + "?" + string.Join("&", queryParameters);
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultOperations.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultOperations.cs
index 0c4f9cafca77..1e5503d3a483 100644
--- a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultOperations.cs
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultOperations.cs
@@ -126,7 +126,7 @@ public async Task BeginCreatingAsync(string resourceGroupNa
url = url + "/";
url = url + Uri.EscapeDataString(vaultName);
List queryParameters = new List();
- queryParameters.Add("api-version=2015-08-15");
+ queryParameters.Add("api-version=2015-11-10");
if (queryParameters.Count > 0)
{
url = url + "?" + string.Join("&", queryParameters);
@@ -399,7 +399,7 @@ public async Task BeginDeletingAsync(st
url = url + "/";
url = url + Uri.EscapeDataString(vaultName);
List queryParameters = new List();
- queryParameters.Add("api-version=2015-08-15");
+ queryParameters.Add("api-version=2015-11-10");
if (queryParameters.Count > 0)
{
url = url + "?" + string.Join("&", queryParameters);
@@ -964,7 +964,7 @@ public async Task ListAsync(string resourceGroupName, CustomR
url = url + "/";
url = url + "vaults";
List queryParameters = new List();
- queryParameters.Add("api-version=2015-08-15");
+ queryParameters.Add("api-version=2015-11-10");
if (queryParameters.Count > 0)
{
url = url + "?" + string.Join("&", queryParameters);
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultUsageOperations.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultUsageOperations.cs
new file mode 100644
index 000000000000..d80f56763e89
--- /dev/null
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultUsageOperations.cs
@@ -0,0 +1,294 @@
+//
+// Copyright (c) Microsoft and contributors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Warning: This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if the
+// code is regenerated.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Hyak.Common;
+using Microsoft.Azure.Management.RecoveryServices;
+using Microsoft.Azure.Management.RecoveryServices.Models;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.Azure.Management.RecoveryServices
+{
+ ///
+ /// Definition of vault operations for the Recovery Services extension.
+ ///
+ internal partial class VaultUsageOperations : IServiceOperations, IVaultUsageOperations
+ {
+ ///
+ /// Initializes a new instance of the VaultUsageOperations class.
+ ///
+ ///
+ /// Reference to the service client.
+ ///
+ internal VaultUsageOperations(RecoveryServicesManagementClient client)
+ {
+ this._client = client;
+ }
+
+ private RecoveryServicesManagementClient _client;
+
+ ///
+ /// Gets a reference to the
+ /// Microsoft.Azure.Management.RecoveryServices.RecoveryServicesManagementClient.
+ ///
+ public RecoveryServicesManagementClient Client
+ {
+ get { return this._client; }
+ }
+
+ ///
+ /// Get the Vault Usage.
+ ///
+ ///
+ /// Required. The name of the (resource group?) cloud service
+ /// containing the vault collection.
+ ///
+ ///
+ /// Required. The name of the vault to get usage.
+ ///
+ ///
+ /// Optional. Request header parameters.
+ ///
+ ///
+ /// Cancellation token.
+ ///
+ ///
+ /// The response model for Vault usage.
+ ///
+ public async Task ListAsync(string resourceGroupName, string vaultName, CustomRequestHeaders customRequestHeaders, CancellationToken cancellationToken)
+ {
+ // Validate
+ if (resourceGroupName == null)
+ {
+ throw new ArgumentNullException("resourceGroupName");
+ }
+ if (vaultName == null)
+ {
+ throw new ArgumentNullException("vaultName");
+ }
+
+ // Tracing
+ bool shouldTrace = TracingAdapter.IsEnabled;
+ string invocationId = null;
+ if (shouldTrace)
+ {
+ invocationId = TracingAdapter.NextInvocationId.ToString();
+ Dictionary tracingParameters = new Dictionary();
+ tracingParameters.Add("resourceGroupName", resourceGroupName);
+ tracingParameters.Add("vaultName", vaultName);
+ tracingParameters.Add("customRequestHeaders", customRequestHeaders);
+ TracingAdapter.Enter(invocationId, this, "ListAsync", tracingParameters);
+ }
+
+ // Construct URL
+ string url = "";
+ url = url + "/Subscriptions/";
+ if (this.Client.Credentials.SubscriptionId != null)
+ {
+ url = url + Uri.EscapeDataString(this.Client.Credentials.SubscriptionId);
+ }
+ url = url + "/resourceGroups/";
+ url = url + Uri.EscapeDataString(resourceGroupName);
+ url = url + "/providers/";
+ url = url + Uri.EscapeDataString(this.Client.ResourceNamespace);
+ url = url + "/";
+ url = url + "vaults";
+ url = url + "/";
+ url = url + Uri.EscapeDataString(vaultName);
+ url = url + "/usages";
+ List queryParameters = new List();
+ queryParameters.Add("api-version=2015-11-10");
+ if (queryParameters.Count > 0)
+ {
+ url = url + "?" + string.Join("&", queryParameters);
+ }
+ string baseUrl = this.Client.BaseUri.AbsoluteUri;
+ // Trim '/' character from the end of baseUrl and beginning of url.
+ if (baseUrl[baseUrl.Length - 1] == '/')
+ {
+ baseUrl = baseUrl.Substring(0, baseUrl.Length - 1);
+ }
+ if (url[0] == '/')
+ {
+ url = url.Substring(1);
+ }
+ url = baseUrl + "/" + url;
+ url = url.Replace(" ", "%20");
+
+ // Create HTTP transport objects
+ HttpRequestMessage httpRequest = null;
+ try
+ {
+ httpRequest = new HttpRequestMessage();
+ httpRequest.Method = HttpMethod.Get;
+ httpRequest.RequestUri = new Uri(url);
+
+ // Set Headers
+ httpRequest.Headers.Add("Accept-Language", customRequestHeaders.Culture);
+ httpRequest.Headers.Add("x-ms-client-request-id", customRequestHeaders.ClientRequestId);
+ httpRequest.Headers.Add("x-ms-version", "2015-01-01");
+
+ // Set Credentials
+ cancellationToken.ThrowIfCancellationRequested();
+ await this.Client.Credentials.ProcessHttpRequestAsync(httpRequest, cancellationToken).ConfigureAwait(false);
+
+ // Send Request
+ HttpResponseMessage httpResponse = null;
+ try
+ {
+ if (shouldTrace)
+ {
+ TracingAdapter.SendRequest(invocationId, httpRequest);
+ }
+ cancellationToken.ThrowIfCancellationRequested();
+ httpResponse = await this.Client.HttpClient.SendAsync(httpRequest, cancellationToken).ConfigureAwait(false);
+ if (shouldTrace)
+ {
+ TracingAdapter.ReceiveResponse(invocationId, httpResponse);
+ }
+ HttpStatusCode statusCode = httpResponse.StatusCode;
+ if (statusCode != HttpStatusCode.OK)
+ {
+ cancellationToken.ThrowIfCancellationRequested();
+ CloudException ex = CloudException.Create(httpRequest, null, httpResponse, await httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false));
+ if (shouldTrace)
+ {
+ TracingAdapter.Error(invocationId, ex);
+ }
+ throw ex;
+ }
+
+ // Create Result
+ VaultUsageListResponse result = null;
+ // Deserialize Response
+ if (statusCode == HttpStatusCode.OK)
+ {
+ cancellationToken.ThrowIfCancellationRequested();
+ string responseContent = await httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+ result = new VaultUsageListResponse();
+ JToken responseDoc = null;
+ if (string.IsNullOrEmpty(responseContent) == false)
+ {
+ responseDoc = JToken.Parse(responseContent);
+ }
+
+ if (responseDoc != null && responseDoc.Type != JTokenType.Null)
+ {
+ JToken valueArray = responseDoc["value"];
+ if (valueArray != null && valueArray.Type != JTokenType.Null)
+ {
+ foreach (JToken valueValue in ((JArray)valueArray))
+ {
+ Usage usageInstance = new Usage();
+ result.Value.Add(usageInstance);
+
+ JToken nameValue = valueValue["name"];
+ if (nameValue != null && nameValue.Type != JTokenType.Null)
+ {
+ Name nameInstance = new Name();
+ usageInstance.Name = nameInstance;
+
+ JToken valueValue2 = nameValue["value"];
+ if (valueValue2 != null && valueValue2.Type != JTokenType.Null)
+ {
+ string valueInstance = ((string)valueValue2);
+ nameInstance.Value = valueInstance;
+ }
+
+ JToken localizedValueValue = nameValue["localizedValue"];
+ if (localizedValueValue != null && localizedValueValue.Type != JTokenType.Null)
+ {
+ string localizedValueInstance = ((string)localizedValueValue);
+ nameInstance.LocalizedValue = localizedValueInstance;
+ }
+ }
+
+ JToken unitValue = valueValue["unit"];
+ if (unitValue != null && unitValue.Type != JTokenType.Null)
+ {
+ string unitInstance = ((string)unitValue);
+ usageInstance.Unit = unitInstance;
+ }
+
+ JToken currentValueValue = valueValue["currentValue"];
+ if (currentValueValue != null && currentValueValue.Type != JTokenType.Null)
+ {
+ string currentValueInstance = ((string)currentValueValue);
+ usageInstance.CurrentValue = currentValueInstance;
+ }
+
+ JToken limitValue = valueValue["limit"];
+ if (limitValue != null && limitValue.Type != JTokenType.Null)
+ {
+ string limitInstance = ((string)limitValue);
+ usageInstance.Limit = limitInstance;
+ }
+
+ JToken nextResetTimeValue = valueValue["nextResetTime"];
+ if (nextResetTimeValue != null && nextResetTimeValue.Type != JTokenType.Null)
+ {
+ string nextResetTimeInstance = ((string)nextResetTimeValue);
+ usageInstance.NextResetTime = nextResetTimeInstance;
+ }
+
+ JToken quotaPeriodValue = valueValue["quotaPeriod"];
+ if (quotaPeriodValue != null && quotaPeriodValue.Type != JTokenType.Null)
+ {
+ string quotaPeriodInstance = ((string)quotaPeriodValue);
+ usageInstance.QuotaPeriod = quotaPeriodInstance;
+ }
+ }
+ }
+ }
+
+ }
+ result.StatusCode = statusCode;
+
+ if (shouldTrace)
+ {
+ TracingAdapter.Exit(invocationId, result);
+ }
+ return result;
+ }
+ finally
+ {
+ if (httpResponse != null)
+ {
+ httpResponse.Dispose();
+ }
+ }
+ }
+ finally
+ {
+ if (httpRequest != null)
+ {
+ httpRequest.Dispose();
+ }
+ }
+ }
+ }
+}
diff --git a/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultUsageOperationsExtensions.cs b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultUsageOperationsExtensions.cs
new file mode 100644
index 000000000000..b4a7f37db713
--- /dev/null
+++ b/src/ResourceManagement/RecoveryServices/RecoveryServicesManagement/Generated/VaultUsageOperationsExtensions.cs
@@ -0,0 +1,87 @@
+//
+// Copyright (c) Microsoft and contributors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Warning: This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if the
+// code is regenerated.
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Azure.Management.RecoveryServices;
+using Microsoft.Azure.Management.RecoveryServices.Models;
+
+namespace Microsoft.Azure.Management.RecoveryServices
+{
+ public static partial class VaultUsageOperationsExtensions
+ {
+ ///
+ /// Get the Vault Usage.
+ ///
+ ///
+ /// Reference to the
+ /// Microsoft.Azure.Management.RecoveryServices.IVaultUsageOperations.
+ ///
+ ///
+ /// Required. The name of the (resource group?) cloud service
+ /// containing the vault collection.
+ ///
+ ///
+ /// Required. The name of the vault to get usage.
+ ///
+ ///
+ /// Optional. Request header parameters.
+ ///
+ ///
+ /// The response model for Vault usage.
+ ///
+ public static VaultUsageListResponse List(this IVaultUsageOperations operations, string resourceGroupName, string vaultName, CustomRequestHeaders customRequestHeaders)
+ {
+ return Task.Factory.StartNew((object s) =>
+ {
+ return ((IVaultUsageOperations)s).ListAsync(resourceGroupName, vaultName, customRequestHeaders);
+ }
+ , operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+ }
+
+ ///
+ /// Get the Vault Usage.
+ ///
+ ///
+ /// Reference to the
+ /// Microsoft.Azure.Management.RecoveryServices.IVaultUsageOperations.
+ ///
+ ///
+ /// Required. The name of the (resource group?) cloud service
+ /// containing the vault collection.
+ ///
+ ///
+ /// Required. The name of the vault to get usage.
+ ///
+ ///
+ /// Optional. Request header parameters.
+ ///
+ ///
+ /// The response model for Vault usage.
+ ///
+ public static Task ListAsync(this IVaultUsageOperations operations, string resourceGroupName, string vaultName, CustomRequestHeaders customRequestHeaders)
+ {
+ return operations.ListAsync(resourceGroupName, vaultName, customRequestHeaders, CancellationToken.None);
+ }
+ }
+}