podmanv2 pod create using podspecgen

using the factory approach similar to container, we now create pods based on a pod spec generator.  wired up the podmanv2 pod create command, podcreatewithspec binding, simple binding test, and apiv2 endpoint.

also included some code refactoring as it introduced as easy circular import.

Signed-off-by: Brent Baude <bbaude@redhat.com>

6 files changed, 205 insertions, 7 deletions

diff --git a/pkg/specgen/create.go b/pkg/specgen/container_create.go
index aefbe7405..cf082441d 100644
--- a/pkg/specgen/create.go
+++ b/pkg/specgen/container_create.go
@@ -13,7 +13,7 @@ import (
 
 // MakeContainer creates a container based on the SpecGenerator
 func (s *SpecGenerator) MakeContainer(rt *libpod.Runtime) (*libpod.Container, error) {
-	if err := s.validate(rt); err != nil {
+	if err := s.validate(); err != nil {
 		return nil, errors.Wrap(err, "invalid config provided")
 	}
 	rtc, err := rt.GetConfig()
diff --git a/pkg/specgen/validate.go b/pkg/specgen/container_validate.go
index 5f567f725..b27659f5f 100644
--- a/pkg/specgen/validate.go
+++ b/pkg/specgen/container_validate.go
@@ -4,8 +4,6 @@ import (
 	"strings"
 
 	"github.com/containers/libpod/pkg/rootless"
-
-	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/pkg/util"
 	"github.com/pkg/errors"
 )
@@ -25,7 +23,7 @@ func exclusiveOptions(opt1, opt2 string) error {
 
 // Validate verifies that the given SpecGenerator is valid and satisfies required
 // input for creating a container.
-func (s *SpecGenerator) validate(rt *libpod.Runtime) error {
+func (s *SpecGenerator) validate() error {
 
 	//
 	// ContainerBasicConfig
diff --git a/pkg/specgen/pod_create.go b/pkg/specgen/pod_create.go
new file mode 100644
index 000000000..06aa24e22
--- /dev/null
+++ b/pkg/specgen/pod_create.go
@@ -0,0 +1,83 @@
+package specgen
+
+import (
+	"context"
+
+	"github.com/containers/libpod/cmd/podman/shared"
+	"github.com/containers/libpod/libpod"
+	"github.com/sirupsen/logrus"
+)
+
+func (p *PodSpecGenerator) MakePod(rt *libpod.Runtime) (*libpod.Pod, error) {
+	if err := p.validate(); err != nil {
+		return nil, err
+	}
+	options, err := p.createPodOptions()
+	if err != nil {
+		return nil, err
+	}
+	return rt.NewPod(context.Background(), options...)
+}
+
+func (p *PodSpecGenerator) createPodOptions() ([]libpod.PodCreateOption, error) {
+	var (
+		options []libpod.PodCreateOption
+	)
+	if !p.NoInfra {
+		options = append(options, libpod.WithInfraContainer())
+		nsOptions, err := shared.GetNamespaceOptions(p.SharedNamespaces)
+		if err != nil {
+			return nil, err
+		}
+		options = append(options, nsOptions...)
+	}
+	if len(p.CgroupParent) > 0 {
+		options = append(options, libpod.WithPodCgroupParent(p.CgroupParent))
+	}
+	if len(p.Labels) > 0 {
+		options = append(options, libpod.WithPodLabels(p.Labels))
+	}
+	if len(p.Name) > 0 {
+		options = append(options, libpod.WithPodName(p.Name))
+	}
+	if len(p.Hostname) > 0 {
+		options = append(options, libpod.WithPodHostname(p.Hostname))
+	}
+	if len(p.HostAdd) > 0 {
+		options = append(options, libpod.WithPodHosts(p.HostAdd))
+	}
+	if len(p.DNSOption) > 0 {
+		options = append(options, libpod.WithPodDNSOption(p.DNSOption))
+	}
+	if len(p.DNSSearch) > 0 {
+		options = append(options, libpod.WithPodDNSSearch(p.DNSSearch))
+	}
+	if p.StaticIP != nil {
+		options = append(options, libpod.WithPodStaticIP(*p.StaticIP))
+	}
+	if p.StaticMAC != nil {
+		options = append(options, libpod.WithPodStaticMAC(*p.StaticMAC))
+	}
+	if p.NoManageResolvConf {
+		options = append(options, libpod.WithPodUseImageResolvConf())
+	}
+	switch p.NetNS.NSMode {
+	case Bridge:
+		logrus.Debugf("Pod using default network mode")
+	case Host:
+		logrus.Debugf("Pod will use host networking")
+		options = append(options, libpod.WithPodHostNetwork())
+	default:
+		logrus.Debugf("Pod joining CNI networks: %v", p.CNINetworks)
+		options = append(options, libpod.WithPodNetworks(p.CNINetworks))
+	}
+
+	if p.NoManageHosts {
+		options = append(options, libpod.WithPodUseImageHosts())
+	}
+	if len(p.PortMappings) > 0 {
+		options = append(options, libpod.WithInfraContainerPorts(p.PortMappings))
+	}
+	options = append(options, libpod.WithPodCgroups())
+	return options, nil
+}
diff --git a/pkg/specgen/pod_validate.go b/pkg/specgen/pod_validate.go
new file mode 100644
index 000000000..50309f096
--- /dev/null
+++ b/pkg/specgen/pod_validate.go
@@ -0,0 +1,104 @@
+package specgen
+
+import (
+	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/rootless"
+	"github.com/pkg/errors"
+)
+
+var (
+	// ErrInvalidPodSpecConfig describes an error given when the podspecgenerator is invalid
+	ErrInvalidPodSpecConfig error = errors.New("invalid pod spec")
+)
+
+func exclusivePodOptions(opt1, opt2 string) error {
+	return errors.Wrapf(ErrInvalidPodSpecConfig, "%s and %s are mutually exclusive pod options", opt1, opt2)
+}
+
+func (p *PodSpecGenerator) validate() error {
+	// PodBasicConfig
+	if p.NoInfra {
+		if len(p.InfraCommand) > 0 {
+			return exclusivePodOptions("NoInfra", "InfraCommand")
+		}
+		if len(p.InfraImage) > 0 {
+			return exclusivePodOptions("NoInfra", "InfraImage")
+		}
+		if len(p.SharedNamespaces) > 0 {
+			return exclusivePodOptions("NoInfo", "SharedNamespaces")
+		}
+	}
+
+	// PodNetworkConfig
+	if err := p.NetNS.validate(); err != nil {
+		return err
+	}
+	if p.NoInfra {
+		if p.NetNS.NSMode == NoNetwork {
+			return errors.New("NoInfra and a none network cannot be used toegther")
+		}
+		if p.StaticIP != nil {
+			return exclusivePodOptions("NoInfra", "StaticIP")
+		}
+		if p.StaticMAC != nil {
+			return exclusivePodOptions("NoInfra", "StaticMAC")
+		}
+		if len(p.DNSOption) > 0 {
+			return exclusivePodOptions("NoInfra", "DNSOption")
+		}
+		if len(p.DNSSearch) > 0 {
+			return exclusivePodOptions("NoInfo", "DNSSearch")
+		}
+		if len(p.DNSServer) > 0 {
+			return exclusivePodOptions("NoInfra", "DNSServer")
+		}
+		if len(p.HostAdd) > 0 {
+			return exclusivePodOptions("NoInfra", "HostAdd")
+		}
+		if p.NoManageResolvConf {
+			return exclusivePodOptions("NoInfra", "NoManageResolvConf")
+		}
+	}
+	if p.NetNS.NSMode != Bridge {
+		if len(p.PortMappings) > 0 {
+			return errors.New("PortMappings can only be used with Bridge mode networking")
+		}
+		if len(p.CNINetworks) > 0 {
+			return errors.New("CNINetworks can only be used with Bridge mode networking")
+		}
+	}
+	if p.NoManageResolvConf {
+		if len(p.DNSServer) > 0 {
+			return exclusivePodOptions("NoManageResolvConf", "DNSServer")
+		}
+		if len(p.DNSSearch) > 0 {
+			return exclusivePodOptions("NoManageResolvConf", "DNSSearch")
+		}
+		if len(p.DNSOption) > 0 {
+			return exclusivePodOptions("NoManageResolvConf", "DNSOption")
+		}
+	}
+	if p.NoManageHosts && len(p.HostAdd) > 0 {
+		return exclusivePodOptions("NoManageHosts", "HostAdd")
+	}
+
+	if err := p.NetNS.validate(); err != nil {
+		return err
+	}
+
+	// Set Defaults
+	if p.NetNS.Value == "" {
+		if rootless.IsRootless() {
+			p.NetNS.NSMode = Slirp
+		} else {
+			p.NetNS.NSMode = Bridge
+		}
+	}
+	if len(p.InfraImage) < 1 {
+		p.InfraImage = define.DefaultInfraImage
+	}
+	if len(p.InfraCommand) < 1 {
+		p.InfraCommand = []string{define.DefaultInfraCommand}
+	}
+	return nil
+}
diff --git a/pkg/specgen/pod.go b/pkg/specgen/podspecgen.go
index 1aada83c4..3f830014d 100644
--- a/pkg/specgen/pod.go
+++ b/pkg/specgen/podspecgen.go
@@ -138,3 +138,16 @@ type PodCgroupConfig struct {
 	// Optional.
 	CgroupParent string `json:"cgroup_parent,omitempty"`
 }
+
+// PodSpecGenerator describes options to create a pod
+// swagger:model PodSpecGenerator
+type PodSpecGenerator struct {
+	PodBasicConfig
+	PodNetworkConfig
+	PodCgroupConfig
+}
+
+// NewPodSpecGenerator creates a new pod spec
+func NewPodSpecGenerator() *PodSpecGenerator {
+	return &PodSpecGenerator{}
+}
diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go
index b123c1da5..89c76c273 100644
--- a/pkg/specgen/specgen.go
+++ b/pkg/specgen/specgen.go
@@ -394,18 +394,18 @@ type SpecGenerator struct {
 
 // NewSpecGenerator returns a SpecGenerator struct given one of two mandatory inputs
 func NewSpecGenerator(image string) *SpecGenerator {
-	net := ContainerNetworkConfig{
+	networkConfig := ContainerNetworkConfig{
 		NetNS: Namespace{
 			NSMode: Bridge,
 		},
 	}
 	csc := ContainerStorageConfig{Image: image}
 	if rootless.IsRootless() {
-		net.NetNS.NSMode = Slirp
+		networkConfig.NetNS.NSMode = Slirp
 	}
 	return &SpecGenerator{
 		ContainerStorageConfig: csc,
-		ContainerNetworkConfig: net,
+		ContainerNetworkConfig: networkConfig,
 	}
 }