Skip to content

Commit

Permalink
Merge pull request kata-containers#229 from jshachm/fix-pod-to-sandbox
Browse files Browse the repository at this point in the history
runtime: fix codes misunderstanding after rename pod to sandbox
  • Loading branch information
WeiZhang555 authored Apr 18, 2018
2 parents a4b7e20 + a050c15 commit fdadb04
Show file tree
Hide file tree
Showing 2 changed files with 135 additions and 135 deletions.
12 changes: 6 additions & 6 deletions virtcontainers/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,32 +48,32 @@ func CreateSandbox(sandboxConfig SandboxConfig) (VCSandbox, error) {

func createSandboxFromConfig(sandboxConfig SandboxConfig) (*Sandbox, error) {
// Create the sandbox.
p, err := createSandbox(sandboxConfig)
s, err := createSandbox(sandboxConfig)
if err != nil {
return nil, err
}

// Create the sandbox network
if err := p.createNetwork(); err != nil {
if err := s.createNetwork(); err != nil {
return nil, err
}

// Start the VM
if err := p.startVM(); err != nil {
if err := s.startVM(); err != nil {
return nil, err
}

// Create Containers
if err := p.createContainers(); err != nil {
if err := s.createContainers(); err != nil {
return nil, err
}

// The sandbox is completely created now, we can store it.
if err := p.storeSandbox(); err != nil {
if err := s.storeSandbox(); err != nil {
return nil, err
}

return p, nil
return s, nil
}

// DeleteSandbox is the virtcontainers sandbox deletion entry point.
Expand Down
Loading

0 comments on commit fdadb04

Please sign in to comment.