Skip to content

Commit fa5cbd2

Browse files
committed
vpp: upgrade to 156d452750ab37a51984938bf4a8ab0e16650d82 (31 mars 23)
This upgrade VPP's version containing mostly changes in the way the memif API allows to create abstract sockets. Notably the syntax changed and is now inconsistent with the tap_v2 api. Changelog also contains patches for avf & wireguard. Signed-off-by: Nathan Skrzypczak <[email protected]>
1 parent 8134c53 commit fa5cbd2

33 files changed

+1195
-885
lines changed

calico-vpp-agent/cni/cni_pod_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ var _ = Describe("Pod-related functionality of CNI", func() {
231231
socket, err := vpp.MemifsocketByID(memifs[0].SocketId)
232232
Expect(err).ToNot(HaveOccurred(), "failed to get memif socket")
233233
Expect(socket.SocketFilename).To(Equal(
234-
fmt.Sprintf("@netns:%s@vpp/memif-%s", newPod.Netns, newPod.InterfaceName)),
234+
fmt.Sprintf("abstract:%s,netns_name=%s", newPod.InterfaceName, newPod.Netns)),
235235
"memif socket file is not configured correctly")
236236

237237
By("Checking PBL (packet punting) to redirect some traffic into memif (secondary interface)")

calico-vpp-agent/cni/pod_interface/common.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ func (i *PodInterfaceDriverData) SpreadTxQueuesOnWorkers(swIfIndex uint32, numTx
3737
"swIfIndex": swIfIndex,
3838
}).Debugf("Spreading %d TX queues on %d workers for pod interface: %v", numTxQueues, i.NDataThreads, i.Name)
3939

40+
return nil // FIXME
41+
4042
// set first tx queue for main worker
4143
err = i.vpp.SetInterfaceTxPlacement(swIfIndex, 0 /* queue */, 0 /* worker */)
4244
if err != nil {

calico-vpp-agent/cni/pod_interface/memif.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (i *MemifPodInterfaceDriver) CreateInterface(podSpec *storage.LocalPodSpec,
5858
if podSpec.NetworkName == "" {
5959
memifName = "@vpp/memif-" + podSpec.InterfaceName
6060
}
61-
socketId, err := i.vpp.AddMemifSocketFileName(fmt.Sprintf("@netns:%s%s", podSpec.NetnsName, memifName))
61+
socketId, err := i.vpp.AddMemifSocketFileName(fmt.Sprintf("abstract:%s,netns_name=%s", memifName, podSpec.NetnsName))
6262
if err != nil {
6363
return err
6464
} else {

vpplink/generated/bindings/capo/capo.ba.go

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

vpplink/generated/bindings/cnat/cnat.ba.go

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

vpplink/generated/bindings/ikev2/ikev2.ba.go

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

0 commit comments

Comments
 (0)