From 8137692dd94e112943dcc576470f4b361fbd8c5c Mon Sep 17 00:00:00 2001 From: "Sridhar K. N. Rao" Date: Wed, 2 Jun 2021 19:11:18 +0530 Subject: WIP:Infrastructure for supporting more K8S Tests. This patch add multiple changes to ViNePerf to support following tests. 1. External virtual switch - not managed by Vineperf. 2. CNI not based on virtual switch 3. Fixed bugs after successful testing. 4. Pylint issues fixed 4. Fix some license-content and comments Signed-off-by: Sridhar K. N. Rao Change-Id: Ie01735f99c0687cc812eae8e67ee2353347924f2 --- conf/02_vswitch.conf | 3 +++ conf/12_k8s.conf | 10 ++++++++-- conf/kubernetes/01_testcases.conf | 20 ++++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf index 4eca1a52..7a29fc70 100644 --- a/conf/02_vswitch.conf +++ b/conf/02_vswitch.conf @@ -250,3 +250,6 @@ VSWITCH_VPP_L2_CONNECT_MODE = 'xconnect' # Options used during creation of dpdkvhostuser interface VSWITCH_VPP_VHOSTUSER_ARGS = ['feature-mask', '0xFF'] + +EXT_VSWITCH_VPP_FLOWCTL = 'vppctl' +EXT_VSWITCH_OVS_FLOWCTL = 'ovs-ofctl' diff --git a/conf/12_k8s.conf b/conf/12_k8s.conf index 5cfac966..545870cd 100644 --- a/conf/12_k8s.conf +++ b/conf/12_k8s.conf @@ -32,10 +32,16 @@ WORKER_PASSWD = 'opnfv' PLUGIN = 'ovsdpdk' # Paths. Default location: Master Node. -NETWORK_ATTACHMENT_FILEPATH = ['/home/opnfv/sridhar/cnb/userspace/ovsdpdk/userspace-ovs-netAttach.yaml'] -POD_MANIFEST_FILEPATH = '/home/opnfv/sridhar/cnb/userspace/ovsdpdk/userspace-ovs-netapp-pod.yaml' +# NETWORK_ATTACHMENT_FILEPATH = ['/home/opnfv/sridhar/cnb/userspace/ovsdpdk/userspace-ovs-netAttach.yaml'] +NETWORK_ATTACHMENT_FILEPATH = ['/home/opnfv/sridhar/cnb/userspace/vpp/userspace-vpp-netAttach-memif.yaml'] +#POD_MANIFEST_FILEPATH = '/home/opnfv/sridhar/cnb/userspace/ovsdpdk/userspace-ovs-netapp-pod.yaml' +POD_MANIFEST_FILEPATH = ['/home/opnfv/sridhar/cnb/userspace/vpp/userspace-dpdk-pod.yaml', + '/home/opnfv/sridhar/cnb/userspace/vpp/userspace-dpdk-pod2.yaml'] # Application pod APP_NAME = 'l2fwd' +EXT_VSWITCH = True +EXT_VSWITCH_TYPE = 'VPP' +EXT_OVS_BRIDGE = 'br0' diff --git a/conf/kubernetes/01_testcases.conf b/conf/kubernetes/01_testcases.conf index c5b3135c..25eea362 100644 --- a/conf/kubernetes/01_testcases.conf +++ b/conf/kubernetes/01_testcases.conf @@ -9,4 +9,24 @@ K8SPERFORMANCE_TESTS = [ }, }, }, + { + "Name": "pcp_evs_tput", + "Deployment": "pcp", + "Description": "LTD.Throughput.RFC2544.Throughput", + "Parameters" : { + "TRAFFIC" : { + "traffic_type" : "rfc2544_throughput", + }, + }, + }, + { + "Name": "pccp_evs_tput", + "Deployment": "pccp", + "Description": "LTD.Throughput.RFC2544.Throughput", + "Parameters" : { + "TRAFFIC" : { + "traffic_type" : "rfc2544_throughput", + }, + }, + }, ] -- cgit 1.2.3-korg