AsrOneSdk · viverm · Jun 28, 2019 · Jul 4, 2019
diff --git a/src/Accounts/Accounts/Accounts.csproj b/src/Accounts/Accounts/Accounts.csproj
@@ -53,5 +53,9 @@
     <ProjectReference Include="..\Authentication.ResourceManager\Authentication.ResourceManager.csproj" />
     <ProjectReference Include="..\Authentication\Authentication.csproj" />  
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Accounts/Authentication.ResourceManager/Authentication.ResourceManager.csproj b/src/Accounts/Authentication.ResourceManager/Authentication.ResourceManager.csproj
@@ -15,4 +15,8 @@
     <ProjectReference Include="..\Authentication\Authentication.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Accounts/Authentication/Authentication.csproj b/src/Accounts/Authentication/Authentication.csproj
@@ -15,4 +15,8 @@
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.19.2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Compute/Compute/Compute.csproj b/src/Compute/Compute/Compute.csproj
@@ -30,4 +30,8 @@
     <Compile Include="$(StorageToolsPath)Adapters\WindowsAzure.Storage.6\AzureStorageContext.cs" Link="Common\AzureStorageContext.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Network/Network/Network.csproj b/src/Network/Network/Network.csproj
@@ -19,4 +19,8 @@
     <None Update="AzureRmNetworkStartup.ps1" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Helpers/RecoveryServices.Backup.Helpers.csproj b/src/RecoveryServices/RecoveryServices.Backup.Helpers/RecoveryServices.Backup.Helpers.csproj
@@ -21,4 +21,8 @@
     <ProjectReference Include="..\RecoveryServices.Backup.Models\RecoveryServices.Backup.Models.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Logger/RecoveryServices.Backup.Logger.csproj b/src/RecoveryServices/RecoveryServices.Backup.Logger/RecoveryServices.Backup.Logger.csproj
@@ -11,4 +11,8 @@
     <RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName).Backup</RootNamespace>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj b/src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj
@@ -15,4 +15,8 @@
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="3.1.1-preview" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/...coveryServices/RecoveryServices.Backup.Providers/RecoveryServices.Backup.Providers.csproj b/...coveryServices/RecoveryServices.Backup.Providers/RecoveryServices.Backup.Providers.csproj
@@ -19,4 +19,8 @@
     <ProjectReference Include="..\RecoveryServices.Backup.ServiceClientAdapter\RecoveryServices.Backup.ServiceClientAdapter.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/...yServices.Backup.ServiceClientAdapter/RecoveryServices.Backup.ServiceClientAdapter.csproj b/...yServices.Backup.ServiceClientAdapter/RecoveryServices.Backup.ServiceClientAdapter.csproj
@@ -22,4 +22,8 @@
     <ProjectReference Include="..\RecoveryServices.Backup.Helpers\RecoveryServices.Backup.Helpers.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj b/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj
@@ -25,4 +25,8 @@
     <None Update="ScenarioTests\**\*.ps1" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/RecoveryServices/RecoveryServices.Backup/RecoveryServices.Backup.csproj b/src/RecoveryServices/RecoveryServices.Backup/RecoveryServices.Backup.csproj
@@ -23,4 +23,8 @@
     <ProjectReference Include="..\RecoveryServices.Backup.ServiceClientAdapter\RecoveryServices.Backup.ServiceClientAdapter.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/...veryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj b/...veryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="25.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.10.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.2.1-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="2.0.1-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="2.0.2-preview" />
   </ItemGroup>
 
   <ItemGroup>
@@ -27,4 +27,8 @@
     <None Update="ScenarioTests\**\*.VaultCredentials" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSObjects.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSObjects.cs
@@ -943,6 +943,10 @@ public ASRVMNicDetails(
             this.PrimaryNicStaticIPAddress = vMNicDetails.PrimaryNicStaticIPAddress;
             this.RecoveryNicIpAddressType = vMNicDetails.RecoveryNicIpAddressType;
             this.EnableAcceleratedNetworkingOnRecovery = vMNicDetails.EnableAcceleratedNetworkingOnRecovery;
+            this.RecoveryPublicIPAddressId = vMNicDetails.RecoveryPublicIpAddressId;
+            this.RecoveryNetworkSecurityGroupId = vMNicDetails.RecoveryNetworkSecurityGroupId;
+            this.RecoveryLBBackendAddressPoolIds =
+                vMNicDetails.RecoveryLBBackendAddressPoolIds?.ToList() ?? new List<string>();
         }
 
         //
@@ -1009,6 +1013,21 @@ public ASRVMNicDetails(
         ///     Gets or sets VM subnet name.
         /// </summary>
         public string VMSubnetName { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the id of the public IP address resource associated with the NIC.
+        /// </summary>
+        public string RecoveryPublicIPAddressId { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the id of the NSG associated with the NIC.
+        /// </summary>
+        public string RecoveryNetworkSecurityGroupId { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the target backend address pools for the NIC.
+        /// </summary>
+        public List<string> RecoveryLBBackendAddressPoolIds { get; set; }
     }
 
     /// <summary>

diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/RecoveryServices.SiteRecovery.csproj b/src/RecoveryServices/RecoveryServices.SiteRecovery/RecoveryServices.SiteRecovery.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.2.1-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="2.0.1-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="2.0.2-preview" />
   </ItemGroup>
 
   <ItemGroup>
@@ -36,4 +36,8 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/...ecovery/ReplicationProtectedItem/SetAzureRmRecoveryServicesAsrReplicationProtectedItem.cs b/...ecovery/ReplicationProtectedItem/SetAzureRmRecoveryServicesAsrReplicationProtectedItem.cs
@@ -189,6 +189,26 @@ public class SetAzureRmRecoveryServicesAsrReplicationProtectedItem : SiteRecover
             Constants.False)]
         public string UseManagedDisk { get; set; }
 
+        /// <summary>
+        ///     Gets or sets the id of the public IP address resource associated with the NIC.
+        /// </summary>
+        [Parameter]
+        [ValidateNotNullOrEmpty]
+        public string RecoveryPublicIPAddressId { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the id of the NSG associated with the NIC.
+        /// </summary>
+        [Parameter]
+        [ValidateNotNullOrEmpty]
+        public string RecoveryNetworkSecurityGroupId { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the target backend address pools for the NIC.
+        /// </summary>
+        [Parameter]
+        public List<string> RecoveryLBBackendAddressPoolIds { get; set; }
+
         /// <summary>
         ///     ProcessRecord of the command.
         /// </summary>
@@ -248,6 +268,17 @@ public override void ExecuteSiteRecoveryCmdlet()
                     return;
                 }
 
+                // NSG, LB and PIP only for A2A provider.
+                if ((!string.IsNullOrEmpty(RecoveryNetworkSecurityGroupId) ||
+                    !string.IsNullOrEmpty(RecoveryPublicIPAddressId) ||
+                    RecoveryLBBackendAddressPoolIds != null &&
+                    RecoveryLBBackendAddressPoolIds.Count > 0) &&
+                    !(provider is A2AReplicationDetails))
+                {
+                    throw new Exception("Setting RecoveryPublicIPAddressId, " +
+                        "RecoveryNetworkSecurityGroupId and RecoveryLBBackendAddressPoolIds " +
+                        "inputs not allowed for providers other than A2A.");
+                }
 
                 var vmName = this.Name;
                 var vmSize = this.Size;
@@ -545,6 +576,12 @@ private List<VMNicInputDetails> getNicListToUpdate(IList<VMNicDetails> vmNicList
                         vMNicInputDetails.SelectionType =
                             string.IsNullOrEmpty(this.NicSelectionType)
                                 ? Constants.SelectedByUser : this.NicSelectionType;
+                        vMNicInputDetails.RecoveryLBBackendAddressPoolIds =
+                            this.RecoveryLBBackendAddressPoolIds;
+                        vMNicInputDetails.RecoveryPublicIpAddressId =
+                            this.RecoveryPublicIPAddressId;
+                        vMNicInputDetails.RecoveryNetworkSecurityGroupId =
+                            this.RecoveryNetworkSecurityGroupId;
                         vMNicInputDetailsList.Add(vMNicInputDetails);
                         // NicId  matched for update
                         nicFoundToBeUpdated = true;
@@ -568,6 +605,12 @@ private List<VMNicInputDetails> getNicListToUpdate(IList<VMNicDetails> vmNicList
                         vMNicInputDetails.SelectionType = nDetails.SelectionType;
                         vMNicInputDetailsList.Add(vMNicInputDetails);
                         vMNicInputDetails.EnableAcceleratedNetworkingOnRecovery = nDetails.EnableAcceleratedNetworkingOnRecovery;
+                        vMNicInputDetails.RecoveryLBBackendAddressPoolIds =
+                            nDetails.RecoveryLBBackendAddressPoolIds;
+                        vMNicInputDetails.RecoveryPublicIpAddressId =
+                            nDetails.RecoveryPublicIpAddressId;
+                        vMNicInputDetails.RecoveryNetworkSecurityGroupId =
+                            nDetails.RecoveryNetworkSecurityGroupId;
                     }
                 }
             }

diff --git a/src/RecoveryServices/RecoveryServices.Test/RecoveryServices.Test.csproj b/src/RecoveryServices/RecoveryServices.Test/RecoveryServices.Test.csproj
@@ -14,4 +14,8 @@
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.2.1-preview" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/RecoveryServices/RecoveryServices/RecoveryServices.csproj b/src/RecoveryServices/RecoveryServices/RecoveryServices.csproj
@@ -34,4 +34,8 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/...ices/RecoveryServices/help/Set-AzRecoveryServicesAsrReplicationProtectedItem.md b/...ices/RecoveryServices/help/Set-AzRecoveryServicesAsrReplicationProtectedItem.md
@@ -414,6 +414,47 @@ Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
+### -RecoveryPublicIPAddressId
+Specifies the ID of the public IP address resource to be associated with the recovery NIC.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+
+### -RecoveryNetworkSecurityGroupId
+Specifies the ID of the network security group to be associated with the recovery NIC.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+
+### -RecoveryLBBackendAddressPoolIds
+Specifies the target backend address pools to be associated with the recovery NIC.
+
+```yaml
+Type: System.Collections.Generic.List`1[String]
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
 
 ### -Confirm
 Prompts you for confirmation before running the cmdlet.

diff --git a/tools/LocalFeed/Microsoft.Azure.Management.RecoveryServices.SiteRecovery.2.0.2-preview.nupkg b/tools/LocalFeed/Microsoft.Azure.Management.RecoveryServices.SiteRecovery.2.0.2-preview.nupkg
diff --git a/tools/ScenarioTest.ResourceManager/ScenarioTest.ResourceManager.csproj b/tools/ScenarioTest.ResourceManager/ScenarioTest.ResourceManager.csproj
@@ -39,4 +39,8 @@
     </Content>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/tools/TestFx/TestFx.csproj b/tools/TestFx/TestFx.csproj
@@ -17,4 +17,8 @@
     <ProjectReference Include="$(RepoSrc)Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+  </ItemGroup>
+
 </Project>