From b8de8853b8a9a0a16ef3e0a1f92ff73fd87b5a00 Mon Sep 17 00:00:00 2001 From: Abhijit Sinha Date: Thu, 8 Feb 2018 16:05:54 +0000 Subject: Prox vnf descriptor cleanup JIRA: YARDSTICK-1003 - There are redundant files for Prox vnf descriptors tg and vnf for 1, 2 and 4 port set-up. - We can use one vnf descriptor file per prox tg and prox vnf, reducing the number of redundant files. - Tested on Prox BM L2fwd 2 and 4 port test case. Change-Id: I4c61fd11725121f19392443460ac2ad39c934e2d Signed-off-by: Abhijit Sinha --- .../vnf_samples/vnf_descriptors/tg_prox_tpl.yaml | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 samples/vnf_samples/vnf_descriptors/tg_prox_tpl.yaml (limited to 'samples/vnf_samples/vnf_descriptors/tg_prox_tpl.yaml') diff --git a/samples/vnf_samples/vnf_descriptors/tg_prox_tpl.yaml b/samples/vnf_samples/vnf_descriptors/tg_prox_tpl.yaml new file mode 100644 index 000000000..20bd12ca2 --- /dev/null +++ b/samples/vnf_samples/vnf_descriptors/tg_prox_tpl.yaml @@ -0,0 +1,47 @@ +# Copyright (c) 2017 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. + +vnfd:vnfd-catalog: + vnfd: + - id: ProxTrafficGen # nsb class mapping + name: proxverifier + short-name: proxverifier + description: prox stateless traffic verifier + mgmt-interface: + vdu-id: proxgen-baremetal + {% if user is defined %} + user: '{{user}}' # Value filled by vnfdgen + {% endif %} + {% if password is defined %} + password: '{{password}}' # Value filled by vnfdgen + {% endif %} + {% if ip is defined %} + ip: '{{ip}}' # Value filled by vnfdgen + {% endif %} + {% if key_filename is defined %} + key_filename: '{{key_filename}}' # Value filled by vnfdgen + {% endif %} + vdu: + - id: proxgen-baremetal + name: proxgen-baremetal + description: prox stateless traffic verifier + + benchmark: + kpi: + - rx_throughput_fps + - tx_throughput_fps + - tx_throughput_mbps + - rx_throughput_mbps + - in_packets + - out_packets -- cgit 1.2.3-korg