diff options
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/ping-ext-ip.yaml | 2 | ||||
| -rw-r--r-- | samples/ping-ext-stimuli.yaml | 2 | ||||
| -rw-r--r-- | samples/ping-heat-context.yaml | 2 | ||||
| -rw-r--r-- | samples/ping-hot.yaml | 2 | ||||
| -rwxr-xr-x | samples/ping-iteration.yaml | 2 | ||||
| -rw-r--r-- | samples/ping-multiple-context.yaml | 4 | ||||
| -rw-r--r-- | samples/ping-multiple-vm.yaml | 2 | ||||
| -rw-r--r-- | samples/ping-option-list.yaml | 2 | ||||
| -rw-r--r-- | samples/ping-parallel.yaml | 2 | ||||
| -rw-r--r-- | samples/ping-serial.yaml | 2 | ||||
| -rw-r--r-- | samples/ping-template.yaml | 2 | ||||
| -rw-r--r-- | samples/ping.yaml | 2 | ||||
| -rw-r--r-- | samples/ping_bottlenecks.yaml | 2 | ||||
| -rw-r--r-- | samples/ping_load.yaml | 4 | ||||
| -rw-r--r-- | samples/storperf.yaml | 2 | ||||
| -rw-r--r-- | samples/vnf_samples/vnf_descriptors/tg_ping_tpl.yaml | 9 | ||||
| -rw-r--r-- | samples/vnf_samples/vnf_descriptors/tg_rfc2544_tpl.yaml | 9 | ||||
| -rw-r--r-- | samples/vnf_samples/vnf_descriptors/tg_rfc2544_tpl_4port.yaml | 103 | ||||
| -rw-r--r-- | samples/vnf_samples/vnf_descriptors/tg_trex_tpl.yaml | 9 | ||||
| -rw-r--r-- | samples/vnf_samples/vnf_descriptors/vpe_vnf.yaml | 10 | ||||
| -rw-r--r-- | samples/vnf_samples/vnf_descriptors/vpe_vnf_4port.yaml | 99 |
21 files changed, 255 insertions, 18 deletions
diff --git a/samples/ping-ext-ip.yaml b/samples/ping-ext-ip.yaml index 86cb799cd..33dd18129 100644 --- a/samples/ping-ext-ip.yaml +++ b/samples/ping-ext-ip.yaml @@ -31,7 +31,7 @@ scenarios: context: name: demo - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros servers: diff --git a/samples/ping-ext-stimuli.yaml b/samples/ping-ext-stimuli.yaml index 5de528198..e0895f13e 100644 --- a/samples/ping-ext-stimuli.yaml +++ b/samples/ping-ext-stimuli.yaml @@ -44,7 +44,7 @@ scenarios: context: name: demo - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros servers: diff --git a/samples/ping-heat-context.yaml b/samples/ping-heat-context.yaml index dd22d58a7..db34ca08c 100644 --- a/samples/ping-heat-context.yaml +++ b/samples/ping-heat-context.yaml @@ -32,7 +32,7 @@ scenarios: context: type: Heat name: demo - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros diff --git a/samples/ping-hot.yaml b/samples/ping-hot.yaml index 418251809..c6366343c 100644 --- a/samples/ping-hot.yaml +++ b/samples/ping-hot.yaml @@ -40,7 +40,7 @@ context: user: cirros heat_template: /tmp/heat-templates/hot/servers_in_new_neutron_net.yaml heat_parameters: - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor key_name: yardstick public_net: "660fc7c3-7a56-4faf-91e5-3c9ebdda0104" diff --git a/samples/ping-iteration.yaml b/samples/ping-iteration.yaml index dea2396cf..bd3411989 100755 --- a/samples/ping-iteration.yaml +++ b/samples/ping-iteration.yaml @@ -31,7 +31,7 @@ scenarios: context: name: demo - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros diff --git a/samples/ping-multiple-context.yaml b/samples/ping-multiple-context.yaml index 557b384f2..7180dae37 100644 --- a/samples/ping-multiple-context.yaml +++ b/samples/ping-multiple-context.yaml @@ -31,7 +31,7 @@ scenarios: contexts: - name: demo1 - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros placement_groups: @@ -46,7 +46,7 @@ contexts: cidr: '10.0.1.0/24' - name: demo2 - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros placement_groups: diff --git a/samples/ping-multiple-vm.yaml b/samples/ping-multiple-vm.yaml index 993c82f49..7eae13004 100644 --- a/samples/ping-multiple-vm.yaml +++ b/samples/ping-multiple-vm.yaml @@ -35,7 +35,7 @@ scenarios: context: name: demo - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros diff --git a/samples/ping-option-list.yaml b/samples/ping-option-list.yaml index fa81fdac2..844431962 100644 --- a/samples/ping-option-list.yaml +++ b/samples/ping-option-list.yaml @@ -29,7 +29,7 @@ scenarios: context: name: demo - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros diff --git a/samples/ping-parallel.yaml b/samples/ping-parallel.yaml index 0da57ec19..8600cbb7f 100644 --- a/samples/ping-parallel.yaml +++ b/samples/ping-parallel.yaml @@ -43,7 +43,7 @@ scenarios: context: name: demo - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros diff --git a/samples/ping-serial.yaml b/samples/ping-serial.yaml index ab06167c7..419c9459f 100644 --- a/samples/ping-serial.yaml +++ b/samples/ping-serial.yaml @@ -42,7 +42,7 @@ scenarios: context: name: demo - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros diff --git a/samples/ping-template.yaml b/samples/ping-template.yaml index fabee07bd..a7327342c 100644 --- a/samples/ping-template.yaml +++ b/samples/ping-template.yaml @@ -36,7 +36,7 @@ scenarios: context: name: demo - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros diff --git a/samples/ping.yaml b/samples/ping.yaml index b95c135eb..0c1783c0b 100644 --- a/samples/ping.yaml +++ b/samples/ping.yaml @@ -31,7 +31,7 @@ scenarios: context: name: demo - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros diff --git a/samples/ping_bottlenecks.yaml b/samples/ping_bottlenecks.yaml index 910bcff73..01977a1de 100644 --- a/samples/ping_bottlenecks.yaml +++ b/samples/ping_bottlenecks.yaml @@ -34,7 +34,7 @@ contexts: {% for num in range(stack_num) %} - name: demo{{num}} - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros diff --git a/samples/ping_load.yaml b/samples/ping_load.yaml index 805ae8f27..2afb1310a 100644 --- a/samples/ping_load.yaml +++ b/samples/ping_load.yaml @@ -34,7 +34,7 @@ scenarios: contexts: - name: demo1 - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros @@ -58,7 +58,7 @@ contexts: cidr: '10.0.1.0/24' - name: demo2 - image: cirros-0.3.3 + image: cirros-0.3.5 flavor: yardstick-flavor user: cirros placement_groups: diff --git a/samples/storperf.yaml b/samples/storperf.yaml index 5848512ed..5000759e0 100644 --- a/samples/storperf.yaml +++ b/samples/storperf.yaml @@ -17,7 +17,7 @@ scenarios: type: StorPerf options: agent_count: 1 - agent_image: "Ubuntu 14.04" + agent_image: "Ubuntu-16.04" public_network: "ext-net" volume_size: 2 # target: diff --git a/samples/vnf_samples/vnf_descriptors/tg_ping_tpl.yaml b/samples/vnf_samples/vnf_descriptors/tg_ping_tpl.yaml index 6e8fcf77e..8192f2568 100644 --- a/samples/vnf_samples/vnf_descriptors/tg_ping_tpl.yaml +++ b/samples/vnf_samples/vnf_descriptors/tg_ping_tpl.yaml @@ -23,9 +23,18 @@ vnfd:vnfd-catalog: memory-mb: '4096' mgmt-interface: vdu-id: pinggen-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 %} connection-point: - name: xe0 type: VPORT diff --git a/samples/vnf_samples/vnf_descriptors/tg_rfc2544_tpl.yaml b/samples/vnf_samples/vnf_descriptors/tg_rfc2544_tpl.yaml index 97feae5ba..dee3dd760 100644 --- a/samples/vnf_samples/vnf_descriptors/tg_rfc2544_tpl.yaml +++ b/samples/vnf_samples/vnf_descriptors/tg_rfc2544_tpl.yaml @@ -20,9 +20,18 @@ vnfd:vnfd-catalog: description: TRex stateless traffic verifier mgmt-interface: vdu-id: trexgen-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 %} connection-point: - name: xe0 type: VPORT diff --git a/samples/vnf_samples/vnf_descriptors/tg_rfc2544_tpl_4port.yaml b/samples/vnf_samples/vnf_descriptors/tg_rfc2544_tpl_4port.yaml new file mode 100644 index 000000000..47da39099 --- /dev/null +++ b/samples/vnf_samples/vnf_descriptors/tg_rfc2544_tpl_4port.yaml @@ -0,0 +1,103 @@ +# Copyright (c) 2016-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: TrexTrafficGenRFC # nsb class mapping + name: trexverifier + short-name: trexverifier + description: TRex stateless traffic verifier + mgmt-interface: + vdu-id: trexgen-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 %} + connection-point: + - name: xe0 + type: VPORT + - name: xe1 + type: VPORT + vdu: + - id: trexgen-baremetal + name: trexgen-baremetal + description: TRex stateless traffic verifier + external-interface: + - name: xe0 + virtual-interface: + type: PCI-PASSTHROUGH + # Substitution variables MUST be quoted. Otherwise Python can misinterpet them. + vpci: '{{ interfaces.xe0.vpci }}' # Value filled by vnfdgen + local_iface_name: '{{ interfaces.xe0.local_iface_name }}' # Value filled by vnfdgen + local_ip: '{{ interfaces.xe0.local_ip }}' # Value filled by vnfdgen + driver: '{{ interfaces.xe0.driver}}' # Value filled by vnfdgen + dst_ip: '{{ interfaces.xe0.dst_ip }}' # Value filled by vnfdgen + local_mac: '{{ interfaces.xe0.local_mac }}' # Value filled by vnfdgen + dst_mac: '{{ interfaces.xe0.dst_mac }}' # Value filled by vnfdgen + bandwidth: 10 Gbps + vnfd-connection-point-ref: xe0 + - name: xe1 + virtual-interface: + type: PCI-PASSTHROUGH + vpci: '{{ interfaces.xe1.vpci }}' # Value filled by vnfdgen + local_iface_name: '{{ interfaces.xe1.local_iface_name }}' # Value filled by vnfdgen + local_ip: '{{ interfaces.xe1.local_ip }}' # Value filled by vnfdgen + driver: '{{ interfaces.xe1.driver}}' # Value filled by vnfdgen + dst_ip: '{{ interfaces.xe1.dst_ip }}' # Value filled by vnfdgen + local_mac: '{{ interfaces.xe1.local_mac }}' # Value filled by vnfdgen + dst_mac: '{{ interfaces.xe1.dst_mac }}' # Value filled by vnfdgen + bandwidth: 10 Gbps + vnfd-connection-point-ref: xe1 + - name: xe2 + virtual-interface: + type: PCI-PASSTHROUGH + # Substitution variables MUST be quoted. Otherwise Python can misinterpet them. + vpci: '{{ interfaces.xe2.vpci }}' # Value filled by vnfdgen + local_iface_name: '{{ interfaces.xe2.local_iface_name }}' # Value filled by vnfdgen + local_ip: '{{ interfaces.xe2.local_ip }}' # Value filled by vnfdgen + driver: '{{ interfaces.xe2.driver}}' # Value filled by vnfdgen + dst_ip: '{{ interfaces.xe2.dst_ip }}' # Value filled by vnfdgen + local_mac: '{{ interfaces.xe2.local_mac }}' # Value filled by vnfdgen + dst_mac: '{{ interfaces.xe2.dst_mac }}' # Value filled by vnfdgen + bandwidth: 10 Gbps + vnfd-connection-point-ref: xe2 + - name: xe3 + virtual-interface: + type: PCI-PASSTHROUGH + vpci: '{{ interfaces.xe3.vpci }}' # Value filled by vnfdgen + local_iface_name: '{{ interfaces.xe3.local_iface_name }}' # Value filled by vnfdgen + local_ip: '{{ interfaces.xe3.local_ip }}' # Value filled by vnfdgen + driver: '{{ interfaces.xe3.driver}}' # Value filled by vnfdgen + dst_ip: '{{ interfaces.xe3.dst_ip }}' # Value filled by vnfdgen + local_mac: '{{ interfaces.xe3.local_mac }}' # Value filled by vnfdgen + dst_mac: '{{ interfaces.xe3.dst_mac }}' # Value filled by vnfdgen + bandwidth: 10 Gbps + vnfd-connection-point-ref: xe3 + + 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_trex_tpl.yaml b/samples/vnf_samples/vnf_descriptors/tg_trex_tpl.yaml index b1641836b..8daca467c 100644 --- a/samples/vnf_samples/vnf_descriptors/tg_trex_tpl.yaml +++ b/samples/vnf_samples/vnf_descriptors/tg_trex_tpl.yaml @@ -23,9 +23,18 @@ vnfd:vnfd-catalog: memory-mb: '4096' mgmt-interface: vdu-id: trexgen-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 %} connection-point: - name: xe0 type: VPORT diff --git a/samples/vnf_samples/vnf_descriptors/vpe_vnf.yaml b/samples/vnf_samples/vnf_descriptors/vpe_vnf.yaml index 75041c3ce..95b0fa8cf 100644 --- a/samples/vnf_samples/vnf_descriptors/vpe_vnf.yaml +++ b/samples/vnf_samples/vnf_descriptors/vpe_vnf.yaml @@ -20,10 +20,18 @@ vnfd:vnfd-catalog: description: vPe approximation using DPDK mgmt-interface: vdu-id: vpevnf-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 - host: '{{host}}' # Value filled by vnfdgen + {% endif %} + {% if key_filename is defined %} + key_filename: '{{key_filename}}' # Value filled by vnfdgen + {% endif %} connection-point: - name: xe0 type: VPORT diff --git a/samples/vnf_samples/vnf_descriptors/vpe_vnf_4port.yaml b/samples/vnf_samples/vnf_descriptors/vpe_vnf_4port.yaml new file mode 100644 index 000000000..a446f0cb6 --- /dev/null +++ b/samples/vnf_samples/vnf_descriptors/vpe_vnf_4port.yaml @@ -0,0 +1,99 @@ +# Copyright (c) 2016-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: VpeApproxVnf + name: VpeVnfSshIntel + short-name: VpeVnf + description: vPe approximation using DPDK + mgmt-interface: + vdu-id: vpevnf-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 %} + connection-point: + - name: xe0 + type: VPORT + - name: xe1 + type: VPORT + vdu: + - id: vpevnf-baremetal + name: vpevnf-baremetal + description: vpe approximation using DPDK + external-interface: + - name: xe0 + virtual-interface: + type: PCI-PASSTHROUGH + # Substitution variables MUST be quoted. Otherwise Python can misinterpet them. + vpci: '{{ interfaces.xe0.vpci }}' # Value filled by vnfdgen + local_ip: '{{ interfaces.xe0.local_ip }}' # Value filled by vnfdgen + dst_ip: '{{ interfaces.xe0.dst_ip }}' # Value filled by vnfdgen + local_mac: '{{ interfaces.xe0.local_mac }}' # Value filled by vnfdgen + netmask: '{{ interfaces.xe0.netmask }}' # Value filled by vnfdgen + dst_mac: '{{ interfaces.xe0.dst_mac }}' # Value filled by vnfdgen + bandwidth: 10 Gbps + vnfd-connection-point-ref: xe0 + - name: xe1 + virtual-interface: + type: PCI-PASSTHROUGH + # Substitution variables MUST be quoted. Otherwise Python can misinterpet them. + vpci: '{{ interfaces.xe1.vpci }}' # Value filled by vnfdgen + local_ip: '{{ interfaces.xe1.local_ip }}' # Value filled by vnfdgen + dst_ip: '{{ interfaces.xe1.dst_ip }}' # Value filled by vnfdgen + local_mac: '{{ interfaces.xe1.local_mac }}' # Value filled by vnfdgen + netmask: '{{ interfaces.xe1.netmask }}' # Value filled by vnfdgen + dst_mac: '{{ interfaces.xe1.dst_mac }}' # Value filled by vnfdgen + bandwidth: 10 Gbps + vnfd-connection-point-ref: xe1 + - name: xe2 + virtual-interface: + type: PCI-PASSTHROUGH + # Substitution variables MUST be quoted. Otherwise Python can misinterpet them. + vpci: '{{ interfaces.xe2.vpci }}' # Value filled by vnfdgen + local_iface_name: '{{ interfaces.xe2.local_iface_name }}' # Value filled by vnfdgen + local_ip: '{{ interfaces.xe2.local_ip }}' # Value filled by vnfdgen + driver: '{{ interfaces.xe2.driver}}' # Value filled by vnfdgen + dst_ip: '{{ interfaces.xe2.dst_ip }}' # Value filled by vnfdgen + local_mac: '{{ interfaces.xe2.local_mac }}' # Value filled by vnfdgen + dst_mac: '{{ interfaces.xe2.dst_mac }}' # Value filled by vnfdgen + bandwidth: 10 Gbps + vnfd-connection-point-ref: xe2 + - name: xe3 + virtual-interface: + type: PCI-PASSTHROUGH + vpci: '{{ interfaces.xe3.vpci }}' # Value filled by vnfdgen + local_iface_name: '{{ interfaces.xe3.local_iface_name }}' # Value filled by vnfdgen + local_ip: '{{ interfaces.xe3.local_ip }}' # Value filled by vnfdgen + driver: '{{ interfaces.xe3.driver}}' # Value filled by vnfdgen + dst_ip: '{{ interfaces.xe3.dst_ip }}' # Value filled by vnfdgen + local_mac: '{{ interfaces.xe3.local_mac }}' # Value filled by vnfdgen + dst_mac: '{{ interfaces.xe3.dst_mac }}' # Value filled by vnfdgen + bandwidth: 10 Gbps + vnfd-connection-point-ref: xe3 + routing_table: {{ routing_table }} + benchmark: + kpi: + - packets_in + - packets_fwd + - packets_dropped |