Merge pull request #5045 from hvermis/ADFv2

[ADF] Adding Update-AzureRmDataFactoryV2 and Stop-AzureRmDataFactoryV2PipelineRun

Author: cormacpayne

src/ResourceManager/DataFactories/AzureRM.DataFactoryV2.psd1

@@ -75,6 +75,7 @@ FunctionsToExport = @()
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
 CmdletsToExport = 
                'Set-AzureRmDataFactoryV2',
+               'Update-AzureRmDataFactoryV2',
                'Get-AzureRmDataFactoryV2', 
                'Remove-AzureRmDataFactoryV2',
                'Set-AzureRmDataFactoryV2LinkedService', 
@@ -94,6 +95,7 @@ CmdletsToExport =
                'Remove-AzureRmDataFactoryV2Pipeline', 
                'Invoke-AzureRmDataFactoryV2Pipeline',
                'Get-AzureRmDataFactoryV2PipelineRun', 
+               'Stop-AzureRmDataFactoryV2PipelineRun', 
                'Get-AzureRmDataFactoryV2ActivityRun',
                'Get-AzureRmDataFactoryV2IntegrationRuntimeKey',
                'Get-AzureRmDataFactoryV2IntegrationRuntime',
@@ -115,7 +117,12 @@ CmdletsToExport =
 # VariablesToExport = @()
 
 # Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
-AliasesToExport = @()
+AliasesToExport = 
+				'New-AzureRmDataFactoryV2',
+				'New-AzureRmDataFactoryV2Dataset',
+				'New-AzureRmDataFactoryV2LinkedService',
+				'New-AzureRmDataFactoryV2Pipeline',
+				'New-AzureRmDataFactoryV2Trigger'
 
 # DSC resources to export from this module
 # DscResourcesToExport = @()

src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/ScenarioTests/DataFactoryTests.cs

@@ -65,5 +65,12 @@ public void TestGetFactoryByNameParameterSetV2()
         {
             RunPowerShellTest("Test-GetFactoryByNameParameterSet");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestUpdateDataFactoryV2()
+        {
+            RunPowerShellTest("Test-UpdateDataFactory");
+        }
     }
 }

src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/ScenarioTests/DataFactoryTests.ps1

@@ -146,3 +146,34 @@ function Test-GetFactoryByNameParameterSet
 
     Assert-ThrowsContains { Get-AzureRmDataFactoryV2 -DataFactoryName $dfname } "ResourceGroupName"
 }
+
+<#
+.SYNOPSIS
+Updates a data factory and then does a Get to verify that both are identical.
+#>
+function Test-UpdateDataFactory
+{
+    $dfname = Get-DataFactoryName
+    $rgname = Get-ResourceGroupName
+    $rglocation = Get-ProviderLocation ResourceManagement
+    $dflocation = Get-ProviderLocation DataFactoryManagement
+    
+    New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Force
+
+    try
+    {
+		Set-AzureRmDataFactoryV2 -ResourceGroupName $rgname -Name $dfname -Location $dflocation -Force
+        $actual = Update-AzureRmDataFactoryV2 -ResourceGroupName $rgname -Name $dfname -Tag @{newTag = "NewTagValue"}
+        $expected = Get-AzureRmDataFactoryV2 -ResourceGroupName $rgname -Name $dfname
+
+        Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
+        Assert-AreEqual $expected.DataFactoryName $actual.DataFactoryName
+        Assert-AreEqual $expected.DataFactoryId $actual.DataFactoryId
+        Assert-AreEqual $expected.Tag $actual.Tag
+    }
+    finally
+    {
+        CleanUp $rgname $dfname
+    }
+}
+

src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/ScenarioTests/RunTests.cs

@@ -31,5 +31,11 @@ public void TestRunV2()
             RunPowerShellTest("Test-Run");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestCancelRunNegativeV2()
+        {
+            RunPowerShellTest("Test-CancelRunNegative");
+        }
     }
 }

src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/ScenarioTests/RunTests.ps1

@@ -43,7 +43,8 @@ function Test-Run
         Set-AzureRmDataFactoryV2Pipeline -ResourceGroupName $rgname -Name $pipelineName -DataFactoryName $dfname -File ".\Resources\pipeline.json" -Force
 
         $Run = Invoke-AzureRmDataFactoryV2Pipeline -ResourceGroupName $rgname -PipelineName $pipelineName -DataFactoryName $dfname -Parameter @{"OutputBlobName"="test";}
-        
+        Assert-True { Stop-AzureRmDataFactoryV2PipelineRun -ResourceGroupName $rgname -PipelineRunId $Run -DataFactoryName $dfname -PassThru}
+
         # Trying get activity run.
         Get-AzureRmDataFactoryV2ActivityRun -ResourceGroupName $rgname -DataFactoryName $dfname -PipelineRunId $Run -RunStartedBefore $endDate -RunStartedAfter $startDate
         Get-AzureRmDataFactoryV2ActivityRun -DataFactory $df -PipelineRunId $Run -RunStartedBefore $endDate -RunStartedAfter $startDate
@@ -56,4 +57,30 @@ function Test-Run
     {
         CleanUp $rgname $dfname
     }
-}
+}
+
+<#
+.SYNOPSIS
+Negative test for cancel pipeline run
+#>
+function Test-CancelRunNegative
+{
+    $dfname = Get-DataFactoryName
+    $rgname = Get-ResourceGroupName
+    $rglocation = Get-ProviderLocation ResourceManagement
+    $dflocation = Get-ProviderLocation DataFactoryManagement
+
+    New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Force
+
+    try
+    {
+        Set-AzureRmDataFactoryV2 -ResourceGroupName $rgname -Name $dfname -Location $dflocation -Force
+        
+        $Run = "someGuid"
+        Assert-ThrowsContains { Stop-AzureRmDataFactoryV2PipelineRun -ResourceGroupName $rgname -DataFactoryName $dfname -PipelineRunId $Run } "Pipeline run does not exist" 
+    }
+    finally
+    {
+        CleanUp $rgname $dfname
+    }
+}