Merge pull request #5611 from baude/v2podcreate

podmanv2 pod create using podspecgen

6 files changed, 110 insertions, 3 deletions

diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go
index 21a674c43..fceed1003 100644
--- a/pkg/domain/entities/engine_container.go
+++ b/pkg/domain/entities/engine_container.go
@@ -15,7 +15,7 @@ type ContainerEngine interface {
 	ContainerStop(ctx context.Context, namesOrIds []string, options StopOptions) ([]*StopReport, error)
 	ContainerWait(ctx context.Context, namesOrIds []string, options WaitOptions) ([]WaitReport, error)
 	ContainerTop(ctx context.Context, options TopOptions) (*StringSliceReport, error)
-
+	PodCreate(ctx context.Context, opts PodCreateOptions) (*PodCreateReport, error)
 	PodExists(ctx context.Context, nameOrId string) (*BoolReport, error)
 	PodKill(ctx context.Context, namesOrIds []string, options PodKillOptions) ([]*PodKillReport, error)
 	PodPause(ctx context.Context, namesOrIds []string, options PodPauseOptions) ([]*PodPauseReport, error)
diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go
index 8d594620f..efda17d65 100644
--- a/pkg/domain/entities/pods.go
+++ b/pkg/domain/entities/pods.go
@@ -1,6 +1,10 @@
 package entities
 
-import "time"
+import (
+	"time"
+
+	"github.com/containers/libpod/pkg/specgen"
+)
 
 type PodKillOptions struct {
 	All    bool
@@ -92,3 +96,48 @@ type PodRmReport struct {
 	Err error
 	Id  string
 }
+
+type PodCreateOptions struct {
+	CGroupParent string
+	Hostname     string
+	Infra        bool
+	InfraImage   string
+	InfraCommand string
+	Labels       map[string]string
+	Name         string
+	Net          *NetOptions
+	Share        []string
+}
+
+type PodCreateReport struct {
+	Id string
+}
+
+func (p PodCreateOptions) ToPodSpecGen(s *specgen.PodSpecGenerator) {
+	// Basic Config
+	s.Name = p.Name
+	s.Hostname = p.Hostname
+	s.Labels = p.Labels
+	s.NoInfra = !p.Infra
+	s.InfraCommand = []string{p.InfraCommand}
+	s.InfraImage = p.InfraImage
+	s.SharedNamespaces = p.Share
+
+	// Networking config
+	s.NetNS = p.Net.Network
+	s.StaticIP = p.Net.StaticIP
+	s.StaticMAC = p.Net.StaticMAC
+	s.PortMappings = p.Net.PublishPorts
+	s.CNINetworks = p.Net.CNINetworks
+	if p.Net.DNSHost {
+		s.NoManageResolvConf = true
+	}
+	s.DNSServer = p.Net.DNSServers
+	s.DNSSearch = p.Net.DNSSearch
+	s.DNSOption = p.Net.DNSOptions
+	s.NoManageHosts = p.Net.NoHosts
+	s.HostAdd = p.Net.AddHosts
+
+	// Cgroup
+	s.CgroupParent = p.CGroupParent
+}
diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go
index e7757a74b..a1a729584 100644
--- a/pkg/domain/entities/types.go
+++ b/pkg/domain/entities/types.go
@@ -1,5 +1,12 @@
 package entities
 
+import (
+	"net"
+
+	"github.com/containers/libpod/pkg/specgen"
+	"github.com/cri-o/ocicni/pkg/ocicni"
+)
+
 type Container struct {
 	IdOrNamed
 }
@@ -15,3 +22,23 @@ type Report struct {
 
 type PodDeleteReport struct{ Report }
 type PodPruneOptions struct{}
+
+type PodPruneReport struct{ Report }
+type VolumeDeleteOptions struct{}
+type VolumeDeleteReport struct{ Report }
+
+// NetOptions reflect the shared network options between
+// pods and containers
+type NetOptions struct {
+	AddHosts     []string
+	CNINetworks  []string
+	DNSHost      bool
+	DNSOptions   []string
+	DNSSearch    []string
+	DNSServers   []net.IP
+	Network      specgen.Namespace
+	NoHosts      bool
+	PublishPorts []ocicni.PortMapping
+	StaticIP     *net.IP
+	StaticMAC    *net.HardwareAddr
+}
diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go
index 4f68ad5f9..619e973cf 100644
--- a/pkg/domain/infra/abi/pods.go
+++ b/pkg/domain/infra/abi/pods.go
@@ -9,6 +9,7 @@ import (
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/signal"
+	"github.com/containers/libpod/pkg/specgen"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
@@ -239,3 +240,13 @@ func (ic *ContainerEngine) PodRm(ctx context.Context, namesOrIds []string, optio
 	}
 	return reports, nil
 }
+
+func (ic *ContainerEngine) PodCreate(ctx context.Context, opts entities.PodCreateOptions) (*entities.PodCreateReport, error) {
+	podSpec := specgen.NewPodSpecGenerator()
+	opts.ToPodSpecGen(podSpec)
+	pod, err := podSpec.MakePod(ic.Libpod)
+	if err != nil {
+		return nil, err
+	}
+	return &entities.PodCreateReport{Id: pod.ID()}, nil
+}
diff --git a/pkg/domain/infra/abi/volumes.go b/pkg/domain/infra/abi/volumes.go
index 5527bb82e..bdae4359d 100644
--- a/pkg/domain/infra/abi/volumes.go
+++ b/pkg/domain/infra/abi/volumes.go
@@ -113,7 +113,20 @@ func (ic *ContainerEngine) VolumeInspect(ctx context.Context, namesOrIds []strin
 }
 
 func (ic *ContainerEngine) VolumePrune(ctx context.Context, opts entities.VolumePruneOptions) ([]*entities.VolumePruneReport, error) {
-	return ic.Libpod.PruneVolumes(ctx)
+	var (
+		reports []*entities.VolumePruneReport
+	)
+	pruned, err := ic.Libpod.PruneVolumes(ctx)
+	if err != nil {
+		return nil, err
+	}
+	for k, v := range pruned {
+		reports = append(reports, &entities.VolumePruneReport{
+			Err: v,
+			Id:  k,
+		})
+	}
+	return reports, nil
 }
 
 func (ic *ContainerEngine) VolumeList(ctx context.Context, opts entities.VolumeListOptions) ([]*entities.VolumeListReport, error) {
diff --git a/pkg/domain/infra/tunnel/pods.go b/pkg/domain/infra/tunnel/pods.go
index 53003da42..4894874e5 100644
--- a/pkg/domain/infra/tunnel/pods.go
+++ b/pkg/domain/infra/tunnel/pods.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/containers/libpod/pkg/bindings/pods"
 	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/pkg/specgen"
 )
 
 func (ic *ContainerEngine) PodExists(ctx context.Context, nameOrId string) (*entities.BoolReport, error) {
@@ -170,3 +171,9 @@ func (ic *ContainerEngine) PodRm(ctx context.Context, namesOrIds []string, optio
 	}
 	return reports, nil
 }
+
+func (ic *ContainerEngine) PodCreate(ctx context.Context, opts entities.PodCreateOptions) (*entities.PodCreateReport, error) {
+	podSpec := specgen.NewPodSpecGenerator()
+	opts.ToPodSpecGen(podSpec)
+	return pods.CreatePodFromSpec(ic.ClientCxt, podSpec)
+}