From 8b5e2a6297e6f6a5426551d1648278906a9d23de Mon Sep 17 00:00:00 2001
From: Brent Baude <bbaude@redhat.com>
Date: Wed, 26 Feb 2020 15:15:36 -0600
Subject: add default network for apiv2 create

during container creation, if no network is provided, we need to add a default value so the container can be later started.

use apiv2 container creation for RunTopContainer instead of an exec to the system podman. RunTopContainer now also returns the container id and an error.

added a libpod commit endpoint.

also, changed the use of the connections and bindings slightly to make it more convenient to write tests.

Fixes: 5366
Signed-off-by: Brent Baude <bbaude@redhat.com>
---
 pkg/specgen/create.go     | 10 ++++++----
 pkg/specgen/namespaces.go | 13 ++++++++++---
 pkg/specgen/validate.go   |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'pkg/specgen')

diff --git a/pkg/specgen/create.go b/pkg/specgen/create.go
index e6ac53016..99a99083b 100644
--- a/pkg/specgen/create.go
+++ b/pkg/specgen/create.go
@@ -13,7 +13,6 @@ import (
 
 // MakeContainer creates a container based on the SpecGenerator
 func (s *SpecGenerator) MakeContainer(rt *libpod.Runtime) (*libpod.Container, error) {
-	var pod *libpod.Pod
 	if err := s.validate(rt); err != nil {
 		return nil, errors.Wrap(err, "invalid config provided")
 	}
@@ -22,7 +21,7 @@ func (s *SpecGenerator) MakeContainer(rt *libpod.Runtime) (*libpod.Container, er
 		return nil, err
 	}
 
-	options, err := s.createContainerOptions(rt, pod)
+	options, err := s.createContainerOptions(rt)
 	if err != nil {
 		return nil, err
 	}
@@ -46,7 +45,7 @@ func (s *SpecGenerator) MakeContainer(rt *libpod.Runtime) (*libpod.Container, er
 	return rt.NewContainer(context.Background(), runtimeSpec, options...)
 }
 
-func (s *SpecGenerator) createContainerOptions(rt *libpod.Runtime, pod *libpod.Pod) ([]libpod.CtrCreateOption, error) {
+func (s *SpecGenerator) createContainerOptions(rt *libpod.Runtime) ([]libpod.CtrCreateOption, error) {
 	var options []libpod.CtrCreateOption
 	var err error
 
@@ -61,6 +60,10 @@ func (s *SpecGenerator) createContainerOptions(rt *libpod.Runtime, pod *libpod.P
 		options = append(options, libpod.WithName(s.Name))
 	}
 	if s.Pod != "" {
+		pod, err := rt.LookupPod(s.Pod)
+		if err != nil {
+			return nil, err
+		}
 		logrus.Debugf("adding container to pod %s", s.Pod)
 		options = append(options, rt.WithPod(pod))
 	}
@@ -116,7 +119,6 @@ func (s *SpecGenerator) createContainerOptions(rt *libpod.Runtime, pod *libpod.P
 	}
 	options = append(options, namespaceOptions...)
 
-	// TODO NetworkNS still needs to be done!
 	if len(s.ConmonPidFile) > 0 {
 		options = append(options, libpod.WithConmonPidFile(s.ConmonPidFile))
 	}
diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go
index 79a83819a..fa2dee77d 100644
--- a/pkg/specgen/namespaces.go
+++ b/pkg/specgen/namespaces.go
@@ -70,9 +70,7 @@ func (n *Namespace) IsPrivate() bool {
 	return n.NSMode == Private
 }
 
-// validate perform simple validation on the namespace to make sure it is not
-// invalid from the get-go
-func (n *Namespace) validate() error {
+func validateNetNS(n *Namespace) error {
 	if n == nil {
 		return nil
 	}
@@ -82,6 +80,15 @@ func (n *Namespace) validate() error {
 	default:
 		return errors.Errorf("invalid network %q", n.NSMode)
 	}
+	return nil
+}
+
+// validate perform simple validation on the namespace to make sure it is not
+// invalid from the get-go
+func (n *Namespace) validate() error {
+	if n == nil {
+		return nil
+	}
 	// Path and From Container MUST have a string value set
 	if n.NSMode == Path || n.NSMode == FromContainer {
 		if len(n.Value) < 1 {
diff --git a/pkg/specgen/validate.go b/pkg/specgen/validate.go
index 78e4d8ad5..dd5ca3a55 100644
--- a/pkg/specgen/validate.go
+++ b/pkg/specgen/validate.go
@@ -138,7 +138,7 @@ func (s *SpecGenerator) validate(rt *libpod.Runtime) error {
 	if err := s.IpcNS.validate(); err != nil {
 		return err
 	}
-	if err := s.NetNS.validate(); err != nil {
+	if err := validateNetNS(&s.NetNS); err != nil {
 		return err
 	}
 	if err := s.PidNS.validate(); err != nil {
-- 
cgit v1.2.3-54-g00ecf