Browse Source

Merge pull request #1323 from aboch/sbr

Return proper error types on sandbox creation
Madhu Venugopal 9 years ago
parent
commit
68e53443c9
1 changed files with 2 additions and 2 deletions
  1. 2 2
      libnetwork/controller.go

+ 2 - 2
libnetwork/controller.go

@@ -806,7 +806,7 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (s
 			// If not a stub, then we already have a complete sandbox.
 			// If not a stub, then we already have a complete sandbox.
 			if !s.isStub {
 			if !s.isStub {
 				c.Unlock()
 				c.Unlock()
-				return nil, types.BadRequestErrorf("container %s is already present: %v", containerID, s)
+				return nil, types.ForbiddenErrorf("container %s is already present: %v", containerID, s)
 			}
 			}
 
 
 			// We already have a stub sandbox from the
 			// We already have a stub sandbox from the
@@ -841,7 +841,7 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (s
 	c.Lock()
 	c.Lock()
 	if sb.ingress && c.ingressSandbox != nil {
 	if sb.ingress && c.ingressSandbox != nil {
 		c.Unlock()
 		c.Unlock()
-		return nil, fmt.Errorf("ingress sandbox already present")
+		return nil, types.ForbiddenErrorf("ingress sandbox already present")
 	}
 	}
 
 
 	if sb.ingress {
 	if sb.ingress {