Merge pull request #3035 from baude/remoteport

podman-remote port

7 files changed, 84 insertions, 35 deletions

diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go
index 4b0641d82..14451d944 100644
--- a/cmd/podman/commands.go
+++ b/cmd/podman/commands.go
@@ -17,7 +17,6 @@ func getMainCommands() []*cobra.Command {
 		_loginCommand,
 		_logoutCommand,
 		_mountCommand,
-		_portCommand,
 		_refreshCommand,
 		_searchCommand,
 		_statsCommand,
@@ -45,7 +44,6 @@ func getContainerSubCommands() []*cobra.Command {
 		_commitCommand,
 		_execCommand,
 		_mountCommand,
-		_portCommand,
 		_refreshCommand,
 		_restoreCommand,
 		_runlabelCommand,
diff --git a/cmd/podman/container.go b/cmd/podman/container.go
index b3058bf12..6a3badc41 100644
--- a/cmd/podman/container.go
+++ b/cmd/podman/container.go
@@ -60,8 +60,9 @@ var (
 		_listSubCommand,
 		_logsCommand,
 		_pauseCommand,
-		_restartCommand,
+		_portCommand,
 		_pruneContainersCommand,
+		_restartCommand,
 		_runCommand,
 		_rmCommand,
 		_startCommand,
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index f501ee674..d2ae6a73a 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -45,6 +45,7 @@ var mainCommands = []*cobra.Command{
 	_logsCommand,
 	_pauseCommand,
 	podCommand.Command,
+	_portCommand,
 	&_psCommand,
 	_pullCommand,
 	_pushCommand,
diff --git a/cmd/podman/port.go b/cmd/podman/port.go
index 7a9f01fe6..1bd2d623e 100644
--- a/cmd/podman/port.go
+++ b/cmd/podman/port.go
@@ -6,8 +6,7 @@ import (
 	"strings"
 
 	"github.com/containers/libpod/cmd/podman/cliconfig"
-	"github.com/containers/libpod/cmd/podman/libpodruntime"
-	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/adapter"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
@@ -51,10 +50,7 @@ func portCmd(c *cliconfig.PortValues) error {
 	var (
 		userProto, containerName string
 		userPort                 int
-		container                *libpod.Container
-		containers               []*libpod.Container
 	)
-
 	args := c.InputArgs
 
 	if c.Latest && c.All {
@@ -66,9 +62,6 @@ func portCmd(c *cliconfig.PortValues) error {
 	if len(args) == 0 && !c.Latest && !c.All {
 		return errors.Errorf("you must supply a running container name or id")
 	}
-	if !c.Latest && !c.All {
-		containerName = args[0]
-	}
 
 	port := ""
 	if len(args) > 1 && !c.Latest {
@@ -98,36 +91,14 @@ func portCmd(c *cliconfig.PortValues) error {
 		}
 	}
 
-	runtime, err := libpodruntime.GetRuntime(getContext(), &c.PodmanCommand)
+	runtime, err := adapter.GetRuntime(getContext(), &c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
 	defer runtime.Shutdown(false)
 
-	if !c.Latest && !c.All {
-		container, err = runtime.LookupContainer(containerName)
-		if err != nil {
-			return errors.Wrapf(err, "unable to find container %s", containerName)
-		}
-		containers = append(containers, container)
-	} else if c.Latest {
-		container, err = runtime.GetLatestContainer()
-		if err != nil {
-			return errors.Wrapf(err, "unable to get last created container")
-		}
-		containers = append(containers, container)
-	} else {
-		containers, err = runtime.GetRunningContainers()
-		if err != nil {
-			return errors.Wrapf(err, "unable to get all containers")
-		}
-	}
-
+	containers, err := runtime.Port(c)
 	for _, con := range containers {
-		if state, _ := con.State(); state != libpod.ContainerStateRunning {
-			continue
-		}
-
 		portmappings, err := con.PortMappings()
 		if err != nil {
 			return err
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go
index 9ec897a60..068ab3a8a 100644
--- a/pkg/adapter/containers.go
+++ b/pkg/adapter/containers.go
@@ -876,3 +876,30 @@ func cleanupContainer(ctx context.Context, ctr *libpod.Container, runtime *Local
 	}
 	return nil
 }
+
+// Port displays port information about existing containers
+func (r *LocalRuntime) Port(c *cliconfig.PortValues) ([]*Container, error) {
+	var (
+		portContainers []*Container
+		containers     []*libpod.Container
+		err            error
+	)
+
+	if !c.All {
+		containers, err = shortcuts.GetContainersByContext(false, c.Latest, c.InputArgs, r.Runtime)
+	} else {
+		containers, err = r.Runtime.GetRunningContainers()
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	//Convert libpod containers to adapter Containers
+	for _, con := range containers {
+		if state, _ := con.State(); state != libpod.ContainerStateRunning {
+			continue
+		}
+		portContainers = append(portContainers, &Container{con})
+	}
+	return portContainers, nil
+}
diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go
index a3a48a564..f08c36e32 100644
--- a/pkg/adapter/containers_remote.go
+++ b/pkg/adapter/containers_remote.go
@@ -18,6 +18,7 @@ import (
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/pkg/inspect"
 	"github.com/containers/libpod/pkg/varlinkapi/virtwriter"
+	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/docker/docker/pkg/term"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
@@ -63,6 +64,19 @@ func (c *Container) Unpause() error {
 	return err
 }
 
+func (c *Container) PortMappings() ([]ocicni.PortMapping, error) {
+	// First check if the container belongs to a network namespace (like a pod)
+	// Taken from libpod portmappings()
+	if len(c.config.NetNsCtr) > 0 {
+		netNsCtr, err := c.Runtime.LookupContainer(c.config.NetNsCtr)
+		if err != nil {
+			return nil, errors.Wrapf(err, "unable to lookup network namespace for container %s", c.ID())
+		}
+		return netNsCtr.PortMappings()
+	}
+	return c.config.PortMappings, nil
+}
+
 // Config returns a container config
 func (r *LocalRuntime) Config(name string) *libpod.ContainerConfig {
 	// TODO the Spec being returned is not populated.  Matt and I could not figure out why.  Will defer
@@ -888,3 +902,23 @@ func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool) ([
 func (r *LocalRuntime) CleanupContainers(ctx context.Context, cli *cliconfig.CleanupValues) ([]string, map[string]error, error) {
 	return nil, nil, errors.New("container cleanup not supported for remote clients")
 }
+
+// Port displays port information about existing containers
+func (r *LocalRuntime) Port(c *cliconfig.PortValues) ([]*Container, error) {
+	var (
+		containers []*Container
+		err        error
+	)
+	// This one is a bit odd because when all is used, we only use running containers.
+	if !c.All {
+		containers, err = r.GetContainersByContext(false, c.Latest, c.InputArgs)
+	} else {
+		//	we need to only use running containers if all
+		filters := []string{libpod.ContainerStateRunning.String()}
+		containers, err = r.LookupContainersWithStatus(filters)
+	}
+	if err != nil {
+		return nil, err
+	}
+	return containers, nil
+}
diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go
index 6102daccf..4986d16f7 100644
--- a/pkg/adapter/runtime_remote.go
+++ b/pkg/adapter/runtime_remote.go
@@ -889,3 +889,20 @@ func (r *LocalRuntime) GenerateKube(c *cliconfig.GenerateKubeValues) (*v1.Pod, *
 	err = json.Unmarshal([]byte(reply.Service), &service)
 	return &pod, &service, err
 }
+
+// GetContainersByContext looks up containers based on the cli input of all, latest, or a list
+func (r *LocalRuntime) GetContainersByContext(all bool, latest bool, namesOrIDs []string) ([]*Container, error) {
+	var containers []*Container
+	cids, err := iopodman.GetContainersByContext().Call(r.Conn, all, latest, namesOrIDs)
+	if err != nil {
+		return nil, err
+	}
+	for _, cid := range cids {
+		ctr, err := r.LookupContainer(cid)
+		if err != nil {
+			return nil, err
+		}
+		containers = append(containers, ctr)
+	}
+	return containers, nil
+}