Merge pull request #3 from Azure/network-september

Network september merge

Author: Khushboo-Baheti

src/Network/Network.Test/ScenarioTests/VirtualNetworkTests.cs

@@ -50,6 +50,14 @@ public void TestVirtualNetworkSubnetCRUD()
             TestRunner.RunTestScript("Test-subnetCRUD");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.sdnnrp)]
+        public void TestVirtualNetworkBgpCommunitiesCRUD()
+        {
+            TestRunner.RunTestScript("Test-bgpCommunitiesCRUD");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, NrpTeamAlias.sdnnrp)]

src/Network/Network.Test/ScenarioTests/VirtualNetworkTests.ps1

@@ -201,6 +201,48 @@ function Test-subnetCRUD
     }
 }
 
+<#
+.SYNOPSIS
+Tests creating, updating & deleting a virtualNetwork with BGP Communities.
+.DESCRIPTION
+SmokeTest
+#>
+function Test-bgpCommunitiesCRUD
+{
+    # Setup
+    $rgname = Get-ResourceGroupName
+    $vnetName = Get-ResourceName
+    $rglocation = Get-ProviderLocation ResourceManagement
+    $resourceTypeParent = "Microsoft.Network/virtualNetworks"
+    $location = Get-ProviderLocation $resourceTypeParent "eastus2euap"
+
+    try
+    {
+        # Create the resource group
+        $resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" }
+
+        # Create q virtual network with a BGP community
+        New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -BgpCommunity 12076:61234
+
+        # Get the virtual network and verify that the community is set to the expected value
+        $vnet = Get-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname
+        Assert-AreEqual "12076:61234" $vnet.BgpCommunities.VirtualNetworkCommunity
+
+        # Update the virtual network with a different BGP community
+        $vnet.BgpCommunities.VirtualNetworkCommunity = "12076:64321"
+        $vnet | Set-AzVirtualNetwork
+
+        # Get the virtual network and verify that the community is set to the new value
+        $vnet = Get-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname
+        Assert-AreEqual "12076:64321" $vnet.BgpCommunities.VirtualNetworkCommunity
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
 <#
 .SYNOPSIS
 Tests creating new virtualNetwork w/ delegated subnets.

src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualNetworkTests/TestVirtualNetworkBgpCommunitiesCRUD.json

@@ -168,6 +168,7 @@ private static void Initialize()
                 // Subnet
                 // CNM to MNM
                 cfg.CreateMap<CNM.PSDhcpOptions, MNM.DhcpOptions>();
+                cfg.CreateMap<CNM.PSVirtualNetworkBgpCommunities, MNM.VirtualNetworkBgpCommunities>();
                 cfg.CreateMap<CNM.PSSubnet, MNM.Subnet>()
                     .ForMember(dest => dest.AddressPrefix, opt => opt.Ignore())
                     .ForMember(dest=> dest.AddressPrefixes, opt => opt.Ignore())
@@ -190,6 +191,7 @@ private static void Initialize()
 
                 // MNM to CNM
                 cfg.CreateMap<MNM.DhcpOptions, CNM.PSDhcpOptions>();
+                cfg.CreateMap<MNM.VirtualNetworkBgpCommunities, CNM.PSVirtualNetworkBgpCommunities>();
                 cfg.CreateMap<MNM.Subnet, CNM.PSSubnet>()
                     .ForMember(dest => dest.AddressPrefix, opt => opt.Ignore())
                     .AfterMap((src, dest) =>

src/Network/Network/Common/NetworkResourceManagerProfile.cs

@@ -28,6 +28,8 @@ public class PSVirtualNetwork : PSTopLevelResource, IResourceReference, IVirtual
 
         public List<PSSubnet> Subnets { get; set; }
 
+        public PSVirtualNetworkBgpCommunities BgpCommunities { get; set; }
+
         public List<PSVirtualNetworkPeering> VirtualNetworkPeerings { get; set; }
 
         [Ps1Xml(Target = ViewControl.Table)]
@@ -56,6 +58,12 @@ public string SubnetsText
             get { return JsonConvert.SerializeObject(Subnets, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
 
+        [JsonIgnore]
+        public string BgpCommunitiesText
+        {
+            get { return JsonConvert.SerializeObject(BgpCommunities, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+        }
+
         [JsonIgnore]
         public string VirtualNetworkPeeringsText
         {

src/Network/Network/Models/PSVirtualNetwork.cs

@@ -0,0 +1,16 @@
+using Newtonsoft.Json;
+
+namespace Microsoft.Azure.Commands.Network.Models
+{
+    public class PSVirtualNetworkBgpCommunities
+    {
+        public string VirtualNetworkCommunity { get; set; }
+
+        public string RegionalCommunity { get; set; }
+
+        public bool ShouldSerializeRegionalCommunity()
+        {
+            return !string.IsNullOrWhiteSpace(this.RegionalCommunity);
+        }
+    }
+}

src/Network/Network/Models/PSVirtualNetworkBgpCommunities.cs

@@ -114,6 +114,15 @@
                 <Label>Subnets</Label>
                 <PropertyName>SubnetsText</PropertyName>
               </ListItem>
+              <ListItem>
+                <Label>BgpCommunities</Label>
+                <PropertyName>BgpCommunitiesText</PropertyName>
+                <ItemSelectionCondition>
+                  <ScriptBlock>
+                    !($_.BgpCommunities -eq $null)
+                  </ScriptBlock>
+                </ItemSelectionCondition>
+              </ListItem>
               <ListItem>
                 <Label>VirtualNetworkPeerings</Label>
                 <PropertyName>VirtualNetworkPeeringsText</PropertyName>

src/Network/Network/Network.format.ps1xml

@@ -72,6 +72,12 @@ public class NewAzureVirtualNetworkCommand : VirtualNetworkBaseCmdlet
              HelpMessage = "The list of subnets")]
         public PSSubnet[] Subnet { get; set; }
 
+        [Parameter(
+             Mandatory = false,
+             ValueFromPipelineByPropertyName = true,
+             HelpMessage = "The BGP Community advertised over ExpressRoute.")]
+        public string BgpCommunity { get; set; }
+
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
@@ -137,8 +143,13 @@ private PSVirtualNetwork CreateVirtualNetwork()
                 vnet.DdosProtectionPlan = new PSResourceId {Id = DdosProtectionPlanId};
             }
 
+            if (!string.IsNullOrWhiteSpace(BgpCommunity))
+            {
+                vnet.BgpCommunities = new PSVirtualNetworkBgpCommunities {VirtualNetworkCommunity = this.BgpCommunity};
+            }
+
             // Map to the sdk object
-            var vnetModel = NetworkResourceManagerProfile.Mapper.Map<MNM.VirtualNetwork>(vnet);
+                var vnetModel = NetworkResourceManagerProfile.Mapper.Map<MNM.VirtualNetwork>(vnet);
             vnetModel.Tags = TagsConversionHelper.CreateTagDictionary(Tag, validate: true);
 
             // Execute the Create VirtualNetwork call

src/Network/Network/VirtualNetwork/NewAzureVirtualNetworkCommand.cs

@@ -15,9 +15,9 @@ Creates a virtual network.
 
 ```
 New-AzVirtualNetwork -Name <String> -ResourceGroupName <String> -Location <String> -AddressPrefix <String[]>
- [-DnsServer <String[]>] [-Subnet <PSSubnet[]>] [-Tag <Hashtable>] [-EnableDdosProtection]
- [-DdosProtectionPlanId <String>] [-Force] [-AsJob] [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
- [-Confirm] [<CommonParameters>]
+ [-DnsServer <String[]>] [-Subnet <PSSubnet[]>] [-BgpCommunity <String>] [-Tag <Hashtable>]
+ [-EnableDdosProtection] [-DdosProtectionPlanId <String>] [-Force] [-AsJob]
+ [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -103,6 +103,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -BgpCommunity
+The BGP Community advertised over ExpressRoute.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -DdosProtectionPlanId
 Reference to the DDoS protection plan resource associated with the virtual network.
 
@@ -286,7 +301,7 @@ 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).
+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