Merge pull request #5206 from shutchings/preview

Machine Learning Compute: Add -IncludeAllResources Paramter for Remove cmdlet

Author: maddieclayton

src/ResourceManager/MachineLearningCompute/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Add IncludeAllResources parameter to Remove-AzureRmMlOpCluster cmdlet
+    - Using this switch parameter will remove all resources that were created with the cluster originally
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
 * Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
 

src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute.Test/Commands.MachineLearningCompute.Test.csproj

@@ -60,7 +60,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.MachineLearningCompute, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.MachineLearningCompute.0.2.0\lib\net452\Microsoft.Azure.Management.MachineLearningCompute.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.MachineLearningCompute.0.3.0\lib\net452\Microsoft.Azure.Management.MachineLearningCompute.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.6.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
@@ -173,6 +173,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.MachineLearningCompute.Test.ScenarioTests.MLCTests\TestNewGetRemove.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.MachineLearningCompute.Test.ScenarioTests.MLCTests\TestRemoveIncludeAllResources.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.MachineLearningCompute.Test.ScenarioTests.MLCTests\TestSet.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute.Test/ScenarioTests/MLCTests.cs

@@ -43,5 +43,12 @@ public void TestSet()
         {
             TestController.NewInstance.RunPsTest(this.interceptor, "Test-Set");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestRemoveIncludeAllResources()
+        {
+            TestController.NewInstance.RunPsTest(this.interceptor, "Test-RemoveIncludeAllResources");
+        }
     }
 }

src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute.Test/ScenarioTests/MLCTests.ps1

@@ -39,7 +39,7 @@ Creates a local operationalization cluster for use in tests.
 function GetDefaultLocalClusterProperties
 {
     $location = "East US 2 EUAP"
-    $clusterType = "West Central US"
+    $clusterType = "Local"
     $description = "Deployed from powershell"
 
     $cluster = New-Object Microsoft.Azure.Management.MachineLearningCompute.Models.OperationalizationCluster `
@@ -302,4 +302,27 @@ function Test-Set
 
     # Cleanup
     TeardownTest -ResourceGroupName $resourceGroupName
-}
+}
+
+function Test-RemoveIncludeAllResources
+{
+    $resourceGroupName = GetUniqueName("mlcrp-cmdlet-test-remove-all")
+    $clusterName = GetUniqueName("mlcrp-cmdlet-test-remove-all")
+
+    SetupTest $resourceGroupName
+
+    # Create the cluster
+    $cluster = GetDefaultLocalClusterProperties
+    $createdCluster = New-AzureRmMlOpCluster -ResourceGroupName $resourceGroupName -Name $clusterName -Cluster $cluster
+
+	# Get the managed by resource group name before deleting
+	$managedByResourceGroupName = GetManagedByResourceGroupName -ResourceGroupName $resourceGroupName
+
+	# Delete the cluster
+	Remove-AzureRmMlOpCluster -ResourceGroupName $resourceGroupName -Name $clusterName -IncludeAllResources
+
+    Assert-Throws ( Get-AzureRmResourceGroup -ResourceGroupName $managedByResourceGroupName )
+
+    # Cleanup
+	Remove-AzureRmResourceGroup -ResourceGroupName $resourceGroupName -Force
+}