Skip to content

Commit a7cd13a

Browse files
committed
remove avf native driver support
avf is deprecated in vpp.
1 parent 75b4436 commit a7cd13a

File tree

12 files changed

+152
-612
lines changed

12 files changed

+152
-612
lines changed

cmd/calicovppctl/main.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -605,13 +605,13 @@ func printHelp() {
605605
fmt.Println("calicovppctl gdb - Attach gdb to the running vpp on the current machine")
606606
fmt.Println("calicovppctl sh [-component vpp|agent] [-node NODENAME] - Get a shell in vpp (dataplane) or agent (controlplane) container")
607607
fmt.Println("calicovppctl trace [-node NODENAME] - Setup VPP packet tracing")
608-
fmt.Println(" Optional params: [-count N] [-timeout SEC] [-interface phy|af_xdp|af_packet|avf|vmxnet3|virtio|rdma|dpdk|memif|vcl]")
608+
fmt.Println(" Optional params: [-count N] [-timeout SEC] [-interface phy|af_xdp|af_packet|vmxnet3|virtio|rdma|dpdk|memif|vcl]")
609609
fmt.Println(" Filter params: [-srcip IP] [-dstip IP] [-srcport PORT] [-dstport PORT] [-protocol tcp|udp|icmp]")
610610
fmt.Println("calicovppctl pcap [-node NODENAME] - Setup VPP PCAP tracing")
611611
fmt.Println(" Optional params: [-count N] [-timeout SEC] [-interface INTERFACE_NAME|any(default)] [-output FILE.pcap]")
612612
fmt.Println(" Filter params: [-srcip IP] [-dstip IP] [-srcport PORT] [-dstport PORT] [-protocol tcp|udp|icmp]")
613613
fmt.Println("calicovppctl dispatch [-node NODENAME] - Setup VPP dispatch tracing")
614-
fmt.Println(" Optional params: [-count N] [-timeout SEC] [-interface phy|af_xdp|af_packet|avf|vmxnet3|virtio|rdma|dpdk|memif|vcl] [-output FILE.pcap]")
614+
fmt.Println(" Optional params: [-count N] [-timeout SEC] [-interface phy|af_xdp|af_packet|vmxnet3|virtio|rdma|dpdk|memif|vcl] [-output FILE.pcap]")
615615
fmt.Println(" Filter params: [-srcip IP] [-dstip IP] [-srcport PORT] [-dstport PORT] [-protocol tcp|udp|icmp]")
616616
fmt.Println()
617617
}
@@ -1507,8 +1507,6 @@ func mapInterfaceTypeToVppInputNode(k *KubeClient, interfaceType string) (string
15071507
return "af-xdp-input", "af_xdp", nil
15081508
case "af_packet":
15091509
return "af-packet-input", "af_packet", nil
1510-
case "avf":
1511-
return "avf-input", "avf", nil
15121510
case "vmxnet3":
15131511
return "vmxnet3-input", "vmxnet3", nil
15141512
case "virtio", "tuntap":
@@ -1528,7 +1526,6 @@ func mapInterfaceTypeToVppInputNode(k *KubeClient, interfaceType string) (string
15281526
errorMsg += " phy : use the physical interface driver configured in calico-vpp-config\n"
15291527
errorMsg += " af_xdp : use an AF_XDP socket to drive the interface\n"
15301528
errorMsg += " af_packet : use an AF_PACKET socket to drive the interface\n"
1531-
errorMsg += " avf : use the VPP native driver for Intel 700-Series and 800-Series interfaces\n"
15321529
errorMsg += " vmxnet3 : use the VPP native driver for VMware virtual interfaces\n"
15331530
errorMsg += " virtio : use the VPP native driver for Virtio virtual interfaces\n"
15341531
errorMsg += " tuntap : alias for virtio (default)\n"

vpp-manager/uplink/avf.go

Lines changed: 0 additions & 180 deletions
This file was deleted.

vpp-manager/uplink/common.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ const (
3535
NativeDriverAfPacket = "af_packet"
3636
NativeDriverAfXdp = "af_xdp"
3737
NativeDriverVirtio = "virtio"
38-
NativeDriverAvf = "avf"
3938
NativeDriverDpdk = "dpdk"
4039
NativeDriverRdma = "rdma"
4140
NativeDriverVmxnet3 = "vmxnet3"
@@ -192,9 +191,6 @@ func SupportedUplinkDrivers(params *config.VppManagerParams, conf *config.LinuxI
192191
if d := NewVirtioDriver(params, conf, spec); d.IsSupported(false /* warn */) {
193192
lst = append(lst, d)
194193
}
195-
if d := NewAVFDriver(params, conf, spec); d.IsSupported(false /* warn */) {
196-
lst = append(lst, d)
197-
}
198194
if d := NewRDMADriver(params, conf, spec); d.IsSupported(false /* warn */) {
199195
lst = append(lst, d)
200196
}
@@ -222,8 +218,6 @@ func NewUplinkDriver(name string, params *config.VppManagerParams, conf *config.
222218
d = NewAFXDPDriver(params, conf, spec)
223219
case NativeDriverVirtio:
224220
d = NewVirtioDriver(params, conf, spec)
225-
case NativeDriverAvf:
226-
d = NewAVFDriver(params, conf, spec)
227221
case NativeDriverDpdk:
228222
d = NewDPDKDriver(params, conf, spec)
229223
case NativeDriverNone:

vpplink/avf.go

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)