api: Refactor RunPod()

Introduce some private functions to allow RunPod() to behave exactly as
if CreatePod() + StartPod() had been called instead. Removing the
duplicated code ensures the behaviour between the two methods for
creating and starting a pod is consistent.
Note that this change modifies the RunPod() behaviour very slightly -
the locking is now handled later, as was previously being done by
CreatePod() + StartPod().
Fixes#485.
Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>

Author: James O. D. Hunt

api.go

@@ -38,6 +38,10 @@ func SetLogger(logger logrus.FieldLogger) {
 // CreatePod is the virtcontainers pod creation entry point.
 // CreatePod creates a pod and its containers. It does not start them.
 funcCreatePod(podConfigPodConfig) (VCPod, error) {
+returncreatePodFromConfig(podConfig)
+}
+
+funccreatePodFromConfig(podConfigPodConfig) (*Pod, error) {
 // Create the pod.
 p, err:=createPod(podConfig)
 iferr!=nil {
@@ -168,8 +172,12 @@ func StartPod(podID string) (VCPod, error) {
 returnnil, err
 	}
 
+returnstartPod(p)
+}
+
+funcstartPod(p*Pod) (*Pod, error) {
 // Start it
-err=p.start()
+err:=p.start()
 iferr!=nil {
 returnnil, err
 	}
@@ -214,14 +222,7 @@ func StopPod(podID string) (VCPod, error) {
 // RunPod is the virtcontainers pod running entry point.
 // RunPod creates a pod and its containers and then it starts them.
 funcRunPod(podConfigPodConfig) (VCPod, error) {
-// Create the pod.
-p, err:=createPod(podConfig)
-iferr!=nil {
-returnnil, err
-	}
-
-// Store it.
-err=p.storePod()
+p, err:=createPodFromConfig(podConfig)
 iferr!=nil {
 returnnil, err
 	}
@@ -232,56 +233,7 @@ func RunPod(podConfig PodConfig) (VCPod, error) {
 	}
 deferunlockPod(lockFile)
 
-// Initialize the network.
-netNsPath, netNsCreated, err:=p.network.init(p.config.NetworkConfig)
-iferr!=nil {
-returnnil, err
-	}
-
-// Execute prestart hooks inside netns
-err=p.network.run(netNsPath, func() error {
-returnp.config.Hooks.preStartHooks()
-	})
-iferr!=nil {
-returnnil, err
-	}
-
-// Add the network
-networkNS, err:=p.network.add(*p, p.config.NetworkConfig, netNsPath, netNsCreated)
-iferr!=nil {
-returnnil, err
-	}
-
-// Store the network
-err=p.storage.storePodNetwork(p.id, networkNS)
-iferr!=nil {
-returnnil, err
-	}
-
-// Start the VM
-err=p.startVM(netNsPath)
-iferr!=nil {
-returnnil, err
-	}
-
-// Start shims
-iferr:=p.startShims(); err!=nil {
-returnnil, err
-	}
-
-// Start the pod
-err=p.start()
-iferr!=nil {
-p.delete()
-returnnil, err
-	}
-
-// Execute poststart hooks
-iferr:=p.config.Hooks.postStartHooks(); err!=nil {
-returnnil, err
-	}
-
-returnp, nil
+returnstartPod(p)
 }
 
 // ListPod is the virtcontainers pod listing entry point.

api_test.go

@@ -274,7 +274,7 @@ func TestCreatePodFailing(t *testing.T) {
 config:=PodConfig{}
 
 p, err:=CreatePod(config)
-ifp!=nil||err==nil {
+ifp.(*Pod)!=nil||err==nil {
 t.Fatal()
 	}
 }