matthew/packer-plugin-xenserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fmt step_wait, interruptible_wait

Browse Source
This commit is contained in:
Cheng Sun 2014-12-09 11:17:35 +00:00
parent cadf3a5d6a
commit efbc365b6d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builder/xenserver/interruptible_wait.go
View File

@ -6,24 +6,26 @@ import (
) )
type InterruptibleWait struct { type InterruptibleWait struct {
Predicate func () (result bool, err error) Predicate func() (result bool, err error)
PredicateInterval time.Duration PredicateInterval time.Duration
Timeout time.Duration Timeout time.Duration
} }
type TimeoutError struct { } type TimeoutError struct{}
func (err TimeoutError) Error() string { func (err TimeoutError) Error() string {
return "Timed out" return "Timed out"
} }
type InterruptedError struct { } type InterruptedError struct{}
func (err InterruptedError) Error() string { func (err InterruptedError) Error() string {
return "Interrupted" return "Interrupted"
} }
type PredicateResult struct { type PredicateResult struct {
complete bool complete bool
err error err error
} }
func (wait InterruptibleWait) Wait(state multistep.StateBag) error { func (wait InterruptibleWait) Wait(state multistep.StateBag) error {

4
builder/xenserver/step_wait.go
View File

@ -20,12 +20,12 @@ func (self *stepWait) Run(state multistep.StateBag) multistep.StepAction {
//Expect install to be configured to shutdown on completion //Expect install to be configured to shutdown on completion
err := InterruptibleWait{ err := InterruptibleWait{
Predicate: func () (bool, error) { Predicate: func() (bool, error) {
power_state, err := instance.GetPowerState() power_state, err := instance.GetPowerState()
return power_state == "Halted", err return power_state == "Halted", err
}, },
PredicateInterval: 30 * time.Second, PredicateInterval: 30 * time.Second,
Timeout: config.InstallTimeout, Timeout: config.InstallTimeout,
}.Wait(state) }.Wait(state)
if err != nil { if err != nil {