Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions cmd/calicovppctl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -605,13 +605,13 @@ func printHelp() {
fmt.Println("calicovppctl gdb - Attach gdb to the running vpp on the current machine")
fmt.Println("calicovppctl sh [-component vpp|agent] [-node NODENAME] - Get a shell in vpp (dataplane) or agent (controlplane) container")
fmt.Println("calicovppctl trace [-node NODENAME] - Setup VPP packet tracing")
fmt.Println(" Optional params: [-count N] [-timeout SEC] [-interface phy|af_xdp|af_packet|avf|vmxnet3|virtio|rdma|dpdk|memif|vcl]")
fmt.Println(" Optional params: [-count N] [-timeout SEC] [-interface phy|af_xdp|af_packet|vmxnet3|virtio|rdma|dpdk|memif|vcl]")
fmt.Println(" Filter params: [-srcip IP] [-dstip IP] [-srcport PORT] [-dstport PORT] [-protocol tcp|udp|icmp]")
fmt.Println("calicovppctl pcap [-node NODENAME] - Setup VPP PCAP tracing")
fmt.Println(" Optional params: [-count N] [-timeout SEC] [-interface INTERFACE_NAME|any(default)] [-output FILE.pcap]")
fmt.Println(" Filter params: [-srcip IP] [-dstip IP] [-srcport PORT] [-dstport PORT] [-protocol tcp|udp|icmp]")
fmt.Println("calicovppctl dispatch [-node NODENAME] - Setup VPP dispatch tracing")
fmt.Println(" Optional params: [-count N] [-timeout SEC] [-interface phy|af_xdp|af_packet|avf|vmxnet3|virtio|rdma|dpdk|memif|vcl] [-output FILE.pcap]")
fmt.Println(" Optional params: [-count N] [-timeout SEC] [-interface phy|af_xdp|af_packet|vmxnet3|virtio|rdma|dpdk|memif|vcl] [-output FILE.pcap]")
fmt.Println(" Filter params: [-srcip IP] [-dstip IP] [-srcport PORT] [-dstport PORT] [-protocol tcp|udp|icmp]")
fmt.Println()
}
Expand Down Expand Up @@ -1507,8 +1507,6 @@ func mapInterfaceTypeToVppInputNode(k *KubeClient, interfaceType string) (string
return "af-xdp-input", "af_xdp", nil
case "af_packet":
return "af-packet-input", "af_packet", nil
case "avf":
return "avf-input", "avf", nil
case "vmxnet3":
return "vmxnet3-input", "vmxnet3", nil
case "virtio", "tuntap":
Expand All @@ -1528,7 +1526,6 @@ func mapInterfaceTypeToVppInputNode(k *KubeClient, interfaceType string) (string
errorMsg += " phy : use the physical interface driver configured in calico-vpp-config\n"
errorMsg += " af_xdp : use an AF_XDP socket to drive the interface\n"
errorMsg += " af_packet : use an AF_PACKET socket to drive the interface\n"
errorMsg += " avf : use the VPP native driver for Intel 700-Series and 800-Series interfaces\n"
errorMsg += " vmxnet3 : use the VPP native driver for VMware virtual interfaces\n"
errorMsg += " virtio : use the VPP native driver for Virtio virtual interfaces\n"
errorMsg += " tuntap : alias for virtio (default)\n"
Expand Down
180 changes: 0 additions & 180 deletions vpp-manager/uplink/avf.go

This file was deleted.

6 changes: 0 additions & 6 deletions vpp-manager/uplink/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ const (
NativeDriverAfPacket = "af_packet"
NativeDriverAfXdp = "af_xdp"
NativeDriverVirtio = "virtio"
NativeDriverAvf = "avf"
NativeDriverDpdk = "dpdk"
NativeDriverRdma = "rdma"
NativeDriverVmxnet3 = "vmxnet3"
Expand Down Expand Up @@ -192,9 +191,6 @@ func SupportedUplinkDrivers(params *config.VppManagerParams, conf *config.LinuxI
if d := NewVirtioDriver(params, conf, spec); d.IsSupported(false /* warn */) {
lst = append(lst, d)
}
if d := NewAVFDriver(params, conf, spec); d.IsSupported(false /* warn */) {
lst = append(lst, d)
}
if d := NewRDMADriver(params, conf, spec); d.IsSupported(false /* warn */) {
lst = append(lst, d)
}
Expand Down Expand Up @@ -222,8 +218,6 @@ func NewUplinkDriver(name string, params *config.VppManagerParams, conf *config.
d = NewAFXDPDriver(params, conf, spec)
case NativeDriverVirtio:
d = NewVirtioDriver(params, conf, spec)
case NativeDriverAvf:
d = NewAVFDriver(params, conf, spec)
case NativeDriverDpdk:
d = NewDPDKDriver(params, conf, spec)
case NativeDriverNone:
Expand Down
66 changes: 0 additions & 66 deletions vpplink/avf.go

This file was deleted.

Loading
Loading