Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed obsoleted MachineStatus code. #85

Closed
wants to merge 1 commit into from
Closed

Removed obsoleted MachineStatus code. #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions source/Octo.Tests/Commands/CleanEnvironmentCommandFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using Octopus.Cli.Infrastructure;
using Octopus.Client.Model;
using FluentAssertions;
#pragma warning disable 618

namespace Octopus.Cli.Tests.Commands
{
Expand All @@ -25,7 +24,7 @@ public void SetUp()
public void ShouldCleanEnvironmentWithEnvironmentAndStatusArgs()
{
CommandLineArgs.Add("-environment=Development");
CommandLineArgs.Add("-status=Offline");
CommandLineArgs.Add("-status=Unavailable");

Repository.Environments.FindByName("Development").Returns(
new EnvironmentResource {Name = "Development", Id = "Environments-001"}
Expand All @@ -37,14 +36,14 @@ public void ShouldCleanEnvironmentWithEnvironmentAndStatusArgs()
{
Name = "PC01466",
Id = "Machines-002",
Status = MachineModelStatus.Offline,
HealthStatus = MachineModelHealthStatus.Unavailable,
EnvironmentIds = new ReferenceCollection("Environments-001")
},
new MachineResource
{
Name = "PC01996",
Id = "Machines-003",
Status = MachineModelStatus.Offline,
HealthStatus = MachineModelHealthStatus.Unavailable,
EnvironmentIds = new ReferenceCollection("Environments-001")
}
};
Expand All @@ -53,20 +52,20 @@ public void ShouldCleanEnvironmentWithEnvironmentAndStatusArgs()

listMachinesCommand.Execute(CommandLineArgs.ToArray());

Log.Received().Information("Found {0} machines in {1} with the status {2}", machineList.Count, "Development", MachineModelStatus.Offline.ToString());
Log.Received().Information("Found {0} machines in {1} with the status {2}", machineList.Count, "Development", MachineModelHealthStatus.Unavailable.ToString());

Log.Received().Information("Deleting {0} {1} (ID: {2})", machineList[0].Name, machineList[0].Status, machineList[0].Id);
Log.Received().Information("Deleting {0} {1} (ID: {2})", machineList[0].Name, machineList[0].HealthStatus, machineList[0].Id);
Repository.Machines.Received().Delete(machineList[0]);

Log.Received().Information("Deleting {0} {1} (ID: {2})", machineList[1].Name, machineList[1].Status, machineList[1].Id);
Log.Received().Information("Deleting {0} {1} (ID: {2})", machineList[1].Name, machineList[1].HealthStatus, machineList[1].Id);
Repository.Machines.Received().Delete(machineList[1]);
}

[Test]
public void ShouldRemoveMachinesBelongingToMultipleEnvironmentsInsteadOfDeleting()
{
CommandLineArgs.Add("-environment=Development");
CommandLineArgs.Add("-status=Offline");
CommandLineArgs.Add("-status=Unavailable");

Repository.Environments.FindByName("Development").Returns(
new EnvironmentResource {Name = "Development", Id = "Environments-001"}
Expand All @@ -78,14 +77,14 @@ public void ShouldRemoveMachinesBelongingToMultipleEnvironmentsInsteadOfDeleting
{
Name = "PC01466",
Id = "Machines-002",
Status = MachineModelStatus.Offline,
HealthStatus = MachineModelHealthStatus.Unavailable,
EnvironmentIds = new ReferenceCollection(new[] {"Environments-001", "Environments-002"})
},
new MachineResource
{
Name = "PC01996",
Id = "Machines-003",
Status = MachineModelStatus.Offline,
HealthStatus = MachineModelHealthStatus.Unavailable,
EnvironmentIds = new ReferenceCollection("Environments-001")
}
};
Expand All @@ -94,14 +93,14 @@ public void ShouldRemoveMachinesBelongingToMultipleEnvironmentsInsteadOfDeleting

listMachinesCommand.Execute(CommandLineArgs.ToArray());

Log.Received().Information("Found {0} machines in {1} with the status {2}", machineList.Count, "Development", MachineModelStatus.Offline.ToString());
Log.Received().Information("Found {0} machines in {1} with the status {2}", machineList.Count, "Development", MachineModelHealthStatus.Unavailable.ToString());
Log.Received().Information("Note: Some of these machines belong to multiple environments. Instead of being deleted, these machines will be removed from the {0} environment.", "Development");

Log.Received().Information("Removing {0} {1} (ID: {2}) from {3}", machineList[0].Name, machineList[0].Status, machineList[0].Id, "Development");
Log.Received().Information("Removing {0} {1} (ID: {2}) from {3}", machineList[0].Name, machineList[0].HealthStatus, machineList[0].Id, "Development");
Assert.That(machineList[0].EnvironmentIds.Count, Is.EqualTo(1), "The machine should have been removed from the Development environment.");
Repository.Machines.Received().Modify(machineList[0]);

Log.Received().Information("Deleting {0} {1} (ID: {2})", machineList[1].Name, machineList[1].Status, machineList[1].Id);
Log.Received().Information("Deleting {0} {1} (ID: {2})", machineList[1].Name, machineList[1].HealthStatus, machineList[1].Id);
Repository.Machines.Received().Delete(machineList[1]);
}

Expand All @@ -126,7 +125,7 @@ public void ShouldNotCleanEnvironmentWithMissingStatusArgs()
public void ShouldNotCleanTheEnvironmentIfEnvironmentNotFound()
{
CommandLineArgs.Add("-environment=Development");
CommandLineArgs.Add("-status=Offline");
CommandLineArgs.Add("-status=Unavailable");

Action exec = () => listMachinesCommand.Execute(CommandLineArgs.ToArray());
exec.ShouldThrow<CouldNotFindException>()
Expand Down
59 changes: 25 additions & 34 deletions source/Octo.Tests/Commands/ListMachinesCommandFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Octopus.Client.Model;
using Octopus.Client.Model.Endpoints;

#pragma warning disable 618

namespace Octopus.Cli.Tests.Commands
{
Expand All @@ -30,7 +29,7 @@ public void SetUp()
public void ShouldGetListOfMachinesWithEnvironmentAndStatusArgs()
{
CommandLineArgs.Add("-environment=Development");
CommandLineArgs.Add("-status=Offline");
CommandLineArgs.Add("-status=Unavailable");

Repository.Environments.FindAll().Returns(new List<EnvironmentResource>
{
Expand All @@ -43,31 +42,31 @@ public void ShouldGetListOfMachinesWithEnvironmentAndStatusArgs()
{
Name = "PC01234",
Id = "Machines-001",
Status = MachineModelStatus.Online,
HealthStatus = MachineModelHealthStatus.Healthy,
EnvironmentIds = new ReferenceCollection("Environments-001")
},
new MachineResource
{
Name = "PC01996",
Id = "Machines-003",
Status = MachineModelStatus.Offline,
HealthStatus = MachineModelHealthStatus.Unhealthy,
EnvironmentIds = new ReferenceCollection("Environments-001")
},
new MachineResource
{
Name = "PC01466",
Id = "Machines-002",
Status = MachineModelStatus.Offline,
HealthStatus = MachineModelHealthStatus.Unhealthy,
EnvironmentIds = new ReferenceCollection("Environments-001")
}
});

listMachinesCommand.Execute(CommandLineArgs.ToArray());

Log.Received().Information("Machines: 2");
Log.Received().Information(MachineLogFormat, "PC01466", MachineModelStatus.Offline.ToString(), "Machines-002", "Development");
Log.Received().Information(MachineLogFormat, "PC01996", MachineModelStatus.Offline.ToString(), "Machines-003", "Development");
Log.DidNotReceive().Information(MachineLogFormat, "PC01234", MachineModelStatus.Online.ToString(), "Machines-001", "Development");
Log.Received().Information(MachineLogFormat, "PC01466", MachineModelHealthStatus.Unhealthy.ToString(), "Machines-002", "Development");
Log.Received().Information(MachineLogFormat, "PC01996", MachineModelHealthStatus.Unhealthy.ToString(), "Machines-003", "Development");
Log.DidNotReceive().Information(MachineLogFormat, "PC01234", MachineModelHealthStatus.Healthy.ToString(), "Machines-001", "Development");
}

[Test]
Expand All @@ -86,17 +85,17 @@ public void ShouldGetListOfMachinesWithEnvironmentArgs()
{
Name = "PC01234",
Id = "Machines-001",
Status = MachineModelStatus.Online,
HealthStatus = MachineModelHealthStatus.Healthy,
EnvironmentIds = new ReferenceCollection("Environments-001")
}
});

listMachinesCommand.Execute(CommandLineArgs.ToArray());

Log.Received().Information("Machines: 1");
Log.Received().Information(MachineLogFormat, "PC01234", MachineModelStatus.Online.ToString(), "Machines-001", "Development");
Log.DidNotReceive().Information(MachineLogFormat, "PC01466", MachineModelStatus.Online.ToString(), "Machines-002", "Development");
Log.DidNotReceive().Information(MachineLogFormat, "PC01996", MachineModelStatus.Offline.ToString(), "Machines-003", "Development");
Log.Received().Information(MachineLogFormat, "PC01234", MachineModelHealthStatus.Healthy.ToString(), "Machines-001", "Development");
Log.DidNotReceive().Information(MachineLogFormat, "PC01466", MachineModelHealthStatus.Healthy.ToString(), "Machines-002", "Development");
Log.DidNotReceive().Information(MachineLogFormat, "PC01996", MachineModelHealthStatus.Unavailable.ToString(), "Machines-003", "Development");
}

[Test]
Expand All @@ -112,29 +111,27 @@ public void ShouldGetListOfMachinesWithNoArgs()
new MachineResource {
Name = "PC01234",
Id = "Machines-001",
Status = MachineModelStatus.Online,
HealthStatus = MachineModelHealthStatus.Healthy,
EnvironmentIds = new ReferenceCollection("Environments-001")
},
new MachineResource {
Name = "PC01466",
Id = "Machines-002",
Status = MachineModelStatus.Online,
HealthStatus = MachineModelHealthStatus.Healthy,
EnvironmentIds = new ReferenceCollection("Environments-001")
}
});

listMachinesCommand.Execute(CommandLineArgs.ToArray());
Log.Received().Information("Machines: 2");
Log.Received().Information(MachineLogFormat, "PC01234", MachineModelStatus.Online.ToString(), "Machines-001", "Development");
Log.Received().Information(MachineLogFormat, "PC01466", MachineModelStatus.Online.ToString(), "Machines-002", "Development");
Log.Received().Information(MachineLogFormat, "PC01234", MachineModelHealthStatus.Healthy.ToString(), "Machines-001", "Development");
Log.Received().Information(MachineLogFormat, "PC01466", MachineModelHealthStatus.Healthy.ToString(), "Machines-002", "Development");
}

[Test]
public void ShouldGetListOfMachinesWithOfflineStatusArgs()
{
CommandLineArgs.Add("-status=Offline");
CommandLineArgs.Add("-status=Unavailable");

Repository.Environments.FindAll().Returns(new List<EnvironmentResource>
{
Expand All @@ -146,28 +143,28 @@ public void ShouldGetListOfMachinesWithOfflineStatusArgs()
new MachineResource {
Name = "PC0123",
Id = "Machines-001",
Status = MachineModelStatus.Online,
HealthStatus = MachineModelHealthStatus.Healthy,
EnvironmentIds = new ReferenceCollection("Environments-001")
},
new MachineResource {
Name = "PC01466",
Id = "Machines-002",
Status = MachineModelStatus.Online,
HealthStatus = MachineModelHealthStatus.Healthy,
EnvironmentIds = new ReferenceCollection("Environments-001")
},
new MachineResource {
Name = "PC01996",
Id = "Machines-003",
Status = MachineModelStatus.Offline,
HealthStatus = MachineModelHealthStatus.Unavailable,
EnvironmentIds = new ReferenceCollection("Environments-001")}
});

listMachinesCommand.Execute(CommandLineArgs.ToArray());

Log.Received().Information("Machines: 1");
Log.DidNotReceive().Information(MachineLogFormat, "PC01234", MachineModelStatus.Online.ToString(), "Machines-001", "Development");
Log.DidNotReceive().Information(MachineLogFormat, "PC01466", MachineModelStatus.Online.ToString(), "Machines-002", "Development");
Log.Received().Information(MachineLogFormat, "PC01996", MachineModelStatus.Offline.ToString(), "Machines-003", "Development");
Log.DidNotReceive().Information(MachineLogFormat, "PC01234", MachineModelHealthStatus.Healthy.ToString(), "Machines-001", "Development");
Log.DidNotReceive().Information(MachineLogFormat, "PC01466", MachineModelHealthStatus.Healthy.ToString(), "Machines-002", "Development");
Log.Received().Information(MachineLogFormat, "PC01996", MachineModelHealthStatus.Unavailable.ToString(), "Machines-003", "Development");
}

[Test]
Expand All @@ -185,21 +182,18 @@ public void ShouldGetListOfMachinesWithMachineHealthStatusArgs()
new MachineResource {
Name = "PC0123",
Id = "Machines-001",
Status = MachineModelStatus.Online,
HealthStatus = MachineModelHealthStatus.Unavailable,
EnvironmentIds = new ReferenceCollection("Environments-001")
},
new MachineResource {
Name = "PC01466",
Id = "Machines-002",
Status = MachineModelStatus.Online,
HealthStatus = MachineModelHealthStatus.HasWarnings,
EnvironmentIds = new ReferenceCollection("Environments-001")
},
new MachineResource {
Name = "PC01996",
Id = "Machines-003",
Status = MachineModelStatus.Offline,
HealthStatus = MachineModelHealthStatus.Healthy,
EnvironmentIds = new ReferenceCollection("Environments-001")}
});
Expand All @@ -225,21 +219,18 @@ public void ShouldLogWarningIfUsingStatusOn34Repo()
new MachineResource {
Name = "PC0123",
Id = "Machines-001",
Status = MachineModelStatus.Online,
HealthStatus = MachineModelHealthStatus.Unavailable,
EnvironmentIds = new ReferenceCollection("Environments-001")
},
new MachineResource {
Name = "PC01466",
Id = "Machines-002",
Status = MachineModelStatus.Online,
HealthStatus = MachineModelHealthStatus.HasWarnings,
EnvironmentIds = new ReferenceCollection("Environments-001")
},
new MachineResource {
Name = "PC01996",
Id = "Machines-003",
Status = MachineModelStatus.Offline,
HealthStatus = MachineModelHealthStatus.Healthy,
EnvironmentIds = new ReferenceCollection("Environments-001")}
});
Expand Down Expand Up @@ -337,28 +328,28 @@ public void ShouldGetListOfMachinesWithStatusArgs()
new MachineResource {
Name = "PC01234",
Id = "Machines-001",
Status = MachineModelStatus.Online,
HealthStatus = MachineModelHealthStatus.Healthy,
EnvironmentIds = new ReferenceCollection("Environments-001")
},
new MachineResource {
Name = "PC01466",
Id = "Machines-002",
Status = MachineModelStatus.Online,
HealthStatus = MachineModelHealthStatus.Healthy,
EnvironmentIds = new ReferenceCollection("Environments-001")
},
new MachineResource {
Name = "PC01996",
Id = "Machines-003",
Status = MachineModelStatus.Offline,
HealthStatus = MachineModelHealthStatus.Unhealthy,
EnvironmentIds = new ReferenceCollection("Environments-001")
}
});

listMachinesCommand.Execute(CommandLineArgs.ToArray());

Log.Received().Information("Machines: 2");
Log.Received().Information(MachineLogFormat, "PC01234", MachineModelStatus.Online.ToString(), "Machines-001", "Development");
Log.Received().Information(MachineLogFormat, "PC01466", MachineModelStatus.Online.ToString(), "Machines-002", "Development");
Log.Received().Information(MachineLogFormat, "PC01234", MachineModelHealthStatus.Healthy.ToString(), "Machines-001", "Development");
Log.Received().Information(MachineLogFormat, "PC01466", MachineModelHealthStatus.Healthy.ToString(), "Machines-002", "Development");
}
}
}
5 changes: 3 additions & 2 deletions source/Octo.Tests/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@
},
"buildOptions": {
"copyToOutput": {
"include": ["Commands/Resources/**"]
}
"include": [ "Commands/Resources/**" ]
},
"warningsAsErrors": true
},
"testRunner": "nunit",
"frameworks": {
Expand Down
5 changes: 2 additions & 3 deletions source/Octo/Commands/CleanEnvironmentCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using Octopus.Client.Model;
using Octopus.Client.Model.Endpoints;

#pragma warning disable 618

namespace Octopus.Cli.Commands
{
Expand Down Expand Up @@ -62,14 +61,14 @@ private void CleanUpEnvironment(List<MachineResource> filteredMachines, Environm
// If the machine belongs to more than one environment, we should remove the machine from the environment rather than delete it altogether.
if (machine.EnvironmentIds.Count > 1)
{
Log.Information("Removing {0} {1} (ID: {2}) from {3}", machine.Name, machine.Status, machine.Id,
Log.Information("Removing {0} {1} (ID: {2}) from {3}", machine.Name, machine.HealthStatus, machine.Id,
environmentResource.Name);
machine.EnvironmentIds.Remove(environmentResource.Id);
Repository.Machines.Modify(machine);
}
else
{
Log.Information("Deleting {0} {1} (ID: {2})", machine.Name, machine.Status, machine.Id);
Log.Information("Deleting {0} {1} (ID: {2})", machine.Name, machine.HealthStatus, machine.Id);
Repository.Machines.Delete(machine);
}
}
Expand Down
Loading