Skip to content

Commit 9278752

Browse files
prbansaprbansa
committed
MarketplaceOrdering cmdlets fix the git merging issues
1 parent d718f57 commit 9278752

File tree

6 files changed

+173
-5395
lines changed

6 files changed

+173
-5395
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 159 additions & 5241 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -471,137 +471,12 @@ public void CanCreateNewHDInsightCluster_LinuxComponentVersion()
471471

472472
[Fact]
473473
[Trait(Category.AcceptanceType, Category.CheckIn)]
474-
public void CanCreateNewHDInsightCluster_DataDisksGroups()
474+
public void CanCreateNewHDInsightCluster_Kafka_DataDisks_Linux()
475475
{
476-
var kafkaClusterType = "Kafka";
477-
var hdiVersion = "3.6";
478-
var coresUsed = 24;
479-
var expectedClusterState = "Running";
480-
var dataDisksGroup = new DataDisksGroupProperties()
481-
{
482-
DisksPerNode = 8
483-
};
484-
var workerNodeDataDisksGroups = new List<DataDisksGroupProperties>()
485-
{
486-
dataDisksGroup
487-
};
488-
489-
cmdlet.ClusterName = ClusterName;
490-
cmdlet.ResourceGroupName = ResourceGroupName;
491-
cmdlet.ClusterSizeInNodes = ClusterSize;
492-
cmdlet.Location = Location;
493-
cmdlet.HttpCredential = _httpCred;
494-
cmdlet.DefaultStorageAccountName = StorageName;
495-
cmdlet.DefaultStorageAccountKey = StorageKey;
496-
cmdlet.ClusterType = kafkaClusterType;
497-
cmdlet.SshCredential = _sshCred;
498-
cmdlet.OSType = OSType.Linux;
499-
cmdlet.WorkerNodeDataDisksGroups = workerNodeDataDisksGroups;
500-
501-
var cluster = new Cluster
502-
{
503-
Id = "id",
504-
Name = ClusterName,
505-
Location = Location,
506-
Properties = new ClusterGetProperties
507-
{
508-
ClusterVersion = hdiVersion,
509-
ClusterState = expectedClusterState,
510-
ClusterDefinition = new ClusterDefinition
511-
{
512-
ClusterType = kafkaClusterType
513-
},
514-
QuotaInfo = new QuotaInfo
515-
{
516-
CoresUsed = coresUsed
517-
},
518-
OperatingSystemType = OSType.Linux,
519-
ComputeProfile = new ComputeProfile()
520-
{
521-
Roles = new List<Role>()
522-
}
523-
}
524-
};
525-
526-
cluster.Properties.ComputeProfile.Roles.Add(new Role()
527-
{
528-
Name = "workernode",
529-
DataDisksGroups = workerNodeDataDisksGroups
530-
});
531-
532-
var coreConfigs = new Dictionary<string, string>
533-
{
534-
{"fs.defaultFS", "wasb://giyertestcsmv2@" + StorageName},
535-
{
536-
"fs.azure.account.key." + StorageName,
537-
StorageKey
538-
}
539-
};
540-
var gatewayConfigs = new Dictionary<string, string>
541-
{
542-
{"restAuthCredential.isEnabled", "true"},
543-
{"restAuthCredential.username", _httpCred.UserName},
544-
{"restAuthCredential.password", _httpCred.Password.ConvertToString()}
545-
};
476+
ClusterType = "Kafka";
477+
HdiVersion = "3.6";
546478

547-
var configurations = new Dictionary<string, Dictionary<string, string>>
548-
{
549-
{"core-site", coreConfigs},
550-
{"gateway", gatewayConfigs}
551-
};
552-
var serializedConfig = JsonConvert.SerializeObject(configurations);
553-
cluster.Properties.ClusterDefinition.Configurations = serializedConfig;
554-
555-
var getresponse = new ClusterGetResponse { Cluster = cluster };
556-
557-
hdinsightManagementMock.Setup(c => c.CreateNewCluster(ResourceGroupName, ClusterName, It.Is<ClusterCreateParameters>(
558-
parameters =>
559-
parameters.ClusterSizeInNodes == ClusterSize &&
560-
parameters.DefaultStorageInfo as AzureStorageInfo != null &&
561-
((AzureStorageInfo)parameters.DefaultStorageInfo).StorageAccountName == StorageName &&
562-
((AzureStorageInfo)parameters.DefaultStorageInfo).StorageAccountKey == StorageKey &&
563-
parameters.Location == Location &&
564-
parameters.UserName == _httpCred.UserName &&
565-
parameters.Password == _httpCred.Password.ConvertToString() &&
566-
parameters.ClusterType == kafkaClusterType &&
567-
parameters.OSType == OSType.Linux &&
568-
parameters.SshUserName == _sshCred.UserName &&
569-
parameters.SshPassword == _sshCred.Password.ConvertToString() &&
570-
parameters.WorkerNodeDataDisksGroups.First().DisksPerNode == dataDisksGroup.DisksPerNode)))
571-
.Returns(getresponse)
572-
.Verifiable();
573-
hdinsightManagementMock.Setup(
574-
c => c.CreateNewCluster(ResourceGroupName, ClusterName, It.Is<ClusterCreateParameters>(
575-
parameters =>
576-
parameters.ClusterSizeInNodes == ClusterSize &&
577-
parameters.DefaultStorageInfo as AzureStorageInfo != null &&
578-
((AzureStorageInfo)parameters.DefaultStorageInfo).StorageAccountName == StorageName &&
579-
((AzureStorageInfo)parameters.DefaultStorageInfo).StorageAccountKey == StorageKey &&
580-
parameters.Location == Location &&
581-
parameters.UserName == _httpCred.UserName &&
582-
parameters.Password == _httpCred.Password.ConvertToString() &&
583-
parameters.ClusterType == ClusterType &&
584-
parameters.OSType == OSType.Linux &&
585-
parameters.SshUserName == _sshCred.UserName &&
586-
parameters.SshPassword == _sshCred.Password.ConvertToString())))
587-
.Returns(getresponse)
588-
.Verifiable();
589-
590-
cmdlet.ExecuteCmdlet();
591-
592-
commandRuntimeMock.VerifyAll();
593-
594-
595-
commandRuntimeMock.Verify(f => f.WriteObject(It.Is<AzureHDInsightCluster>(
596-
clusterout =>
597-
clusterout.ClusterState == expectedClusterState &&
598-
clusterout.ClusterType == kafkaClusterType &&
599-
clusterout.ClusterVersion == hdiVersion &&
600-
clusterout.CoresUsed == coresUsed &&
601-
clusterout.Location == Location &&
602-
clusterout.Name == ClusterName &&
603-
clusterout.OperatingSystemType == OSType.Linux)),
604-
Times.Once);
479+
CreateNewHDInsightCluster(workerNodeDataDisks: 8);
605480
}
606481

607482
[Fact]

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

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,7 @@ var storageAccount in
158158
{
159159
result.ComponentVersion.Add(component.Key, component.Value);
160160
}
161-
foreach (var dataDisksGroups in parameters.WorkerNodeDataDisksGroups.Where(d => d.DisksPerNode > 0))
162-
{
163-
result.DataDisksGroupProperties.Add(dataDisksGroups);
164-
}
161+
165162
return result;
166163
}
167164
set
@@ -213,10 +210,6 @@ var storageAccount in
213210
{
214211
parameters.ComponentVersion.Add(component.Key, component.Value);
215212
}
216-
foreach (var dataDisksGroups in value.DataDisksGroupProperties.Where(d => d.DisksPerNode > 0))
217-
{
218-
this.parameters.WorkerNodeDataDisksGroups.Add(dataDisksGroups);
219-
}
220213
}
221214
}
222215

@@ -294,13 +287,6 @@ public Dictionary<string, string> ComponentVersion
294287
set { parameters.ComponentVersion = value; }
295288
}
296289

297-
[Parameter(HelpMessage = "Gets or sets the data disks groups for worker node role in the cluster.")]
298-
public List<DataDisksGroupProperties> WorkerNodeDataDisksGroups
299-
{
300-
get { return parameters.WorkerNodeDataDisksGroups; }
301-
set { parameters.WorkerNodeDataDisksGroups = value; }
302-
}
303-
304290
[Parameter(HelpMessage = "Gets or sets the virtual network guid for this HDInsight cluster.")]
305291
public string VirtualNetworkId
306292
{
@@ -477,14 +463,13 @@ var storageAccount in
477463
};
478464
}
479465

480-
if (WorkerNodeDataDisksGroups != null)
466+
if (DisksPerWorkerNode > 0)
481467
{
482-
var dataDisksGroups = WorkerNodeDataDisksGroups;
483-
this.parameters.WorkerNodeDataDisksGroups = new List<DataDisksGroupProperties>()
468+
parameters.WorkerNodeDataDisksGroups = new List<DataDisksGroupProperties>()
484469
{
485470
new DataDisksGroupProperties()
486471
{
487-
DisksPerNode = dataDisksGroups.First().DisksPerNode
472+
DisksPerNode = DisksPerWorkerNode
488473
}
489474
};
490475
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ public AzureHDInsightCluster(Cluster cluster)
4848
WorkerNodeDataDisksGroups = new List<DataDisksGroupProperties>();
4949
if (cluster.Properties.ComputeProfile != null && cluster.Properties.ComputeProfile.Roles.Any())
5050
{
51-
foreach (var role in cluster.Properties.ComputeProfile.Roles)
51+
var rolesWithDataDisksGroups = cluster.Properties.ComputeProfile.Roles.Where(x => x.DataDisksGroups != null);
52+
foreach (var role in rolesWithDataDisksGroups)
5253
{
5354
WorkerNodeDataDisksGroups.AddRange(role.DataDisksGroups);
5455
}
@@ -188,7 +189,7 @@ public AzureHDInsightCluster(Cluster cluster, IDictionary<string, string> cluste
188189
public List<string> ComponentVersion { get; set; }
189190

190191
/// <summary>
191-
/// Data Disks Properties for the worker role.
192+
/// Data Disks Group Properties for the Worker Role.
192193
/// </summary>
193194
public List<DataDisksGroupProperties> WorkerNodeDataDisksGroups { get; set; }
194195

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ public class AzureHDInsightConfig
131131
public AzureHDInsightSecurityProfile SecurityProfile { get; set; }
132132

133133
/// <summary>
134-
/// Gets or sets the data disks groups properties for the cluster.
134+
/// Gets or sets the number of disks for worker node role for the cluster.
135135
/// </summary>
136-
public List<DataDisksGroupProperties> DataDisksGroupProperties { get; set; }
136+
public int DisksPerWorkerNode { get; set; }
137137

138138
public AzureHDInsightConfig()
139139
{
@@ -142,7 +142,6 @@ public AzureHDInsightConfig()
142142
Configurations = new Dictionary<string, Hashtable>();
143143
ScriptActions = new Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>>();
144144
ComponentVersion = new Dictionary<string, string>();
145-
DataDisksGroupProperties = new List<DataDisksGroupProperties>();
146145
}
147146
}
148147
}

‎tools/AzureRM/AzureRM.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '3.4.0';
8181
@{ModuleName = 'AzureRM.LogicApp'; RequiredVersion = '3.4.0'; },
8282
@{ModuleName = 'AzureRM.MachineLearning'; RequiredVersion = '0.15.6'; },
8383
@{ModuleName = 'AzureRM.MachineLearningCompute'; RequiredVersion = '0.1.0'},
84-
@{ModuleName = 'AzureRM.MarketplaceOrdering'; RequiredVersion = '0.1.0'; },
84+
@{ModuleName = 'AzureRM.MarketplaceOrdering'; RequiredVersion = '0.1.0'; },
8585
@{ModuleName = 'AzureRM.Media'; RequiredVersion = '0.7.6'; },
8686
@{ModuleName = 'AzureRM.Network'; RequiredVersion = '4.4.0'; },
8787
@{ModuleName = 'AzureRM.NotificationHubs'; RequiredVersion = '3.4.0'; },

0 commit comments

Comments
 (0)