diff options
Diffstat (limited to 'etc')
11 files changed, 99 insertions, 19 deletions
diff --git a/etc/yardstick/nodes/standalone/baremetal_trex.yaml b/etc/yardstick/nodes/standalone/baremetal_trex.yaml index d41b8989f..b3b57d066 100644 --- a/etc/yardstick/nodes/standalone/baremetal_trex.yaml +++ b/etc/yardstick/nodes/standalone/baremetal_trex.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2017 Intel Corporation +# Copyright (c) 2016-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ nodes: - - name: tg__0 + name: trafficgen_0 role: tg__0 ip: {{gen.ip.mgmt[0]| ipaddr('address')}} user: {{gen.user}} diff --git a/etc/yardstick/nodes/standalone/ixia_correlated_template.yaml b/etc/yardstick/nodes/standalone/ixia_correlated_template.yaml index ef63ea04c..8fdaf9f6d 100644 --- a/etc/yardstick/nodes/standalone/ixia_correlated_template.yaml +++ b/etc/yardstick/nodes/standalone/ixia_correlated_template.yaml @@ -20,7 +20,7 @@ nodes: - - name: tg__0 + name: trafficgen_0 role: IxNet ip: {{gen.ip.mgmt[0]| ipaddr('address')}} user: {{gen.user}} @@ -53,7 +53,7 @@ nodes: {% endfor %} - - name: tg__1 + name: trafficgen_1 role: tg__1 ip: {{gen_1.ip.mgmt[0]| ipaddr('address')}} user: {{gen_1.user}} diff --git a/etc/yardstick/nodes/standalone/ixia_template.yaml b/etc/yardstick/nodes/standalone/ixia_template.yaml index 98ed8c5c2..97749aa1f 100644 --- a/etc/yardstick/nodes/standalone/ixia_template.yaml +++ b/etc/yardstick/nodes/standalone/ixia_template.yaml @@ -20,7 +20,7 @@ nodes: - - name: tg__0 + name: trafficgen_0 role: IxNet ip: {{gen.ip.mgmt[0]| ipaddr('address')}} user: {{gen.user}} diff --git a/etc/yardstick/nodes/standalone/pod_bm_vnf.yaml b/etc/yardstick/nodes/standalone/pod_bm_vnf.yaml index b724cb09b..bf8c45f25 100644 --- a/etc/yardstick/nodes/standalone/pod_bm_vnf.yaml +++ b/etc/yardstick/nodes/standalone/pod_bm_vnf.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2017 Intel Corporation +# Copyright (c) 2016-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ nodes: - - name: vnf__0 + name: vnf_0 role: vnf__0 ip: {{vnf.ip.mgmt[0]| ipaddr('address')}} user: {{vnf.user}} diff --git a/etc/yardstick/nodes/standalone/pod_bm_vnf_scale_out.yaml b/etc/yardstick/nodes/standalone/pod_bm_vnf_scale_out.yaml index b48a04911..3fd9db26e 100644 --- a/etc/yardstick/nodes/standalone/pod_bm_vnf_scale_out.yaml +++ b/etc/yardstick/nodes/standalone/pod_bm_vnf_scale_out.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Intel Corporation +# Copyright (c) 2018-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ nodes: {% for num in range(num_vnfs|int) %} - - name: vnf__{{ num }} + name: vnf_{{ num }} role: vnf__{{ num }} ip: {{vnf.ip.mgmt[num] | ipaddr('address')}} user: {{vnf.user}} diff --git a/etc/yardstick/nodes/standalone/pod_landslide.yaml b/etc/yardstick/nodes/standalone/pod_landslide.yaml index c84aed142..32e9a336e 100644 --- a/etc/yardstick/nodes/standalone/pod_landslide.yaml +++ b/etc/yardstick/nodes/standalone/pod_landslide.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Intel Corporation +# Copyright (c) 2018-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ nodes: - - name: "tg__0" + name: "trafficgen_0" role: tg__0 tas_manager: ip: 192.168.122.100 diff --git a/etc/yardstick/nodes/standalone/pod_landslide_network_dedicated.yaml b/etc/yardstick/nodes/standalone/pod_landslide_network_dedicated.yaml index 6b8db54c2..e416ec351 100644 --- a/etc/yardstick/nodes/standalone/pod_landslide_network_dedicated.yaml +++ b/etc/yardstick/nodes/standalone/pod_landslide_network_dedicated.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Intel Corporation +# Copyright (c) 2018-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ nodes: - - name: "tg__0" + name: "trafficgen_0" role: tg__0 tas_manager: ip: 192.168.122.100 @@ -161,4 +161,3 @@ nodes: phy: *ts2_port1 ip: 10.42.32.95 nextHop: '' - diff --git a/etc/yardstick/nodes/standalone/pod_vepc_sut.yaml b/etc/yardstick/nodes/standalone/pod_vepc_sut.yaml index 8467303e9..5d5ff379b 100644 --- a/etc/yardstick/nodes/standalone/pod_vepc_sut.yaml +++ b/etc/yardstick/nodes/standalone/pod_vepc_sut.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Intel Corporation +# Copyright (c) 2018-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ nodes: - - name: "vnf__0" + name: "vnf_0" role: vnf__0 ip: 192.168.122.200 user: user diff --git a/etc/yardstick/nodes/standalone/sipp_baremetal_pod.yaml b/etc/yardstick/nodes/standalone/sipp_baremetal_pod.yaml new file mode 100644 index 000000000..c7a0af1dd --- /dev/null +++ b/etc/yardstick/nodes/standalone/sipp_baremetal_pod.yaml @@ -0,0 +1,52 @@ +# Copyright (c) 2019 Viosoft 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. + +nodes: +- + name: sipp + role: TrafficGen + ip: 10.80.3.7 + user: USER_ROOT + password: PASSWORD_ROOT + interfaces: + xe0: # logical name from topology.yaml and vnfd.yaml + local_ip: "10.80.3.7" + netmask: "255.255.255.0" + local_mac: "90:e2:ba:7c:30:e8" + xe1: + local_ip: "10.80.3.7" + netmask: "255.255.255.0" + local_mac: "90:e2:ba:7c:30:e8" +- + name: pcscf + role: VirtualNetworkFunction + ip: 10.80.3.11 + user: USER_ROOT + password: PASSWORD_ROOT + interfaces: + xe0: + local_ip: "10.80.3.11" + netmask: "255.255.255.0" + local_mac: "90:e2:ba:7c:41:a8" +- + name: hss + role: VirtualNetworkFunction + ip: 10.80.3.11 + user: USER_ROOT + password: PASSWORD_ROOT + interfaces: + xe0: + local_ip: "10.80.3.11" + netmask: "255.255.255.0" + local_mac: "90:e2:ba:7c:41:a8" diff --git a/etc/yardstick/nodes/standalone/sipp_pod.yaml b/etc/yardstick/nodes/standalone/sipp_pod.yaml new file mode 100644 index 000000000..ae473c509 --- /dev/null +++ b/etc/yardstick/nodes/standalone/sipp_pod.yaml @@ -0,0 +1,30 @@ +# Copyright (c) 2019 Viosoft 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. + +nodes: +- + name: sipp + role: TrafficGen + ip: 10.80.3.7 + user: USER_ROOT + password: PASSWORD_ROOT + interfaces: + xe0: # logical name from topology.yaml and vnfd.yaml + local_ip: "10.80.3.7" + netmask: "255.255.255.0" + local_mac: "0c:c4:7a:de:8f:da" + xe1: # logical name from topology.yaml and vnfd.yaml + local_ip: "10.80.3.7" + netmask: "255.255.255.0" + local_mac: "0c:c4:7a:de:8f:da" diff --git a/etc/yardstick/nodes/standalone/trex_bm.yaml.sample b/etc/yardstick/nodes/standalone/trex_bm.yaml.sample index 55a359ce1..1f46caaf0 100644 --- a/etc/yardstick/nodes/standalone/trex_bm.yaml.sample +++ b/etc/yardstick/nodes/standalone/trex_bm.yaml.sample @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2017 Intel Corporation +# Copyright (c) 2016-2019 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ nodes: - - name: tg__0 + name: trafficgen_0 role: tg__0 ip: 1.1.1.1 user: root @@ -35,4 +35,3 @@ nodes: local_ip: "152.16.40.20" netmask: "255.255.255.0" local_mac: "00:00.00:00:00:02" - |