Skip to content

Commit ccc4ba7

Browse files
MiYanniMiYanni
authored
Merge pull request Azure#7404 from lewu-msft/preview
[ADLS] adding virtual network rule CRUD to account
2 parents d4b7edb + d67f188 commit ccc4ba7

File tree

50 files changed

+12208
-6570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+12208
-6570
lines changed

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
2828
<PackageReference Include="Microsoft.Azure.Management.DataLake.Analytics" Version="3.3.0-preview" />
29-
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.3.0-preview" />
29+
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.1-preview" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<Private>True</Private>
5050
</Reference>
5151
<Reference Include="Microsoft.Azure.Management.DataLake.Store">
52-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.2.3.0-preview\lib\net452\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
52+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.2.4.1-preview\lib\net452\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
5555
<Reference Include="Microsoft.Azure.Management.Storage">

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.DataLake.Analytics" version="3.3.0-preview" targetFramework="net452" />
9-
<package id="Microsoft.Azure.Management.DataLake.Store" version="2.3.0-preview" targetFramework="net452" />
9+
<package id="Microsoft.Azure.Management.DataLake.Store" version="2.4.1-preview" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.Netcore.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
</PropertyGroup>
2626

2727
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
28-
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.3.0-preview" />
28+
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.1-preview" />
29+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.5.0-preview" />
2930
</ItemGroup>
3031

3132
<ItemGroup>

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.csproj

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@
4242
<ErrorReport>prompt</ErrorReport>
4343
<RunCodeAnalysis>false</RunCodeAnalysis>
4444
</PropertyGroup>
45-
<ItemGroup>
46-
<Reference Include="Microsoft.Azure.Management.DataLake.Store">
47-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.2.3.0-preview\lib\net452\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
48-
<Private>True</Private>
49-
</Reference>
50-
</ItemGroup>
5145
<ItemGroup>
5246
<Compile Include="Properties\AssemblyInfo.cs" />
5347
<Compile Include="ScenarioTests\AdlsAliasTests.cs" />
@@ -56,6 +50,10 @@
5650
<Compile Include="ScenarioTests\UrlDecodingRecordMatcher.cs" />
5751
</ItemGroup>
5852
<ItemGroup>
53+
<ProjectReference Include="..\..\Network\Commands.Network\Commands.Network.csproj">
54+
<Project>{98cfd96b-a6bc-4f15-ae2c-603fc2b58981}</Project>
55+
<Name>Commands.Network</Name>
56+
</ProjectReference>
5957
<ProjectReference Include="..\Commands.DataLakeStore\Commands.DataLakeStore.csproj">
6058
<Project>{8aab43e6-e8f6-4f91-af8a-6a63cd78ef1e}</Project>
6159
<Name>Commands.DataLakeStore</Name>
@@ -76,52 +74,65 @@
7674
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7775
</None>
7876
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests\TestAdlsAccount.json">
79-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
77+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8078
</None>
8179
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests\TestAdlsAccountTiers.json">
82-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
80+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8381
</None>
8482
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests\TestAdlsFileSystem.json">
85-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
83+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8684
</None>
8785
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests\TestAdlsFileSystemPermissions.json">
88-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
86+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8987
</None>
9088
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests\TestAdlsFirewallRules.json">
9189
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9290
</None>
91+
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests\TestAdlsVirtualNetworkRules.json">
92+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
93+
</None>
9394
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests\TestAdlsTrustedIdProvider.json">
9495
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9596
</None>
9697
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests\TestNegativeAdlsAccount.json">
97-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
98+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9899
</None>
99100
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests\TestAdlsAccount.json">
100-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
101+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
101102
</None>
102103
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests\TestAdlsAccountTiers.json">
103-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
104+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
104105
</None>
105106
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests\TestAdlsFileSystem.json">
106-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
107+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
107108
</None>
108109
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests\TestAdlsFileSystemPermissions.json">
109-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
110+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
110111
</None>
111112
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests\TestAdlsFirewallRules.json">
112113
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
113114
</None>
115+
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests\TestAdlsVirtualNetworkRules.json">
116+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
117+
</None>
114118
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests\TestAdlsTrustedIdProvider.json">
115119
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
116120
</None>
117121
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests\TestNegativeAdlsAccount.json">
118-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
122+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
119123
</None>
120124
</ItemGroup>
121125
<ItemGroup>
122126
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
123127
</ItemGroup>
124-
<ItemGroup />
128+
<ItemGroup>
129+
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.2.4.1-preview\lib\net452\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
131+
</Reference>
132+
<Reference Include="Microsoft.Azure.Management.Network, Version=19.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.5.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
134+
</Reference>
135+
</ItemGroup>
125136
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
126137
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
127138
</Project>

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/ScenarioTests/AdlsAliasTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ public void TestAdlsFirewallRules()
5151
NewInstance.RunPsTest(_logger, string.Format("Test-DataLakeStoreFirewall -location '{0}'", AdlsTestsBase.ResourceGroupLocation));
5252
}
5353

54+
[Fact]
55+
[Trait(Category.AcceptanceType, Category.CheckIn)]
56+
public void TestAdlsVirtualNetworkRules()
57+
{
58+
NewInstance.RunPsTest(_logger, string.Format("Test-DataLakeStoreVirtualNetwork -location '{0}'", AdlsTestsBase.ResourceGroupLocation));
59+
}
60+
5461
[Fact]
5562
[Trait(Category.AcceptanceType, Category.CheckIn)]
5663
public void TestAdlsTrustedIdProvider()

0 commit comments

Comments
 (0)