Merge "Addition of IRQ Mode to NSB NFVI (PROX)"

2 files changed, 98 insertions, 0 deletions

diff --git a/samples/vnf_samples/vnf_descriptors/prox_irq_vnf.yaml b/samples/vnf_samples/vnf_descriptors/prox_irq_vnf.yaml
new file mode 100644
index 000000000..12f2a69ca
--- /dev/null
+++ b/samples/vnf_samples/vnf_descriptors/prox_irq_vnf.yaml
@@ -0,0 +1,49 @@
+# Copyright (c) 2018 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: ProxIrqVNF  # nsb class mapping
+        name: proxirqvnf
+        short-name: proxirqvnf
+        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:
+                - max_irq
+                - irq(0)
+                - irq(1)
+                - irq(2)
+                - irq(3)
+                - irq(4)
+                - irq(5)
+                - irq(6)
diff --git a/samples/vnf_samples/vnf_descriptors/tg_prox_irq.yaml b/samples/vnf_samples/vnf_descriptors/tg_prox_irq.yaml
new file mode 100644
index 000000000..c7b07201a
--- /dev/null
+++ b/samples/vnf_samples/vnf_descriptors/tg_prox_irq.yaml
@@ -0,0 +1,49 @@
+# Copyright (c) 2018 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: ProxIrqGen  # nsb class mapping
+        name: proxirqgen
+        short-name: proxirqgen
+        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:
+                - max_irq
+                - irq(0)
+                - irq(1)
+                - irq(2)
+                - irq(3)
+                - irq(4)
+                - irq(5)
+                - irq(6)