From ef89131b851a69f28da8b6c2309b677f3048436e Mon Sep 17 00:00:00 2001
From: Peng Tao <bergwolf@gmail.com>
Date: Wed, 18 Apr 2018 11:43:43 +0800
Subject: [PATCH] api: add sandbox Delete API

By exporting the existing sandbox delete() function.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
---
 virtcontainers/api.go                | 2 +-
 virtcontainers/interfaces.go         | 1 +
 virtcontainers/pkg/vcmock/sandbox.go | 5 +++++
 virtcontainers/sandbox.go            | 4 ++--
 virtcontainers/sandbox_test.go       | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/virtcontainers/api.go b/virtcontainers/api.go
index 208abb8408..3603f8ee35 100644
--- a/virtcontainers/api.go
+++ b/virtcontainers/api.go
@@ -85,7 +85,7 @@ func DeleteSandbox(sandboxID string) (VCSandbox, error) {
 	}
 
 	// Delete it.
-	if err := p.delete(); err != nil {
+	if err := p.Delete(); err != nil {
 		return nil, err
 	}
 
diff --git a/virtcontainers/interfaces.go b/virtcontainers/interfaces.go
index 06dbc8b49f..1787f942e2 100644
--- a/virtcontainers/interfaces.go
+++ b/virtcontainers/interfaces.go
@@ -49,6 +49,7 @@ type VCSandbox interface {
 	Pause() error
 	Resume() error
 	Release() error
+	Delete() error
 }
 
 // VCContainer is the Container interface
diff --git a/virtcontainers/pkg/vcmock/sandbox.go b/virtcontainers/pkg/vcmock/sandbox.go
index a849739e2f..2c33d74da4 100644
--- a/virtcontainers/pkg/vcmock/sandbox.go
+++ b/virtcontainers/pkg/vcmock/sandbox.go
@@ -64,3 +64,8 @@ func (p *Sandbox) Pause() error {
 func (p *Sandbox) Resume() error {
 	return nil
 }
+
+// Delete implements the VCSandbox function of the same name.
+func (p *Sandbox) Delete() error {
+	return nil
+}
diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go
index ab75c6ce80..be96807668 100644
--- a/virtcontainers/sandbox.go
+++ b/virtcontainers/sandbox.go
@@ -765,9 +765,9 @@ func (s *Sandbox) removeContainer(containerID string) error {
 		containerID, s.id)
 }
 
-// delete deletes an already created sandbox.
+// Delete deletes an already created sandbox.
 // The VM in which the sandbox is running will be shut down.
-func (s *Sandbox) delete() error {
+func (s *Sandbox) Delete() error {
 	if s.state.State != StateReady &&
 		s.state.State != StatePaused &&
 		s.state.State != StateStopped {
diff --git a/virtcontainers/sandbox_test.go b/virtcontainers/sandbox_test.go
index ab12b58390..d58e9b9811 100644
--- a/virtcontainers/sandbox_test.go
+++ b/virtcontainers/sandbox_test.go
@@ -605,7 +605,7 @@ func TestSandboxSetSandboxAndContainerState(t *testing.T) {
 	}
 
 	// clean up
-	err = p.delete()
+	err = p.Delete()
 	if err != nil {
 		t.Fatal(err)
 	}