Merge pull request #181 from angelabriel/master

fix bare-metal handling for tag 'virt'

Author: angelabriel

system/daemon.go

@@ -66,6 +66,10 @@ func SystemdDetectVirt(opt string) (bool, string, error) {
 		return virt, vtype, ErrorLog("%v - Failed to call systemd-detect-virt %s - %s", err, opt, strings.TrimSpace(string(out)))
 	}
 	vtype = strings.TrimSpace(string(out))
+	if vtype == "none" {
+		vtype = "bare-metal"
+		err = nil
+	}
 	return virt, vtype, err
 }
 

system/daemon_test.go

@@ -496,7 +496,7 @@ func TestSystemdDetectVirt(t *testing.T) {
 		t.Errorf("Test failed, returned error should be 'nil', but got: '%v'", err)
 	}
 
-	exp = "none"
+	exp = "bare-metal"
 	virt, vtype, err = SystemdDetectVirt(opt)
 	if !virt {
 		t.Error("virtualization should be true, but is false")
@@ -510,16 +510,16 @@ func TestSystemdDetectVirt(t *testing.T) {
 
 	// test: virtualization NOT available
 	systemddvCmd = path.Join(os.Getenv("GOPATH"), "/src/github.com/SUSE/saptune/testdata/systemdDVNOK")
-	exp = "none"
+	exp = "bare-metal"
 	virt, vtype, err = SystemdDetectVirt("-v")
 	if virt {
 		t.Error("virtualization should be false, but is true")
 	}
 	if vtype != exp {
 		t.Errorf("Test failed, expected: '%s', got: '%s'", exp, vtype)
 	}
-	if err == nil {
-		t.Errorf("Test failed, returned error should be NOT 'nil', but got: '%v'", err)
+	if err != nil {
+		t.Errorf("Test failed, returned error should be 'nil', but got: '%v'", err)
 	}
 	virt, vtype, err = SystemdDetectVirt("-c")
 	if virt {
@@ -528,8 +528,8 @@ func TestSystemdDetectVirt(t *testing.T) {
 	if vtype != exp {
 		t.Errorf("Test failed, expected: '%s', got: '%s'", exp, vtype)
 	}
-	if err == nil {
-		t.Errorf("Test failed, returned error should be NOT 'nil', but got: '%v'", err)
+	if err != nil {
+		t.Errorf("Test failed, returned error should be 'nil', but got: '%v'", err)
 	}
 	virt, vtype, err = SystemdDetectVirt(opt)
 	if virt {
@@ -538,8 +538,8 @@ func TestSystemdDetectVirt(t *testing.T) {
 	if vtype != exp {
 		t.Errorf("Test failed, expected: '%s', got: '%s'", exp, vtype)
 	}
-	if err == nil {
-		t.Errorf("Test failed, returned error should be NOT 'nil', but got: '%v'", err)
+	if err != nil {
+		t.Errorf("Test failed, returned error should be 'nil', but got: '%v'", err)
 	}
 	exp = ""
 	virt, vtype, err = SystemdDetectVirt("-r")

txtparser/tags.go

@@ -234,7 +234,7 @@ func chkVirtTags(tagField string, secFields []string) bool {
 	}
 	// order of vopt and err check is by intention
 	if err != nil {
-		system.InfoLog("No virtualization detected - bare metal system or error with systemd-detect-virt. Skipping whole section '%v' with all lines till next valid section definition", secFields)
+		system.InfoLog("No virtualization detected - error with systemd-detect-virt. Skipping whole section '%v' with all lines till next valid section definition", secFields)
 		return false
 	}
 	if tagField != chkVirt {