Skip to content

Commit 69f088e

Browse files
committed
fix: add default vlan group to vlans that are not mapped in the relation (fixes #481)
1 parent fab0c38 commit 69f088e

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

internal/source/common/utils.go

+11-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ func MatchVlanToGroup(
8888
vlanGroupSiteRelations map[string]string,
8989
) (*objects.VlanGroup, error) {
9090
if vlanGroupRelations == nil {
91-
vlanGroup, _ := nbi.CreateDefaultVlanGroupForVlan(ctx, vlanSite)
91+
vlanGroup, err := nbi.CreateDefaultVlanGroupForVlan(ctx, vlanSite)
92+
if err != nil {
93+
return nil, fmt.Errorf("create default vlan group for vlan %s: %s", vlanName, err)
94+
}
9295
return vlanGroup, nil
9396
}
9497
vlanGroupName, err := utils.MatchStringToValue(vlanName, vlanGroupRelations)
@@ -111,7 +114,7 @@ func MatchVlanToGroup(
111114
}
112115
}
113116
}
114-
var vlanGroup *objects.VlanGroup
117+
115118
if vlanGroupName != "" {
116119
vlanGroup := &objects.VlanGroup{
117120
Name: vlanGroupName,
@@ -128,6 +131,12 @@ func MatchVlanToGroup(
128131
}
129132
return vlanGroup, nil
130133
}
134+
135+
// No vlan group was matched create default one.
136+
vlanGroup, err := nbi.CreateDefaultVlanGroupForVlan(ctx, vlanSite)
137+
if err != nil {
138+
return nil, fmt.Errorf("create default vlan group for vlan %s: %s", vlanName, err)
139+
}
131140
return vlanGroup, nil
132141
}
133142

0 commit comments

Comments
 (0)