Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose new SKUs for VirtualNetworkGateway ER and VPN VMSS #4322

Closed
wants to merge 2 commits into from
Closed

Expose new SKUs for VirtualNetworkGateway ER and VPN VMSS #4322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
943ed99
Expose new SKUs for VirtualNetworkGateway ER and VPN VMSS
ritwikbasu May 15, 2018
21e04d8
Review Comments
ritwikbasu May 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/SDKs/Network/Management.Network/Generated/Models/VirtualNetworkGatewaySku.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ public VirtualNetworkGatewaySku()
/// </summary>
/// <param name="name">Gateway SKU name. Possible values include:
/// 'Basic', 'HighPerformance', 'Standard', 'UltraPerformance',
/// 'VpnGw1', 'VpnGw2', 'VpnGw3'</param>
/// 'VpnGw1', 'VpnGw2', 'VpnGw3', 'VpnGw1AZ', 'VpnGw2AZ', 'VpnGw3AZ',
/// 'ErGw1AZ', 'ErGw2AZ', 'ErGw3AZ'</param>
/// <param name="tier">Gateway SKU tier. Possible values include:
/// 'Basic', 'HighPerformance', 'Standard', 'UltraPerformance',
/// 'VpnGw1', 'VpnGw2', 'VpnGw3'</param>
/// 'VpnGw1', 'VpnGw2', 'VpnGw3', 'VpnGw1AZ', 'VpnGw2AZ', 'VpnGw3AZ',
/// 'ErGw1AZ', 'ErGw2AZ', 'ErGw3AZ'</param>
/// <param name="capacity">The capacity.</param>
public VirtualNetworkGatewaySku(string name = default(string), string tier = default(string), int? capacity = default(int?))
{
Expand All @@ -52,15 +54,17 @@ public VirtualNetworkGatewaySku()
/// <summary>
/// Gets or sets gateway SKU name. Possible values include: 'Basic',
/// 'HighPerformance', 'Standard', 'UltraPerformance', 'VpnGw1',
/// 'VpnGw2', 'VpnGw3'
/// 'VpnGw2', 'VpnGw3', 'VpnGw1AZ', 'VpnGw2AZ', 'VpnGw3AZ', 'ErGw1AZ',
/// 'ErGw2AZ', 'ErGw3AZ'
/// </summary>
[JsonProperty(PropertyName = "name")]
public string Name { get; set; }

/// <summary>
/// Gets or sets gateway SKU tier. Possible values include: 'Basic',
/// 'HighPerformance', 'Standard', 'UltraPerformance', 'VpnGw1',
/// 'VpnGw2', 'VpnGw3'
/// 'VpnGw2', 'VpnGw3', 'VpnGw1AZ', 'VpnGw2AZ', 'VpnGw3AZ', 'ErGw1AZ',
/// 'ErGw2AZ', 'ErGw3AZ'
/// </summary>
[JsonProperty(PropertyName = "tier")]
public string Tier { get; set; }
Expand Down
6 changes: 6 additions & 0 deletions src/SDKs/Network/Management.Network/Generated/Models/VirtualNetworkGatewaySkuName.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,11 @@ public static class VirtualNetworkGatewaySkuName
public const string VpnGw1 = "VpnGw1";
public const string VpnGw2 = "VpnGw2";
public const string VpnGw3 = "VpnGw3";
public const string VpnGw1AZ = "VpnGw1AZ";
public const string VpnGw2AZ = "VpnGw2AZ";
public const string VpnGw3AZ = "VpnGw3AZ";
public const string ErGw1AZ = "ErGw1AZ";
public const string ErGw2AZ = "ErGw2AZ";
public const string ErGw3AZ = "ErGw3AZ";
}
}
6 changes: 6 additions & 0 deletions src/SDKs/Network/Management.Network/Generated/Models/VirtualNetworkGatewaySkuTier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,11 @@ public static class VirtualNetworkGatewaySkuTier
public const string VpnGw1 = "VpnGw1";
public const string VpnGw2 = "VpnGw2";
public const string VpnGw3 = "VpnGw3";
public const string VpnGw1AZ = "VpnGw1AZ";
public const string VpnGw2AZ = "VpnGw2AZ";
public const string VpnGw3AZ = "VpnGw3AZ";
public const string ErGw1AZ = "ErGw1AZ";
public const string ErGw2AZ = "ErGw2AZ";
public const string ErGw3AZ = "ErGw3AZ";
}
}
3 changes: 2 additions & 1 deletion src/SDKs/Network/Management.Network/Microsoft.Azure.Management.Network.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
<PackageId>Microsoft.Azure.Management.Network</PackageId>
<Description>Provides management capabilities for Network services.</Description>
<AssemblyName>Microsoft.Azure.Management.Network</AssemblyName>
<Version>19.0.0-preview</Version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not look like a breaking change. You can simply set it as 19.0.1-preview instead

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, update the PackageReleaseNotes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in second commit.

<Version>19.0.1-preview</Version>
<PackageTags>Microsoft Azure Network management;Network;Network management;</PackageTags>
<PackageReleaseNotes>
<![CDATA[
- Made id read-only by bringing properties from shared resource in DDos Protection plan functionality
- Introduce new SKUs for cross zone VPN and ExpressRoute gateways.
]]></PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/SDKs/Network/Management.Network/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[assembly: AssemblyDescription("Provides Microsoft Azure Network management functions for managing the Microsoft Azure Network service.")]

[assembly: AssemblyVersion("19.0.0.0")]
[assembly: AssemblyFileVersion("19.0.0.0")]
[assembly: AssemblyFileVersion("19.0.1.0")]

[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Microsoft Azure .NET SDK")]
Expand Down
8 changes: 4 additions & 4 deletions src/SDKs/_metadata/network_resource-manager.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
2018-04-26 20:59:33 UTC
2018-05-15 23:11:28 UTC

1) azure-rest-api-specs repository information
GitHub user: Azure
Branch: master
Commit: b9721ae4c9f04914cc89260b8339dc33372f835b
Branch: Network-2018-05-01
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologize for missing this, we cannot accept PRs for sdks generated from a branch other than master. If your changes have already been merged in the Network May REST spec, you don't need this PR
Please talk to @MikhailTryakhov if you have any doubts

Commit: c8aea945a903ec70e8acf18530cc9924fa822cfb

2) AutoRest information
Requested version: latest
Bootstrapper version: C:\Users\mitryakh\AppData\Roaming\npm `-- autorest@2.0.4262
Bootstrapper version: C:\Users\ritwikb\AppData\Roaming\npm `-- autorest@2.0.4262
Latest installed version: