Skip to content

Commit

Permalink
update sdk due to billing plan swagger file change (#8475)
Browse files Browse the repository at this point in the history 
* update sdk due to billing plan swagger file change

* update version

* update

* remove unnecessary file
  • Loading branch information
@Only2125 @isra-fel
Only2125 authored and isra-fel committed Nov 1, 2019
1 parent ca486cb commit f922ba6
Show file tree
Hide file tree
Showing 21 changed files with 321 additions and 310 deletions.
4 changes: 2 additions & 2 deletions eng/mgmt/mgmtmetadata/reservations_resource-manager.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ Commencing code generation
Generating CSharp code
Executing AutoRest command
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/reservations/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\azure-sdk-for-net\sdk
2019-10-08 04:32:49 UTC
2019-10-28 03:49:20 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: 5e0762f0cdf27908b6aa3319dec3b384c144fb7c
Commit: 08800e55784acd375627f6f2f3ecaddbbbc41c3c
AutoRest information
Requested version: latest
Bootstrapper version: autorest@2.0.4283
4 changes: 2 additions & 2 deletions sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/Catalog.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public Catalog()
/// this SKU.</param>
/// <param name="terms">Available reservation terms for this
/// resource</param>
public Catalog(string resourceType = default(string), string name = default(string), CatalogBillingPlansItem billingPlans = default(CatalogBillingPlansItem), IList<string> terms = default(IList<string>), IList<string> locations = default(IList<string>), IList<SkuProperty> skuProperties = default(IList<SkuProperty>), IList<SkuRestriction> restrictions = default(IList<SkuRestriction>))
public Catalog(string resourceType = default(string), string name = default(string), IDictionary<string, IList<string>> billingPlans = default(IDictionary<string, IList<string>>), IList<string> terms = default(IList<string>), IList<string> locations = default(IList<string>), IList<SkuProperty> skuProperties = default(IList<SkuProperty>), IList<SkuRestriction> restrictions = default(IList<SkuRestriction>))
{
ResourceType = resourceType;
Name = name;
Expand Down Expand Up @@ -68,7 +68,7 @@ public Catalog()
/// Gets or sets the billing plan options available for this SKU.
/// </summary>
[JsonProperty(PropertyName = "billingPlans")]
public CatalogBillingPlansItem BillingPlans { get; set; }
public IDictionary<string, IList<string>> BillingPlans { get; set; }

/// <summary>
/// Gets available reservation terms for this resource
Expand Down
10 changes: 10 additions & 0 deletions ...ions/Microsoft.Azure.Management.Reservations/src/Generated/SdkInfo_AzureReservationAPI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,15 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_AzureReservatio
}.AsEnumerable();
}
}
// BEGIN: Code Generation Metadata Section
public static readonly String AutoRestVersion = "latest";
public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4283";
public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/reservations/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\\azure-sdk-for-net\\sdk";
public static readonly String GithubForkName = "Azure";
public static readonly String GithubBranchName = "master";
public static readonly String GithubCommidId = "08800e55784acd375627f6f2f3ecaddbbbc41c3c";
public static readonly String CodeGenerationErrors = "";
public static readonly String GithubRepoName = "azure-rest-api-specs";
// END: Code Generation Metadata Section
}
}
4 changes: 2 additions & 2 deletions ...icrosoft.Azure.Management.Reservations/src/Microsoft.Azure.Management.Reservations.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<PackageId>Microsoft.Azure.Management.Reservations</PackageId>
<Description>Microsoft.Azure.Management.Reservations Library</Description>
<AssemblyName>Microsoft.Azure.Management.Reservations</AssemblyName>
<Version>1.12.0-preview</Version>
<Version>1.13.0-preview</Version>
<PackageTags>Reservations;</PackageTags>
<PackageReleaseNotes>
Release Billing Plan for Reservations.
Update billing plan sdk
</PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion sdk/reservations/Microsoft.Azure.Management.Reservations/src/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Reserved Instance Resources.")]

[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.12.0.0")]
[assembly: AssemblyFileVersion("1.13.0.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Microsoft Azure .NET SDK")]
Expand Down
14 changes: 7 additions & 7 deletions ...servations/tests/SessionRecords/NonReservationObjectTests/TestGetAppliedReservations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"e70bf4f3-b674-475a-9e89-1a4cbd1f82b3"
"2fa8962a-2656-4eea-9421-13381da20075"
],
"accept-language": [
"en-US"
Expand All @@ -24,7 +24,7 @@
"no-cache"
],
"Date": [
"Tue, 01 Oct 2019 23:07:42 GMT"
"Mon, 28 Oct 2019 03:59:34 GMT"
],
"Pragma": [
"no-cache"
Expand All @@ -39,22 +39,22 @@
"11999"
],
"x-ms-request-id": [
"westus:6b1d19bd-1902-495f-81b7-00d358838976"
"westus:9210ac5b-7d9d-4484-b2aa-318bc632f9ee"
],
"X-Content-Type-Options": [
"nosniff"
],
"x-ms-correlation-request-id": [
"cdb5ff43-ba29-4c7c-a903-310c38c2b0d0"
"308042d8-86a2-4d5e-8f3f-7d4e460c5317"
],
"x-ms-routing-request-id": [
"WESTUS:20191001T230743Z:cdb5ff43-ba29-4c7c-a903-310c38c2b0d0"
"WESTUS:20191028T035935Z:308042d8-86a2-4d5e-8f3f-7d4e460c5317"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"Content-Length": [
"4755"
"5103"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand All @@ -63,7 +63,7 @@
"-1"
]
},
"ResponseBody": "{\r\n \"id\": \"/subscriptions/d3ae48e5-dbb2-4618-afd4-fb1b8559cb80/providers/microsoft.capacity/AppliedReservations/default\",\r\n \"type\": \"Microsoft.Capacity/AppliedReservations\",\r\n \"name\": \"default\",\r\n \"properties\": {\r\n \"reservationOrderIds\": {\r\n \"value\": [\r\n \"/providers/Microsoft.Capacity/reservationorders/5f47bc68-c4dc-465c-8ccf-59a60155821e\",\r\n \"/providers/Microsoft.Capacity/reservationorders/1ce5c506-dc1a-4529-9e8a-ce71a3fce011\",\r\n \"/providers/Microsoft.Capacity/reservationorders/5097858c-9ee1-4e1f-9115-e778bc9f07f8\",\r\n \"/providers/Microsoft.Capacity/reservationorders/f83755e0-cbcc-4dd6-a381-cd1022e9374f\",\r\n \"/providers/Microsoft.Capacity/reservationorders/2c777d7f-2b8f-4249-ac3e-b704bfc9646b\",\r\n \"/providers/Microsoft.Capacity/reservationorders/ddc21f31-8ec3-4ecb-a6db-d9c4fa0f1d4d\",\r\n \"/providers/Microsoft.Capacity/reservationorders/97460b12-886c-4388-ac53-43740663802b\",\r\n \"/providers/Microsoft.Capacity/reservationorders/13c2133e-9d20-4908-8def-965b521bf9b7\",\r\n \"/providers/Microsoft.Capacity/reservationorders/451d0d8f-6aff-4b52-a4c8-44d10a4e8b9a\",\r\n \"/providers/Microsoft.Capacity/reservationorders/e742d109-1e57-4054-b9d3-dd18548a0256\",\r\n \"/providers/Microsoft.Capacity/reservationorders/84586bd7-adae-4f62-b87f-b5a36c219d44\",\r\n \"/providers/Microsoft.Capacity/reservationorders/5af652ab-8a38-4821-a88d-9f552037fd86\",\r\n \"/providers/Microsoft.Capacity/reservationorders/37fdc3cd-7016-4711-9bb9-c8976367197a\",\r\n \"/providers/Microsoft.Capacity/reservationorders/1933daea-fa47-4883-b228-ebdcc345a9d1\",\r\n \"/providers/Microsoft.Capacity/reservationorders/f311bbb7-9010-4327-a4cb-81efc96850e0\",\r\n \"/providers/Microsoft.Capacity/reservationorders/d983fd17-f9d5-4990-8a28-067d9368c5fd\",\r\n \"/providers/Microsoft.Capacity/reservationorders/0107376d-9008-461d-bf44-e0ae83716cf5\",\r\n \"/providers/Microsoft.Capacity/reservationorders/0dc0d697-97d8-4546-87eb-7ae8a84c286c\",\r\n \"/providers/Microsoft.Capacity/reservationorders/0a47417c-cd30-4f67-add6-d631583e09f3\",\r\n \"/providers/Microsoft.Capacity/reservationorders/6dbddcad-2aa5-4305-8429-4a0c6f31b869\",\r\n \"/providers/Microsoft.Capacity/reservationorders/9066e49b-f7a6-4a57-95e3-47cdcb039d7e\",\r\n \"/providers/Microsoft.Capacity/reservationorders/4159f0e3-8031-4634-a68f-5b51c3dc6050\",\r\n \"/providers/Microsoft.Capacity/reservationorders/7440222d-d419-4fe5-b05b-371b02a0bb9b\",\r\n \"/providers/Microsoft.Capacity/reservationorders/f1c36fc4-8b11-4125-a90c-548ad1a45d0b\",\r\n \"/providers/Microsoft.Capacity/reservationorders/5d9b905b-fffc-45b5-b4d3-6d7517d931b4\",\r\n \"/providers/Microsoft.Capacity/reservationorders/13c73cbd-12de-4c14-8550-ed34b10a32e1\",\r\n \"/providers/Microsoft.Capacity/reservationorders/9cd45f08-e1b3-43d1-a82d-27ecb595d05c\",\r\n \"/providers/Microsoft.Capacity/reservationorders/39c34e3b-5c05-466d-a421-94577296af06\",\r\n \"/providers/Microsoft.Capacity/reservationorders/fdef0d1f-2d3c-402e-9feb-80019f5ae145\",\r\n \"/providers/Microsoft.Capacity/reservationorders/c9eff5a5-69ec-4017-aec7-cccee1ec945c\",\r\n \"/providers/Microsoft.Capacity/reservationorders/c39c8099-79d1-430f-bc57-23616364ff2a\",\r\n \"/providers/Microsoft.Capacity/reservationorders/09895b41-b30c-4c33-8132-18afa2ed5c80\",\r\n \"/providers/Microsoft.Capacity/reservationorders/49b5fcb8-a2aa-410c-8552-29592dd7a516\",\r\n \"/providers/Microsoft.Capacity/reservationorders/f511a846-907c-486e-b870-a6be48e050a4\",\r\n \"/providers/Microsoft.Capacity/reservationorders/d645bf91-149b-46e2-b331-38fa66595842\",\r\n \"/providers/Microsoft.Capacity/reservationorders/eae108d9-a71c-47e2-9bc8-7902663db5f1\",\r\n \"/providers/Microsoft.Capacity/reservationorders/cfc4c7a8-8d39-45f8-b37b-ee7f6502a366\",\r\n \"/providers/Microsoft.Capacity/reservationorders/154ed3db-262c-40e5-baa3-a0505b6cdfdd\",\r\n \"/providers/Microsoft.Capacity/reservationorders/9a48675e-e8b8-423e-9dea-bf37034b8201\",\r\n \"/providers/Microsoft.Capacity/reservationorders/6cabdb81-d202-4450-834d-68a18bd52533\",\r\n \"/providers/Microsoft.Capacity/reservationorders/d828b714-cf82-459a-97b7-079747fd772c\",\r\n \"/providers/Microsoft.Capacity/reservationorders/fe1341ea-4820-4ac9-9352-4136a6d8a252\",\r\n \"/providers/Microsoft.Capacity/reservationorders/f794f893-e8bf-40d5-9e65-9c8dc6b5f01d\",\r\n \"/providers/Microsoft.Capacity/reservationorders/0c0e972c-a418-497c-8fc9-96b5d43fcb1d\",\r\n \"/providers/Microsoft.Capacity/reservationorders/c01a66ab-5306-44f5-aa7b-ed7b45d92bf9\",\r\n \"/providers/Microsoft.Capacity/reservationorders/f0400cad-33cf-4867-a9c3-0ef6b558d163\",\r\n \"/providers/Microsoft.Capacity/reservationorders/ba84276f-2f1b-40d1-b007-5610d4e6d1ac\",\r\n \"/providers/Microsoft.Capacity/reservationorders/0af601f3-7868-44ee-b833-4d2e64ad3d70\",\r\n \"/providers/Microsoft.Capacity/reservationorders/ff3d6f81-2bea-4d59-b205-85e9effd8c1a\",\r\n \"/providers/Microsoft.Capacity/reservationorders/5a8109f2-0b2f-49f3-9b2c-2db32934b5c3\",\r\n \"/providers/Microsoft.Capacity/reservationorders/7ec328e0-0312-4d3c-841b-b5e4d032a43c\",\r\n \"/providers/Microsoft.Capacity/reservationorders/1d8785bf-0817-4bf5-b7aa-5b2684bc98ee\"\r\n ]\r\n }\r\n }\r\n}",
"ResponseBody": "{\r\n \"id\": \"/subscriptions/d3ae48e5-dbb2-4618-afd4-fb1b8559cb80/providers/microsoft.capacity/AppliedReservations/default\",\r\n \"type\": \"Microsoft.Capacity/AppliedReservations\",\r\n \"name\": \"default\",\r\n \"properties\": {\r\n \"reservationOrderIds\": {\r\n \"value\": [\r\n \"/providers/Microsoft.Capacity/reservationorders/5f47bc68-c4dc-465c-8ccf-59a60155821e\",\r\n \"/providers/Microsoft.Capacity/reservationorders/1ce5c506-dc1a-4529-9e8a-ce71a3fce011\",\r\n \"/providers/Microsoft.Capacity/reservationorders/5097858c-9ee1-4e1f-9115-e778bc9f07f8\",\r\n \"/providers/Microsoft.Capacity/reservationorders/f83755e0-cbcc-4dd6-a381-cd1022e9374f\",\r\n \"/providers/Microsoft.Capacity/reservationorders/2c777d7f-2b8f-4249-ac3e-b704bfc9646b\",\r\n \"/providers/Microsoft.Capacity/reservationorders/ddc21f31-8ec3-4ecb-a6db-d9c4fa0f1d4d\",\r\n \"/providers/Microsoft.Capacity/reservationorders/97460b12-886c-4388-ac53-43740663802b\",\r\n \"/providers/Microsoft.Capacity/reservationorders/13c2133e-9d20-4908-8def-965b521bf9b7\",\r\n \"/providers/Microsoft.Capacity/reservationorders/451d0d8f-6aff-4b52-a4c8-44d10a4e8b9a\",\r\n \"/providers/Microsoft.Capacity/reservationorders/e742d109-1e57-4054-b9d3-dd18548a0256\",\r\n \"/providers/Microsoft.Capacity/reservationorders/84586bd7-adae-4f62-b87f-b5a36c219d44\",\r\n \"/providers/Microsoft.Capacity/reservationorders/5af652ab-8a38-4821-a88d-9f552037fd86\",\r\n \"/providers/Microsoft.Capacity/reservationorders/37fdc3cd-7016-4711-9bb9-c8976367197a\",\r\n \"/providers/Microsoft.Capacity/reservationorders/1933daea-fa47-4883-b228-ebdcc345a9d1\",\r\n \"/providers/Microsoft.Capacity/reservationorders/f311bbb7-9010-4327-a4cb-81efc96850e0\",\r\n \"/providers/Microsoft.Capacity/reservationorders/d983fd17-f9d5-4990-8a28-067d9368c5fd\",\r\n \"/providers/Microsoft.Capacity/reservationorders/0107376d-9008-461d-bf44-e0ae83716cf5\",\r\n \"/providers/Microsoft.Capacity/reservationorders/0dc0d697-97d8-4546-87eb-7ae8a84c286c\",\r\n \"/providers/Microsoft.Capacity/reservationorders/0a47417c-cd30-4f67-add6-d631583e09f3\",\r\n \"/providers/Microsoft.Capacity/reservationorders/6dbddcad-2aa5-4305-8429-4a0c6f31b869\",\r\n \"/providers/Microsoft.Capacity/reservationorders/9066e49b-f7a6-4a57-95e3-47cdcb039d7e\",\r\n \"/providers/Microsoft.Capacity/reservationorders/4159f0e3-8031-4634-a68f-5b51c3dc6050\",\r\n \"/providers/Microsoft.Capacity/reservationorders/7440222d-d419-4fe5-b05b-371b02a0bb9b\",\r\n \"/providers/Microsoft.Capacity/reservationorders/f1c36fc4-8b11-4125-a90c-548ad1a45d0b\",\r\n \"/providers/Microsoft.Capacity/reservationorders/5d9b905b-fffc-45b5-b4d3-6d7517d931b4\",\r\n \"/providers/Microsoft.Capacity/reservationorders/13c73cbd-12de-4c14-8550-ed34b10a32e1\",\r\n \"/providers/Microsoft.Capacity/reservationorders/9cd45f08-e1b3-43d1-a82d-27ecb595d05c\",\r\n \"/providers/Microsoft.Capacity/reservationorders/39c34e3b-5c05-466d-a421-94577296af06\",\r\n \"/providers/Microsoft.Capacity/reservationorders/fdef0d1f-2d3c-402e-9feb-80019f5ae145\",\r\n \"/providers/Microsoft.Capacity/reservationorders/c9eff5a5-69ec-4017-aec7-cccee1ec945c\",\r\n \"/providers/Microsoft.Capacity/reservationorders/c39c8099-79d1-430f-bc57-23616364ff2a\",\r\n \"/providers/Microsoft.Capacity/reservationorders/09895b41-b30c-4c33-8132-18afa2ed5c80\",\r\n \"/providers/Microsoft.Capacity/reservationorders/49b5fcb8-a2aa-410c-8552-29592dd7a516\",\r\n \"/providers/Microsoft.Capacity/reservationorders/f511a846-907c-486e-b870-a6be48e050a4\",\r\n \"/providers/Microsoft.Capacity/reservationorders/d645bf91-149b-46e2-b331-38fa66595842\",\r\n \"/providers/Microsoft.Capacity/reservationorders/eae108d9-a71c-47e2-9bc8-7902663db5f1\",\r\n \"/providers/Microsoft.Capacity/reservationorders/cfc4c7a8-8d39-45f8-b37b-ee7f6502a366\",\r\n \"/providers/Microsoft.Capacity/reservationorders/154ed3db-262c-40e5-baa3-a0505b6cdfdd\",\r\n \"/providers/Microsoft.Capacity/reservationorders/9a48675e-e8b8-423e-9dea-bf37034b8201\",\r\n \"/providers/Microsoft.Capacity/reservationorders/6cabdb81-d202-4450-834d-68a18bd52533\",\r\n \"/providers/Microsoft.Capacity/reservationorders/d828b714-cf82-459a-97b7-079747fd772c\",\r\n \"/providers/Microsoft.Capacity/reservationorders/fe1341ea-4820-4ac9-9352-4136a6d8a252\",\r\n \"/providers/Microsoft.Capacity/reservationorders/f794f893-e8bf-40d5-9e65-9c8dc6b5f01d\",\r\n \"/providers/Microsoft.Capacity/reservationorders/0c0e972c-a418-497c-8fc9-96b5d43fcb1d\",\r\n \"/providers/Microsoft.Capacity/reservationorders/c01a66ab-5306-44f5-aa7b-ed7b45d92bf9\",\r\n \"/providers/Microsoft.Capacity/reservationorders/f0400cad-33cf-4867-a9c3-0ef6b558d163\",\r\n \"/providers/Microsoft.Capacity/reservationorders/ba84276f-2f1b-40d1-b007-5610d4e6d1ac\",\r\n \"/providers/Microsoft.Capacity/reservationorders/0af601f3-7868-44ee-b833-4d2e64ad3d70\",\r\n \"/providers/Microsoft.Capacity/reservationorders/ff3d6f81-2bea-4d59-b205-85e9effd8c1a\",\r\n \"/providers/Microsoft.Capacity/reservationorders/5a8109f2-0b2f-49f3-9b2c-2db32934b5c3\",\r\n \"/providers/Microsoft.Capacity/reservationorders/7ec328e0-0312-4d3c-841b-b5e4d032a43c\",\r\n \"/providers/Microsoft.Capacity/reservationorders/1d8785bf-0817-4bf5-b7aa-5b2684bc98ee\",\r\n \"/providers/Microsoft.Capacity/reservationorders/36ff776c-c4e7-44f0-bd82-82dad39f02c1\",\r\n \"/providers/Microsoft.Capacity/reservationorders/bb1ee7ab-4e31-4124-8aa0-a17d0f3bead7\",\r\n \"/providers/Microsoft.Capacity/reservationorders/1c0b97a3-3a73-4ce7-8abd-d4f260934109\",\r\n \"/providers/Microsoft.Capacity/reservationorders/11e0f3cb-d8d2-42d4-8b24-b460cab90b67\"\r\n ]\r\n }\r\n }\r\n}",
"StatusCode": 200
}
],
Expand Down
Loading

0 comments on commit f922ba6

Please sign in to comment.