Skip to content

Commit ce28783

Browse files
begoldsmbegoldsm
committed
Merge pull request #1 from yoreddy/dev
updated hdi sdk version and fixed build failures
2 parents ff61ac8 + 893a226 commit ce28783

File tree

10 files changed

+24
-23
lines changed

10 files changed

+24
-23
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</Reference>
5454
<Reference Include="Microsoft.Azure.Management.HDInsight, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5555
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.1.0.9-preview\lib\net40\Microsoft.Azure.Management.HDInsight.dll</HintPath>
56+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.1.0.8-preview\lib\net40\Microsoft.Azure.Management.HDInsight.dll</HintPath>
5757
</Reference>
5858
<Reference Include="Microsoft.Azure.Management.HDInsight.Job, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5959
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ public void CanGrantHttpAccess()
6262
param =>
6363
param.HttpUserEnabled && param.HttpUsername == _httpCred.UserName &&
6464
param.HttpPassword == _httpCred.Password.ConvertToString())))
65-
.Returns(new HDInsightLongRunningOperationResponse
65+
.Returns(new OperationResource
6666
{
67-
Error = null,
67+
ErrorInfo = null,
6868
StatusCode = HttpStatusCode.OK,
69-
Status = OperationStatus.Succeeded
69+
State = AsyncOperationState.Succeeded
7070
})
7171
.Verifiable();
7272

@@ -100,11 +100,11 @@ public void CanRevokeHttpAccess()
100100
!param.HttpUserEnabled &&
101101
string.IsNullOrEmpty(param.HttpPassword) &&
102102
string.IsNullOrEmpty(param.HttpUsername))))
103-
.Returns(new HDInsightLongRunningOperationResponse
103+
.Returns(new OperationResource
104104
{
105-
Error = null,
105+
ErrorInfo = null,
106106
StatusCode = HttpStatusCode.OK,
107-
Status = OperationStatus.Succeeded
107+
State = AsyncOperationState.Succeeded
108108
})
109109
.Verifiable();
110110

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ public void CanGrantRdpAccess()
6868
param.OsProfile.WindowsOperatingSystemProfile.RdpSettings.UserName == _rdpCred.UserName &&
6969
param.OsProfile.WindowsOperatingSystemProfile.RdpSettings.Password ==
7070
_rdpCred.Password.ConvertToString())))
71-
.Returns(new HDInsightLongRunningOperationResponse
71+
.Returns(new OperationResource
7272
{
73-
Error = null,
73+
ErrorInfo= null,
7474
StatusCode = HttpStatusCode.OK,
75-
Status = OperationStatus.Succeeded
75+
State = AsyncOperationState.Succeeded
7676
})
7777
.Verifiable();
7878

@@ -92,11 +92,11 @@ public void CanRevokeRdpAccess()
9292
param =>
9393
param.OsProfile.LinuxOperatingSystemProfile == null &&
9494
param.OsProfile.WindowsOperatingSystemProfile.RdpSettings == null)))
95-
.Returns(new HDInsightLongRunningOperationResponse
95+
.Returns(new OperationResource
9696
{
97-
Error = null,
97+
ErrorInfo = null,
9898
StatusCode = HttpStatusCode.OK,
99-
Status = OperationStatus.Succeeded
99+
State = AsyncOperationState.Succeeded
100100
})
101101
.Verifiable();
102102

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ public void CanResizeCluster()
8080
c.ResizeCluster(ResourceGroupName, ClusterName,
8181
It.Is<ClusterResizeParameters>(
8282
param => param.TargetInstanceCount == targetcount)))
83-
.Returns(new HDInsightLongRunningOperationResponse
83+
.Returns(new OperationResource
8484
{
85-
Error = null,
85+
ErrorInfo = null,
8686
StatusCode = HttpStatusCode.OK,
87-
Status = OperationStatus.Succeeded
87+
State = AsyncOperationState.Succeeded
8888
})
8989
.Verifiable();
9090

‎src/ResourceManager/HDInsight/Commands.HDInsight.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.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.9-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.HDInsight" version="1.0.8-preview" targetFramework="net45" />
1010
<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" />

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@
119119
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.7.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll</HintPath>
120120
</Reference>
121121
<Reference Include="Microsoft.Azure.Management.HDInsight">
122-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.1.0.9-preview\lib\net40\Microsoft.Azure.Management.HDInsight.dll</HintPath>
122+
<SpecificVersion>False</SpecificVersion>
123+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.1.0.8-preview\lib\net40\Microsoft.Azure.Management.HDInsight.dll</HintPath>
123124
</Reference>
124125
<Reference Include="Microsoft.Azure.Management.HDInsight.Job, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125126
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,17 @@ public virtual ClusterGetResponse Get(string resourceGroupName, string clusterNa
8080
return HdInsightManagementClient.Clusters.Get(resourceGroupName, clusterName);
8181
}
8282

83-
public virtual HDInsightLongRunningOperationResponse ResizeCluster(string resourceGroupName, string clusterName, ClusterResizeParameters resizeParams)
83+
public virtual OperationResource ResizeCluster(string resourceGroupName, string clusterName, ClusterResizeParameters resizeParams)
8484
{
8585
return HdInsightManagementClient.Clusters.Resize(resourceGroupName, clusterName, resizeParams);
8686
}
8787

88-
public virtual ClusterGetResponse DeleteCluster(string resourceGroupName, string clusterName)
88+
public virtual OperationResource DeleteCluster(string resourceGroupName, string clusterName)
8989
{
9090
return HdInsightManagementClient.Clusters.Delete(resourceGroupName, clusterName);
9191
}
9292

93-
public virtual HDInsightLongRunningOperationResponse ConfigureHttp(string resourceGroupName, string clusterName, HttpSettingsParameters httpSettings)
93+
public virtual OperationResource ConfigureHttp(string resourceGroupName, string clusterName, HttpSettingsParameters httpSettings)
9494
{
9595
return HdInsightManagementClient.Clusters.ConfigureHttpSettings(resourceGroupName, clusterName, httpSettings);
9696
}
@@ -100,7 +100,7 @@ public virtual HttpConnectivitySettings GetConnectivitySettings(string resourceG
100100
return HdInsightManagementClient.Clusters.GetConnectivitySettings(resourceGroupName, clusterName);
101101
}
102102

103-
public virtual HDInsightLongRunningOperationResponse ConfigureRdp(string resourceGroupName, string clusterName, RDPSettingsParameters rdpSettings)
103+
public virtual OperationResource ConfigureRdp(string resourceGroupName, string clusterName, RDPSettingsParameters rdpSettings)
104104
{
105105
return HdInsightManagementClient.Clusters.ConfigureRdpSettings(resourceGroupName, clusterName, rdpSettings);
106106
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Authentication" version="1.3.5-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.HDInsight" version="1.0.9-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.HDInsight" version="1.0.8-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.HDInsight.Job" version="1.0.6-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5772.15967-prerelease" targetFramework="net45" />

‎tools/LocalFeed/Microsoft.Azure.Management.HDInsight.1.0.8-preview.nupkg

127 KB
Binary file not shown.

‎tools/LocalFeed/Microsoft.Azure.Management.HDInsight.1.0.9-preview.nupkg

-127 KB
Binary file not shown.

0 commit comments

Comments
 (0)