From 5bb855a82d960a4fb796e801ec9a9a22dc40b1ca Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Mon, 21 May 2018 08:42:08 +0100 Subject: [PATCH] vPE Sample VNF is missing in the installation scripts Sample VNF vPE is missing in the installation scripts and should be added to support the execution of the test cases related. JIRA: YARDSTICK-1187 Change-Id: I6684304cc97fd3bde90ca06f5fe8df9e1d11ce18 Signed-off-by: Rodolfo Alonso Hernandez --- ansible/roles/install_samplevnf/vars/main.yml | 2 ++ ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml | 2 ++ ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml | 2 ++ yardstick/network_services/vnf_generic/vnf/vpe_vnf.py | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ansible/roles/install_samplevnf/vars/main.yml b/ansible/roles/install_samplevnf/vars/main.yml index 45cea6820..29a7de7a0 100644 --- a/ansible/roles/install_samplevnf/vars/main.yml +++ b/ansible/roles/install_samplevnf/vars/main.yml @@ -48,11 +48,13 @@ vnf_build_dirs: ACL: vACL FW: vFW CGNATP: vCGNAPT + PE: vPE UDP_Replay: UDP_Replay PROX: DPPD-PROX vnf_app_names: ACL: vACL FW: vFW CGNATP: vCGNAPT + PE: vPE UDP_Replay: UDP_Replay PROX: prox diff --git a/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml b/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml index 479b45c92..51756b8c7 100644 --- a/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml +++ b/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml @@ -45,6 +45,8 @@ vnf_name: FW - role: install_samplevnf vnf_name: CGNATP + - role: install_samplevnf + vnf_name: PE # build shared DPDK for collectd only, required DPDK downloaded already - install_dpdk_shared - install_rabbitmq diff --git a/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml b/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml index 7aa6c8c12..b721703e8 100644 --- a/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml +++ b/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml @@ -55,6 +55,8 @@ vnf_name: FW - role: install_samplevnf vnf_name: CGNATP + - role: install_samplevnf + vnf_name: PE # build shared DPDK for collectd only, required DPDK downloaded already - install_dpdk_shared - install_rabbitmq diff --git a/yardstick/network_services/vnf_generic/vnf/vpe_vnf.py b/yardstick/network_services/vnf_generic/vnf/vpe_vnf.py index 0067f6bf9..91d10facd 100644 --- a/yardstick/network_services/vnf_generic/vnf/vpe_vnf.py +++ b/yardstick/network_services/vnf_generic/vnf/vpe_vnf.py @@ -236,7 +236,7 @@ class ConfigCreate(object): class VpeApproxSetupEnvHelper(DpdkVnfSetupEnvHelper): - APP_NAME = 'vPE_vnf' + APP_NAME = 'vPE' CFG_CONFIG = "/tmp/vpe_config" CFG_SCRIPT = "/tmp/vpe_script" TM_CONFIG = "/tmp/full_tm_profile_10G.cfg" @@ -283,7 +283,7 @@ class VpeApproxSetupEnvHelper(DpdkVnfSetupEnvHelper): class VpeApproxVnf(SampleVNF): """ This class handles vPE VNF model-driver definitions """ - APP_NAME = 'vPE_vnf' + APP_NAME = 'vPE' APP_WORD = 'vpe' COLLECT_KPI = VPE_COLLECT_KPI WAIT_TIME = 20 -- 2.16.6