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 <abhijit.sinha@intel.com>

1 files changed, 48 insertions, 0 deletions

diff --git a/samples/vnf_samples/vnf_descriptors/prox_vnf.yaml b/samples/vnf_samples/vnf_descriptors/prox_vnf.yaml
new file mode 100644
index 000000000..13c4e9db7
--- /dev/null
+++ b/samples/vnf_samples/vnf_descriptors/prox_vnf.yaml
@@ -0,0 +1,48 @@
+# 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: ProxApproxVnf
+        name: ProxVnf
+        short-name: ProxVnf
+        description: PROX approximation using DPDK
+        mgmt-interface:
+            vdu-id: prox-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: proxvnf-baremetal
+            name: proxvnf-baremetal
+            description: PROX approximation using DPDK
+            vm-flavor:
+                vcpu-count: '4'
+                memory-mb: '4096'
+            routing_table: {{ routing_table }}
+            nd_route_tbl: {{ nd_route_tbl }}
+        benchmark:
+            kpi:
+                - packets_in
+                - packets_fwd
+                - packets_dropped