Skip to content

Commit

Permalink
Merge branch '224-add-command-to-allow-server-to-be-rebooted-straight…
Browse files Browse the repository at this point in the history
…-into-neboot-environment' into 'develop'

Resolve "Add command to allow server to be rebooted straight into neboot environment"

Closes #224

See merge request open-source/bytemark-client!231
  • Loading branch information
telyn committed Mar 22, 2018
2 parents df7799f + 37d0974 commit bade9d2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions cmd/bytemark/power.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ func init() {
c.Log("Done!\n\nStarting %s back up.", vmName)
if appliance != "" {
err = brainMethods.StartVirtualMachineWithAppliance(c.Client(), vmName, appliance)
c.Log("Server has now started. Use bytemark console %v` or visit https://%v to connect.", c.String("server"), c.Config().PanelURL())
} else {
err = c.Client().StartVirtualMachine(vmName)
}
Expand Down
1 change: 1 addition & 0 deletions cmd/bytemark/power_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ func TestRestartCommand(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
config, client, app := testutil.BaseTestAuthSetup(t, false, commands)
config.When("GetVirtualMachine").Return(defVM)
config.When("PanelURL").Return("something.com")

client.When("ShutdownVirtualMachine", test.vmname, true).Times(1)
client.When("GetVirtualMachine", test.vmname).Return(brain.VirtualMachine{PowerOn: false})
Expand Down

0 comments on commit bade9d2

Please sign in to comment.