This fix removes code duplication and consolidates networkIsRemoved into one place. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> (cherry picked from commit 28b7824caa9c8f1acc0471136a8a4fd80e51f491) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: dd20556e037b262473f3f8163dfc7c21e9161c8e Component: engine
21 lines
550 B
Go
21 lines
550 B
Go
package network
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/client"
|
|
"gotest.tools/poll"
|
|
)
|
|
|
|
// IsRemoved verifies the network is removed.
|
|
func IsRemoved(ctx context.Context, client client.NetworkAPIClient, networkID string) func(log poll.LogT) poll.Result {
|
|
return func(log poll.LogT) poll.Result {
|
|
_, err := client.NetworkInspect(ctx, networkID, types.NetworkInspectOptions{})
|
|
if err == nil {
|
|
return poll.Continue("waiting for network %s to be removed", networkID)
|
|
}
|
|
return poll.Success()
|
|
}
|
|
}
|