building

Shefali · Shefali · commit 46711cd6c3c2 · 2015-10-02T20:13:31.000-07:00
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj
@@ -150,7 +150,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="HDInsightTestBase.cs" />
-    <None Include="app.config" />
     <None Include="ScenarioTests\HDInsightConfigurationTests.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/UnitTests/GetClusterTests.cs b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/UnitTests/GetClusterTests.cs
@@ -54,7 +54,7 @@ public void CanGetHDInsightCluster()
                     ClusterState = "Running",
                     ClusterDefinition = new ClusterDefinition
                     {
-                        ClusterType = HDInsightClusterType.Hadoop
+                        ClusterType = "Hadoop"
                     },
                     QuotaInfo = new QuotaInfo
                     {
@@ -95,7 +95,7 @@ public void CanListHDInsightClustersInRG()
                     ClusterState = "Running",
                     ClusterDefinition = new ClusterDefinition
                     {
-                        ClusterType = HDInsightClusterType.Hadoop
+                        ClusterType = "Hadoop"
                     },
                     QuotaInfo = new QuotaInfo
                     {
@@ -116,7 +116,7 @@ public void CanListHDInsightClustersInRG()
                     ClusterState = "Running",
                     ClusterDefinition = new ClusterDefinition
                     {
-                        ClusterType = HDInsightClusterType.Hadoop
+                        ClusterType = "Hadoop"
                     },
                     QuotaInfo = new QuotaInfo
                     {
@@ -163,7 +163,7 @@ public void CanListHDInsightClusters()
                     ClusterState = "Running",
                     ClusterDefinition = new ClusterDefinition
                     {
-                        ClusterType = HDInsightClusterType.Hadoop
+                        ClusterType = "Hadoop"
                     },
                     QuotaInfo = new QuotaInfo
                     {
@@ -184,7 +184,7 @@ public void CanListHDInsightClusters()
                     ClusterState = "Running",
                     ClusterDefinition = new ClusterDefinition
                     {
-                        ClusterType = HDInsightClusterType.Hadoop
+                        ClusterType = "Hadoop"
                     },
                     QuotaInfo = new QuotaInfo
                     {
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/UnitTests/NewClusterTests.cs b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/UnitTests/NewClusterTests.cs
@@ -67,7 +67,7 @@ public void CanCreateNewHDInsightCluster()
                     ClusterState = "Running",
                     ClusterDefinition = new ClusterDefinition
                     {
-                        ClusterType = HDInsightClusterType.Hadoop
+                        ClusterType = "Hadoop"
                     },
                     QuotaInfo = new QuotaInfo
                     {
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/UnitTests/ResizeClusterTests.cs b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/UnitTests/ResizeClusterTests.cs
@@ -56,7 +56,7 @@ public void CanResizeCluster()
                     ClusterState = "Running",
                     ClusterDefinition = new ClusterDefinition
                     {
-                        ClusterType = HDInsightClusterType.Hadoop
+                        ClusterType = "Hadoop"
                     },
                     QuotaInfo = new QuotaInfo
                     {
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj b/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj
@@ -91,7 +91,6 @@
       <Link>AzureRM.HDInsight.psd1</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="app.config" />
     <None Include="Microsoft.Azure.Commands.HDInsight.dll-help.psd1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightCluster.cs b/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightCluster.cs
@@ -29,7 +29,9 @@ public AzureHDInsightCluster(Cluster cluster)
             ClusterVersion = cluster.Properties.ClusterVersion;
             OperatingSystemType = cluster.Properties.OperatingSystemType;
             ClusterState = cluster.Properties.ClusterState;
-            ClusterType = cluster.Properties.ClusterDefinition.ClusterType;
+            HDInsightClusterType type;
+            Enum.TryParse(cluster.Properties.ClusterDefinition.ClusterType, out type);
+            ClusterType = type;
             CoresUsed = cluster.Properties.QuotaInfo.CoresUsed;
             var httpEndpoint =
                 cluster.Properties.ConnectivityEndpoints.FirstOrDefault(c => c.Name.Equals("HTTPS", StringComparison.OrdinalIgnoreCase));

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void CanGetHDInsightCluster()`
`54`	`54`	`ClusterState = "Running",`
`55`	`55`	`ClusterDefinition = new ClusterDefinition`
`56`	`56`	`{`
`57`		`- ClusterType = HDInsightClusterType.Hadoop`
	`57`	`+ ClusterType = "Hadoop"`
`58`	`58`	`},`
`59`	`59`	`QuotaInfo = new QuotaInfo`
`60`	`60`	`{`
`@@ -95,7 +95,7 @@ public void CanListHDInsightClustersInRG()`
`95`	`95`	`ClusterState = "Running",`
`96`	`96`	`ClusterDefinition = new ClusterDefinition`
`97`	`97`	`{`
`98`		`- ClusterType = HDInsightClusterType.Hadoop`
	`98`	`+ ClusterType = "Hadoop"`
`99`	`99`	`},`
`100`	`100`	`QuotaInfo = new QuotaInfo`
`101`	`101`	`{`
`@@ -116,7 +116,7 @@ public void CanListHDInsightClustersInRG()`
`116`	`116`	`ClusterState = "Running",`
`117`	`117`	`ClusterDefinition = new ClusterDefinition`
`118`	`118`	`{`
`119`		`- ClusterType = HDInsightClusterType.Hadoop`
	`119`	`+ ClusterType = "Hadoop"`
`120`	`120`	`},`
`121`	`121`	`QuotaInfo = new QuotaInfo`
`122`	`122`	`{`
`@@ -163,7 +163,7 @@ public void CanListHDInsightClusters()`
`163`	`163`	`ClusterState = "Running",`
`164`	`164`	`ClusterDefinition = new ClusterDefinition`
`165`	`165`	`{`
`166`		`- ClusterType = HDInsightClusterType.Hadoop`
	`166`	`+ ClusterType = "Hadoop"`
`167`	`167`	`},`
`168`	`168`	`QuotaInfo = new QuotaInfo`
`169`	`169`	`{`
`@@ -184,7 +184,7 @@ public void CanListHDInsightClusters()`
`184`	`184`	`ClusterState = "Running",`
`185`	`185`	`ClusterDefinition = new ClusterDefinition`
`186`	`186`	`{`
`187`		`- ClusterType = HDInsightClusterType.Hadoop`
	`187`	`+ ClusterType = "Hadoop"`
`188`	`188`	`},`
`189`	`189`	`QuotaInfo = new QuotaInfo`
`190`	`190`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void CanCreateNewHDInsightCluster()`
`67`	`67`	`ClusterState = "Running",`
`68`	`68`	`ClusterDefinition = new ClusterDefinition`
`69`	`69`	`{`
`70`		`- ClusterType = HDInsightClusterType.Hadoop`
	`70`	`+ ClusterType = "Hadoop"`
`71`	`71`	`},`
`72`	`72`	`QuotaInfo = new QuotaInfo`
`73`	`73`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public void CanResizeCluster()`
`56`	`56`	`ClusterState = "Running",`
`57`	`57`	`ClusterDefinition = new ClusterDefinition`
`58`	`58`	`{`
`59`		`- ClusterType = HDInsightClusterType.Hadoop`
	`59`	`+ ClusterType = "Hadoop"`
`60`	`60`	`},`
`61`	`61`	`QuotaInfo = new QuotaInfo`
`62`	`62`	`{`