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>

diff --git a/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml b/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml
index 10902a7..f59146c 100644 (file)
--- a/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml
+++ b/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml
@@ -21,10 +21,10 @@ nsd:nsd-catalog:
         constituent-vnfd:
         -   member-vnf-index: '1'
             vnfd-id-ref: tg__0
-            VNF model: ../../vnf_descriptors/tg_prox_tpl-1.yaml
+            VNF model: ../../vnf_descriptors/tg_prox_tpl.yaml
         -   member-vnf-index: '2'
             vnfd-id-ref: vnf__0
-            VNF model: ../../vnf_descriptors/prox_vnf-1.yaml
+            VNF model: ../../vnf_descriptors/prox_vnf.yaml
         vld:
         -   id: uplink_0
             name: tg__0 to vnf__0 link 1

diff --git a/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml b/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml
index 11eed52..63d0acc 100644 (file)
--- a/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml
+++ b/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml
@@ -21,10 +21,10 @@ nsd:nsd-catalog:
         constituent-vnfd:
         -   member-vnf-index: '1'
             vnfd-id-ref: tg__0
-            VNF model: ../../vnf_descriptors/tg_prox_tpl-2.yaml
+            VNF model: ../../vnf_descriptors/tg_prox_tpl.yaml
         -   member-vnf-index: '2'
             vnfd-id-ref: vnf__0
-            VNF model: ../../vnf_descriptors/prox_vnf-2.yaml
+            VNF model: ../../vnf_descriptors/prox_vnf.yaml
         vld:
         -   id: uplink_0
             name: tg__0 to vnf__0 link 1

diff --git a/samples/vnf_samples/nsut/prox/prox-tg-topology-4.yaml b/samples/vnf_samples/nsut/prox/prox-tg-topology-4.yaml
index eda239e..b4b0036 100644 (file)
--- a/samples/vnf_samples/nsut/prox/prox-tg-topology-4.yaml
+++ b/samples/vnf_samples/nsut/prox/prox-tg-topology-4.yaml
@@ -21,10 +21,10 @@ nsd:nsd-catalog:
         constituent-vnfd:
         -   member-vnf-index: '1'
             vnfd-id-ref: tg__0
-            VNF model: ../../vnf_descriptors/tg_prox_tpl-4.yaml
+            VNF model: ../../vnf_descriptors/tg_prox_tpl.yaml
         -   member-vnf-index: '2'
             vnfd-id-ref: vnf__0
-            VNF model: ../../vnf_descriptors/prox_vnf-4.yaml
+            VNF model: ../../vnf_descriptors/prox_vnf.yaml
         vld:
         -   id: uplink_0
             name: tg__0 to vnf__0 link 1

diff --git a/samples/vnf_samples/vnf_descriptors/prox_vnf-2.yaml b/samples/vnf_samples/vnf_descriptors/prox_vnf-2.yaml
deleted file mode 100644 (file)
index 13c4e9d..0000000
--- a/samples/vnf_samples/vnf_descriptors/prox_vnf-2.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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

diff --git a/samples/vnf_samples/vnf_descriptors/prox_vnf-4.yaml b/samples/vnf_samples/vnf_descriptors/prox_vnf-4.yaml
deleted file mode 100644 (file)
index 13c4e9d..0000000
--- a/samples/vnf_samples/vnf_descriptors/prox_vnf-4.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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

diff --git a/samples/vnf_samples/vnf_descriptors/prox_vnf-1.yaml b/samples/vnf_samples/vnf_descriptors/prox_vnf.yaml
similarity index 100%
rename from samples/vnf_samples/vnf_descriptors/prox_vnf-1.yaml
rename to samples/vnf_samples/vnf_descriptors/prox_vnf.yaml

diff --git a/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-1.yaml b/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-1.yaml
deleted file mode 100644 (file)
index 7301439..0000000
--- a/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-1.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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

diff --git a/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-4.yaml b/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-4.yaml
deleted file mode 100644 (file)
index 20bd12c..0000000
--- a/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-4.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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

diff --git a/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-2.yaml b/samples/vnf_samples/vnf_descriptors/tg_prox_tpl.yaml
similarity index 100%
rename from samples/vnf_samples/vnf_descriptors/tg_prox_tpl-2.yaml
rename to samples/vnf_samples/vnf_descriptors/tg_prox_tpl.yaml