fix(ovirt): use default values for platform attributes

bl4ko · Sep 9, 2024 · eba786c · eba786c
1 parent 0b26538
commit eba786c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/internal/source/ovirt/ovirt_sync.go b/internal/source/ovirt/ovirt_sync.go
@@ -260,8 +260,9 @@ func (o *OVirtSource) syncHosts(nbi *inventory.NetboxInventory) error {
 		}
 		platformName := utils.GeneratePlatformName(osDistribution, osVersion, cpuArch)
 		hostPlatformStruct := &objects.Platform{
-			Name: platformName,
-			Slug: utils.Slugify(platformName),
+			Name:         platformName,
+			Slug:         utils.Slugify(platformName),
+			Manufacturer: hostManufacturer,
 		}
 		hostPlatform, err = nbi.AddPlatform(o.Ctx, hostPlatformStruct)
 		if err != nil {
@@ -799,7 +800,9 @@ func (o *OVirtSource) extractVMData(nbi *inventory.NetboxInventory, vmID string,
 
 	// VM's Platform
 	var vmPlatform *objects.Platform
-	var vmOsType, vmOsVersion, vmCPUArch string
+	vmOsType := constants.DefaultOSName
+	vmCPUArch := constants.DefaultCPUArch
+	vmOsVersion := constants.DefaultOSVersion
 	if guestOs, exists := vm.GuestOperatingSystem(); exists {
 		if guestOsType, exists := guestOs.Distribution(); exists {
 			vmOsType = guestOsType

diff --git a/internal/utils/dcim.go b/internal/utils/dcim.go
@@ -54,15 +54,13 @@ func GeneratePlatformName(osDistribution string, osMajorVersion string, cpuArch
 	if osDistribution != "" {
 		osDistribution = SerializeOSName(osDistribution)
 	} else {
-		return constants.DefaultOSName
+		osDistribution = constants.DefaultOSName
 	}
+
 	if osMajorVersion != "" {
-		if !strings.Contains(osDistribution, "(") {
-			osMajorVersion = fmt.Sprintf(" %s", osMajorVersion)
-		} else {
-			osMajorVersion = ""
-		}
+		osMajorVersion = fmt.Sprintf(" %s", osMajorVersion)
 	}
+
 	if cpuArch != "" {
 		// Check if cpuArch was extreacted from osDistribution
 		if !strings.Contains(osDistribution, "(") {
@@ -71,6 +69,7 @@ func GeneratePlatformName(osDistribution string, osMajorVersion string, cpuArch
 			cpuArch = ""
 		}
 	}
+
 	return fmt.Sprintf("%s%s%s", osDistribution, osMajorVersion, cpuArch)
 }
 
@@ -147,6 +146,9 @@ var UniversalOSMap = map[string]string{
 
 // SerializeOSName returns serialized OS name from the given string.
 func SerializeOSName(os string) string {
+	if os == constants.DefaultOSName {
+		return os
+	}
 	for regex, name := range SpecificOSMap {
 		matched, _ := regexp.MatchString(regex, os)
 		if matched {

diff --git a/internal/utils/dcim_test.go b/internal/utils/dcim_test.go
@@ -250,6 +250,13 @@ func TestSerializeOSName(t *testing.T) {
 			},
 			want: "Custom OS",
 		},
+		{
+			name: "Don't serialize default OS name",
+			args: args{
+				os: constants.DefaultOSName,
+			},
+			want: constants.DefaultOSName,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {