Merge pull request #200 from bergwolf/rename

runtime: rename pod to sandbox

cli/config/configuration.toml.in

@@ -33,7 +33,7 @@ firmware = "@FIRMWAREPATH@"
 # For example, `machine_accelerators = "nosmm,nosmbus,nosata,nopit,static-prt,nofw"`
 machine_accelerators="@MACHINEACCELERATORS@"
 
-# Default number of vCPUs per POD/VM:
+# Default number of vCPUs per SB/VM:
 # unspecified or 0                --> will be set to @DEFVCPUS@
 # < 0                             --> will be set to the actual number of physical cores
 # > 0 <= number of physical cores --> will be set to the specified number
@@ -47,13 +47,13 @@ default_vcpus = 1
 # * Until 30 devices per bridge can be hot plugged.
 # * Until 5 PCI bridges can be cold plugged per VM.
 #   This limitation could be a bug in qemu or in the kernel
-# Default number of bridges per POD/VM:
+# Default number of bridges per SB/VM:
 # unspecified or 0   --> will be set to @DEFBRIDGES@
 # > 1 <= 5           --> will be set to the specified number
 # > 5                --> will be set to 5
 default_bridges = @DEFBRIDGES@
 
-# Default memory size in MiB for POD/VM.
+# Default memory size in MiB for SB/VM.
 # If unspecified then it will be set @DEFMEMSZ@ MiB.
 #default_memory = @DEFMEMSZ@
 

cli/create.go

@@ -115,7 +115,7 @@ func create(containerID, bundlePath, console, pidFilePath string, detach bool,
 
 	switch containerType {
 	case vc.PodSandbox:
-		process, err = createPod(ociSpec, runtimeConfig, containerID, bundlePath, console, disableOutput)
+		process, err = createSandbox(ociSpec, runtimeConfig, containerID, bundlePath, console, disableOutput)
 		if err != nil {
 			return err
 		}
@@ -131,7 +131,7 @@ func create(containerID, bundlePath, console, pidFilePath string, detach bool,
 	// is shim's in our case. This is mandatory to make sure there is no one
 	// else (like Docker) trying to create those files on our behalf. We want to
 	// know those files location so that we can remove them when delete is called.
-	cgroupsPathList, err := processCgroupsPath(ociSpec, containerType.IsPod())
+	cgroupsPathList, err := processCgroupsPath(ociSpec, containerType.IsSandbox())
 	if err != nil {
 		return err
 	}
@@ -225,27 +225,27 @@ func setKernelParams(containerID string, runtimeConfig *oci.RuntimeConfig) error
 	return nil
 }
 
-func createPod(ociSpec oci.CompatOCISpec, runtimeConfig oci.RuntimeConfig,
+func createSandbox(ociSpec oci.CompatOCISpec, runtimeConfig oci.RuntimeConfig,
 	containerID, bundlePath, console string, disableOutput bool) (vc.Process, error) {
 
 	err := setKernelParams(containerID, &runtimeConfig)
 	if err != nil {
 		return vc.Process{}, err
 	}
 
-	podConfig, err := oci.PodConfig(ociSpec, runtimeConfig, bundlePath, containerID, console, disableOutput)
+	sandboxConfig, err := oci.SandboxConfig(ociSpec, runtimeConfig, bundlePath, containerID, console, disableOutput)
 	if err != nil {
 		return vc.Process{}, err
 	}
 
-	pod, err := vci.CreatePod(podConfig)
+	sandbox, err := vci.CreateSandbox(sandboxConfig)
 	if err != nil {
 		return vc.Process{}, err
 	}
 
-	containers := pod.GetAllContainers()
+	containers := sandbox.GetAllContainers()
 	if len(containers) != 1 {
-		return vc.Process{}, fmt.Errorf("BUG: Container list from pod is wrong, expecting only one container, found %d containers", len(containers))
+		return vc.Process{}, fmt.Errorf("BUG: Container list from sandbox is wrong, expecting only one container, found %d containers", len(containers))
 	}
 
 	return containers[0].Process(), nil
@@ -259,12 +259,12 @@ func createContainer(ociSpec oci.CompatOCISpec, containerID, bundlePath,
 		return vc.Process{}, err
 	}
 
-	podID, err := ociSpec.PodID()
+	sandboxID, err := ociSpec.SandboxID()
 	if err != nil {
 		return vc.Process{}, err
 	}
 
-	_, c, err := vci.CreateContainer(podID, contConfig)
+	_, c, err := vci.CreateContainer(sandboxID, contConfig)
 	if err != nil {
 		return vc.Process{}, err
 	}