Merge pull request #285 from MabOneSdk/dev1

FI from dev1 to release

Author: Samuel Anudeep

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CmdletParamEnums.cs

@@ -73,6 +73,5 @@ public enum ItemParams
         ProtectionStatus,
         ProtectionState,
         DeleteBackupData,
-        ExpiryDate,
     }
 }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs

@@ -182,7 +182,6 @@ public BaseRecoveryServicesJobResponse DisableProtection()
         public BaseRecoveryServicesJobResponse TriggerBackup()
         {
             AzureRmRecoveryServicesBackupItemBase item = (AzureRmRecoveryServicesBackupItemBase)ProviderData.ProviderParameters[ItemParams.Item];
-            DateTime expiryDate = (DateTime)ProviderData.ProviderParameters[ItemParams.ExpiryDate];
             AzureRmRecoveryServicesBackupIaasVmItem iaasVmItem = item as AzureRmRecoveryServicesBackupIaasVmItem;
             return HydraAdapter.TriggerBackup(IdUtils.GetValueByName(iaasVmItem.Id, IdUtils.IdNames.ProtectionContainerName),
                 IdUtils.GetValueByName(iaasVmItem.Id, IdUtils.IdNames.ProtectedItemName));

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Backup/BackupAzureRmRecoveryServicesItem.cs

@@ -35,18 +35,13 @@ public class BackupAzureRmRecoveryServicesBackupItem : RecoveryServicesBackupCmd
         [ValidateNotNullOrEmpty]
         public AzureRmRecoveryServicesBackupItemBase Item { get; set; }
 
-        [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Item.ExpiryDate, ValueFromPipeline = false)]
-        [ValidateNotNullOrEmpty]
-        public DateTime ExpiryDate { get; set; }
-
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
 
             PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
                 {
                     {ItemParams.Item, Item},
-                    {ItemParams.ExpiryDate, ExpiryDate},
                 }, HydraAdapter);
 
             IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(Item.WorkloadType, Item.BackupManagementType);

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml

@@ -2,19 +2,15 @@
 <Configuration>
   <ViewDefinitions>
 	  <View>
-		  <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesDpmBackupEngine</Name>
+		  <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupEngineBase</Name>
 		  <ViewSelectedBy>
-			  <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesDpmBackupEngine</TypeName>
+			  <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupEngineBase</TypeName>
 		  </ViewSelectedBy>
 		  <TableControl>
 			  <TableHeaders>
 				  <TableColumnHeader>
 					  <Label>Name</Label>
-					  <Width>40</Width>
-				  </TableColumnHeader>
-				  <TableColumnHeader>
-					  <Label>BackupEngineType</Label>
-					  <Width>20</Width>
+					  <Width>55</Width>
 				  </TableColumnHeader>
 				  <TableColumnHeader>
 					  <Label>BackupManagementType</Label>
@@ -27,9 +23,6 @@
 						  <TableColumnItem>
 							  <PropertyName>Name</PropertyName>
 						  </TableColumnItem>
-						  <TableColumnItem>
-							  <PropertyName>BackupEngineType</PropertyName>
-						  </TableColumnItem>
 						  <TableColumnItem>
 							  <PropertyName>BackupManagementType</PropertyName>
 						  </TableColumnItem>
@@ -39,7 +32,7 @@
 		  </TableControl>
 	  </View>
 	  <View>
-		  <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesDpmBackupEngine</Name>
+		  <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesMabContainer</Name>
 		  <ViewSelectedBy>
 			  <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesMabContainer</TypeName>
 		  </ViewSelectedBy>
@@ -57,10 +50,6 @@
 					  <Label>BackupManagementType</Label>
 					  <Width>20</Width>
 				  </TableColumnHeader>
-				  <TableColumnHeader>
-					  <Label>Status</Label>
-					  <Width>20</Width>
-				  </TableColumnHeader>
 			  </TableHeaders>
 			  <TableRowEntries>
 				  <TableRowEntry>
@@ -74,9 +63,6 @@
 						  <TableColumnItem>
 							  <PropertyName>BackupManagementType</PropertyName>
 						  </TableColumnItem>
-						  <TableColumnItem>
-							  <PropertyName>Status</PropertyName>
-						  </TableColumnItem>
 					  </TableColumnItems>
 				  </TableRowEntry>
 			  </TableRowEntries>