From 9074565f4e623124f17ce02657e35d658abafae5 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Tue, 25 Sep 2018 10:09:16 -0700 Subject: Implement pod varlink bindings * Update varlink document * Add NoContainersInPod error in go and python * Add support for varlink pod interface * New code passes pylint * Fix bug in test_runner.sh * Update integration tests for race condition on status check * Add missing port config file support Signed-off-by: Jhon Honce --- cmd/podman/varlink/io.podman.varlink | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cmd') diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink index 810f757ca..88ae45fb1 100644 --- a/cmd/podman/varlink/io.podman.varlink +++ b/cmd/podman/varlink/io.podman.varlink @@ -820,6 +820,10 @@ error PodNotFound (name: string) # a container ID of the container that failed. error PodContainerError (podname: string, errors: []PodContainerErrorData) +# NoContainersInPod means a pod has no containers on which to perform operation. It contains +# the pod ID. +error NoContainersInPod (name: string) + # ErrorOccurred is a generic error for an error that occurs during the execution. The actual error message # is includes as part of the error's text. error ErrorOccurred (reason: string) -- cgit v1.2.3-54-g00ecf From ff38edaafefa1cdac9a87a1a08b8f4fcd94ae996 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Fri, 28 Sep 2018 14:49:01 -0700 Subject: * Update documenation Signed-off-by: Jhon Honce --- cmd/podman/varlink/io.podman.varlink | 2 +- contrib/python/podman/podman/libs/errors.py | 6 +++--- contrib/python/podman/podman/libs/pods.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'cmd') diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink index 88ae45fb1..4a4a1854c 100644 --- a/cmd/podman/varlink/io.podman.varlink +++ b/cmd/podman/varlink/io.podman.varlink @@ -820,7 +820,7 @@ error PodNotFound (name: string) # a container ID of the container that failed. error PodContainerError (podname: string, errors: []PodContainerErrorData) -# NoContainersInPod means a pod has no containers on which to perform operation. It contains +# NoContainersInPod means a pod has no containers on which to perform the operation. It contains # the pod ID. error NoContainersInPod (name: string) diff --git a/contrib/python/podman/podman/libs/errors.py b/contrib/python/podman/podman/libs/errors.py index 1b94344c4..2821d3597 100644 --- a/contrib/python/podman/podman/libs/errors.py +++ b/contrib/python/podman/podman/libs/errors.py @@ -23,15 +23,15 @@ class VarlinkErrorProxy(VarlinkError): class ContainerNotFound(VarlinkErrorProxy): - """Raised when Client can not find requested container.""" + """Raised when Client cannot find requested container.""" class ImageNotFound(VarlinkErrorProxy): - """Raised when Client can not find requested image.""" + """Raised when Client cannot find requested image.""" class PodNotFound(VarlinkErrorProxy): - """Raised when Client can not find requested image.""" + """Raised when Client cannot find requested image.""" class PodContainerError(VarlinkErrorProxy): diff --git a/contrib/python/podman/podman/libs/pods.py b/contrib/python/podman/podman/libs/pods.py index 6aec2c186..b14a13dd2 100644 --- a/contrib/python/podman/podman/libs/pods.py +++ b/contrib/python/podman/podman/libs/pods.py @@ -71,7 +71,7 @@ class Pod(collections.UserDict): return self._refresh(podman) def remove(self, force=False): - """Remove all containers in the pod, the pod, return pod ident. + """Remove pod and its containers returning pod ident. force=True, stop any running container. """ @@ -105,7 +105,7 @@ class Pod(collections.UserDict): return self._refresh(podman) def top(self): - """Display stats for all containers exit.""" + """Display stats for all containers.""" with self._client() as podman: results = podman.TopPod(self._ident) return results['pod'] -- cgit v1.2.3-54-g00ecf