Merge pull request #9757 from shawncx/AddSSISStagingProxy

Add Parameters for Set-AzDataFactoryV2IntegrationRuntime
Azure · Aug 12, 2019 · 374f33e · 374f33e
2 parents 53fc708 + 38de552
commit 374f33e
Show file tree

Hide file tree

Showing 7 changed files with 1,740 additions and 4,082 deletions.
diff --git a/src/DataFactory/DataFactoryV2.Test/ScenarioTests/IntegrationRuntimeTests.ps1 b/src/DataFactory/DataFactoryV2.Test/ScenarioTests/IntegrationRuntimeTests.ps1
@@ -104,7 +104,21 @@ function Test-SsisAzure-IntegrationRuntime
             -Name $dfname `
             -Location $dflocation `
             -Force
-
+
+        # Prepare proxy selfhsoted IR
+        $proxyIrName = "proxy-selfhosted-integrationruntime"   
+        $actualProxyIr = Set-AzDataFactoryV2IntegrationRuntime -ResourceGroupName $rgname `
+            -DataFactoryName $dfname `
+            -Name $proxyIrName `
+            -Type 'SelfHosted' `
+            -Force
+        Assert-AreEqual $actualProxyIr.Name $proxyIrName
+
+        # Prepare proxy linked service
+        $lsname = "proxy-linkedservice"
+        $actualProxyLs = Set-AzDataFactoryV2LinkedService -ResourceGroupName $rgname -DataFactoryName $dfname -Name $lsname -File .\Resources\linkedService.json -Force
+        Assert-AreEqual $actualProxyLs.Name $lsname
+
         $irname = "ssis-azure-ir"
         $description = "SSIS-Azure integration runtime"
 
@@ -143,6 +157,8 @@ function Test-SsisAzure-IntegrationRuntime
             -MaxParallelExecutionsPerNode 1 `
             -LicenseType LicenseIncluded `
             -Edition Enterprise `
+            -DataProxyIntegrationRuntimeName $proxyIrName `
+            -DataProxyStagingLinkedServiceName $lsname `
             -Force
 
         $expected = Get-AzDataFactoryV2IntegrationRuntime -ResourceGroupName $rgname `
@@ -156,6 +172,10 @@ function Test-SsisAzure-IntegrationRuntime
 
         Wait-Seconds 15
         Remove-AzDataFactoryV2IntegrationRuntime -ResourceGroupName $rgname -DataFactoryName $dfname -Name $irname -Force
+
+        Remove-AzDataFactoryV2LinkedService -ResourceGroupName $rgname -DataFactoryName $dfname -Name $lsname -Force
+
+        Remove-AzDataFactoryV2IntegrationRuntime -ResourceId $actualProxyIr.Id -Force
     }
     finally
     {