From 1ea5c5239f9003f9cb8492f1d5b00a75724a7180 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Thu, 18 Aug 2016 12:00:44 +0100 Subject: cuse: Remove vHost Cuse support Support of vHost Cuse interface is not supported by OVS anymore, so it was removed also from VSPERF. Cuse can be used with older VSPERF release if needed. JIRA: VSPERF-376 Change-Id: Id786bddf5fa9dce5706a93de7b089707a60317cd Signed-off-by: Martin Klozik Reviewed-by: Maryam Tahhan Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Bill Michalowski --- vnfs/qemu/qemu.py | 2 +- vnfs/qemu/qemu_dpdk_vhost_cuse.py | 58 --------------------------------------- 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 vnfs/qemu/qemu_dpdk_vhost_cuse.py (limited to 'vnfs') diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py index 02ada4b5..b5eaddc3 100644 --- a/vnfs/qemu/qemu.py +++ b/vnfs/qemu/qemu.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Automation of QEMU hypervisor for launching vhost-cuse enabled guests. +"""Automation of QEMU hypervisor for launching guests. """ import os diff --git a/vnfs/qemu/qemu_dpdk_vhost_cuse.py b/vnfs/qemu/qemu_dpdk_vhost_cuse.py deleted file mode 100644 index ab4fec84..00000000 --- a/vnfs/qemu/qemu_dpdk_vhost_cuse.py +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2015 Intel Corporation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Automation of QEMU hypervisor for launching vhost-cuse enabled guests. -""" - -import logging - -from conf import settings as S -from vnfs.qemu.qemu import IVnfQemu - -class QemuDpdkVhostCuse(IVnfQemu): - """ - Control an instance of QEMU with vHost cuse guest communication. - """ - def __init__(self): - """ - Initialisation function. - """ - super(QemuDpdkVhostCuse, self).__init__() - self._logger = logging.getLogger(__name__) - - # calculate indexes of guest devices (e.g. charx, dpdkvhostuserx) - i = self._number * 2 - if1 = str(i) - if2 = str(i + 1) - net1 = 'net' + str(i + 1) - net2 = 'net' + str(i + 2) - - self._cmd += ['-netdev', - 'type=tap,id=' + net1 + ',script=no,downscript=no,' + - 'ifname=dpdkvhostcuse' + if1 + ',vhost=on', - '-device', - 'virtio-net-pci,mac=' + - S.getValue('GUEST_NET1_MAC')[self._number] + - ',netdev=' + net1 + ',csum=off,gso=off,' + - 'guest_tso4=off,guest_tso6=off,guest_ecn=off', - '-netdev', - 'type=tap,id=' + net2 + - ',script=no,downscript=no,' + - 'ifname=dpdkvhostcuse' + if2 + ',vhost=on', - '-device', - 'virtio-net-pci,mac=' + - S.getValue('GUEST_NET2_MAC')[self._number] + - ',netdev=' + net2 + ',csum=off,gso=off,' + - 'guest_tso4=off,guest_tso6=off,guest_ecn=off', - ] -- cgit 1.2.3-korg