From 0ceacc9ce1e78b9115ffa00ea749d4deaf573e8f Mon Sep 17 00:00:00 2001 From: Daniel Lepage Date: Wed, 29 Jan 2025 12:43:00 -0500 Subject: [PATCH] Don't migrate legacy vendor. --- .../profile/profiledefinition/validation.go | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkg/networkdevice/profile/profiledefinition/validation.go b/pkg/networkdevice/profile/profiledefinition/validation.go index 21e55dfb673297..4b95fd12b97b20 100644 --- a/pkg/networkdevice/profile/profiledefinition/validation.go +++ b/pkg/networkdevice/profile/profiledefinition/validation.go @@ -51,22 +51,23 @@ const ( func ValidateEnrichProfile(profile *ProfileDefinition) []string { NormalizeMetrics(profile.Metrics) // migrate legacy profile.Device.Vendor to metadata field. - if profile.Device.Vendor != "" { - dev, ok := profile.Metadata["device"] - if !ok { - profile.Metadata["device"] = MetadataResourceConfig{ - Fields: make(map[string]MetadataField), - } - dev = profile.Metadata["device"] - } - _, ok = dev.Fields["vendor"] - if !ok { - dev.Fields["vendor"] = MetadataField{ - Value: profile.Device.Vendor, - } - } - profile.Device.Vendor = "" - } + // TODO this is commented out because it changes existing behavior; uncomment when we want to support this properly. + // if profile.Device.Vendor != "" { + // dev, ok := profile.Metadata["device"] + // if !ok { + // profile.Metadata["device"] = MetadataResourceConfig{ + // Fields: make(map[string]MetadataField), + // } + // dev = profile.Metadata["device"] + // } + // _, ok = dev.Fields["vendor"] + // if !ok { + // dev.Fields["vendor"] = MetadataField{ + // Value: profile.Device.Vendor, + // } + // } + // profile.Device.Vendor = "" + // } errors := ValidateEnrichMetadata(profile.Metadata) errors = append(errors, ValidateEnrichMetrics(profile.Metrics)...) errors = append(errors, ValidateEnrichMetricTags(profile.MetricTags)...)