Merge pull request AzureRT#186 from MabOneSdk/anudeeb-dev1

Using ExecutionBlock in cmdlets

Author: Samuel Anudeep

src/ResourceManager/RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesContainer.cs

@@ -53,31 +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);
 
-            // 4. Filter by RG Name
-            if (ContainerType == Models.ContainerType.AzureVM)
-            {
-                containerModels.RemoveAll(containerModel =>
-                    (containerModel as AzureRmRecoveryServicesIaasVmContainer).ResourceGroupName == ResourceGroupName);
-            }
+                    // 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);
+                });
         }
     }
 }

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();
+                });
         }
     }
 }

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();
+            });  
         }
     }
 }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Commands.RecoveryServices.Backup.HydraAdapter.csproj

@@ -70,6 +70,12 @@
   <ItemGroup>
     <Content Include="Resources\Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Commands.RecoveryServices.Backup.Models\Commands.RecoveryServices.Backup.Models.csproj">
+      <Project>{30b92759-50b3-494e-b9f0-ec9a2ce9d57b}</Project>
+      <Name>Commands.RecoveryServices.Backup.Models</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj

@@ -59,6 +59,10 @@
     <Compile Include="Providers\IaasVmPsBackupProvider.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
+      <Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
+      <Name>Commands.ResourceManager.Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Commands.RecoveryServices.Backup.Helpers\Commands.RecoveryServices.Backup.Helpers.csproj">
       <Project>{0e1d3f36-e6c8-4764-8c7d-6f9ee537490c}</Project>
       <Name>Commands.RecoveryServices.Backup.Helpers</Name>

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

@@ -66,5 +66,15 @@ public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse Modify
         {
             throw new NotImplementedException();
         }
+
+        public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse GetPolicy()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DeletePolicy()
+        {
+            throw new NotImplementedException();
+        }
     }
 }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj

@@ -62,9 +62,14 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="xunit">
+      <HintPath>..\..\..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <None Include="ScenarioTests\AzureVm\ContainerTests.ps1" />
+    <Compile Include="ScenarioTests\AzureVm\ContainerTests.cs" />
     <Compile Include="ScenarioTests\TestsBase.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -79,6 +84,9 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/AzureVm/ContainerTests.cs

@@ -0,0 +1,32 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
+{
+    public class ContainerTests : RecoveryServicesBackupTestsBase
+    {
+        [Fact]
+        public void Test()
+        {
+            this.RunPowerShellTest("Test");
+        }
+    }
+}

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/AzureVm/ContainerTests.ps1

@@ -0,0 +1,14 @@
+# ----------------------------------------------------------------------------------
+#
+# Copyright Microsoft Corporation
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ----------------------------------------------------------------------------------
+

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/TestsBase.cs

@@ -61,6 +61,10 @@ protected void RunPowerShellTest(params string[] scripts)
             using (UndoContext context = UndoContext.Current)
             {
                 context.Start(TestUtilities.GetCallingClass(2), TestUtilities.GetCurrentMethodName(2));
+                
+                string baseDir = TestUtilities.GetMockBaseDirectory();
+                string callingClass = TestUtilities.GetCallingClass(2);
+                string currMethodName = TestUtilities.GetCurrentMethodName(2);
 
                 SetupManagementClients();
 

src/ResourceManager/RecoveryServices.Backup/Properties/Resources.Designer.cs

@@ -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>

src/ResourceManager/RecoveryServices.Backup/Properties/Resources.resx

@@ -50,6 +50,7 @@ protected void ExecutionBlock(Action action)
             }
             catch (Exception exception)
             {
+                WriteDebug(String.Format(Resources.ExceptionInExecution, exception.GetType()));
                 HandleException(exception);
             }
         }