Enable cpu/mem settings in docker inspect (#8420)

Author: wjun

lib/apiservers/engine/proxy/container_proxy.go

@@ -1249,7 +1249,8 @@ func hostConfigFromContainerInfo(vc *viccontainer.VicContainer, info *models.Con
 	//
 	// The values we fill out below is an abridged list of the original struct.
 	resourceConfig := container.Resources{
-		Memory: info.ContainerConfig.MemorySizeMB,
+		Memory:     info.ContainerConfig.MemorySizeMB,
+		CpusetCpus: strconv.FormatInt((int64)(info.ContainerConfig.NumCPU), 10),
 		// Applicable to all platforms
 		//			CPUShares int64 `json:"CpuShares"` // CPU shares (relative weight vs. other containers)
 		//			Memory    int64 // Memory limit (in bytes)

lib/apiservers/portlayer/restapi/handlers/containers_handlers.go

@@ -584,6 +584,7 @@ func convertContainerToContainerInfo(c *exec.Container) *models.ContainerInfo {
 	info.ContainerConfig.RestartCount = int64(container.ExecConfig.Diagnostics.ResurrectionCount)
 	info.ContainerConfig.StorageSize = container.VMUnsharedDisk
 	info.ContainerConfig.MemorySizeMB = int64(container.MemorySizeMB)
+	info.ContainerConfig.NumCPU = container.NumCPU
 
 	if container.ExecConfig.Annotations != nil && len(container.ExecConfig.Annotations) > 0 {
 		info.ContainerConfig.Annotations = make(map[string]string)

lib/apiservers/portlayer/swagger.json

@@ -3731,6 +3731,10 @@
 				},
 				"memorySizeMB": {
 					"type": "integer"
+				},
+				"numCpu": {
+					"type": "integer",
+					"format": "int32"
 				}
 			}
 		},

lib/portlayer/exec/commit.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
 	"github.com/vmware/vic/lib/portlayer/event/events"
 	"github.com/vmware/vic/pkg/retry"
@@ -78,6 +79,15 @@ func Commit(ctx context.Context, sess *session.Session, h *Handle, waitTime *int
 
 		h.vm.DisableDestroy(op)
 		c = newContainer(&h.containerBase)
+
+		var o mo.VirtualMachine
+		if err := h.vm.Properties(op, h.vm.Reference(), []string{"summary"}, &o); err != nil {
+			op.Errorf("An error occurred while retrieving summary information from the vm.")
+			return err
+		}
+		c.MemorySizeMB = o.Summary.Config.MemorySizeMB
+		c.NumCPU = o.Summary.Config.NumCpu
+
 		Containers.Put(c)
 
 		err = Config.addToVMGroup(op)

lib/portlayer/exec/container.go

@@ -148,6 +148,7 @@ type ContainerInfo struct {
 	state State
 
 	MemorySizeMB int32
+	NumCPU       int32
 
 	// Size of the leaf (unused)
 	VMUnsharedDisk int64
@@ -950,6 +951,7 @@ func convertInfraContainers(ctx context.Context, sess *session.Session, vms []mo
 		}
 
 		c.MemorySizeMB = v.Summary.Config.MemorySizeMB
+		c.NumCPU = v.Summary.Config.NumCpu
 
 		cons = append(cons, c)
 	}

tests/test-cases/Group1-Docker-Commands/1-23-Docker-Inspect.md

@@ -34,6 +34,11 @@ This test requires that a vSphere server is running and available
 21. Issue docker inspect busybox -f '{{.RepoDigest}}'
 22. Issue docker inspect on container with both an anonymous and named volume bound to mount points
 23. Issue docker inspect container status across container lifecycle (created, running, exited)
+24. Issue docker run with specified hostname and inspect hostname included in config
+25. Issue docker inspect -f {{range .NetworkSettings.Networks}}{{.MacAddress}}{{end}} <containerID>
+26. Issue docker create with specififed DNS and inspect DNS in the result
+27. Issue docker create with multiple specififed DNS and inspect all DNS entries in the result
+28. Issue docker inspect and get memory and cpu numbers included in hostconfig
 
 # Expected Outcome:
 * Step 3,4,7,8 should result in success and a properly formatted JSON response
@@ -56,6 +61,11 @@ Error: No such image or container: fake
 * Step 21 should result in a valid digest, previously cached
 * Step 22 should result in valid Mounts data
 * Step 23 should result in correct container status values (created, running, exited)
+* Step 24 should result in hostname in config
+* Step 25 should result macaddress in the result
+* Step 26 should result DNS
+* Step 27 should result multiple DNS entries
+* Step 28 should result memory and cpu numbers in hostconfig
 
 # Possible Problems:
 None

tests/test-cases/Group1-Docker-Commands/1-23-Docker-Inspect.robot

@@ -196,3 +196,14 @@ Docker inspect container with multiple specified DNS
     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
     Should Be Equal As Integers  ${rc}  0
 
+Docker inspect for cpu and memory settings
+    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox}
+    Should Be Equal As Integers  ${rc}  0
+    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect ${container}
+    Should Be Equal As Integers  ${rc}  0
+    ${output}=  Evaluate  json.loads(r'''${output}''')  json
+    ${hostconfig}=  Get From Dictionary  ${output[0]}  HostConfig
+    ${mem}=  Get From Dictionary  ${hostconfig}  Memory
+    Should Be Equal As Integers  ${mem}  2048
+    ${cpu}=  Get From Dictionary  ${hostconfig}  CpusetCpus
+    Should Be Equal As Integers  ${cpu}  2