diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-28 15:15:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-28 15:15:51 +0200 |
commit | ffe87c0bdfdd5f4be596731b2a31c44745a5dbfa (patch) | |
tree | 4f83af8ff1f361598613a022d18e3bf5bb6554e0 | |
parent | e1699d8591ab87717ae018583c896561c43efb29 (diff) | |
parent | 82ed99b6afa9ec67539afd6e3d9e299ea5c4e74b (diff) | |
download | podman-ffe87c0bdfdd5f4be596731b2a31c44745a5dbfa.tar.gz podman-ffe87c0bdfdd5f4be596731b2a31c44745a5dbfa.tar.bz2 podman-ffe87c0bdfdd5f4be596731b2a31c44745a5dbfa.zip |
Merge pull request #13677 from flouthoc/rename-event
libpod, event: generate a valid event on container `rename` operation
-rw-r--r-- | libpod/events/config.go | 2 | ||||
-rw-r--r-- | libpod/events/events.go | 2 | ||||
-rw-r--r-- | libpod/runtime_ctr.go | 1 | ||||
-rw-r--r-- | test/e2e/rename_test.go | 17 |
4 files changed, 22 insertions, 0 deletions
diff --git a/libpod/events/config.go b/libpod/events/config.go index d88d7b6e3..188d15578 100644 --- a/libpod/events/config.go +++ b/libpod/events/config.go @@ -162,6 +162,8 @@ const ( Refresh Status = "refresh" // Remove ... Remove Status = "remove" + // Rename indicates that a container was renamed + Rename Status = "rename" // Renumber indicates that lock numbers were reallocated at user // request. Renumber Status = "renumber" diff --git a/libpod/events/events.go b/libpod/events/events.go index 16dd6424e..d7bba7295 100644 --- a/libpod/events/events.go +++ b/libpod/events/events.go @@ -188,6 +188,8 @@ func StringToStatus(name string) (Status, error) { return Refresh, nil case Remove.String(): return Remove, nil + case Rename.String(): + return Rename, nil case Renumber.String(): return Renumber, nil case Restart.String(): diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index fc1a688fb..8c3d283a5 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -155,6 +155,7 @@ func (r *Runtime) RenameContainer(ctx context.Context, ctr *Container, newName s return nil, err } + ctr.newContainerEvent(events.Rename) return ctr, nil } diff --git a/test/e2e/rename_test.go b/test/e2e/rename_test.go index c146eb410..ef90c3f22 100644 --- a/test/e2e/rename_test.go +++ b/test/e2e/rename_test.go @@ -74,6 +74,23 @@ var _ = Describe("podman rename", func() { Expect(ps.OutputToString()).To(ContainSubstring(newName)) }) + It("Successfully rename a created container and test event generated", func() { + ctrName := "testCtr" + ctr := podmanTest.Podman([]string{"create", "--name", ctrName, ALPINE, "top"}) + ctr.WaitWithDefaultTimeout() + Expect(ctr).Should(Exit(0)) + + newName := "aNewName" + rename := podmanTest.Podman([]string{"rename", ctrName, newName}) + rename.WaitWithDefaultTimeout() + Expect(rename).Should(Exit(0)) + + result := podmanTest.Podman([]string{"events", "--stream=false", "--filter", "container=aNewName"}) + result.WaitWithDefaultTimeout() + Expect(result).Should(Exit(0)) + Expect(result.OutputToString()).To(ContainSubstring("rename")) + }) + It("Successfully rename a running container", func() { ctrName := "testCtr" ctr := podmanTest.Podman([]string{"run", "-d", "--name", ctrName, ALPINE, "top"}) |