Skip to content

Commit f2674a6

Browse files
ogailogail
committed
Merge pull request #1055 from shefaliv/dev
updating hdi refs
2 parents 56d97ab + 46711cd commit f2674a6

File tree

10 files changed

+57
-18
lines changed

10 files changed

+57
-18
lines changed

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

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,13 @@
5151
<Reference Include="Microsoft.Azure.Management.Authorization">
5252
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
5353
</Reference>
54-
<Reference Include="Microsoft.Azure.Management.HDInsight">
55-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.1.0.1-preview\lib\net40\Microsoft.Azure.Management.HDInsight.dll</HintPath>
54+
<Reference Include="Microsoft.Azure.Management.HDInsight, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55+
<SpecificVersion>False</SpecificVersion>
56+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.1.0.7-preview\lib\net40\Microsoft.Azure.Management.HDInsight.dll</HintPath>
5657
</Reference>
57-
<Reference Include="Microsoft.Azure.Management.HDInsight.Job">
58-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.Job.1.0.1-preview\lib\net40\Microsoft.Azure.Management.HDInsight.Job.dll</HintPath>
58+
<Reference Include="Microsoft.Azure.Management.HDInsight.Job, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59+
<SpecificVersion>False</SpecificVersion>
60+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.Job.1.0.6-preview\lib\net40\Microsoft.Azure.Management.HDInsight.Job.dll</HintPath>
5961
</Reference>
6062
<Reference Include="Microsoft.Azure.Management.Storage">
6163
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
@@ -71,6 +73,18 @@
7173
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5715.36130-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
7274
<Private>True</Private>
7375
</Reference>
76+
<Reference Include="Microsoft.Data.Edm, Version=5.6.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77+
<SpecificVersion>False</SpecificVersion>
78+
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
79+
</Reference>
80+
<Reference Include="Microsoft.Data.OData, Version=5.6.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<SpecificVersion>False</SpecificVersion>
82+
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.2\lib\net40\Microsoft.Data.OData.dll</HintPath>
83+
</Reference>
84+
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85+
<SpecificVersion>False</SpecificVersion>
86+
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
87+
</Reference>
7488
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7589
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
7690
<Private>True</Private>
@@ -96,6 +110,14 @@
96110
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
97111
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
98112
</Reference>
113+
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114+
<SpecificVersion>False</SpecificVersion>
115+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
116+
</Reference>
117+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118+
<SpecificVersion>False</SpecificVersion>
119+
<HintPath>..\..\..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
120+
</Reference>
99121
<Reference Include="Newtonsoft.Json">
100122
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
101123
</Reference>
@@ -110,6 +132,10 @@
110132
<Reference Include="System.Net" />
111133
<Reference Include="System.Net.Http" />
112134
<Reference Include="System.Net.Http.WebRequest" />
135+
<Reference Include="System.Spatial, Version=5.6.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
136+
<SpecificVersion>False</SpecificVersion>
137+
<HintPath>..\..\..\packages\System.Spatial.5.6.2\lib\net40\System.Spatial.dll</HintPath>
138+
</Reference>
113139
<Reference Include="System.Xml.Linq" />
114140
<Reference Include="System.Data.DataSetExtensions" />
115141
<Reference Include="Microsoft.CSharp" />

‎src/ResourceManager/HDInsight/Commands.HDInsight.Test/UnitTests/GetClusterTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void CanGetHDInsightCluster()
5454
ClusterState = "Running",
5555
ClusterDefinition = new ClusterDefinition
5656
{
57-
ClusterType = HDInsightClusterType.Hadoop
57+
ClusterType = "Hadoop"
5858
},
5959
QuotaInfo = new QuotaInfo
6060
{
@@ -95,7 +95,7 @@ public void CanListHDInsightClustersInRG()
9595
ClusterState = "Running",
9696
ClusterDefinition = new ClusterDefinition
9797
{
98-
ClusterType = HDInsightClusterType.Hadoop
98+
ClusterType = "Hadoop"
9999
},
100100
QuotaInfo = new QuotaInfo
101101
{
@@ -116,7 +116,7 @@ public void CanListHDInsightClustersInRG()
116116
ClusterState = "Running",
117117
ClusterDefinition = new ClusterDefinition
118118
{
119-
ClusterType = HDInsightClusterType.Hadoop
119+
ClusterType = "Hadoop"
120120
},
121121
QuotaInfo = new QuotaInfo
122122
{
@@ -163,7 +163,7 @@ public void CanListHDInsightClusters()
163163
ClusterState = "Running",
164164
ClusterDefinition = new ClusterDefinition
165165
{
166-
ClusterType = HDInsightClusterType.Hadoop
166+
ClusterType = "Hadoop"
167167
},
168168
QuotaInfo = new QuotaInfo
169169
{
@@ -184,7 +184,7 @@ public void CanListHDInsightClusters()
184184
ClusterState = "Running",
185185
ClusterDefinition = new ClusterDefinition
186186
{
187-
ClusterType = HDInsightClusterType.Hadoop
187+
ClusterType = "Hadoop"
188188
},
189189
QuotaInfo = new QuotaInfo
190190
{

‎src/ResourceManager/HDInsight/Commands.HDInsight.Test/UnitTests/NewClusterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void CanCreateNewHDInsightCluster()
6767
ClusterState = "Running",
6868
ClusterDefinition = new ClusterDefinition
6969
{
70-
ClusterType = HDInsightClusterType.Hadoop
70+
ClusterType = "Hadoop"
7171
},
7272
QuotaInfo = new QuotaInfo
7373
{

‎src/ResourceManager/HDInsight/Commands.HDInsight.Test/UnitTests/ResizeClusterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void CanResizeCluster()
5656
ClusterState = "Running",
5757
ClusterDefinition = new ClusterDefinition
5858
{
59-
ClusterType = HDInsightClusterType.Hadoop
59+
ClusterType = "Hadoop"
6060
},
6161
QuotaInfo = new QuotaInfo
6262
{

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,27 @@
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Authorization" version="0.18.2-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.HDInsight" version="1.0.1-preview" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.HDInsight.Job" version="1.0.1-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.HDInsight" version="1.0.7-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.HDInsight.Job" version="1.0.6-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Test.Framework" version="1.0.5715.36130-prerelease" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5715.36130-prerelease" targetFramework="net45" />
1515
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1616
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1717
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
18+
<package id="Microsoft.Data.Edm" version="5.6.2" targetFramework="net45" />
19+
<package id="Microsoft.Data.OData" version="5.6.2" targetFramework="net45" />
20+
<package id="Microsoft.Data.Services.Client" version="5.6.2" targetFramework="net45" />
1821
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1922
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
2023
<package id="Microsoft.Rest.ClientRuntime" version="1.2.0" targetFramework="net45" />
2124
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
25+
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
2226
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
2327
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
28+
<package id="System.Spatial" version="5.6.2" targetFramework="net45" />
29+
<package id="WindowsAzure.Storage" version="4.3.0" targetFramework="net45" />
2430
<package id="xunit" version="1.9.2" targetFramework="net45" />
2531
<package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
2632
<package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net45" />

‎src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
</Reference>
116116
<Reference Include="Microsoft.Azure.Management.HDInsight, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117117
<SpecificVersion>False</SpecificVersion>
118-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.1.0.6-preview\lib\net40\Microsoft.Azure.Management.HDInsight.dll</HintPath>
118+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.1.0.7-preview\lib\net40\Microsoft.Azure.Management.HDInsight.dll</HintPath>
119119
</Reference>
120120
<Reference Include="Microsoft.Azure.Management.HDInsight.Job, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121121
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/HDInsight/Commands.HDInsight/ManagementCommands/GetAzureHDInsightClusterCommand.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ public class GetAzureHDInsightCommand : HDInsightCmdletBase
4444

4545
protected override void ProcessRecord()
4646
{
47+
if (ClusterName != null && ResourceGroupName == null)
48+
{
49+
ResourceGroupName = GetResourceGroupByAccountName(ClusterName);
50+
}
51+
4752
var result = HDInsightManagementClient.GetCluster(ResourceGroupName, ClusterName);
4853

4954
var output = result.Select(entry =>

‎src/ResourceManager/HDInsight/Commands.HDInsight/ManagementCommands/NewAzureHDInsightClusterCommand.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ var storageAccount in
212212
{
213213
result.Configurations.Add(val.Key, DictionaryToHashtable(val.Value));
214214
}
215-
foreach (var action in parameters.ScriptActions.Where(action => result.ScriptActions.ContainsKey(action.Key)))
215+
foreach (var action in parameters.ScriptActions.Where(action => !result.ScriptActions.ContainsKey(action.Key)))
216216
{
217217
result.ScriptActions.Add(action.Key, action.Value.Select(a => new AzureHDInsightScriptAction(a)).ToList());
218218
}
@@ -239,7 +239,7 @@ var storageAccount in
239239
{
240240
parameters.Configurations.Add(val.Key, HashtableToDictionary(val.Value));
241241
}
242-
foreach (var action in value.ScriptActions.Where(action => parameters.ScriptActions.ContainsKey(action.Key)))
242+
foreach (var action in value.ScriptActions.Where(action => !parameters.ScriptActions.ContainsKey(action.Key)))
243243
{
244244
parameters.ScriptActions.Add(action.Key, action.Value.Select(a => a.GetScriptActionFromPSModel()).ToList());
245245
}

‎src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightCluster.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ public AzureHDInsightCluster(Cluster cluster)
2929
ClusterVersion = cluster.Properties.ClusterVersion;
3030
OperatingSystemType = cluster.Properties.OperatingSystemType;
3131
ClusterState = cluster.Properties.ClusterState;
32-
ClusterType = cluster.Properties.ClusterDefinition.ClusterType;
32+
HDInsightClusterType type;
33+
Enum.TryParse(cluster.Properties.ClusterDefinition.ClusterType, out type);
34+
ClusterType = type;
3335
CoresUsed = cluster.Properties.QuotaInfo.CoresUsed;
3436
var httpEndpoint =
3537
cluster.Properties.ConnectivityEndpoints.FirstOrDefault(c => c.Name.Equals("HTTPS", StringComparison.OrdinalIgnoreCase));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Authentication" version="1.3.2-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.HDInsight" version="1.0.6-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.HDInsight" version="1.0.7-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.HDInsight.Job" version="1.0.6-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5715.36130-prerelease" targetFramework="net45" />

0 commit comments

Comments
 (0)