Some fixes for SAN scenarios

Author: vimalth

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1

@@ -1236,8 +1236,8 @@ function Test-SanE2E
 	Import-AzureSiteRecoveryVaultSettingsFile $vaultSettingsFilePath
 
 	$servers = Get-AzureSiteRecoveryServer
-	$primaryVmm = $servers[1]
-	$recoveryVmm = $servers[0]
+	$primaryVmm = $servers[0]
+	$recoveryVmm = $servers[1]
 	$storagePri = Get-AzureSiteRecoveryStorage -Server $primaryVmm
 	$storageRec = Get-AzureSiteRecoveryStorage -Server $recoveryVmm
 
@@ -1300,7 +1300,7 @@ function Test-SanE2E
 		}
 
 		# Find recovery cloud
-		if ($protectionContainer.Name.Contains("SanRecoverySanCloud"))
+		if ($protectionContainer.Name.Contains("SanRecoveryCloud"))
 		{
 			$recoveryContainer = $protectionContainer
 		}

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/SetAzureSiteRecoveryProtectionEntity.cs

@@ -238,7 +238,8 @@ public override void ExecuteCmdlet()
                                     null :
                                     pc.ProtectionContainer.AvailableProtectionProfiles[0].ReplicationProvider;
 
-                                if (replicationProvider != Constants.HyperVReplica && replicationProvider != Constants.San)
+                                if (replicationProvider != Constants.HyperVReplica && 
+                                    replicationProvider != Constants.San)
                                 {
                                     throw new Exception("Please provide the protection profile object. It can be chosen from available protection profiles of the protection container.");
                                 }
@@ -269,7 +270,8 @@ public override void ExecuteCmdlet()
                                         null :
                                         pc.ProtectionContainer.AvailableProtectionProfiles[0].ReplicationProvider;
 
-                                    if (replicationProvider != Constants.HyperVReplica)
+                                    if (replicationProvider != Constants.HyperVReplica && 
+                                        replicationProvider != Constants.San)
                                     {
                                         throw new Exception("Please provide the protection profile object. It can be chosen from available protection profiles of the protection container.");
                                     }
@@ -284,7 +286,7 @@ public override void ExecuteCmdlet()
                                     sanInput.CloudId = this.ProtectionContainerId;
                                     sanInput.RemoteArrayId = this.RecoveryArrayId;
                                     sanInput.ReplicationType = this.Replicationtype;
-                                    sanInput.Rpo = this.RPO;
+                                    sanInput.RecoveryPointObjective = this.RPO;
 
                                     input.ReplicationProviderInput = DataContractUtils.Serialize<SanEnableProtectionInput>(sanInput);
                                 }
@@ -338,11 +340,11 @@ public override void ExecuteCmdlet()
                             else
                             {
                                 DisableProtectionInput input = null;
-                                string recoveryCloudId = string.Empty;
-                                Utilities.GetCloudIdFromContainerId(this.RecoveryContainerId, out recoveryCloudId);
 
                                 if (replicationProvider == Constants.San)
                                 {
+                                    string recoveryCloudId = string.Empty;
+                                    Utilities.GetCloudIdFromContainerId(this.RecoveryContainerId, out recoveryCloudId);
                                     input = new DisableProtectionInput();
                                     SanDisableProtectionInput sanInput = new SanDisableProtectionInput();
                                     sanInput.DeleteReplicaLuns = this.DeleteReplicaLuns;

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/lib/Microsoft.WindowsAzure.Management.RecoveryServices.Specification.dll

@@ -1249,7 +1249,7 @@ public class SanEnableProtectionInput
         ///    - RPO value non-zero -> Should be one of the array's supported RPO values.
         /// </summary>
         [DataMember(Order = 5)]
-        public int Rpo { get; set; }
+        public int RecoveryPointObjective { get; set; }
 
         /// <summary>
         /// Gets or sets the remote array to be used for protection.