cc-env: Include hypervisor block storage driver in cc-env output

Add the hypervisor block device driver being used in the Hypervisor section of cc-env output. Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
clearcontainers · Feb 28, 2018 · 2082315 · 2082315
1 parent 1768dd5
commit 2082315
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/cc-env.go b/cc-env.go
@@ -76,10 +76,11 @@ type RuntimeVersionInfo struct {
 
 // HypervisorInfo stores hypervisor details
 type HypervisorInfo struct {
-	MachineType string
-	Version     string
-	Path        string
-	Debug       bool
+	MachineType       string
+	Version           string
+	Path              string
+	Debug             bool
+	BlockDeviceDriver string
 }
 
 // ProxyInfo stores proxy details
@@ -269,9 +270,10 @@ func getHypervisorInfo(config oci.RuntimeConfig) HypervisorInfo {
 	}
 
 	return HypervisorInfo{
-		MachineType: config.HypervisorConfig.HypervisorMachineType,
-		Version:     version,
-		Path:        hypervisorPath,
+		MachineType:       config.HypervisorConfig.HypervisorMachineType,
+		Version:           version,
+		Path:              hypervisorPath,
+		BlockDeviceDriver: config.HypervisorConfig.BlockDeviceDriver,
 	}
 }
 

diff --git a/cc-env_test.go b/cc-env_test.go
@@ -234,9 +234,10 @@ model name	: %s
 
 func getExpectedHypervisor(config oci.RuntimeConfig) HypervisorInfo {
 	return HypervisorInfo{
-		Version:     testHypervisorVersion,
-		Path:        config.HypervisorConfig.HypervisorPath,
-		MachineType: config.HypervisorConfig.HypervisorMachineType,
+		Version:           testHypervisorVersion,
+		Path:              config.HypervisorConfig.HypervisorPath,
+		MachineType:       config.HypervisorConfig.HypervisorMachineType,
+		BlockDeviceDriver: config.HypervisorConfig.BlockDeviceDriver,
 	}
 }