Merge pull request #208 from MabOneSdk/dev1-sudreddy

sudhakar4171 · sudhakar4171 · commit a5b35dcc0f03 · 2016-03-24T15:57:04.000+05:30
Added format.ps1xml for RSVault and minor fixes in policy
diff --git a/src/ResourceManager/RecoveryServices.Backup/AzureRM.RecoveryServices.Backup.psd1 b/src/ResourceManager/RecoveryServices.Backup/AzureRM.RecoveryServices.Backup.psd1
@@ -57,7 +57,9 @@ ScriptsToProcess = @()
 TypesToProcess = @()  
   
 # Format files (.ps1xml) to be loaded when importing this module  
-FormatsToProcess = @()  
+FormatsToProcess = @(
+    '.\Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml'
+)  
   
 # Modules to import as nested modules of the module specified in ModuleToProcess  
 NestedModules = @(  
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesBackupRetentionPolicyObject.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesBackupRetentionPolicyObject.cs
@@ -32,7 +32,7 @@ public class GetAzureRmRecoveryServicesBackupRetentionPolicyObject : RecoverySer
 
         [Parameter(Mandatory = false, HelpMessage = "Temp Help message. Need to update it")]
         [ValidateNotNullOrEmpty]
-        public BackupManagementType BackupManagementType { get; set; }
+        public BackupManagementType? BackupManagementType { get; set; }
 
         public override void ExecuteCmdlet()
         {
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesSchedulePolicyObject.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesSchedulePolicyObject.cs
@@ -32,7 +32,7 @@ public class GetAzureRmRecoveryServicesSchedulePolicyObject : RecoveryServicesBa
 
         [Parameter(Mandatory = false, HelpMessage = "Temp Help message. Need to update it")]
         [ValidateNotNullOrEmpty]
-        public BackupManagementType BackupManagementType { get; set; }
+        public BackupManagementType? BackupManagementType { get; set; }
 
         public override void ExecuteCmdlet()
         {
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/NewAzureRmRecoveryServicesPolicy.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/NewAzureRmRecoveryServicesPolicy.cs
@@ -42,7 +42,7 @@ public class NewAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackup
 
         [Parameter(Position = 3, Mandatory = false, HelpMessage = ParamHelpMsg.Common.BackupManagementType, ValueFromPipelineByPropertyName = true)]
         [ValidateNotNullOrEmpty]
-        public BackupManagementType BackupManagementType { get; set; }
+        public BackupManagementType? BackupManagementType { get; set; }
 
         [Parameter(Position = 4, Mandatory = false, HelpMessage = ParamHelpMsg.Policy.RetentionPolicy, ValueFromPipelineByPropertyName = true)]
         [ValidateNotNullOrEmpty]
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj
@@ -129,6 +129,9 @@
     <None Include="AzureRM.RecoveryServices.Backup.psd1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs
@@ -76,15 +76,15 @@ public IPsBackupProvider GetProviderInstance(ContainerType containerType, Backup
             throw new NotImplementedException();
         }
 
-        public IPsBackupProvider GetProviderInstance(WorkloadType workloadType, BackupManagementType backupManagementType)
+        public IPsBackupProvider GetProviderInstance(WorkloadType workloadType, BackupManagementType? backupManagementType)
         {
             PsBackupProviderTypes psProviderType;
 
             switch (workloadType)
             {
                 case WorkloadType.AzureVM:
                     // validate backupManagementType is valid
-                    if (backupManagementType != BackupManagementType.AzureVM)
+                    if (backupManagementType.HasValue && backupManagementType != BackupManagementType.AzureVM)
                     {
                         // throw exception that it is not expected
                         throw new ArgumentException("BackupManagementType is not expected for WorkloadType: " +
diff --git a/src/ResourceManager/RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml b/src/ResourceManager/RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Configuration>
+  <ViewDefinitions>   
+    <View>
+      <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesIaasVmPolicy</Name>
+      <ViewSelectedBy>
+        <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesIaasVmPolicy</TypeName>
+      </ViewSelectedBy>
+      <TableControl>
+        <TableHeaders>
+          <TableColumnHeader>
+            <Label>Name</Label>
+            <Width>25</Width>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Label>WorkloadType</Label>
+            <Width>18</Width>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Label>BackupManagementType</Label>
+            <Width>18</Width>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Label>BackupTime</Label>
+            <Width>30</Width>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Label>DaysOfWeek</Label>
+            <Width>40</Width>
+          </TableColumnHeader>
+        </TableHeaders>
+        <TableRowEntries>
+          <TableRowEntry>
+            <TableColumnItems>
+              <TableColumnItem>
+                <PropertyName>Name</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>WorkloadType</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>BackupManagementType</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>SchedulePolicy.ScheduleRunTimes</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>SchedulePolicy.ScheduleRunDays</PropertyName>
+              </TableColumnItem>
+            </TableColumnItems>
+          </TableRowEntry>
+        </TableRowEntries>
+      </TableControl>
+    </View>
+  </ViewDefinitions>
+</Configuration>

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public class GetAzureRmRecoveryServicesBackupRetentionPolicyObject : RecoverySer`
`32`	`32`
`33`	`33`	`[Parameter(Mandatory = false, HelpMessage = "Temp Help message. Need to update it")]`
`34`	`34`	`[ValidateNotNullOrEmpty]`
`35`		`- public BackupManagementType BackupManagementType { get; set; }`
	`35`	`+ public BackupManagementType? BackupManagementType { get; set; }`
`36`	`36`
`37`	`37`	`public override void ExecuteCmdlet()`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -76,15 +76,15 @@ public IPsBackupProvider GetProviderInstance(ContainerType containerType, Backup`
`76`	`76`	`throw new NotImplementedException();`
`77`	`77`	`}`
`78`	`78`
`79`		`- public IPsBackupProvider GetProviderInstance(WorkloadType workloadType, BackupManagementType backupManagementType)`
	`79`	`+ public IPsBackupProvider GetProviderInstance(WorkloadType workloadType, BackupManagementType? backupManagementType)`
`80`	`80`	`{`
`81`	`81`	`PsBackupProviderTypes psProviderType;`
`82`	`82`
`83`	`83`	`switch (workloadType)`
`84`	`84`	`{`
`85`	`85`	`case WorkloadType.AzureVM:`
`86`	`86`	`// validate backupManagementType is valid`
`87`		`- if (backupManagementType != BackupManagementType.AzureVM)`
	`87`	`+ if (backupManagementType.HasValue && backupManagementType != BackupManagementType.AzureVM)`
`88`	`88`	`{`
`89`	`89`	`// throw exception that it is not expected`
`90`	`90`	`throw new ArgumentException("BackupManagementType is not expected for WorkloadType: " +`