Skip to content

Commit 4b40f29

Browse files
author
begoldsm
committed
Rerun tests and address comments.
1 parent 748366b commit 4b40f29

File tree

9 files changed

+19816
-2251
lines changed

9 files changed

+19816
-2251
lines changed

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/ScenarioTests/AdlaTests.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ function Test-DataLakeAnalyticsAccount
117117
$adlsAccountInfo = Get-AzureRmDataLakeAnalyticsDataSource -Account $accountName -DataLakeStore $secondDataLakeAccountName
118118
Assert-AreEqual $secondDataLakeAccountName $adlsAccountInfo.Name
119119

120-
# get the list of data lakes
121-
$adlsAccountInfos = Get-AzureRmDataLakeAnalyticsDataSource -Account $accountName -DataSource DataLakeStore
120+
# get the list of all data sources
121+
$adlsAccountInfos = Get-AzureRmDataLakeAnalyticsDataSource -Account $accountName
122122
Assert-AreEqual 2 $adlsAccountInfos.Count
123123

124124
# remove the Data lake storage account
@@ -139,9 +139,9 @@ function Test-DataLakeAnalyticsAccount
139139
$blobAccountInfo = Get-AzureRmDataLakeAnalyticsDataSource -Account $accountName -Blob $blobAccountName
140140
Assert-AreEqual $blobAccountName $blobAccountInfo.Name
141141

142-
# get the list of blobs
143-
$blobAccountInfos = Get-AzureRmDataLakeAnalyticsDataSource -Account $accountName -DataSource Blob
144-
Assert-AreEqual 1 $blobAccountInfos.Count
142+
# get the list of data sources (there should be two, one ADLS account and one blob storage account)
143+
$blobAccountInfos = Get-AzureRmDataLakeAnalyticsDataSource -Account $accountName
144+
Assert-AreEqual 2 $blobAccountInfos.Count
145145

146146
# remove the blob storage account
147147
Assert-True {Remove-AzureRmDataLakeAnalyticsDataSource -Account $accountName -Blob $blobAccountName -Force -PassThru} "Remove blob Storage account failed."

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests/TestAdlaAccount.json

Lines changed: 1091 additions & 713 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests/TestAdlaCatalog.json

Lines changed: 17513 additions & 713 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests/TestAdlaJob.json

Lines changed: 340 additions & 271 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests/TestNegativeAdlaAccount.json

Lines changed: 413 additions & 284 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests/TestNegativeAdlaJob.json

Lines changed: 426 additions & 237 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/GetAzureRmDataLakeAnalyticsDataSource.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.DataLakeAnalytics
2424
[Alias("Get-AdlAnalyticsDataSource")]
2525
public class GetAzureDataLakeAnalyticsDataSource : DataLakeAnalyticsCmdletBase
2626
{
27-
internal const string DataLakeParameterSetName = "Get a Data Lake storage account";
27+
internal const string DataLakeParameterSetName = "Get a Data Lake Store account";
2828
internal const string BlobParameterSetName = "Get a Blob storage account";
2929
internal const string ListStorageParameterSetName = "List a data source";
3030

@@ -41,12 +41,12 @@ public class GetAzureDataLakeAnalyticsDataSource : DataLakeAnalyticsCmdletBase
4141

4242
[Parameter(ValueFromPipelineByPropertyName = true, Position = 1, Mandatory = true,
4343
ParameterSetName = DataLakeParameterSetName,
44-
HelpMessage = "The name of the Data Lake Storage account to get from the account.")]
44+
HelpMessage = "The name of the Data Lake Store account to get from the account.")]
4545
[ValidateNotNullOrEmpty]
4646
public string DataLakeStore { get; set; }
4747

4848
[Parameter(ValueFromPipelineByPropertyName = true, Position = 1, Mandatory = true,
49-
ParameterSetName = BlobParameterSetName, HelpMessage = "The name of the Blob to get from the account.")]
49+
ParameterSetName = BlobParameterSetName, HelpMessage = "The name of the Blob storage to get from the account.")]
5050
[ValidateNotNullOrEmpty]
5151
[Alias("AzureBlob")]
5252
public string Blob { get; set; }

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Microsoft.Azure.Commands.DataLakeAnalytics.dll-help.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -859,13 +859,6 @@ The acceptable values for this parameter are:</maml:para>
859859
</maml:description>
860860
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
861861
</command:parameter>
862-
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="1">
863-
<maml:name>DataSource</maml:name>
864-
<maml:description>
865-
<maml:para>Specifies the type of data source to list.</maml:para>
866-
</maml:description>
867-
<command:parameterValue required="true" variableLength="false">DataLakeAnalyticsEnums+DataSourceType</command:parameterValue>
868-
</command:parameter>
869862
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
870863
<maml:name>InformationAction</maml:name>
871864
<maml:description>
@@ -955,18 +948,6 @@ The acceptable values for this parameter are:</maml:para>
955948
</dev:type>
956949
<dev:defaultValue></dev:defaultValue>
957950
</command:parameter>
958-
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="1">
959-
<maml:name>DataSource</maml:name>
960-
<maml:description>
961-
<maml:para>Specifies the type of data source to list.</maml:para>
962-
</maml:description>
963-
<command:parameterValue required="true" variableLength="false">DataLakeAnalyticsEnums+DataSourceType</command:parameterValue>
964-
<dev:type>
965-
<maml:name>DataLakeAnalyticsEnums+DataSourceType</maml:name>
966-
<maml:uri/>
967-
</dev:type>
968-
<dev:defaultValue></dev:defaultValue>
969-
</command:parameter>
970951
</command:parameters>
971952
<command:inputTypes>
972953
<command:inputType>

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Microsoft.Azure.Commands.DataLakeStore.dll-help.xml

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,13 +1748,20 @@
17481748
<command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
17491749
</command:parameter>
17501750
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="6">
1751-
<maml:name>NumThreads</maml:name>
1751+
<maml:name>PerFileThreadCount</maml:name>
17521752
<maml:description>
1753-
<maml:para>Specifies the number of threads to use to upload the file or folder.</maml:para>
1753+
<maml:para>Indicates the maximum number of threads to use per file. Default is 10.</maml:para>
17541754
</maml:description>
17551755
<command:parameterValue required="true" variableLength="false">Int32</command:parameterValue>
17561756
</command:parameter>
1757-
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="7">
1757+
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="7">
1758+
<maml:name>ConcurrentFileCount</maml:name>
1759+
<maml:description>
1760+
<maml:para>Indicates the maximum number of files to upload in parallel for a folder upload. Default is 5.</maml:para>
1761+
</maml:description>
1762+
<command:parameterValue required="true" variableLength="false">Int32</command:parameterValue>
1763+
</command:parameter>
1764+
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="8">
17581765
<maml:name>Force</maml:name>
17591766
<maml:description>
17601767
<maml:para>Indicates that this operation can overwrite the destination file if it already exists.</maml:para>
@@ -1851,9 +1858,9 @@
18511858
<dev:defaultValue>none</dev:defaultValue>
18521859
</command:parameter>
18531860
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="6">
1854-
<maml:name>NumThreads</maml:name>
1861+
<maml:name>PerFileThreadCount</maml:name>
18551862
<maml:description>
1856-
<maml:para>Specifies the number of threads to use to upload the file or folder.</maml:para>
1863+
<maml:para>Indicates the maximum number of threads to use per file. Default is 10.</maml:para>
18571864
</maml:description>
18581865
<command:parameterValue required="true" variableLength="false">Int32</command:parameterValue>
18591866
<dev:type>
@@ -1862,7 +1869,19 @@
18621869
</dev:type>
18631870
<dev:defaultValue>none</dev:defaultValue>
18641871
</command:parameter>
1865-
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="7">
1872+
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="7">
1873+
<maml:name>ConcurrentFileCount</maml:name>
1874+
<maml:description>
1875+
<maml:para>Indicates the maximum number of files to upload in parallel for a folder upload. Default is 5.</maml:para>
1876+
</maml:description>
1877+
<command:parameterValue required="true" variableLength="false">Int32</command:parameterValue>
1878+
<dev:type>
1879+
<maml:name>Int32</maml:name>
1880+
<maml:uri/>
1881+
</dev:type>
1882+
<dev:defaultValue>none</dev:defaultValue>
1883+
</command:parameter>
1884+
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="8">
18661885
<maml:name>Force</maml:name>
18671886
<maml:description>
18681887
<maml:para>Indicates that this operation can overwrite the destination file if it already exists.</maml:para>

0 commit comments

Comments
 (0)