Merge branch 'network-april' into netApril

Author: anton-evseev

src/Network/Network.Test/ScenarioTests/NetworkServiceTagsTests.cs

@@ -0,0 +1,36 @@
+// ----------------------------------------------------------------------------------
+//
+// 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.Network.Test.ScenarioTests;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Xunit;
+
+namespace Commands.Network.Test.ScenarioTests
+{
+    public class NetworkServiceTagsTests : NetworkTestRunner
+    {
+        public NetworkServiceTagsTests(Xunit.Abstractions.ITestOutputHelper output)
+            : base(output)
+        {
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.sdnnrp)]
+        public void TestNetworkServiceTagsList()
+        {
+            TestRunner.RunTestScript( "Test-NetworkServiceTagsList");
+        }
+    }
+}

src/Network/Network.Test/ScenarioTests/NetworkServiceTagsTests.ps1

@@ -0,0 +1,46 @@
+# ----------------------------------------------------------------------------------
+#
+# 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.
+# ----------------------------------------------------------------------------------
+
+<#
+.SYNOPSIS
+Tests checking API to list service tags.
+#>
+function Test-NetworkServiceTagsList
+{
+    $location = Get-ProviderLocation ResourceManagement;
+
+    try
+    {
+        $results = Get-AzNetworkServiceTag -Location $location;
+        Assert-NotNull $results;
+
+        Assert-AreEqual $results.Type "Microsoft.Network/serviceTags";
+        Assert-NotNull $results.Name;
+        Assert-NotNull $results.Id;
+        Assert-NotNull $results.ChangeNumber;
+        Assert-NotNull $results.Cloud;
+        Assert-NotNull $results.Values;
+        Assert-True { $results.Values.Count -gt 1 };
+
+        $serviceTagInformation = $results.Values[0];
+
+        Assert-NotNull $serviceTagInformation.Name;
+        Assert-NotNull $serviceTagInformation.Id;
+        Assert-NotNull $serviceTagInformation.Properties.ChangeNumber;
+        Assert-NotNull $serviceTagInformation.Properties.Region;
+        Assert-NotNull $serviceTagInformation.Properties.SystemService;
+        Assert-True { $serviceTagInformation.Properties.AddressPrefixes.Count -gt 1 };
+    }
+    finally {}
+}

src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkServiceTagsTests/TestNetworkServiceTagsList.json

@@ -396,6 +396,7 @@ CmdletsToExport = 'Add-AzApplicationGatewayAuthenticationCertificate',
                'Get-AzExpressRouteCrossConnectionRouteTableSummary', 
                'Get-AzNatGateway', 'New-AzNatGateway', 'Remove-AzNatGateway', 
                'Set-AzNatGateway', 
+               'Get-AzNetworkServiceTag', 
                'New-AzPrivateEndpoint', 'Get-AzPrivateEndpoint', 'Remove-AzPrivateEndpoint', 
                'New-AzPrivateLinkServiceConnection', 
                'New-AzPrivateLinkService', 'Get-AzPrivateLinkService', 'Remove-AzPrivateLinkService', 

src/Network/Network/Az.Network.psd1

@@ -48,6 +48,7 @@
 * Fixed Cortex Get cmdlets for list all part
 * Fixed VirtualHub reference creation for ExpressRouteGateways, VpnGateway
 * Added support for Availability Zones in AzureFirewall and NatGateway
+* Added cmdlet Get-AzNetworkServiceTag
 
 ## Version 1.8.1
 * Add DisableBgpRoutePropagation flag to Effective Route Table output

src/Network/Network/ChangeLog.md

@@ -0,0 +1,34 @@
+//
+// 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 System.Collections.Generic;
+
+namespace Microsoft.Azure.Commands.Network.Models
+{
+    public class PSNetworkServiceTag
+    {
+        public string Name { get; set; }
+
+        public string Id { get; set; }
+
+        public string Type { get; set; }
+
+        public string Cloud { get; set; }
+
+        public string ChangeNumber { get; set; }
+
+        public List<PSNetworkServiceTagInformation> Values { get; set; }
+    }
+}

src/Network/Network/Models/PSNetworkServiceTag.cs

@@ -0,0 +1,26 @@
+//
+// 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.
+//
+
+namespace Microsoft.Azure.Commands.Network.Models
+{
+    public class PSNetworkServiceTagInformation
+    {
+        public string Name { get; set; }
+
+        public string Id { get; set; }
+
+        public PSNetworkServiceTagInformationProperties Properties { get; set; }
+    }
+}

src/Network/Network/Models/PSNetworkServiceTagInformation.cs

@@ -0,0 +1,30 @@
+//
+// 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 System.Collections.Generic;
+
+namespace Microsoft.Azure.Commands.Network.Models
+{
+    public class PSNetworkServiceTagInformationProperties
+    {
+        public string Region { get; set; }
+
+        public string SystemService { get; set; }
+ 
+        public string ChangeNumber { get; set; }
+
+        public List<string> AddressPrefixes { get; set; }
+    }
+}

src/Network/Network/Models/PSNetworkServiceTagInformationProperties.cs

@@ -0,0 +1,47 @@
+// 
+// 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.
+// 
+
+using System.Collections.Generic;
+using System.Management.Automation;
+using Microsoft.Azure.Commands.Network.Models;
+using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
+using Microsoft.Azure.Management.Network;
+using CNM = Microsoft.Azure.Commands.Network.Models;
+
+namespace Microsoft.Azure.Commands.Network.Automation
+{
+    [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "NetworkServiceTag"), OutputType(typeof(PSNetworkServiceTag))]
+    public partial class GetAzureNetworkServiceTagCommand : NetworkBaseCmdlet
+    {
+        [Parameter(
+            Mandatory = true,
+            HelpMessage = "The location.",
+            ValueFromPipelineByPropertyName = true)]
+        [LocationCompleter("Microsoft.Network/locations/serviceTags")]
+        [ValidateNotNullOrEmpty]
+        public string Location { get; set; }
+
+        public override void Execute()
+        {
+            base.Execute();
+
+            var serviceTagsList = this.NetworkClient.NetworkManagementClient.ServiceTags.List(Location);
+            PSNetworkServiceTag psNetworkServiceTag = NetworkResourceManagerProfile.Mapper.Map<CNM.PSNetworkServiceTag>(serviceTagsList);
+
+            WriteObject(psNetworkServiceTag, true);
+        }
+    }
+}

src/Network/Network/NetworkServiceTag/GetAzureNetworkServiceTagCommand.cs

@@ -350,6 +350,9 @@ Gets a network security group.
 ### [Get-AzNetworkSecurityRuleConfig](Get-AzNetworkSecurityRuleConfig.md)
 Get a network security rule configuration for a network security group.
 
+### [Get-AzNetworkServiceTag](Get-AzNetworkServiceTag.md)
+Gets the list of service tag information resources.
+
 ### [Get-AzNetworkUsage](Get-AzNetworkUsage.md)
 Lists network usages for a subscription
 

src/Network/Network/help/Az.Network.md

@@ -0,0 +1,83 @@
+---
+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/get-aznetworkservicetag
+schema: 2.0.0
+---
+
+# Get-AzNetworkServiceTag
+
+## SYNOPSIS
+Gets the list of service tag information resources.
+
+## SYNTAX
+
+```
+Get-AzNetworkServiceTag -Location <String> [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
+```
+
+## DESCRIPTION
+The **Get-AzNetworkServiceTag** cmdlet gets the list of service tag information resources.
+
+## EXAMPLES
+
+### Example 1
+```powershell
+PS C:\> Get-AzNetworkServiceTag -Location eastus2
+
+Name         : Public
+Id           : /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx/providers/Microsoft.Network/serviceTags/Public
+Type         : Microsoft.Network/serviceTags
+ChangeNumber : 63
+Cloud        : Public
+Values       : {ApiManagement, ApiManagement.AustraliaCentral, ApiManagement.AustraliaCentral2, ApiManagement.AustraliaEast...}
+```
+
+The command gets the list of service tag information resources.
+
+## PARAMETERS
+
+### -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
+```
+
+### -Location
+The location.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+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
+
+### Microsoft.Azure.Commands.Network.Models.PSNetworkServiceTag
+
+## NOTES
+
+## RELATED LINKS