summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSujil02 <sushah@redhat.com>2020-05-21 18:23:12 -0400
committerSujil02 <sushah@redhat.com>2020-05-22 07:49:55 -0400
commita61f9fd54703c2e77ede4e0e1504f2e499eb5baf (patch)
treee60bccf54ec9b9615298db82f4687d5edd21849b
parent05a061282c02331425e1caceae80c6b44b7dc9ec (diff)
downloadpodman-a61f9fd54703c2e77ede4e0e1504f2e499eb5baf.tar.gz
podman-a61f9fd54703c2e77ede4e0e1504f2e499eb5baf.tar.bz2
podman-a61f9fd54703c2e77ede4e0e1504f2e499eb5baf.zip
Removes remote system reset functionality. skip e2e test for remote.
As system reset too dangerous for remote use, deleting the functionality and the test case. Signed-off-by: Sujil02 <sushah@redhat.com>
-rw-r--r--pkg/api/handlers/libpod/system.go10
-rw-r--r--pkg/api/server/register_system.go14
-rw-r--r--pkg/bindings/system/system.go13
-rw-r--r--pkg/bindings/test/system_test.go42
-rw-r--r--pkg/domain/infra/tunnel/system.go5
-rw-r--r--test/e2e/system_reset_test.go2
6 files changed, 1 insertions, 85 deletions
diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go
index 81ed37b4a..f575546c9 100644
--- a/pkg/api/handlers/libpod/system.go
+++ b/pkg/api/handlers/libpod/system.go
@@ -71,16 +71,6 @@ func SystemPrune(w http.ResponseWriter, r *http.Request) {
utils.WriteResponse(w, http.StatusOK, systemPruneReport)
}
-// SystemReset Resets podman storage back to default state
-func SystemReset(w http.ResponseWriter, r *http.Request) {
- err := r.Context().Value("runtime").(*libpod.Runtime).Reset(r.Context())
- if err != nil {
- utils.InternalServerError(w, err)
- return
- }
- utils.WriteResponse(w, http.StatusOK, nil)
-}
-
func DiskUsage(w http.ResponseWriter, r *http.Request) {
// Options are only used by the CLI
options := entities.SystemDfOptions{}
diff --git a/pkg/api/server/register_system.go b/pkg/api/server/register_system.go
index 8a942a888..118ad2d08 100644
--- a/pkg/api/server/register_system.go
+++ b/pkg/api/server/register_system.go
@@ -27,20 +27,6 @@ func (s *APIServer) registerSystemHandlers(r *mux.Router) error {
// 500:
// $ref: "#/responses/InternalError"
r.Handle(VersionedPath("/libpod/system/prune"), s.APIHandler(libpod.SystemPrune)).Methods(http.MethodPost)
- // swagger:operation POST /libpod/system/reset libpod resetSystem
- // ---
- // tags:
- // - system
- // summary: Reset podman storage
- // description: All containers will be stopped and removed, and all images, volumes and container content will be removed.
- // produces:
- // - application/json
- // responses:
- // 200:
- // description: no error
- // 500:
- // $ref: "#/responses/InternalError"
- r.Handle(VersionedPath("/libpod/system/reset"), s.APIHandler(libpod.SystemReset)).Methods(http.MethodPost)
// swagger:operation GET /libpod/system/df libpod df
// ---
// tags:
diff --git a/pkg/bindings/system/system.go b/pkg/bindings/system/system.go
index ed960b8e0..5348d0cfb 100644
--- a/pkg/bindings/system/system.go
+++ b/pkg/bindings/system/system.go
@@ -122,19 +122,6 @@ func Version(ctx context.Context) (*entities.SystemVersionReport, error) {
return &report, err
}
-// Reset removes all unused system data.
-func Reset(ctx context.Context) error {
- conn, err := bindings.GetClient(ctx)
- if err != nil {
- return err
- }
- response, err := conn.DoRequest(nil, http.MethodPost, "/system/reset", nil)
- if err != nil {
- return err
- }
- return response.Process(response)
-}
-
// DiskUsage returns information about image, container, and volume disk
// consumption
func DiskUsage(ctx context.Context) (*entities.SystemDfReport, error) {
diff --git a/pkg/bindings/test/system_test.go b/pkg/bindings/test/system_test.go
index fb2df258b..27ab2f555 100644
--- a/pkg/bindings/test/system_test.go
+++ b/pkg/bindings/test/system_test.go
@@ -5,7 +5,6 @@ import (
"github.com/containers/libpod/pkg/bindings"
"github.com/containers/libpod/pkg/bindings/containers"
- "github.com/containers/libpod/pkg/bindings/images"
"github.com/containers/libpod/pkg/bindings/pods"
"github.com/containers/libpod/pkg/bindings/system"
"github.com/containers/libpod/pkg/bindings/volumes"
@@ -150,45 +149,4 @@ var _ = Describe("Podman system", func() {
// Volume should be pruned now as flag set true
Expect(len(systemPruneResponse.VolumePruneReport)).To(Equal(1))
})
-
- It("podman system reset", func() {
- // Adding an unused volume should work
- _, err := volumes.Create(bt.conn, entities.VolumeCreateOptions{})
- Expect(err).To(BeNil())
-
- vols, err := volumes.List(bt.conn, nil)
- Expect(err).To(BeNil())
- Expect(len(vols)).To(Equal(1))
-
- // Start a pod and leave it running
- _, err = pods.Start(bt.conn, newpod)
- Expect(err).To(BeNil())
-
- imageSummary, err := images.List(bt.conn, nil, nil)
- Expect(err).To(BeNil())
- // Since in the begin context images are created
- Expect(len(imageSummary)).To(Equal(3))
-
- err = system.Reset(bt.conn)
- Expect(err).To(BeNil())
-
- // re-establish connection
- s = bt.startAPIService()
- time.Sleep(1 * time.Second)
-
- // No pods
- podSummary, err := pods.List(bt.conn, nil)
- Expect(err).To(BeNil())
- Expect(len(podSummary)).To(Equal(0))
-
- // No images
- imageSummary, err = images.List(bt.conn, bindings.PTrue, nil)
- Expect(err).To(BeNil())
- Expect(len(imageSummary)).To(Equal(0))
-
- // no volumes
- vols, err = volumes.List(bt.conn, nil)
- Expect(err).To(BeNil())
- Expect(len(vols)).To(BeZero())
- })
})
diff --git a/pkg/domain/infra/tunnel/system.go b/pkg/domain/infra/tunnel/system.go
index 829af31f6..109e6c1d7 100644
--- a/pkg/domain/infra/tunnel/system.go
+++ b/pkg/domain/infra/tunnel/system.go
@@ -27,11 +27,6 @@ func (ic *ContainerEngine) SystemPrune(ctx context.Context, options entities.Sys
return system.Prune(ic.ClientCxt, &options.All, &options.Volume)
}
-// Reset removes all storage
-func (ic *SystemEngine) Reset(ctx context.Context) error {
- return system.Reset(ic.ClientCxt)
-}
-
func (ic *ContainerEngine) SystemDf(ctx context.Context, options entities.SystemDfOptions) (*entities.SystemDfReport, error) {
return system.DiskUsage(ic.ClientCxt)
}
diff --git a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go
index f45ff0c5f..63e77af86 100644
--- a/test/e2e/system_reset_test.go
+++ b/test/e2e/system_reset_test.go
@@ -34,7 +34,7 @@ var _ = Describe("podman system reset", func() {
})
It("podman system reset", func() {
- Skip(v2remotefail)
+ SkipIfRemote()
// system reset will not remove additional store images, so need to grab length
session := podmanTest.Podman([]string{"rmi", "--force", "--all"})