Using ExecutionBlock in cmdlets

dragonfly91 · dragonfly91 · commit 4cb6cda32fe3 · 2016-03-14T15:21:59.000+05:30
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesContainer.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesContainer.cs
@@ -53,32 +53,35 @@ public class GetAzureRmRecoveryServicesContainer : RecoveryServicesBackupCmdletB
 
         public override void ExecuteCmdlet()
         {
-            base.ExecuteCmdlet();
+            ExecutionBlock(() =>
+                {
+                    base.ExecuteCmdlet();
 
-            ProtectionContainerListQueryParams queryParams = new ProtectionContainerListQueryParams();
+                    ProtectionContainerListQueryParams queryParams = new ProtectionContainerListQueryParams();
 
-            // 1. Filter by Name
-            queryParams.FriendlyName = Name;
+                    // 1. Filter by Name
+                    queryParams.FriendlyName = Name;
 
-            // 2. Filter by ContainerType
-            queryParams.ProviderType = HydraHelpers.GetHydraProviderType(ContainerType);
+                    // 2. Filter by ContainerType
+                    queryParams.ProviderType = HydraHelpers.GetHydraProviderType(ContainerType);
 
-            // 3. Filter by Status
-            queryParams.RegistrationStatus = Status.ToString();
+                    // 3. Filter by Status
+                    queryParams.RegistrationStatus = Status.ToString();
 
-            var listResponse = HydraAdapter.ListContainers(Vault.Name, Vault.ResouceGroupName, queryParams);
+                    var listResponse = HydraAdapter.ListContainers(Vault.Name, Vault.ResouceGroupName, queryParams);
 
-            List<AzureRmRecoveryServicesContainerBase> containerModels = ConversionHelpers.GetContainerModelList(listResponse);
+                    List<AzureRmRecoveryServicesContainerBase> containerModels = ConversionHelpers.GetContainerModelList(listResponse);
 
-            // NOTE: Should move this to provider?
-            // 4. Filter by RG Name
-            if (ContainerType == Models.ContainerType.AzureVM)
-            {
-                containerModels = containerModels.Where(containerModel =>
-                    (containerModel as AzureRmRecoveryServicesIaasVmContainer).ResourceGroupName == ResourceGroupName).ToList();
-            }
+                    // NOTE: Should move this to provider?
+                    // 4. Filter by RG Name
+                    if (ContainerType == Models.ContainerType.AzureVM)
+                    {
+                        containerModels = containerModels.Where(containerModel =>
+                            (containerModel as AzureRmRecoveryServicesIaasVmContainer).ResourceGroupName == ResourceGroupName).ToList();
+                    }
 
-            WriteObject(containerModels);
+                    WriteObject(containerModels);
+                });
         }
     }
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRMBackupRetentionPolicyObject.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRMBackupRetentionPolicyObject.cs
@@ -39,7 +39,10 @@ public class GetAzureRMBackupRetentionPolicyObject : RecoveryServicesBackupCmdle
 
         public override void ExecuteCmdlet()
         {
-            base.ExecuteCmdlet();
+            ExecutionBlock(() =>
+                {
+                    base.ExecuteCmdlet();
+                });
         }
     }
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRMBackupSchedulePolicyObject.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRMBackupSchedulePolicyObject.cs
@@ -39,7 +39,10 @@ public class GetAzureRMBackupSchedulePolicyObject : RecoveryServicesBackupCmdlet
 
         public override void ExecuteCmdlet()
         {
-            base.ExecuteCmdlet();           
+            ExecutionBlock(() =>
+            {
+                base.ExecuteCmdlet();
+            });  
         }
     }
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesPolicy.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesPolicy.cs
@@ -35,14 +35,17 @@ public class GetAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackup
 
         public override void ExecuteCmdlet()
         {
-            base.ExecuteCmdlet();
+            ExecutionBlock(() =>
+                {
+                    base.ExecuteCmdlet();
 
-            PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
-            {  
-                {ContainerParams.Name, Name},             
-            }, HydraAdapter);
+                    PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
+                    {  
+                        {ContainerParams.Name, Name},             
+                    }, HydraAdapter);
 
-            IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.AzureVM);
+                    IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.AzureVM);
+                });
         }
     }
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/NewAzureRmRecoveryServicesPolicy.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/NewAzureRmRecoveryServicesPolicy.cs
@@ -51,14 +51,17 @@ public class NewAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackup
 
         public override void ExecuteCmdlet()
         {
-            base.ExecuteCmdlet();
+            ExecutionBlock(() =>
+                {
+                    base.ExecuteCmdlet();
 
-            PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
-            {  
-                {ContainerParams.Name, Name},             
-            }, HydraAdapter);
+                    PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
+                    {  
+                        {ContainerParams.Name, Name},             
+                    }, HydraAdapter);
 
-            IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.AzureVM);
+                    IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.AzureVM);
+                });
         }
     }
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/SetAzureRmRecoveryServicesPolicy.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/SetAzureRmRecoveryServicesPolicy.cs
@@ -51,14 +51,17 @@ public class SetAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackup
 
         public override void ExecuteCmdlet()
         {
-            base.ExecuteCmdlet();
+            ExecutionBlock(() =>
+                {
+                    base.ExecuteCmdlet();
 
-            PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
-            {  
-                {ContainerParams.Name, Name},             
-            }, HydraAdapter);
+                    PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
+                    {  
+                        {ContainerParams.Name, Name},             
+                    }, HydraAdapter);
 
-            IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.AzureVM);
+                    IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.AzureVM);
+                });
         }
     }
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Properties/Resources.Designer.cs b/src/ResourceManager/RecoveryServices.Backup/Properties/Resources.Designer.cs
diff --git a/src/ResourceManager/RecoveryServices.Backup/Properties/Resources.resx b/src/ResourceManager/RecoveryServices.Backup/Properties/Resources.resx
@@ -129,6 +129,9 @@
   <data name="CloudExceptionCodeNotFound" xml:space="preserve">
     <value>Received CloudException, StatusCode: {0}.</value>
   </data>
+  <data name="ExceptionInExecution" xml:space="preserve">
+    <value>Caught exception, type: {0}.</value>
+  </data>
   <data name="ResourceNotFoundMessage" xml:space="preserve">
     <value>The specified resource does not exist.</value>
   </data>
diff --git a/src/ResourceManager/RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs b/src/ResourceManager/RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs
@@ -50,6 +50,7 @@ protected void ExecutionBlock(Action action)
             }
             catch (Exception exception)
             {
+                WriteDebug(String.Format(Resources.ExceptionInExecution, exception.GetType()));
                 HandleException(exception);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,10 @@ public class GetAzureRMBackupRetentionPolicyObject : RecoveryServicesBackupCmdle`
`39`	`39`
`40`	`40`	`public override void ExecuteCmdlet()`
`41`	`41`	`{`
`42`		`- base.ExecuteCmdlet();`
	`42`	`+ ExecutionBlock(() =>`
	`43`	`+ {`
	`44`	`+ base.ExecuteCmdlet();`
	`45`	`+ });`
`43`	`46`	`}`
`44`	`47`	`}`
`45`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,17 @@ public class GetAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackup`
`35`	`35`
`36`	`36`	`public override void ExecuteCmdlet()`
`37`	`37`	`{`
`38`		`- base.ExecuteCmdlet();`
	`38`	`+ ExecutionBlock(() =>`
	`39`	`+ {`
	`40`	`+ base.ExecuteCmdlet();`
`39`	`41`
`40`		`- PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()`
`41`		`- {`
`42`		`- {ContainerParams.Name, Name},`
`43`		`- }, HydraAdapter);`
	`42`	`+ PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()`
	`43`	`+ {`
	`44`	`+ {ContainerParams.Name, Name},`
	`45`	`+ }, HydraAdapter);`
`44`	`46`
`45`		`- IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.AzureVM);`
	`47`	`+ IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.AzureVM);`
	`48`	`+ });`
`46`	`49`	`}`
`47`	`50`	`}`
`48`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,14 +51,17 @@ public class NewAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackup`
`51`	`51`
`52`	`52`	`public override void ExecuteCmdlet()`
`53`	`53`	`{`
`54`		`- base.ExecuteCmdlet();`
	`54`	`+ ExecutionBlock(() =>`
	`55`	`+ {`
	`56`	`+ base.ExecuteCmdlet();`
`55`	`57`
`56`		`- PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()`
`57`		`- {`
`58`		`- {ContainerParams.Name, Name},`
`59`		`- }, HydraAdapter);`
	`58`	`+ PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()`
	`59`	`+ {`
	`60`	`+ {ContainerParams.Name, Name},`
	`61`	`+ }, HydraAdapter);`
`60`	`62`
`61`		`- IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.AzureVM);`
	`63`	`+ IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.AzureVM);`
	`64`	`+ });`
`62`	`65`	`}`
`63`	`66`	`}`
`64`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,14 +51,17 @@ public class SetAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackup`
`51`	`51`
`52`	`52`	`public override void ExecuteCmdlet()`
`53`	`53`	`{`
`54`		`- base.ExecuteCmdlet();`
	`54`	`+ ExecutionBlock(() =>`
	`55`	`+ {`
	`56`	`+ base.ExecuteCmdlet();`
`55`	`57`
`56`		`- PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()`
`57`		`- {`
`58`		`- {ContainerParams.Name, Name},`
`59`		`- }, HydraAdapter);`
	`58`	`+ PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()`
	`59`	`+ {`
	`60`	`+ {ContainerParams.Name, Name},`
	`61`	`+ }, HydraAdapter);`
`60`	`62`
`61`		`- IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.AzureVM);`
	`63`	`+ IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.AzureVM);`
	`64`	`+ });`
`62`	`65`	`}`
`63`	`66`	`}`
`64`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ protected void ExecutionBlock(Action action)`
`50`	`50`	`}`
`51`	`51`	`catch (Exception exception)`
`52`	`52`	`{`
	`53`	`+ WriteDebug(String.Format(Resources.ExceptionInExecution, exception.GetType()));`
`53`	`54`	`HandleException(exception);`
`54`	`55`	`}`
`55`	`56`	`}`