made changes required for E2A replication provider

Author: sriramvu

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj

@@ -48,8 +48,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.SiteRecovery, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.SiteRecovery.0.1.0-preview\lib\net40\Microsoft.Azure.Management.SiteRecovery.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.SiteRecovery, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.SiteRecovery.0.1.7-preview\lib\net40\Microsoft.Azure.Management.SiteRecovery.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -97,15 +97,15 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Common\PSRecoveryServicesClient.cs" />
-    <Compile Include="Common\PSRecoveryServicesClientHelper.cs" />
-    <Compile Include="Common\PSRecoveryServicesJobsClient.cs" />
-    <Compile Include="Common\PSRecoveryServicesProtectionEntityClient.cs" />
-    <Compile Include="Common\PSRecoveryServicesProtectionContainerClient.cs" />
-    <Compile Include="Common\PSRecoveryServicesProtectionProfileClient.cs" />
-    <Compile Include="Common\PSRecoveryServicesServerClient.cs" />
-    <Compile Include="Common\PSRecoveryServicesVaultClient.cs" />
-    <Compile Include="Common\PSRecoveryServicesVaultExtendedInfoClient.cs" />
+    <Compile Include="Common\PSSiteRecoveryClient.cs" />
+    <Compile Include="Common\PSSiteRecoveryClientHelper.cs" />
+    <Compile Include="Common\PSSiteRecoveryJobsClient.cs" />
+    <Compile Include="Common\PSSiteRecoveryProtectionEntityClient.cs" />
+    <Compile Include="Common\PSSiteRecoveryProtectionContainerClient.cs" />
+    <Compile Include="Common\PSSiteRecoveryProtectionProfileClient.cs" />
+    <Compile Include="Common\PSSiteRecoveryServerClient.cs" />
+    <Compile Include="Common\PSSiteRecoveryVaultClient.cs" />
+    <Compile Include="Common\PSSiteRecoveryVaultExtendedInfoClient.cs" />
     <Compile Include="Common\SiteRecoveryCmdletBase.cs" />
     <Compile Include="Job\GetAzureSiteRecoveryJob.cs" />
     <Compile Include="Job\ResumeAzureSiteRecoveryJob.cs" />

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSRecoveryServicesClient.cs renamed to src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryClient.cs

@@ -188,5 +188,28 @@ protected void ValidateUsageById(string replicationProvider, string paramName)
                     paramName));
             }
         }
+
+        /// <summary>
+        /// Gets the current vault location.
+        /// </summary>
+        /// <returns>The current vault location.</returns>
+        protected string GetCurrentValutLocation()
+        {
+            string location = string.Empty;
+
+            VaultListResponse vaultListResponse =
+                RecoveryServicesClient.GetVaultsInResouceGroup(PSRecoveryServicesClient.asrVaultCreds.ResourceGroupName);
+
+            foreach (Vault vault in vaultListResponse.Vaults)
+            {
+                if (0 == string.Compare(PSRecoveryServicesClient.asrVaultCreds.ResourceName, vault.Name, true))
+                {
+                    location = vault.Location;
+                    break;
+                }
+            }
+
+            return location;
+        }
     }
 }

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSRecoveryServicesClientHelper.cs renamed to src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryClientHelper.cs

@@ -550,26 +550,55 @@ public ASRProtectionProfile(ProtectionProfile profile)
 
             if (profile.CustomData.ReplicationProvider == Constants.HyperVReplica)
             {
-                JavaScriptSerializer serializer = new JavaScriptSerializer();
-                HyperVReplicaProtectionProfileDetails details = (HyperVReplicaProtectionProfileDetails)profile.CustomData.ReplicationProviderSettings;
+                HyperVReplicaProtectionProfileDetails details =
+                    (HyperVReplicaProtectionProfileDetails)profile.CustomData.ReplicationProviderSettings;
 
-                this.ReplicationProviderSettings = new ASRHyperVReplicaProtectionProfileDetails();
-                this.ReplicationProviderSettings.ReplicaDeletionOption =
+                ASRHyperVReplicaProtectionProfileDetails replicationProviderSettings =
+                    new ASRHyperVReplicaProtectionProfileDetails();
+
+                replicationProviderSettings.ReplicaDeletionOption =
                     details.ReplicaDeletionOption;
-                this.ReplicationProviderSettings.ApplicationConsistentSnapshotFrequencyInHours =
+                replicationProviderSettings.ApplicationConsistentSnapshotFrequencyInHours =
                     details.ApplicationConsistentSnapshotFrequencyInHours;
-
-                this.ReplicationProviderSettings.Compression=
+                replicationProviderSettings.Compression =
                     details.Compression;
-                this.ReplicationProviderSettings.ReplicationFrequencyInSeconds =
+                replicationProviderSettings.ReplicationFrequencyInSeconds =
                     details.ReplicationFrequencyInSeconds;
-                this.ReplicationProviderSettings.AllowedAuthenticationType =
-                    (details.AllowedAuthenticationType == 1) ? Constants.AuthenticationTypeKerberos : Constants.AuthenticationTypeCertificate; 
-                this.ReplicationProviderSettings.RecoveryPoints = details.RecoveryPoints;
-                this.ReplicationProviderSettings.InitialReplicationMethod =
-                    (string.Compare(details.InitialReplicationMethod, "OverNetwork", StringComparison.OrdinalIgnoreCase) == 0) ? Constants.OnlineReplicationMethod : Constants.OfflineReplicationMethod;
-                this.ReplicationProviderSettings.ReplicationPort = details.ReplicationPort;
-                this.ReplicationProviderSettings.OnlineReplicationStartTime = details.OnlineReplicationStartTime;
+                replicationProviderSettings.AllowedAuthenticationType =
+                    (details.AllowedAuthenticationType == 1) ?
+                    Constants.AuthenticationTypeKerberos :
+                    Constants.AuthenticationTypeCertificate;
+                replicationProviderSettings.RecoveryPoints = details.RecoveryPoints;
+                replicationProviderSettings.InitialReplicationMethod =
+                    (string.Compare(details.InitialReplicationMethod, "OverNetwork", StringComparison.OrdinalIgnoreCase) == 0) ?
+                    Constants.OnlineReplicationMethod :
+                    Constants.OfflineReplicationMethod;
+                replicationProviderSettings.ReplicationPort = details.ReplicationPort;
+                replicationProviderSettings.OnlineReplicationStartTime = details.OnlineReplicationStartTime;
+
+                this.ReplicationProviderSettings = replicationProviderSettings;
+            }
+            else if (profile.CustomData.ReplicationProvider == Constants.HyperVReplicaAzure)
+            {
+                HyperVReplicaAzureProtectionProfileDetails details =
+                    (HyperVReplicaAzureProtectionProfileDetails)profile.CustomData.ReplicationProviderSettings;
+
+                ASRHyperVReplicaAzureProtectionProfileDetails replicationProviderSettings =
+                    new ASRHyperVReplicaAzureProtectionProfileDetails();
+
+                replicationProviderSettings.ApplicationConsistentSnapshotFrequencyInHours =
+                    details.ApplicationConsistentSnapshotFrequencyInHours;
+                replicationProviderSettings.ReplicationFrequencyInSeconds = details.ReplicationInterval;
+                replicationProviderSettings.RecoveryPoints = details.RecoveryPointHistoryDuration;
+                replicationProviderSettings.OnlineReplicationStartTime = details.OnlineReplicationStartTime;
+                replicationProviderSettings.Encryption = details.Encryption;
+                replicationProviderSettings.ActiveStorageAccount = new CustomerStorageAccount();
+                replicationProviderSettings.ActiveStorageAccount.StorageAccountName =
+                    details.ActiveStorageAccount.StorageAccountName;
+                replicationProviderSettings.ActiveStorageAccount.SubscriptionId =
+                    details.ActiveStorageAccount.SubscriptionId;
+
+                this.ReplicationProviderSettings = replicationProviderSettings;
             }
         }
 
@@ -603,14 +632,21 @@ public ASRProtectionProfile(ProtectionProfile profile)
         /// Gets or sets HyperVReplicaProviderSettings
         /// </summary>
         // public HyperVReplicaProviderSettings ReplicationProviderSettings { get; set; }
-        public ASRHyperVReplicaProtectionProfileDetails ReplicationProviderSettings { get; set; }
+        public ASRProtectionProfileProviderSettingsDetails ReplicationProviderSettings { get; set; }
 
         #endregion Properties
     }
 
+    /// <summary>
+    /// Protection profile provider settings
+    /// </summary>
+    public class ASRProtectionProfileProviderSettingsDetails
+    {
+    }
+
     // Summary:
     //     HyperV Replica Protection Profile Details.
-    public class ASRHyperVReplicaProtectionProfileDetails
+    public class ASRHyperVReplicaProtectionProfileDetails : ASRProtectionProfileProviderSettingsDetails
     {
 
         // Summary:
@@ -658,6 +694,52 @@ public class ASRHyperVReplicaProtectionProfileDetails
         public ushort ReplicationPort { get; set; }
     }
 
+    /// <summary>
+    /// ASR HyperV Replica Azure enable protection input.
+    /// </summary>
+    public class ASRHyperVReplicaAzureProtectionProfileDetails : ASRProtectionProfileProviderSettingsDetails
+    {
+        // Summary:
+        //     Optional.
+        public CustomerStorageAccount ActiveStorageAccount { get; set; }
+        //
+        // Summary:
+        //     Optional.
+        public int ApplicationConsistentSnapshotFrequencyInHours { get; set; }
+        //
+        // Summary:
+        //     Optional.
+        public string Encryption { get; set; }
+        //
+        // Summary:
+        //     Optional.
+        public TimeSpan? OnlineReplicationStartTime { get; set; }
+        //
+        // Summary:
+        //     Optional.
+        public int RecoveryPoints { get; set; }
+        //
+        // Summary:
+        //     Optional.
+        public int ReplicationFrequencyInSeconds { get; set; }
+    }
+
+    /// <summary>
+    /// ASR Customer Storage Account.
+    /// </summary>
+    public class ASRCustomerStorageAccount
+    {
+        /// <summary>
+        /// Name of the storage account.
+        /// </summary>
+        public string StorageAccountName { get; set; }
+
+        /// <summary>
+        /// Subscription ID to which the Storage Account is associated.
+        /// </summary>
+        public string SubscriptionId { get; set; }
+    }
+
     /// <summary>
     /// Azure Site Recovery Protection Entity.
     /// </summary>
@@ -700,19 +782,41 @@ public ASRProtectionEntity(ProtectionEntity pe)
             this.ReplicationHealth = pe.Properties.ReplicationHealth;
             this.TestFailoverStateDescription = pe.Properties.TestFailoverStateDescription;
 
-            /*
-            if (!string.IsNullOrWhiteSpace(pe.ReplicationProviderSettings))
+            if (pe.Properties.ReplicationProviderSettings != null)
             {
-                AzureVmDiskDetails diskDetails;
-                DataContractUtils.Deserialize<AzureVmDiskDetails>(
-                    pe.ReplicationProviderSettings, out diskDetails);
-
-                this.Disks = diskDetails.Disks;
-                this.OSDiskId = diskDetails.VHDId;
-                this.OSDiskName = diskDetails.OsDisk;
-                this.OS = diskDetails.OsType;
+                if (0 == string.Compare(
+                    pe.Properties.ReplicationProvider,
+                    Constants.HyperVReplicaAzure,
+                    StringComparison.OrdinalIgnoreCase))
+                {
+                    if (pe.Properties.ReplicationProviderSettings is AzureProtectionEntityProviderSettings)
+                    {
+                        AzureProtectionEntityProviderSettings providerSettings =
+                            (AzureProtectionEntityProviderSettings)pe.Properties.ReplicationProviderSettings;
+
+                        AzureVmDiskDetails diskDetails = providerSettings.VMDiskDetails;
+                        this.UpdateDiskDetails(diskDetails);
+
+                        // also take the VM properties
+                    }
+                    else if (pe.Properties.ReplicationProviderSettings is OnPremProtectionEntityProviderSettings)
+                    {
+                        OnPremProtectionEntityProviderSettings providerSettings =
+                            (OnPremProtectionEntityProviderSettings)pe.Properties.ReplicationProviderSettings;
+
+                        AzureVmDiskDetails diskDetails = providerSettings.VMDiskDetails;
+                        this.UpdateDiskDetails(diskDetails);
+                    }
+                }
+                else
+                {
+                    OnPremProtectionEntityProviderSettings providerSettings =
+                        (OnPremProtectionEntityProviderSettings)pe.Properties.ReplicationProviderSettings;
+
+                    AzureVmDiskDetails diskDetails = providerSettings.VMDiskDetails;
+                    this.UpdateDiskDetails(diskDetails);
+                }
             }
-            */
 
             if (pe.Properties.ProtectionProfile != null &&
                 !string.IsNullOrWhiteSpace(pe.Properties.ProtectionProfile.Id))
@@ -721,6 +825,22 @@ public ASRProtectionEntity(ProtectionEntity pe)
             }
         }
 
+        private void UpdateDiskDetails(AzureVmDiskDetails diskDetails)
+        {
+            this.Disks = new List<VirtualHardDisk>();
+            foreach (var disk in diskDetails.Disks)
+            {
+                VirtualHardDisk hd = new VirtualHardDisk();
+                hd.Id = disk.Id;
+                hd.Name = disk.Name;
+                this.Disks.Add(hd);
+            }
+
+            this.OSDiskId = diskDetails.VHDId;
+            this.OSDiskName = diskDetails.OsDisk;
+            this.OS = diskDetails.OsType;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ASRProtectionEntity" /> class with 
         /// required parameters.
@@ -863,25 +983,25 @@ public ASRProtectionEntity(
         /// </summary>
         public ASRProtectionProfile ProtectionProfile { get; set; }
 
-        ///// <summary>
-        ///// Gets or sets OSDiskVHDId.
-        ///// </summary>
-        //public string OSDiskId { get; set; }
+        /// <summary>
+        /// Gets or sets OSDiskVHDId.
+        /// </summary>
+        public string OSDiskId { get; set; }
 
-        ///// <summary>
-        ///// Gets or sets OS DiskName.
-        ///// </summary>
-        //public string OSDiskName { get; set; }
+        /// <summary>
+        /// Gets or sets OS DiskName.
+        /// </summary>
+        public string OSDiskName { get; set; }
 
-        ///// <summary>
-        ///// Gets or sets OS.
-        ///// </summary>
-        //public string OS { get; set; }
+        /// <summary>
+        /// Gets or sets OS.
+        /// </summary>
+        public string OS { get; set; }
 
-        ///// <summary>
-        ///// Gets or sets OS.
-        ///// </summary>
-        //public List<VirtualHardDisk> Disks { get; set; }
+        /// <summary>
+        /// Gets or sets OS.
+        /// </summary>
+        public List<VirtualHardDisk> Disks { get; set; }
 
         /// <summary>
         /// Gets or sets Replication provider.

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSRecoveryServicesJobsClient.cs renamed to src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryJobsClient.cs

@@ -277,4 +277,7 @@ Please provide a storage account with the same location as that of the vault.</v
   <data name="VaultCannotBeDeleted" xml:space="preserve">
     <value>Vault {0} cannot be deleted as it contains registered servers. Unregister them and then retry the operation.</value>
   </data>
+  <data name="ProtectionProfileNotFound" xml:space="preserve">
+    <value>Protection Profile {0} is not associated with the Vault {1}</value>
+  </data>
 </root>