From 5e849f143bb3c92effbd444c1c3c6e216398ecee Mon Sep 17 00:00:00 2001
From: Peng Tao <bergwolf@gmail.com>
Date: Fri, 31 Aug 2018 16:54:01 +0800
Subject: [PATCH] network: always assign sandbox networkNS

For vm factory, we also need netns to be set otherwise we fail to
create new VMs in `s.network.run`.

Fixes: #681

Signed-off-by: Peng Tao <bergwolf@gmail.com>
---
 virtcontainers/default_network.go |  6 +-----
 virtcontainers/sandbox.go         | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/virtcontainers/default_network.go b/virtcontainers/default_network.go
index c4556fb74b..293e20ed6c 100644
--- a/virtcontainers/default_network.go
+++ b/virtcontainers/default_network.go
@@ -54,11 +54,7 @@ func (n *defNetwork) add(s *Sandbox) error {
 		return err
 	}
 
-	s.networkNS = NetworkNamespace{
-		NetNsPath:    s.config.NetworkConfig.NetNSPath,
-		NetNsCreated: s.config.NetworkConfig.NetNsCreated,
-		Endpoints:    endpoints,
-	}
+	s.networkNS.Endpoints = endpoints
 
 	err = doNetNS(s.config.NetworkConfig.NetNSPath, func(_ ns.NetNS) error {
 		for _, endpoint := range s.networkNS.Endpoints {
diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go
index d6fb118108..4542e80984 100644
--- a/virtcontainers/sandbox.go
+++ b/virtcontainers/sandbox.go
@@ -973,19 +973,22 @@ func (s *Sandbox) createNetwork() error {
 	span, _ := s.trace("createNetwork")
 	defer span.Finish()
 
+	s.networkNS = NetworkNamespace{
+		NetNsPath:    s.config.NetworkConfig.NetNSPath,
+		NetNsCreated: s.config.NetworkConfig.NetNsCreated,
+	}
+
 	// In case there is a factory, the network should be handled
 	// through some calls at the API level, in order to add or
 	// remove interfaces and routes.
 	// This prevents from any assumptions that could be made from
 	// virtcontainers, in particular that the VM has not been started
 	// before it starts to scan the current network.
-	if s.factory != nil {
-		return nil
-	}
-
-	// Add the network
-	if err := s.network.add(s); err != nil {
-		return err
+	if s.factory == nil {
+		// Add the network
+		if err := s.network.add(s); err != nil {
+			return err
+		}
 	}
 
 	// Store the network
@@ -1117,8 +1120,6 @@ func (s *Sandbox) startVM() error {
 			if err != nil {
 				return err
 			}
-			// FIXME: factory vm needs network hotplug to add Nics.
-			s.networkNS.NetNsPath = ""
 			return nil
 		}