Skip to content

Commit 7744540

Browse files
author
begoldsm
committed
Update to latest SDK packages and re-run tests
1 parent 18704c8 commit 7744540

File tree

26 files changed

+4190
-4163
lines changed

26 files changed

+4190
-4163
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@
6262
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6363
<Private>True</Private>
6464
</Reference>
65-
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65+
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.10.2-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
70-
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.10.1-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.11.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
7575
<Reference Include="Microsoft.Azure.Management.Storage">

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

Lines changed: 1011 additions & 741 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: 678 additions & 1080 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: 378 additions & 291 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: 409 additions & 304 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: 338 additions & 293 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
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" />
8-
<package id="Microsoft.Azure.Management.DataLake.Analytics" version="0.10.2-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.DataLake.Store" version="0.10.1-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.DataLake.Analytics" version="0.11.0-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.DataLake.Store" version="0.11.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.19.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.5896.19355-prerelease" targetFramework="net45" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
<Reference Include="Microsoft.Azure.Common.NetFramework">
4646
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
4747
</Reference>
48-
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48+
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4949
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.10.2-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
50+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
5353
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,11 @@ public override void ExecuteCmdlet()
184184

185185
if (!string.IsNullOrEmpty(CompileMode))
186186
{
187-
sqlIpProperties.CompileMode = CompileMode;
187+
CompileMode toUse;
188+
if(Enum.TryParse(CompileMode, out toUse))
189+
{
190+
sqlIpProperties.CompileMode = toUse;
191+
}
188192
}
189193

190194
if (!string.IsNullOrEmpty(Runtime))

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Models/DataLakeAnalyticsClient.cs

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -362,33 +362,33 @@ private IPage<DataLakeAnalyticsAccount> ListAccountsWithNextLink(string nextLink
362362
public USqlSecret CreateSecret(string accountName, string databaseName,
363363
string secretName, string password, string hostUri)
364364
{
365-
return _catalogClient.Catalog.CreateSecret(databaseName, secretName,
365+
return _catalogClient.Catalog.CreateSecret(accountName, databaseName, secretName,
366366
new DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters
367367
{
368368
Password = password,
369369
Uri = hostUri
370-
}, accountName);
370+
});
371371
}
372372

373373
public USqlSecret UpdateSecret(string accountName, string databaseName,
374374
string secretName, string password, string hostUri)
375375
{
376-
return _catalogClient.Catalog.UpdateSecret(databaseName, secretName,
376+
return _catalogClient.Catalog.UpdateSecret(accountName, databaseName, secretName,
377377
new DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters
378378
{
379379
Password = password,
380380
Uri = hostUri
381-
}, accountName);
381+
});
382382
}
383383

384384
public void DeleteSecret(string accountName, string databaseName, string secretName)
385385
{
386-
_catalogClient.Catalog.DeleteSecret(databaseName, secretName, accountName);
386+
_catalogClient.Catalog.DeleteSecret(accountName, databaseName, secretName);
387387
}
388388

389389
public USqlSecret GetSecret(string accountName, string databaseName, string secretName)
390390
{
391-
return _catalogClient.Catalog.GetSecret(databaseName, secretName, accountName);
391+
return _catalogClient.Catalog.GetSecret(accountName, databaseName, secretName);
392392
}
393393

394394
public bool TestCatalogItem(string accountName, CatalogPathInstance path,
@@ -576,7 +576,7 @@ public IList<CatalogItem> GetCatalogItem(string accountName, CatalogPathInstance
576576

577577
private USqlDatabase GetDatabase(string accountName, string databaseName)
578578
{
579-
return _catalogClient.Catalog.GetDatabase(databaseName, accountName);
579+
return _catalogClient.Catalog.GetDatabase(accountName, databaseName);
580580
}
581581

582582
private IList<USqlDatabase> GetDatabases(string accountName)
@@ -597,13 +597,13 @@ private USqlAssembly GetAssembly(string accountName, string databaseName,
597597
string assemblyName)
598598
{
599599
return
600-
_catalogClient.Catalog.GetAssembly(databaseName, assemblyName, accountName);
600+
_catalogClient.Catalog.GetAssembly(accountName, databaseName, assemblyName);
601601
}
602602

603603
private IList<USqlAssemblyClr> GetAssemblies(string accountName, string databaseName)
604604
{
605605
List<USqlAssemblyClr> toReturn = new List<USqlAssemblyClr>();
606-
var response = _catalogClient.Catalog.ListAssemblies(databaseName, accountName);
606+
var response = _catalogClient.Catalog.ListAssemblies(accountName, databaseName);
607607
toReturn.AddRange(response);
608608
while (!string.IsNullOrEmpty(response.NextPageLink))
609609
{
@@ -618,15 +618,15 @@ private USqlExternalDataSource GetExternalDataSource(string accountName,
618618
string databaseName, string dataSourceName)
619619
{
620620
return
621-
_catalogClient.Catalog.GetExternalDataSource(databaseName,
622-
dataSourceName, accountName);
621+
_catalogClient.Catalog.GetExternalDataSource(accountName, databaseName,
622+
dataSourceName);
623623
}
624624

625625
private IList<USqlExternalDataSource> GetExternalDataSources(string accountName,
626626
string databaseName)
627627
{
628628
List<USqlExternalDataSource> toReturn = new List<USqlExternalDataSource>();
629-
var response = _catalogClient.Catalog.ListExternalDataSources(databaseName, accountName);
629+
var response = _catalogClient.Catalog.ListExternalDataSources(accountName, databaseName);
630630
toReturn.AddRange(response);
631631
while (!string.IsNullOrEmpty(response.NextPageLink))
632632
{
@@ -641,15 +641,15 @@ private USqlCredential GetCredential(string accountName,
641641
string databaseName, string credName)
642642
{
643643
return
644-
_catalogClient.Catalog.GetCredential(databaseName,
645-
credName, accountName);
644+
_catalogClient.Catalog.GetCredential(accountName, databaseName,
645+
credName);
646646
}
647647

648648
private IList<USqlCredential> GetCredentials(string accountName,
649649
string databaseName)
650650
{
651651
List<USqlCredential> toReturn = new List<USqlCredential>();
652-
var response = _catalogClient.Catalog.ListCredentials(databaseName, accountName);
652+
var response = _catalogClient.Catalog.ListCredentials(accountName, databaseName);
653653
toReturn.AddRange(response);
654654
while (!string.IsNullOrEmpty(response.NextPageLink))
655655
{
@@ -663,13 +663,13 @@ private IList<USqlCredential> GetCredentials(string accountName,
663663
private USqlSchema GetSchema(string accountName, string databaseName,
664664
string schemaName)
665665
{
666-
return _catalogClient.Catalog.GetSchema(databaseName, schemaName, accountName);
666+
return _catalogClient.Catalog.GetSchema(accountName, databaseName, schemaName);
667667
}
668668

669669
private IList<USqlSchema> GetSchemas(string accountName, string databaseName)
670670
{
671671
List<USqlSchema> toReturn = new List<USqlSchema>();
672-
var response = _catalogClient.Catalog.ListSchemas(databaseName, accountName);
672+
var response = _catalogClient.Catalog.ListSchemas(accountName, databaseName);
673673
toReturn.AddRange(response);
674674
while (!string.IsNullOrEmpty(response.NextPageLink))
675675
{
@@ -684,14 +684,14 @@ private USqlTable GetTable(string accountName, string databaseName, string schem
684684
string tableName)
685685
{
686686
return
687-
_catalogClient.Catalog.GetTable(databaseName, schemaName, tableName, accountName);
687+
_catalogClient.Catalog.GetTable(accountName, databaseName, schemaName, tableName);
688688
}
689689

690690
private IList<USqlTable> GetTables(string accountName, string databaseName,
691691
string schemaName)
692692
{
693693
List<USqlTable> toReturn = new List<USqlTable>();
694-
var response = _catalogClient.Catalog.ListTables(databaseName, schemaName, accountName);
694+
var response = _catalogClient.Catalog.ListTables(accountName, databaseName, schemaName);
695695
toReturn.AddRange(response);
696696
while (!string.IsNullOrEmpty(response.NextPageLink))
697697
{
@@ -706,15 +706,15 @@ private USqlTableValuedFunction GetTableValuedFunction(string accountName,
706706
string databaseName, string schemaName, string tableValuedFunctionName)
707707
{
708708
return
709-
_catalogClient.Catalog.GetTableValuedFunction(databaseName, schemaName,
710-
tableValuedFunctionName, accountName);
709+
_catalogClient.Catalog.GetTableValuedFunction(accountName, databaseName, schemaName,
710+
tableValuedFunctionName);
711711
}
712712

713713
private IList<USqlTableValuedFunction> GetTableValuedFunctions(string accountName,
714714
string databaseName, string schemaName)
715715
{
716716
List<USqlTableValuedFunction> toReturn = new List<USqlTableValuedFunction>();
717-
var response = _catalogClient.Catalog.ListTableValuedFunctions(databaseName, schemaName, accountName);
717+
var response = _catalogClient.Catalog.ListTableValuedFunctions(accountName, databaseName, schemaName);
718718
toReturn.AddRange(response);
719719
while (!string.IsNullOrEmpty(response.NextPageLink))
720720
{
@@ -729,15 +729,15 @@ private USqlTableStatistics GetTableStatistic(string accountName, string databas
729729
string schemaName, string tableName, string statisticsName)
730730
{
731731
return
732-
_catalogClient.Catalog.GetTableStatistic(databaseName, schemaName,
733-
tableName, statisticsName, accountName);
732+
_catalogClient.Catalog.GetTableStatistic(accountName, databaseName, schemaName,
733+
tableName, statisticsName);
734734
}
735735

736736
private IList<USqlTableStatistics> GetTableStatistics(string accountName,
737737
string databaseName, string schemaName, string tableName)
738738
{
739739
List<USqlTableStatistics> toReturn = new List<USqlTableStatistics>();
740-
var response = _catalogClient.Catalog.ListTableStatistics(databaseName, schemaName, tableName, accountName);
740+
var response = _catalogClient.Catalog.ListTableStatistics(accountName, databaseName, schemaName, tableName);
741741
toReturn.AddRange(response);
742742
while (!string.IsNullOrEmpty(response.NextPageLink))
743743
{
@@ -752,14 +752,14 @@ private USqlView GetView(string accountName, string databaseName, string schemaN
752752
string viewName)
753753
{
754754
return
755-
_catalogClient.Catalog.GetView(databaseName, schemaName, viewName, accountName);
755+
_catalogClient.Catalog.GetView(accountName, databaseName, schemaName, viewName);
756756
}
757757

758758
private IList<USqlView> GetViews(string accountName, string databaseName,
759759
string schemaName)
760760
{
761761
List<USqlView> toReturn = new List<USqlView>();
762-
var response = _catalogClient.Catalog.ListViews(databaseName, schemaName, accountName);
762+
var response = _catalogClient.Catalog.ListViews(accountName, databaseName, schemaName);
763763
toReturn.AddRange(response);
764764
while (!string.IsNullOrEmpty(response.NextPageLink))
765765
{
@@ -774,14 +774,14 @@ private USqlProcedure GetProcedure(string accountName, string databaseName, stri
774774
string procName)
775775
{
776776
return
777-
_catalogClient.Catalog.GetProcedure(databaseName, schemaName, procName, accountName);
777+
_catalogClient.Catalog.GetProcedure(accountName, databaseName, schemaName, procName);
778778
}
779779

780780
private IList<USqlProcedure> GetProcedures(string accountName, string databaseName,
781781
string schemaName)
782782
{
783783
List<USqlProcedure> toReturn = new List<USqlProcedure>();
784-
var response = _catalogClient.Catalog.ListProcedures(databaseName, schemaName, accountName);
784+
var response = _catalogClient.Catalog.ListProcedures(accountName, databaseName, schemaName);
785785
toReturn.AddRange(response);
786786
while (!string.IsNullOrEmpty(response.NextPageLink))
787787
{
@@ -796,7 +796,7 @@ private IList<USqlType> GetTypes(string accountName, string databaseName,
796796
string schemaName)
797797
{
798798
List<USqlType> toReturn = new List<USqlType>();
799-
var response = _catalogClient.Catalog.ListTypes(databaseName, schemaName, accountName);
799+
var response = _catalogClient.Catalog.ListTypes(accountName, databaseName, schemaName);
800800
toReturn.AddRange(response);
801801
while (!string.IsNullOrEmpty(response.NextPageLink))
802802
{
@@ -813,35 +813,35 @@ private IList<USqlType> GetTypes(string accountName, string databaseName,
813813

814814
public JobInformation GetJob(string accountName, Guid jobId)
815815
{
816-
return _jobClient.Job.Get(jobId, accountName);
816+
return _jobClient.Job.Get(accountName, jobId);
817817
}
818818

819819
public JobInformation SubmitJob(string accountName, JobInformation jobToSubmit)
820820
{
821821
return
822-
_jobClient.Job.Create(jobToSubmit.JobId.GetValueOrDefault(),
823-
jobToSubmit, accountName);
822+
_jobClient.Job.Create(accountName, jobToSubmit.JobId.GetValueOrDefault(),
823+
jobToSubmit);
824824
}
825825

826826
public JobInformation BuildJob(string accountName, JobInformation jobToBuild)
827827
{
828828
return
829-
_jobClient.Job.Build(jobToBuild, accountName);
829+
_jobClient.Job.Build(accountName, jobToBuild);
830830
}
831831

832832
public void CancelJob(string accountName, Guid jobId)
833833
{
834-
_jobClient.Job.Cancel(jobId, accountName);
834+
_jobClient.Job.Cancel(accountName, jobId);
835835
}
836836

837837
public JobDataPath GetDebugDataPaths(string accountName, Guid jobId)
838838
{
839-
return _jobClient.Job.GetDebugDataPath(jobId, accountName);
839+
return _jobClient.Job.GetDebugDataPath(accountName, jobId);
840840
}
841841

842842
public JobStatistics GetJobStatistics(string accountName, Guid jobId)
843843
{
844-
return _jobClient.Job.GetStatistics(jobId, accountName);
844+
return _jobClient.Job.GetStatistics(accountName, jobId);
845845
}
846846

847847
public List<JobInformation> ListJobs(string accountName, string filter, int? top,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
6-
<package id="Microsoft.Azure.Management.DataLake.Analytics" version="0.10.2-preview" targetFramework="net45" />
6+
<package id="Microsoft.Azure.Management.DataLake.Analytics" version="0.11.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.19.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
99
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@
6262
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6363
<Private>True</Private>
6464
</Reference>
65-
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65+
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.10.1-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.11.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Management.DataLake.StoreUploader, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.StoreUploader.0.10.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.StoreUploader.dll</HintPath>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.StoreUploader.0.10.1-preview\lib\net45\Microsoft.Azure.Management.DataLake.StoreUploader.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
7575
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

0 commit comments

Comments
 (0)