Skip to content

Commit

Permalink
fix: add default vlan group to vlans that are not mapped in the relat…
Browse files Browse the repository at this point in the history
…ion (fixes #481)
  • Loading branch information
bl4ko committed Feb 26, 2025
1 parent fab0c38 commit 69f088e
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions internal/source/common/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@ func MatchVlanToGroup(
vlanGroupSiteRelations map[string]string,
) (*objects.VlanGroup, error) {
if vlanGroupRelations == nil {
vlanGroup, _ := nbi.CreateDefaultVlanGroupForVlan(ctx, vlanSite)
vlanGroup, err := nbi.CreateDefaultVlanGroupForVlan(ctx, vlanSite)
if err != nil {
return nil, fmt.Errorf("create default vlan group for vlan %s: %s", vlanName, err)
}
return vlanGroup, nil
}
vlanGroupName, err := utils.MatchStringToValue(vlanName, vlanGroupRelations)
Expand All @@ -111,7 +114,7 @@ func MatchVlanToGroup(
}
}
}
var vlanGroup *objects.VlanGroup

if vlanGroupName != "" {
vlanGroup := &objects.VlanGroup{
Name: vlanGroupName,
Expand All @@ -128,6 +131,12 @@ func MatchVlanToGroup(
}
return vlanGroup, nil
}

// No vlan group was matched create default one.
vlanGroup, err := nbi.CreateDefaultVlanGroupForVlan(ctx, vlanSite)
if err != nil {
return nil, fmt.Errorf("create default vlan group for vlan %s: %s", vlanName, err)
}
return vlanGroup, nil
}

Expand Down

0 comments on commit 69f088e

Please sign in to comment.