From 62f8ebd89e669457f19655a642bfb7a472f56d40 Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Tue, 7 Jul 2020 13:59:48 +0530 Subject: [PATCH 01/15] Add New-AzExpressRoutePortLOA cmdlet. --- src/Network/Network/Az.Network.psd1 | 3 +- .../NewAzureRmExpressRoutePortLOACommand.cs | 125 ++++++++++++++++++ 2 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 src/Network/Network/ExpressRoutePort/LOA/NewAzureRmExpressRoutePortLOACommand.cs diff --git a/src/Network/Network/Az.Network.psd1 b/src/Network/Network/Az.Network.psd1 index 30758b6bd350..61db679b5a9d 100644 --- a/src/Network/Network/Az.Network.psd1 +++ b/src/Network/Network/Az.Network.psd1 @@ -500,7 +500,8 @@ CmdletsToExport = 'Add-AzApplicationGatewayAuthenticationCertificate', 'Update-AzVirtualApplianceSite', 'New-AzOffice365PolicyProperty', 'Get-AzNetworkVirtualApplianceSku', - 'New-AzVirtualApplianceSkuProperty' + 'New-AzVirtualApplianceSkuProperty', + 'New-AzExpressRoutePortLOA' # Variables to export from this module # VariablesToExport = @() diff --git a/src/Network/Network/ExpressRoutePort/LOA/NewAzureRmExpressRoutePortLOACommand.cs b/src/Network/Network/ExpressRoutePort/LOA/NewAzureRmExpressRoutePortLOACommand.cs new file mode 100644 index 000000000000..b21b63842c3a --- /dev/null +++ b/src/Network/Network/ExpressRoutePort/LOA/NewAzureRmExpressRoutePortLOACommand.cs @@ -0,0 +1,125 @@ +// ---------------------------------------------------------------------------------- +// +// Copyright Microsoft Corporation +// 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.Commands.ResourceManager.Common.ArgumentCompleters; +using Microsoft.Azure.Commands.Network.Models; +using Microsoft.Azure.Management.Internal.Resources.Utilities.Models; +using Microsoft.Azure.Management.Network; +using System; +using System.Management.Automation; +using System.IO; +using Microsoft.Azure.Management.Network.Models; +using System.ComponentModel; +using System.Security.Cryptography; + +namespace Microsoft.Azure.Commands.Network +{ + [Cmdlet(VerbsCommon.New, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ExpressRoutePortLOA", SupportsShouldProcess = false, DefaultParameterSetName = ResourceNameParameterSet), OutputType(typeof(bool))] + public partial class NewAzureRmExpressRoutePortLOA : NetworkBaseCmdlet + { + private const string ResourceIdParameterSet = "ResourceIdParameterSet"; + private const string ResourceNameParameterSet = "ResourceNameParameterSet"; + private const string ResourceObjectParameterSet = "ResourceObjectParameterSet"; + private const string DefaultFileName = "LOA.pdf"; + + [Parameter( + ParameterSetName = ResourceNameParameterSet, + Mandatory = true, + HelpMessage = "The express route port name.", + ValueFromPipelineByPropertyName = false)] + [ValidateNotNullOrEmpty] + public string PortName { get; set; } + + [Parameter( + ParameterSetName = ResourceNameParameterSet, + Mandatory = true, + HelpMessage = "The resource group name of the express route port.", + ValueFromPipelineByPropertyName = false)] + [ResourceGroupCompleter] + [ValidateNotNullOrEmpty] + public string ResourceGroupName { get; set; } + + [Parameter( + ParameterSetName = ResourceObjectParameterSet, + Mandatory = true, + HelpMessage = "The express route port resource.", + ValueFromPipelineByPropertyName = false)] + [ValidateNotNullOrEmpty] + public PSExpressRoutePort ExpressRoutePort { get; set; } + + [Alias("ResourceId")] + [Parameter( + ParameterSetName = ResourceIdParameterSet, + Mandatory = true, + HelpMessage = "ResourceId of the express route port.", + ValueFromPipelineByPropertyName = true)] + [ValidateNotNullOrEmpty] + public string Id { get; set; } + + [Alias("Name")] + [Parameter( + Mandatory = true, + HelpMessage = "The customer name to whom this Express Route Port is assigned to.", + ValueFromPipelineByPropertyName = false)] + [ValidateNotNullOrEmpty] + public string CustomerName { get; set; } + + [Parameter( + Mandatory = false, + HelpMessage = "The output filepath to store the Letter of Authorization to.", + ValueFromPipelineByPropertyName = false)] + public string Destination { get; set; } + + [Parameter(Mandatory = false)] + public SwitchParameter PassThru { get; set; } + + [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")] + public SwitchParameter AsJob { get; set; } + + public override void Execute() + { + base.Execute(); + + if (string.Equals(this.ParameterSetName, ResourceObjectParameterSet, StringComparison.OrdinalIgnoreCase)) + { + ResourceGroupName = ExpressRoutePort.ResourceGroupName; + PortName = ExpressRoutePort.Name; + } + if (string.Equals(this.ParameterSetName, ResourceIdParameterSet, StringComparison.OrdinalIgnoreCase)) + { + var resourceInfo = new ResourceIdentifier(Id); + ResourceGroupName = resourceInfo.ResourceGroupName; + PortName = resourceInfo.ResourceName; + } + GenerateExpressRoutePortsLOARequest generateExpressRoutePortsLOARequest = new GenerateExpressRoutePortsLOARequest(CustomerName); + var response = this.NetworkClient.NetworkManagementClient.ExpressRoutePorts.GenerateLOA(this.ResourceGroupName, this.PortName, generateExpressRoutePortsLOARequest); + var decodedDocument = Convert.FromBase64String(response.EncodedContent); + string pwd = Directory.GetCurrentDirectory(); + if (String.IsNullOrEmpty(Destination)) + { + Destination = DefaultFileName; + } + if (!(Path.IsPathRooted(Destination))) + { + Destination = Directory.GetCurrentDirectory() + "\\" + Destination; + } + File.WriteAllBytes(Destination, decodedDocument); + Console.WriteLine("Written Letter of Authorization To: " + Destination); + if (PassThru) + { + WriteObject(true); + } + } + } +} From 6709909a2791bc2a72edea90b1c1483b996f6c22 Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Tue, 7 Jul 2020 14:07:03 +0530 Subject: [PATCH 02/15] Add new cmdlet tests. --- .../ScenarioTests/ExpressRoutePortTests.cs | 9 +++++ .../ScenarioTests/ExpressRoutePortTests.ps1 | 40 +++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/src/Network/Network.Test/ScenarioTests/ExpressRoutePortTests.cs b/src/Network/Network.Test/ScenarioTests/ExpressRoutePortTests.cs index 2c5c1045cf68..d82d2e7632da 100644 --- a/src/Network/Network.Test/ScenarioTests/ExpressRoutePortTests.cs +++ b/src/Network/Network.Test/ScenarioTests/ExpressRoutePortTests.cs @@ -40,5 +40,14 @@ public void TestExpressRoutePortIdentityCRUD() { TestRunner.RunTestScript("Test-ExpressRoutePortIdentityCRUD"); } + + [Fact(Skip = "Nfv-RP rollout in progress")] + [Trait(Category.AcceptanceType, Category.CheckIn)] + [Trait(Category.Owner, NrpTeamAlias.pgtm)] + public void TestExpressRoutePortGenerateLOA() + { + TestRunner.RunTestScript("Test-ExpressRoutePortGenerateLOA"); + } + } } diff --git a/src/Network/Network.Test/ScenarioTests/ExpressRoutePortTests.ps1 b/src/Network/Network.Test/ScenarioTests/ExpressRoutePortTests.ps1 index 327f9c4c266d..639c4fa2a03f 100644 --- a/src/Network/Network.Test/ScenarioTests/ExpressRoutePortTests.ps1 +++ b/src/Network/Network.Test/ScenarioTests/ExpressRoutePortTests.ps1 @@ -187,4 +187,44 @@ function Test-ExpressRoutePortIdentityCRUD } } +<# +.SYNOPSIS +Test creating new ExpressRoutePort +#> +function Test-ExpressRoutePortGenerateLOA +{ + # Setup + $rgname = Get-ResourceGroupName + $rname = Get-ResourceName + $resourceTypeParent = "Microsoft.Network/expressRoutePorts" + + # Only available peering location and location for now. + $rglocation = "eastus2euap" + $location = "eastus2euap" + $peeringLocation = "Good Grief" + $encapsulation = "QinQ" + $bandwidthInGbps = 25 + $customerName = "contoso" + + try + { + $resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation + + # Create ExpressRoutePort + $vExpressRoutePort = New-AzExpressRoutePort -ResourceGroupName $rgname -Name $rname -Location $location -PeeringLocation $peeringLocation -Encapsulation $encapsulation -BandwidthInGbps $bandwidthInGbps + Assert-NotNull $vExpressRoutePort + Assert-True { Check-CmdletReturnType "New-AzExpressRoutePort" $vExpressRoutePort } + Assert-NotNull $vExpressRoutePort.Links + Assert-True { $vExpressRoutePort.Links.Count -eq 2 } + Assert-AreEqual $rname $vExpressRoutePort.Name + + $loa = New-AzExpressRoutePortLOA -ResourceGroupName $rgname -PortName $rname -CustomerName $customerName -PassThru + Assert-True { $loa -eq $true } + } + finally + { + # Cleanup + Clean-ResourceGroup $rgname + } +} From cbc37900f7a427be722f4c7fda0b3b06d1c30515 Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Tue, 7 Jul 2020 14:12:04 +0530 Subject: [PATCH 03/15] Remove unused variable. --- .../ExpressRoutePort/LOA/NewAzureRmExpressRoutePortLOACommand.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Network/Network/ExpressRoutePort/LOA/NewAzureRmExpressRoutePortLOACommand.cs b/src/Network/Network/ExpressRoutePort/LOA/NewAzureRmExpressRoutePortLOACommand.cs index b21b63842c3a..26256c54beb6 100644 --- a/src/Network/Network/ExpressRoutePort/LOA/NewAzureRmExpressRoutePortLOACommand.cs +++ b/src/Network/Network/ExpressRoutePort/LOA/NewAzureRmExpressRoutePortLOACommand.cs @@ -105,7 +105,6 @@ public override void Execute() GenerateExpressRoutePortsLOARequest generateExpressRoutePortsLOARequest = new GenerateExpressRoutePortsLOARequest(CustomerName); var response = this.NetworkClient.NetworkManagementClient.ExpressRoutePorts.GenerateLOA(this.ResourceGroupName, this.PortName, generateExpressRoutePortsLOARequest); var decodedDocument = Convert.FromBase64String(response.EncodedContent); - string pwd = Directory.GetCurrentDirectory(); if (String.IsNullOrEmpty(Destination)) { Destination = DefaultFileName; From c75d29ac189543fbd844d4251dee795ac2e9d271 Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Tue, 7 Jul 2020 14:22:56 +0530 Subject: [PATCH 04/15] Added help md files. --- .../Network/help/New-AzExpressRoutePortLOA.md | 196 ++++++++++++++++++ 1 file changed, 196 insertions(+) create mode 100644 src/Network/Network/help/New-AzExpressRoutePortLOA.md diff --git a/src/Network/Network/help/New-AzExpressRoutePortLOA.md b/src/Network/Network/help/New-AzExpressRoutePortLOA.md new file mode 100644 index 000000000000..5b1646634cb0 --- /dev/null +++ b/src/Network/Network/help/New-AzExpressRoutePortLOA.md @@ -0,0 +1,196 @@ +--- +external help file: Microsoft.Azure.PowerShell.Cmdlets.Network.dll-Help.xml +Module Name: Az.Network +online version: https://docs.microsoft.com/en-us/powershell/module/az.network/new-azexpressrouteportloa +schema: 2.0.0 +--- + +# New-AzExpressRoutePortLOA + +## SYNOPSIS +Download letter of authorization document for an express route port. + +## SYNTAX + +### ResourceNameParameterSet (Default) +``` +New-AzExpressRoutePortLOA -PortName -ResourceGroupName -CustomerName + [-Destination ] [-PassThru] [-AsJob] [-DefaultProfile ] [] +``` + +### ResourceObjectParameterSet +``` +New-AzExpressRoutePortLOA -ExpressRoutePort -CustomerName [-Destination ] + [-PassThru] [-AsJob] [-DefaultProfile ] [] +``` + +### ResourceIdParameterSet +``` +New-AzExpressRoutePortLOA -Id -CustomerName [-Destination ] [-PassThru] [-AsJob] + [-DefaultProfile ] [] +``` + +## DESCRIPTION +New-AzExpressRoutePortLOA cmdlet downloads a letter of authorization document in PDF format for an express route port. + + +## EXAMPLES + +### Example 1 +```powershell +PS C:\> New-AzExpressRoutePortLOA -ResourceGroupName myRg -PortName myPort -CustomerName Contoso -Destination loa.pdf +``` + +Download the letter of authorization document for express route port 'myPort' and store it in file 'loa.pdf'. + +## PARAMETERS + +### -AsJob +Run cmdlet in the background + +```yaml +Type: System.Management.Automation.SwitchParameter +Parameter Sets: (All) +Aliases: + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -CustomerName +The customer name to whom this Express Route Port is assigned to. + +```yaml +Type: System.String +Parameter Sets: (All) +Aliases: Name + +Required: True +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -DefaultProfile +The credentials, account, tenant, and subscription used for communication with Azure. + +```yaml +Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer +Parameter Sets: (All) +Aliases: AzContext, AzureRmContext, AzureCredential + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -Destination +The output filepath to store the Letter of Authorization to. + +```yaml +Type: System.String +Parameter Sets: (All) +Aliases: + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -ExpressRoutePort +The express route port resource. + +```yaml +Type: Microsoft.Azure.Commands.Network.Models.PSExpressRoutePort +Parameter Sets: ResourceObjectParameterSet +Aliases: + +Required: True +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -Id +ResourceId of the express route port. + +```yaml +Type: System.String +Parameter Sets: ResourceIdParameterSet +Aliases: ResourceId + +Required: True +Position: Named +Default value: None +Accept pipeline input: True (ByPropertyName) +Accept wildcard characters: False +``` + +### -PassThru +Returns an object representing the item with which you are working. By default, this cmdlet does not generate any output. + +```yaml +Type: System.Management.Automation.SwitchParameter +Parameter Sets: (All) +Aliases: + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -PortName +The express route port name. + +```yaml +Type: System.String +Parameter Sets: ResourceNameParameterSet +Aliases: + +Required: True +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -ResourceGroupName +The resource group name of the express route port. + +```yaml +Type: System.String +Parameter Sets: ResourceNameParameterSet +Aliases: + +Required: True +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### CommonParameters +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). + +## INPUTS + +### System.String + +## OUTPUTS + +### System.Boolean + +## NOTES + +## RELATED LINKS From 2fb772826af4188c178cab9fe63d4660abf13adc Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Tue, 7 Jul 2020 15:43:14 +0530 Subject: [PATCH 05/15] Supress static analysis warnings. --- tools/StaticAnalysis/Exceptions/Az.Network/SignatureIssues.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/StaticAnalysis/Exceptions/Az.Network/SignatureIssues.csv b/tools/StaticAnalysis/Exceptions/Az.Network/SignatureIssues.csv index 31668d27c088..5eb38ee5c2fa 100644 --- a/tools/StaticAnalysis/Exceptions/Az.Network/SignatureIssues.csv +++ b/tools/StaticAnalysis/Exceptions/Az.Network/SignatureIssues.csv @@ -358,3 +358,4 @@ "Microsoft.Azure.PowerShell.Cmdlets.Network.dll","Microsoft.Azure.Commands.Network.NewAzureFirewallPolicyNetworkRuleCommand","New-AzFirewallPolicyNetworkRule","1","8510","Cmdlet 'New-AzFirewallPolicyNetworkRule' has multiple parameter sets, but no defined default parameter set.","Define a default parameter set in the cmdlet attribute." "Microsoft.Azure.PowerShell.Cmdlets.Network.dll","Microsoft.Azure.Commands.Network.NewOffice365PolicyPropertyCommand","New-AzOffice365PolicyProperty","1","8100","New-AzOffice365PolicyProperty Does not support ShouldProcess but the cmdlet verb New indicates that it should.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue" "Microsoft.Azure.PowerShell.Cmdlets.Network.dll","Microsoft.Azure.Commands.Network.NewVirtualApplianceSkuPropertyCommand","New-AzVirtualApplianceSkuProperty","1","8100","New-AzVirtualApplianceSkuProperty Does not support ShouldProcess but the cmdlet verb New indicates that it should.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue" +"Microsoft.Azure.PowerShell.Cmdlets.Network.dll","Microsoft.Azure.Commands.Network.NewAzureRmExpressRoutePortLOACommand","New-AzExpressRoutePortLOA","1","8100","New-AzExpressRoutePortLOA Does not support ShouldProcess but the cmdlet verb New indicates that it should.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue" From 763fb8aca7d0f955a11973e9b654f3203e5bb8a2 Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Tue, 7 Jul 2020 15:45:30 +0530 Subject: [PATCH 06/15] Change csproj for the SDK with LOA code. This swagger changes are merged into network-june-release --- src/Network/Network/Network.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Network/Network/Network.csproj b/src/Network/Network/Network.csproj index f88a5f0a86ea..764ad89837ed 100644 --- a/src/Network/Network/Network.csproj +++ b/src/Network/Network/Network.csproj @@ -14,7 +14,7 @@ - + From 40e6b690f1f1d2bd6034f34c0fb8ada30aa36d7f Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Tue, 7 Jul 2020 15:53:53 +0530 Subject: [PATCH 07/15] Added details in changelog --- src/Network/Network/ChangeLog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Network/Network/ChangeLog.md b/src/Network/Network/ChangeLog.md index 17d55e74f74d..d8c528ed18bd 100644 --- a/src/Network/Network/ChangeLog.md +++ b/src/Network/Network/ChangeLog.md @@ -19,6 +19,8 @@ ---> ## Upcoming Release +* Added new cmdlet for Azure Express Route Port + - `New-AzExpressRoutePortLOA` * Fixed parameters swap in VWan HubVnet connection * Added new cmdlets for Azure Network Virtual Appliance Sites - `Get-AzVirtualApplianceSite` From 6a3eedfd0a90c6e0c0be42b1fa761ed6a7228127 Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Thu, 23 Jul 2020 08:00:44 +0530 Subject: [PATCH 08/15] Revert "Change csproj for the SDK with LOA code." This reverts commit 763fb8aca7d0f955a11973e9b654f3203e5bb8a2. --- src/Network/Network/Network.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Network/Network/Network.csproj b/src/Network/Network/Network.csproj index 764ad89837ed..f88a5f0a86ea 100644 --- a/src/Network/Network/Network.csproj +++ b/src/Network/Network/Network.csproj @@ -14,7 +14,7 @@ - + From 68a8620e51e6567561a16aa11a2695c117270c3d Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Thu, 23 Jul 2020 19:37:34 +0530 Subject: [PATCH 09/15] Added null validation for invalid ResourceId --- .../LOA/NewAzureRmExpressRoutePortLOACommand.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Network/Network/ExpressRoutePort/LOA/NewAzureRmExpressRoutePortLOACommand.cs b/src/Network/Network/ExpressRoutePort/LOA/NewAzureRmExpressRoutePortLOACommand.cs index 26256c54beb6..fe942dd84487 100644 --- a/src/Network/Network/ExpressRoutePort/LOA/NewAzureRmExpressRoutePortLOACommand.cs +++ b/src/Network/Network/ExpressRoutePort/LOA/NewAzureRmExpressRoutePortLOACommand.cs @@ -102,6 +102,10 @@ public override void Execute() ResourceGroupName = resourceInfo.ResourceGroupName; PortName = resourceInfo.ResourceName; } + if(this.ResourceGroupName == null || this.PortName == null){ + Console.WriteLine("Empty resource group or port name."); + return; + } GenerateExpressRoutePortsLOARequest generateExpressRoutePortsLOARequest = new GenerateExpressRoutePortsLOARequest(CustomerName); var response = this.NetworkClient.NetworkManagementClient.ExpressRoutePorts.GenerateLOA(this.ResourceGroupName, this.PortName, generateExpressRoutePortsLOARequest); var decodedDocument = Convert.FromBase64String(response.EncodedContent); From 5872b9a589f09c6d6b1a8ede0d7cb819cf19f9be Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Thu, 3 Sep 2020 08:52:21 +0530 Subject: [PATCH 10/15] Update SDK version to the latest --- src/Network/Network/Network.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Network/Network/Network.csproj b/src/Network/Network/Network.csproj index 764ad89837ed..a5a09cfcb3dd 100644 --- a/src/Network/Network/Network.csproj +++ b/src/Network/Network/Network.csproj @@ -14,7 +14,7 @@ - + From 7a26dd8754e8c602e734426789c50cbec7d48bbc Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Thu, 3 Sep 2020 10:14:05 +0530 Subject: [PATCH 11/15] Add Error Suppresion --- tools/StaticAnalysis/Exceptions/Az.Network/SignatureIssues.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/StaticAnalysis/Exceptions/Az.Network/SignatureIssues.csv b/tools/StaticAnalysis/Exceptions/Az.Network/SignatureIssues.csv index c56db40ac9d9..1d3ce5ee3e3f 100644 --- a/tools/StaticAnalysis/Exceptions/Az.Network/SignatureIssues.csv +++ b/tools/StaticAnalysis/Exceptions/Az.Network/SignatureIssues.csv @@ -370,4 +370,4 @@ "Microsoft.Azure.PowerShell.Cmdlets.Network.dll","Microsoft.Azure.Commands.Network.UpdateAzureRmVpnServerConfigurationCommand","Update-AzVpnServerConfiguration","1","8700","Parameter set 'ByVpnServerConfigurationResourceIdByCertificateAuthentication', 'ByVpnServerConfigurationResourceIdByRadiusAuthentication', 'ByVpnServerConfigurationResourceIdByAadAuthentication' of cmdlet 'Update-AzVpnServerConfiguration' have the same mandatory parameters, and both of them are not default parameter set which may cause confusion.","Merge these parameter sets into one parameter set." "Microsoft.Azure.PowerShell.Cmdlets.Network.dll","Microsoft.Azure.Commands.Network.GetAzureRmVpnSiteCommand","Get-AzVpnSite","1","8700","Parameter set 'ListByResourceGroupName', '__AllParameterSets' of cmdlet 'Get-AzVpnSite' have the same mandatory parameters, and both of them are not default parameter set which may cause confusion.","Merge these parameter sets into one parameter set." "Microsoft.Azure.PowerShell.Cmdlets.Network.dll","Microsoft.Azure.Commands.Network.Bastion.GetAzBastionCommand","Get-AzBastion","1","8700","Parameter set 'ListByResourceGroupName', '__AllParameterSets' of cmdlet 'Get-AzBastion' have the same mandatory parameters, and both of them are not default parameter set which may cause confusion.","Merge these parameter sets into one parameter set." -"Microsoft.Azure.PowerShell.Cmdlets.Network.dll","Microsoft.Azure.Commands.Network.NewAzureRmExpressRoutePortLOACommand","New-AzExpressRoutePortLOA","1","8100","New-AzExpressRoutePortLOA Does not support ShouldProcess but the cmdlet verb New indicates that it should.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue" +"Microsoft.Azure.PowerShell.Cmdlets.Network.dll","Microsoft.Azure.Commands.Network.NewAzureRmExpressRoutePortLOA","New-AzExpressRoutePortLOA","1","8100","New-AzExpressRoutePortLOA Does not support ShouldProcess but the cmdlet verb New indicates that it should.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue" From 4beee1c5c9488185838f84e6d7ee9148bc7c75ce Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Thu, 3 Sep 2020 22:54:23 +0530 Subject: [PATCH 12/15] Change csproj --- src/Network/Network/Network.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Network/Network/Network.csproj b/src/Network/Network/Network.csproj index a5a09cfcb3dd..c4bf14045c75 100644 --- a/src/Network/Network/Network.csproj +++ b/src/Network/Network/Network.csproj @@ -14,7 +14,7 @@ - + From 2ea89e262f9e2913d633eaf548db8cd22cd25a6a Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Wed, 9 Sep 2020 14:31:38 +0530 Subject: [PATCH 13/15] Trigger new build. From fd6ee41617bc7bb9b0e451aae3e5b83ff79c5b7b Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Thu, 10 Sep 2020 08:18:08 +0530 Subject: [PATCH 14/15] Fix merge conflict markers --- .github/CODEOWNERS | 5 ----- src/Network/Network/ChangeLog.md | 6 ------ 2 files changed, 11 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b005ddd193b6..60aef8cd79bb 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,8 +1,3 @@ # To make sure Network PRs go to the right branch, e.g. network-april -<<<<<<< HEAD -/src/Network/ @number213 - -======= /src/Network/ @MikhailTryakhov ->>>>>>> bcb49468faa053add80c87357c9f56ffb360c730 /src/Compute/ @bilaakpan-ms @sandido @dkulkarni-ms @haagha @madewithsmiles @MS-syh2qs @grizzlytheodore diff --git a/src/Network/Network/ChangeLog.md b/src/Network/Network/ChangeLog.md index cfa1cccde7aa..fdc0e5d71a41 100644 --- a/src/Network/Network/ChangeLog.md +++ b/src/Network/Network/ChangeLog.md @@ -57,17 +57,12 @@ - `Update-AzNetworkVirtualAppliance` - `Get-AzNetworkVirtualApplianceSku` - `New-AzVirtualApplianceSkuProperty` -<<<<<<< HEAD -<<<<<<< HEAD * Onboard Application Gateway to Private Link Common Cmdlets * Onboard StorageSync to Private Link Common Cmdlets * Add `AllowActiveFTP` parameter to `AzureFirewall` -======= * Onboarded Application Gateway to Private Link Common Cmdlets * Onboarded StorageSync to Private Link Common Cmdlets * Onboarded SignalR to Private Link Common Cmdlets ->>>>>>> 00bc26d7f02562e54f4474e0cda73981b67cff6d -======= * Added new cmdlets for VirtualWan - `Start-AzVpnGatewayPacketCapture` - `Stop-AzVpnGatewayPacketCapture` @@ -86,7 +81,6 @@ * Added new cmdlet `Reset-AzVpnGateway` for customers to reset/reboot their VirtualWan VpnGateway for troubleshooting. * Updated `Set-AzVirtualNetworkSubnetConfig` - Set NSG and Route Table properties of subnet to null if explicitly set in parameters[#1548][#9718] ->>>>>>> bcb49468faa053add80c87357c9f56ffb360c730 ## Version 3.1.0 * Added support for AddressPrefixType parameter to `Remove-AzExpressRouteCircuitConnectionConfig` From 82072cba78dd2cae4a191e1819a5b2d4d57c0287 Mon Sep 17 00:00:00 2001 From: Neel Bhavsar Date: Thu, 10 Sep 2020 08:19:55 +0530 Subject: [PATCH 15/15] Trigger CI build. --- src/Network/Network/ChangeLog.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Network/Network/ChangeLog.md b/src/Network/Network/ChangeLog.md index fdc0e5d71a41..f4904b7f5b0d 100644 --- a/src/Network/Network/ChangeLog.md +++ b/src/Network/Network/ChangeLog.md @@ -57,12 +57,6 @@ - `Update-AzNetworkVirtualAppliance` - `Get-AzNetworkVirtualApplianceSku` - `New-AzVirtualApplianceSkuProperty` -* Onboard Application Gateway to Private Link Common Cmdlets -* Onboard StorageSync to Private Link Common Cmdlets -* Add `AllowActiveFTP` parameter to `AzureFirewall` -* Onboarded Application Gateway to Private Link Common Cmdlets -* Onboarded StorageSync to Private Link Common Cmdlets -* Onboarded SignalR to Private Link Common Cmdlets * Added new cmdlets for VirtualWan - `Start-AzVpnGatewayPacketCapture` - `Stop-AzVpnGatewayPacketCapture`