Skip to content

Commit 0c73381

Browse files
Address Review comments
1 parent c11ec70 commit 0c73381

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

src/ResourceManager/Automation/Commands.Automation/Cmdlet/ImportAzureAutomationDscNodeConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace Microsoft.Azure.Commands.Automation.Cmdlet
2626
/// <summary>
2727
/// Imports dsc node configuration script
2828
/// </summary>
29-
[Cmdlet(VerbsData.Import, "AzureRMAutomationDscNodeConfiguration")]
29+
[Cmdlet(VerbsData.Import, "AzureRmAutomationDscNodeConfiguration")]
3030
[OutputType(typeof(NodeConfiguration))]
3131
public class ImportAzureAutomationDscNodeConfiguration : AzureAutomationBaseCmdlet
3232
{

src/ResourceManager/Automation/Commands.Automation/Cmdlet/RemoveAzureAutomationConnectionType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.Automation.Cmdlet
2424
/// <summary>
2525
/// Removes a Connection type for automation.
2626
/// </summary>
27-
[Cmdlet(VerbsCommon.Remove, "AzureRMAutomationConnectionType", DefaultParameterSetName = AutomationCmdletParameterSets.ByName)]
27+
[Cmdlet(VerbsCommon.Remove, "AzureRmAutomationConnectionType", DefaultParameterSetName = AutomationCmdletParameterSets.ByName)]
2828
public class RemoveAzureAutomationConnectionType : AzureAutomationBaseCmdlet
2929
{
3030
/// <summary>

src/ResourceManager/Automation/Commands.Automation/Cmdlet/StartAzureAutomationDscCompilationJob.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.Automation.Cmdlet
2828
/// <summary>
2929
/// starts azure automation compilation job
3030
/// </summary>
31-
[Cmdlet(VerbsLifecycle.Start, "AzureRMAutomationDscCompilationJob")]
31+
[Cmdlet(VerbsLifecycle.Start, "AzureRmAutomationDscCompilationJob")]
3232
[OutputType(typeof(CompilationJob))]
3333
public class StartAzureAutomationDscCompilationJob : AzureAutomationBaseCmdlet
3434
{

src/ResourceManager/Automation/Commands.Automation/Common/AutomationClientDSC.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,9 @@ public Model.DscConfiguration CreateConfiguration(
263263
string configrationName,
264264
string nodeName)
265265
{
266-
string configurationContent = "Configuration {0} { Node {1} { } } ";
267-
configurationContent = string.Format(configurationContent,configrationName,nodeName);
266+
string configurationContent = "Configuration #configrationName# { Node #nodeName# { } } ";
267+
configurationContent = configurationContent.Replace("#configrationName#", configrationName);
268+
configurationContent = configurationContent.Replace("#nodeName#", nodeName);
268269

269270
using (var request = new RequestSettings(this.automationManagementClient))
270271
{
@@ -1163,7 +1164,7 @@ public Model.NodeConfiguration GetNodeConfiguration(string resourceGroupName, st
11631164
var nodeConfigurations = new List<Model.NodeConfiguration>();
11641165
foreach (var nodeConfiguration in nodeConfigModels)
11651166
{
1166-
string computedRollupStatus = GetRollupStatus(resourceGroupName, automationAccountName, nodeConfiguration.Name);
1167+
string computedRollupStatus = GetRollupStatus(resourceGroupName, automationAccountName, nodeConfiguration.Configuration.Name);
11671168

11681169
if (string.IsNullOrEmpty(rollupStatus) || (rollupStatus != null && computedRollupStatus.Equals(rollupStatus)))
11691170
{
@@ -1196,7 +1197,8 @@ public Model.NodeConfiguration CreateNodeConfiguration(
11961197
if (File.Exists(Path.GetFullPath(sourcePath)))
11971198
{
11981199
fileContent = System.IO.File.ReadAllText(sourcePath);
1199-
nodeConfigurationName = configurationName + "." + System.IO.Path.GetFileNameWithoutExtension(sourcePath);
1200+
nodeName = System.IO.Path.GetFileNameWithoutExtension(sourcePath);
1201+
nodeConfigurationName = configurationName + "." + nodeName;
12001202
}
12011203
else
12021204
{

0 commit comments

Comments
 (0)