Skip to content

Commit 0860d53

Browse files
zeekezeeke
authored
Merge pull request #828 from rollandf/mtu-ovs
Support mtu_request for OVS
2 parents 220247d + e49dac0 commit 0860d53

11 files changed

+58
-0
lines changed

‎api/v1/helper.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,10 @@ func (p *SriovNetworkNodePolicy) ApplyBridgeConfig(state *SriovNetworkNodeState)
484484
Interface: p.Spec.Bridge.OVS.Uplink.Interface,
485485
}},
486486
}
487+
if p.Spec.Mtu > 0 {
488+
mtu := p.Spec.Mtu
489+
ovsBridge.Uplinks[0].Interface.MTURequest = &mtu
490+
}
487491
log.Info("Update bridge for interface", "name", iface.Name, "bridge", ovsBridge.Name)
488492

489493
// We need to keep slices with bridges ordered to avoid unnecessary updates in the K8S API.

‎api/v1/sriovnetworknodepolicy_types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ type OVSInterfaceConfig struct {
125125
ExternalIDs map[string]string `json:"externalIDs,omitempty"`
126126
// other_config field in the Interface table in OVSDB
127127
OtherConfig map[string]string `json:"otherConfig,omitempty"`
128+
// mtu_request field in the Interface table in OVSDB
129+
MTURequest *int `json:"mtuRequest,omitempty"`
128130
}
129131

130132
// SriovNetworkNodePolicyStatus defines the observed state of SriovNetworkNodePolicy

‎api/v1/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ spec:
8181
description: external_ids field in the Interface table
8282
in OVSDB
8383
type: object
84+
mtuRequest:
85+
description: mtu_request field in the Interface table
86+
in OVSDB
87+
type: integer
8488
options:
8589
additionalProperties:
8690
type: string

‎config/crd/bases/sriovnetwork.openshift.io_sriovnetworknodestates.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ spec:
102102
description: external_ids field in the Interface
103103
table in OVSDB
104104
type: object
105+
mtuRequest:
106+
description: mtu_request field in the Interface
107+
table in OVSDB
108+
type: integer
105109
options:
106110
additionalProperties:
107111
type: string
@@ -237,6 +241,10 @@ spec:
237241
description: external_ids field in the Interface
238242
table in OVSDB
239243
type: object
244+
mtuRequest:
245+
description: mtu_request field in the Interface
246+
table in OVSDB
247+
type: integer
240248
options:
241249
additionalProperties:
242250
type: string

‎deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ spec:
8181
description: external_ids field in the Interface table
8282
in OVSDB
8383
type: object
84+
mtuRequest:
85+
description: mtu_request field in the Interface table
86+
in OVSDB
87+
type: integer
8488
options:
8589
additionalProperties:
8690
type: string

‎deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworknodestates.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ spec:
102102
description: external_ids field in the Interface
103103
table in OVSDB
104104
type: object
105+
mtuRequest:
106+
description: mtu_request field in the Interface
107+
table in OVSDB
108+
type: integer
105109
options:
106110
additionalProperties:
107111
type: string
@@ -237,6 +241,10 @@ spec:
237241
description: external_ids field in the Interface
238242
table in OVSDB
239243
type: object
244+
mtuRequest:
245+
description: mtu_request field in the Interface
246+
table in OVSDB
247+
type: integer
240248
options:
241249
additionalProperties:
242250
type: string

‎pkg/host/internal/bridge/ovs/models.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ type InterfaceEntry struct {
3636
Options map[string]string `ovsdb:"options"`
3737
ExternalIDs map[string]string `ovsdb:"external_ids"`
3838
OtherConfig map[string]string `ovsdb:"other_config"`
39+
MTURequest *int `ovsdb:"mtu_request"`
3940
}
4041

4142
// PortEntry represents some fields of the object in the Port table

‎pkg/host/internal/bridge/ovs/ovs.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ func (o *ovs) CreateOVSBridge(ctx context.Context, conf *sriovnetworkv1.OVSConfi
156156
Options: conf.Uplinks[0].Interface.Options,
157157
ExternalIDs: conf.Uplinks[0].Interface.ExternalIDs,
158158
OtherConfig: conf.Uplinks[0].Interface.OtherConfig,
159+
MTURequest: conf.Uplinks[0].Interface.MTURequest,
159160
}); err != nil {
160161
funcLog.Error(err, "CreateOVSBridge(): failed to add uplink interface to the bridge")
161162
return err
@@ -592,6 +593,10 @@ func (o *ovs) getCurrentBridgeState(ctx context.Context, dbClient client.Client,
592593
OtherConfig: updateMap(knownConfigUplink.Interface.OtherConfig, iface.OtherConfig),
593594
},
594595
}}
596+
if iface.MTURequest != nil {
597+
mtu := *iface.MTURequest
598+
currentConfig.Uplinks[0].Interface.MTURequest = &mtu
599+
}
595600
return currentConfig, nil
596601
}
597602

@@ -707,6 +712,7 @@ func getClient(ctx context.Context) (client.Client, error) {
707712
&interfaceEntry.Options,
708713
&interfaceEntry.ExternalIDs,
709714
&interfaceEntry.OtherConfig,
715+
&interfaceEntry.MTURequest,
710716
),
711717
client.WithTable(portEntry,
712718
&portEntry.UUID,

‎pkg/host/internal/bridge/ovs/ovs_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
)
2828

2929
func getManagedBridges() map[string]*sriovnetworkv1.OVSConfigExt {
30+
mtu := 5000
3031
return map[string]*sriovnetworkv1.OVSConfigExt{
3132
"br-0000_d8_00.0": {
3233
Name: "br-0000_d8_00.0",
@@ -43,6 +44,7 @@ func getManagedBridges() map[string]*sriovnetworkv1.OVSConfigExt {
4344
ExternalIDs: map[string]string{"iface_externalID_key": "iface_externalID_value"},
4445
OtherConfig: map[string]string{"iface_otherConfig_key": "iface_otherConfig_value"},
4546
Options: map[string]string{"iface_options_key": "iface_options_value"},
47+
MTURequest: &mtu,
4648
},
4749
}},
4850
},
@@ -83,13 +85,15 @@ func (t *testDBEntries) GetCreateOperations(c client.Client) []ovsdb.Operation {
8385
}
8486

8587
func getDefaultInitialDBContent() *testDBEntries {
88+
mtu := 5000
8689
iface := &InterfaceEntry{
8790
Name: "enp216s0f0np0",
8891
UUID: uuid.NewString(),
8992
Type: "dpdk",
9093
ExternalIDs: map[string]string{"iface_externalID_key": "iface_externalID_value"},
9194
OtherConfig: map[string]string{"iface_otherConfig_key": "iface_otherConfig_value"},
9295
Options: map[string]string{"iface_options_key": "iface_options_value"},
96+
MTURequest: &mtu,
9397
}
9498
port := &PortEntry{
9599
Name: "enp216s0f0np0",
@@ -156,6 +160,7 @@ func validateDBConfig(dbContent *testDBEntries, conf *sriovnetworkv1.OVSConfigEx
156160
Expect(iface.Type).To(Equal(conf.Uplinks[0].Interface.Type))
157161
Expect(iface.OtherConfig).To(Equal(conf.Uplinks[0].Interface.OtherConfig))
158162
Expect(iface.ExternalIDs).To(Equal(conf.Uplinks[0].Interface.ExternalIDs))
163+
Expect(iface.MTURequest).To(Equal(conf.Uplinks[0].Interface.MTURequest))
159164
}
160165

161166
var _ = Describe("OVS", func() {
@@ -457,6 +462,7 @@ var _ = Describe("OVS", func() {
457462
initialDBContent := getDefaultInitialDBContent()
458463
initialDBContent.Bridge[0].ExternalIDs = nil
459464
initialDBContent.Bridge[0].OtherConfig = nil
465+
initialDBContent.Interface[0].MTURequest = nil
460466
createInitialDBContent(ctx, ovsClient, initialDBContent)
461467
conf := getManagedBridges()
462468
store.EXPECT().GetManagedOVSBridges().Return(conf, nil)
@@ -465,6 +471,7 @@ var _ = Describe("OVS", func() {
465471
Expect(ret).To(HaveLen(1))
466472
Expect(ret[0].Bridge.ExternalIDs).To(BeEmpty())
467473
Expect(ret[0].Bridge.OtherConfig).To(BeEmpty())
474+
Expect(ret[0].Uplinks[0].Interface.MTURequest).To(BeNil())
468475
})
469476
})
470477
Context("RemoveOVSBridge", func() {

‎pkg/host/internal/bridge/ovs/test_db.ovsschema

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,15 @@
105105
},
106106
"type": {
107107
"type": "string"
108+
},
109+
"mtu_request":{
110+
"type": {
111+
"key": {
112+
"minInteger":1,
113+
"type": "integer"
114+
},
115+
"min": 0
116+
}
108117
}
109118
},
110119
"indexes": [

0 commit comments

Comments
 (0)