Add new properties a new commandlet to support the address space update in peered vNets

src/Batch/Batch.Test/Batch.Test.csproj

@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.Azure.Batch" Version="13.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Batch" Version="11.0.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
   </ItemGroup>
 
   <ItemGroup>

src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
   </ItemGroup>
 
 </Project>

src/Compute/Compute.Test/Compute.Test.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="44.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
   </ItemGroup>
 
   <ItemGroup>

src/ContainerRegistry/ContainerRegistry.Test/ContainerRegistry.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.ContainerRegistry" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.6.0">
       <NoWarn>NU1608</NoWarn>

src/CosmosDB/CosmosDB.Test/CosmosDB.Test.csproj

@@ -4,7 +4,7 @@
   </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Test.props" />
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
     <PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="2.0.0" />
 </ItemGroup>
 </Project>

src/DataLakeStore/DataLakeStore.Test/DataLakeStore.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
   </ItemGroup>
 
   <ItemGroup>

src/Dns/Dns.Test/Dns.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
   </ItemGroup>
 
 </Project>

src/HDInsight/HDInsight.Test/HDInsight.Test.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.Azure.Management.HDInsight.Job" Version="2.0.7" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
     <PackageReference Include="Microsoft.Azure.Management.ManagedServiceIdentity" Version="0.11.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
     <PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
   </ItemGroup>
 

src/HPCCache/HPCCache.Test/HPCCache.Test.csproj

@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Authorization" Version="2.11.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.5.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
   </ItemGroup>
 

src/KeyVault/KeyVault.Test/KeyVault.Test.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
     <PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
   </ItemGroup>
 
   <ItemGroup>

src/Monitor/Monitor.Test/Monitor.Test.csproj

@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Monitor" Version="0.25.3-preview" />
     <PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.3.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
     <PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
   </ItemGroup>
 

src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.10.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
   </ItemGroup>
 
 </Project>

src/Network/Network.Test/Network.Test.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
     <PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />

src/Network/Network/Az.Network.psd1

@@ -378,7 +378,8 @@ CmdletsToExport = 'Add-AzApplicationGatewayAuthenticationCertificate',
                'Remove-AzNetworkSecurityGroup', 'Set-AzNetworkSecurityGroup', 
                'Test-AzDnsAvailability', 'Add-AzVirtualNetworkPeering', 
                'Get-AzVirtualNetworkPeering', 'Remove-AzVirtualNetworkPeering', 
-               'Set-AzVirtualNetworkPeering', 'Remove-AzVirtualNetwork', 
+               'Set-AzVirtualNetworkPeering', 'Sync-AzVirtualNetworkPeering', 
+               'Remove-AzVirtualNetwork', 
                'Set-AzVirtualNetwork', 'Remove-AzVirtualNetworkSubnetConfig', 
                'Set-AzVirtualNetworkSubnetConfig', 
                'Get-AzVirtualNetworkSubnetConfig', 

src/Network/Network/Common/NetworkResourceManagerProfile.cs

@@ -343,15 +343,31 @@ private static void Initialize()
                 cfg.CreateMap<CNM.PSVirtualNetworkPeering, MNM.VirtualNetworkPeering>()
                     .ForMember(
                         dest => dest.RemoteAddressSpace,
+                        opt => opt.MapFrom(src => src.PeeredRemoteAddressSpace)
+                    );
+
+                // MNM to CNM
+                cfg.CreateMap<MNM.VirtualNetworkPeering, CNM.PSVirtualNetworkPeering>()
+                    .ForMember(
+                        dest => dest.PeeredRemoteAddressSpace,
+                        opt => opt.MapFrom(src => src.RemoteAddressSpace)
+                    );
+
+                /*
+                // CNM to MNM
+                cfg.CreateMap<CNM.PSVirtualNetworkPeering, MNM.VirtualNetworkPeering>()
+                    .ForMember(
+                        dest => dest.RemoteVirtualNetworkAddressSpace,
                         opt => opt.MapFrom(src => src.RemoteVirtualNetworkAddressSpace)
                     );
 
                 // MNM to CNM
                 cfg.CreateMap<MNM.VirtualNetworkPeering, CNM.PSVirtualNetworkPeering>()
                     .ForMember(
                         dest => dest.RemoteVirtualNetworkAddressSpace,
-                        opt => opt.MapFrom(src => src.RemoteAddressSpace)
+                        opt => opt.MapFrom(src => src.RemoteVirtualNetworkAddressSpace)
                     );
+                */
 
                 // VirtualNetwork
                 // CNM to MNM

src/Network/Network/Models/PSVirtualNetworkPeering.cs

@@ -31,6 +31,9 @@ public class PSVirtualNetworkPeering : PSChildResource
         [JsonProperty(Order = 1)]
         public string PeeringState { get; set; }
 
+        [JsonProperty(Order = 1)]
+        public string PeeringSyncLevel { get; set; }
+
         [JsonProperty(Order = 1)]
         [Ps1Xml(Target = ViewControl.Table)]
         public bool? AllowVirtualNetworkAccess { get; set; }
@@ -53,6 +56,9 @@ public class PSVirtualNetworkPeering : PSChildResource
         [JsonProperty(Order = 1)]
         public List<PSResourceId> RemoteGateways { get; set; }
 
+        [JsonProperty(Order = 1)]
+        public PSAddressSpace PeeredRemoteAddressSpace { get; set; }
+
         [JsonProperty(Order = 1)]
         public PSAddressSpace RemoteVirtualNetworkAddressSpace { get; set; }
 
@@ -75,6 +81,12 @@ public string RemoteGatewaysText
             get { return JsonConvert.SerializeObject(RemoteGateways, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
 
+        [JsonIgnore]
+        public string PeeredRemoteAddressSpaceText
+        {
+            get { return JsonConvert.SerializeObject(PeeredRemoteAddressSpace, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+        }
+
         [JsonIgnore]
         public string RemoteVirtualNetworkAddressSpaceText
         {

src/Network/Network/Network.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
   </ItemGroup>
 
   <ItemGroup>

src/Network/Network/Network.format.ps1xml

@@ -1351,6 +1351,10 @@
                 <Label>VirtualNetworkName</Label>
                 <PropertyName>VirtualNetworkName</PropertyName>
               </ListItem>
+              <ListItem>
+                <Label>PeeringSyncLevel</Label>
+                <PropertyName>PeeringSyncLevel</PropertyName>
+              </ListItem>
               <ListItem>
                 <Label>PeeringState</Label>
                 <PropertyName>PeeringState</PropertyName>
@@ -1383,6 +1387,10 @@
                 <Label>RemoteGateways</Label>
                 <PropertyName>RemoteGatewaysText</PropertyName>
               </ListItem>
+              <ListItem>
+                <Label>PeeredRemoteAddressSpace</Label>
+                <PropertyName>PeeredRemoteAddressSpaceText</PropertyName>
+              </ListItem>
               <ListItem>
                 <Label>RemoteVirtualNetworkAddressSpace</Label>
                 <PropertyName>RemoteVirtualNetworkAddressSpaceText</PropertyName>

src/Network/Network/VirtualNetwork/Peering/AddAzureVirtualNetworkPeeringCommand.cs

@@ -112,7 +112,7 @@ private PSVirtualNetworkPeering AddVirtualNetworkPeering()
             var vnetPeeringModel = NetworkResourceManagerProfile.Mapper.Map<MNM.VirtualNetworkPeering>(vnetPeering);
 
             // Execute the Create VirtualNetwork call
-            this.VirtualNetworkPeeringClient.CreateOrUpdateWithHttpMessagesAsync(this.VirtualNetwork.ResourceGroupName, this.VirtualNetwork.Name, this.Name, vnetPeeringModel, auxAuthHeader).GetAwaiter().GetResult();
+            this.VirtualNetworkPeeringClient.CreateOrUpdateWithHttpMessagesAsync(this.VirtualNetwork.ResourceGroupName, this.VirtualNetwork.Name, this.Name, vnetPeeringModel, null, auxAuthHeader).GetAwaiter().GetResult();
             var getVirtualNetworkPeering = this.GetVirtualNetworkPeering(this.VirtualNetwork.ResourceGroupName, this.VirtualNetwork.Name, this.Name);
 
             return getVirtualNetworkPeering;

src/Network/Network/VirtualNetwork/Peering/SetAzureVirtualNetworkPeeringCommand.cs

@@ -61,7 +61,7 @@ public override void Execute()
             }
 
             // Execute the Create VirtualNetwork call
-            this.VirtualNetworkPeeringClient.CreateOrUpdateWithHttpMessagesAsync(this.VirtualNetworkPeering.ResourceGroupName, this.VirtualNetworkPeering.VirtualNetworkName, this.VirtualNetworkPeering.Name, vnetPeeringModel, auxAuthHeader).GetAwaiter().GetResult();
+            this.VirtualNetworkPeeringClient.CreateOrUpdateWithHttpMessagesAsync(this.VirtualNetworkPeering.ResourceGroupName, this.VirtualNetworkPeering.VirtualNetworkName, this.VirtualNetworkPeering.Name, vnetPeeringModel, null, auxAuthHeader).GetAwaiter().GetResult();
 
             var getVirtualNetworkPeering = this.GetVirtualNetworkPeering(this.VirtualNetworkPeering.ResourceGroupName, this.VirtualNetworkPeering.VirtualNetworkName, this.VirtualNetworkPeering.Name);
 

src/Network/Network/VirtualNetwork/Peering/SyncAzureVirtualNetworkPeeringCommand.cs

@@ -0,0 +1,105 @@
+// ----------------------------------------------------------------------------------
+//
+// 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.Models;
+using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
+using Microsoft.Azure.Management.Network;
+using System;
+using System.Collections.Generic;
+using System.Management.Automation;
+using MNM = Microsoft.Azure.Management.Network.Models;
+
+namespace Microsoft.Azure.Commands.Network
+{
+    [Cmdlet("Sync", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VirtualNetworkPeering"), OutputType(typeof(PSVirtualNetworkPeering))]
+    public class SyncAzureVirtualNetworkPeeringCommand : VirtualNetworkPeeringBase
+    {
+        [Parameter(
+             Mandatory = true,
+             ValueFromPipelineByPropertyName = true,
+             HelpMessage = "The virtual network name.")]
+        [ResourceNameCompleter("Microsoft.Network/virtualNetworks", "ResourceGroupName")]
+        [ValidateNotNullOrEmpty]
+        public string VirtualNetworkName { get; set; }
+
+        [Parameter(
+            Mandatory = true,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The resource group name.")]
+        [ResourceGroupCompleter]
+        [ValidateNotNullOrEmpty]
+        public string ResourceGroupName { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The virtual network peering name.")]
+        [ResourceNameCompleter("Microsoft.Network/virtualNetworks/virtualNetworkPeerings", "ResourceGroupName", "VirtualNetworkName")]
+        [ValidateNotNullOrEmpty]
+        [SupportsWildcards]
+        public string Name { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipeline = true,
+            HelpMessage = "The virtual network peering")]
+        public PSVirtualNetworkPeering VirtualNetworkPeering { get; set; }
+
+        public override void Execute()
+        {
+            base.Execute();
+            var existingPeering = this.VirtualNetworkPeering;
+
+            if(existingPeering == null)
+            {
+                existingPeering = this.GetVirtualNetworkPeering(this.ResourceGroupName, this.VirtualNetworkName, this.Name);
+            }
+
+            var updatedPeering = UpdateVirtualNetworkPeering(existingPeering);
+            WriteObject(updatedPeering);
+        }
+
+        private PSVirtualNetworkPeering UpdateVirtualNetworkPeering(PSVirtualNetworkPeering existingPeering)
+        {
+            if (!this.IsVirtualNetworkPeeringPresent(existingPeering.ResourceGroupName, existingPeering.VirtualNetworkName, existingPeering.Name))
+            {
+                throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
+            }
+
+            // Map to the sdk object
+            var vnetPeeringModel = NetworkResourceManagerProfile.Mapper.Map<MNM.VirtualNetworkPeering>(existingPeering);
+
+            //Get the remote VNet Id nad ge then get th etoke for the resource Id if tis in a different tenant
+            var remoteVirtualNetworkId = existingPeering.RemoteVirtualNetwork.Id;
+            Dictionary<string, List<string>> auxAuthHeader = null;
+            if (remoteVirtualNetworkId != null)
+            {
+                List<string> resourceIds = new List<string>();
+                resourceIds.Add(remoteVirtualNetworkId);
+                var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);
+                if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
+                {
+                    auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
+                }
+            }
+
+            // Create/Update call with 'sync' param set tot true
+            this.VirtualNetworkPeeringClient.CreateOrUpdateWithHttpMessagesAsync(existingPeering.ResourceGroupName, existingPeering.VirtualNetworkName, existingPeering.Name, vnetPeeringModel, true.ToString(), auxAuthHeader).GetAwaiter().GetResult();
+
+            var getVirtualNetworkPeering = this.GetVirtualNetworkPeering(existingPeering.ResourceGroupName, existingPeering.VirtualNetworkName, existingPeering.Name);
+
+            return getVirtualNetworkPeering;
+        }
+    }
+}

src/PrivateDns/PrivateDns.Test/PrivateDns.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.PrivateDns" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
   </ItemGroup>
 
   <ItemGroup>

src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="44.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.3.1-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.1.5-preview" />
   </ItemGroup>

src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="44.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.3.1-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.1.5-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.3.0" />

src/SignalR/SignalR.Test/SignalR.Test.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="323.1255.27827" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
     <PackageReference Include="Microsoft.Azure.Management.PrivateDns" Version="1.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.SignalR" Version="1.1.0" />
   </ItemGroup>