summaryrefslogtreecommitdiff
path: root/pkg/domain/infra/tunnel
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-13 12:24:05 -0700
committerGitHub <noreply@github.com>2020-05-13 12:24:05 -0700
commit886b2cc4b10c32611b45da983fa9d1318d38356a (patch)
tree4484691fbb13faef71e7b11cfa3a81ab46c9fee2 /pkg/domain/infra/tunnel
parentd147b3ee027580dd7afdeb0fa04d990ae1d2ee91 (diff)
parentcf502b99feda401ced410fbcfd1a3a2663c7a559 (diff)
downloadpodman-886b2cc4b10c32611b45da983fa9d1318d38356a.tar.gz
podman-886b2cc4b10c32611b45da983fa9d1318d38356a.tar.bz2
podman-886b2cc4b10c32611b45da983fa9d1318d38356a.zip
Merge pull request #6197 from baude/v2remotenetwork
enable podman v2 networking for remote client
Diffstat (limited to 'pkg/domain/infra/tunnel')
-rw-r--r--pkg/domain/infra/tunnel/network.go27
1 files changed, 22 insertions, 5 deletions
diff --git a/pkg/domain/infra/tunnel/network.go b/pkg/domain/infra/tunnel/network.go
index 4ff72dcfc..7725d8257 100644
--- a/pkg/domain/infra/tunnel/network.go
+++ b/pkg/domain/infra/tunnel/network.go
@@ -2,22 +2,39 @@ package tunnel
import (
"context"
- "errors"
+ "github.com/containers/libpod/pkg/bindings/network"
"github.com/containers/libpod/pkg/domain/entities"
)
func (ic *ContainerEngine) NetworkList(ctx context.Context, options entities.NetworkListOptions) ([]*entities.NetworkListReport, error) {
- return nil, errors.New("not implemented")
+ return network.List(ic.ClientCxt)
}
func (ic *ContainerEngine) NetworkInspect(ctx context.Context, namesOrIds []string, options entities.NetworkInspectOptions) ([]entities.NetworkInspectReport, error) {
- return nil, errors.New("not implemented")
+ var reports []entities.NetworkInspectReport
+ for _, name := range namesOrIds {
+ report, err := network.Inspect(ic.ClientCxt, name)
+ if err != nil {
+ return nil, err
+ }
+ reports = append(reports, report...)
+ }
+ return reports, nil
}
+
func (ic *ContainerEngine) NetworkRm(ctx context.Context, namesOrIds []string, options entities.NetworkRmOptions) ([]*entities.NetworkRmReport, error) {
- return nil, errors.New("not implemented")
+ var reports []*entities.NetworkRmReport
+ for _, name := range namesOrIds {
+ report, err := network.Remove(ic.ClientCxt, name, &options.Force)
+ if err != nil {
+ report[0].Err = err
+ }
+ reports = append(reports, report...)
+ }
+ return reports, nil
}
func (ic *ContainerEngine) NetworkCreate(ctx context.Context, name string, options entities.NetworkCreateOptions) (*entities.NetworkCreateReport, error) {
- return nil, errors.New("not implemented")
+ return network.Create(ic.ClientCxt, options, &name)
}