Merge pull request Azure#10979 from AsrOneSdk/origin/vijami/vaultCredChanges

Fix for Vault credential file download and fix for initial replication start time for H2A

Author: VeryEarly

src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSConstants.cs

@@ -121,6 +121,11 @@ public static class Constants
         /// </summary>
         public const string Disable = "Disable";
 
+        /// <summary>
+        ///     Disabled.
+        /// </summary>
+        public const string Disabled = "Disabled";
+
         /// <summary>
         ///     Represents Disable protection.
         /// </summary>
@@ -131,6 +136,11 @@ public static class Constants
         /// </summary>
         public const string Enable = "Enable";
 
+        /// <summary>
+        ///     Enabled.
+        /// </summary>
+        public const string Enabled = "Enabled";
+
         /// <summary>
         ///     Represents Enable protection.
         /// </summary>
@@ -427,6 +437,11 @@ public static class Constants
         /// </summary>
         public const string SelectedByDefault = "SelectedByDefault";
 
+        /// <summary>
+        ///     Secondary Vm on Recovery cloud
+        /// </summary>
+        public const string SecondaryVMOnRecoveryCloud = "SecondaryVMOnRecoveryCloud";
+
         /// <summary>
         ///     Nic Selection Type - SelectedByUser
         /// </summary>

src/RecoveryServices/RecoveryServices.SiteRecovery/Policy/UpdateAzureRmRecoveryServicesAsrPolicy.cs

@@ -327,7 +327,7 @@ private void HyperVToAzurePolicyObject()
             this.replicationStartTime =
                 this.MyInvocation.BoundParameters.ContainsKey(
                     Utilities.GetMemberName(() => this.ReplicationStartTime))
-                    ? this.replicationStartTime
+                    ? this.ReplicationStartTime
                     : replicationProviderSettings.OnlineReplicationStartTime;
             this.recoveryAzureStorageAccountId =
                 this.MyInvocation.BoundParameters.ContainsKey(
@@ -428,7 +428,8 @@ private void EnterpriseToEnterprisePolicyObject()
             this.compression =
                 this.MyInvocation.BoundParameters.ContainsKey(
                     Utilities.GetMemberName(() => this.Compression)) ? this.Compression
-                    : replicationProviderSettings.Compression;
+                    : replicationProviderSettings.Compression == Constants.Disabled ? Constants.Disable
+                    : Constants.Enable;
             this.replicationPort =
                 this.MyInvocation.BoundParameters.ContainsKey(
                     Utilities.GetMemberName(() => this.ReplicationPort)) ? this.ReplicationPort
@@ -451,12 +452,13 @@ private void EnterpriseToEnterprisePolicyObject()
             this.replicationStartTime =
                 this.MyInvocation.BoundParameters.ContainsKey(
                     Utilities.GetMemberName(() => this.ReplicationStartTime))
-                    ? this.replicationStartTime
+                    ? this.ReplicationStartTime
                     : replicationProviderSettings.OnlineReplicationStartTime;
             this.replicaDeletion =
                 this.MyInvocation.BoundParameters.ContainsKey(
                     Utilities.GetMemberName(() => this.ReplicaDeletion)) ? this.ReplicaDeletion
-                    : replicationProviderSettings.ReplicaDeletionOption;
+                    : replicationProviderSettings.ReplicaDeletionOption == Constants.SecondaryVMOnRecoveryCloud ? Constants.Required
+                    : Constants.NotRequired;
 
             var updatePolicyProperties = new UpdatePolicyInputProperties();
 

src/RecoveryServices/RecoveryServices/Vault/GetAzureRMRecoveryServicesVaultSettingsFile.cs

@@ -235,7 +235,10 @@ private void GetBackupCredentialsWithCertificate(string certificate)
             {
                 // Upload cert into ID Mgmt
                 WriteDebug(string.Format(CultureInfo.InvariantCulture, Resources.UploadingCertToIdmgmt));
-                var bytes = Encoding.ASCII.GetBytes(certificate);
+                X509Certificate2 x509 = new X509Certificate2();
+                byte[] data = Convert.FromBase64String(certificate);
+                x509.Import(data);
+                var bytes = x509.RawData;
                 var certificateArgs = new CertificateRequest
                 {
                     Properties = new RawCertificateData {Certificate = bytes, AuthType = AuthType.AAD}
@@ -304,7 +307,10 @@ private void GetSiteRecoveryCredentialsWithCertificate(string certificate)
                 var fullFilePath = System.IO.Path.Combine(filePath, fileName);
                 // Upload cert into ID Mgmt
                 WriteDebug(string.Format(CultureInfo.InvariantCulture, Resources.UploadingCertToIdmgmt));
-                var bytes = Encoding.ASCII.GetBytes(certificate);
+                X509Certificate2 x509 = new X509Certificate2();
+                byte[] data = Convert.FromBase64String(certificate);
+                x509.Import(data);
+                var bytes = x509.RawData;
                 var certificateArgs = new CertificateRequest
                 {
                     Properties = new RawCertificateData {Certificate = bytes, AuthType = AuthType.AAD}