diff options
Diffstat (limited to 'samples')
42 files changed, 229 insertions, 19 deletions
diff --git a/samples/fio.yaml b/samples/fio.yaml index b6e5a282f..0890766cf 100644 --- a/samples/fio.yaml +++ b/samples/fio.yaml @@ -9,6 +9,7 @@ --- # Sample benchmark task config file # measure storage performance using fio +# can be used both on Openstack and Kubernetes with "context_type" # # For this sample just like running the command below on the test vm and # getting benchmark info back to the yardstick. @@ -18,18 +19,24 @@ # -direct=1 -group_reporting -numjobs=1 -time_based \ # --output-format=json +{% set context_type = context_type or "Heat" %} +{% set separator = separator or "." %} +{% if context_type == "Kubernetes" %} +{% set separator = "-" %} +{% endif %} + schema: "yardstick:task:0.1" scenarios: - type: Fio options: - filename: /home/ubuntu/data.raw + filename: /tmp/data.raw bs: 4k iodepth: 1 rw: rw ramp_time: 10 - host: fio.demo + host: fio{{ separator }}demo runner: type: Duration duration: 60 @@ -44,7 +51,25 @@ scenarios: action: monitor context: + type: {{ context_type }} name: demo + {% if context_type == "Kubernetes" %} + + servers: + fio: + image: opnfv/yardstick-image-k8s + resources: + limits: + cpu: 1 + memory: 1Gi + requests: + cpu: 1 + memory: 1Gi + command: /bin/bash + args: ['-c', 'mkdir /root/.ssh; cp /tmp/.ssh/authorized_keys ~/.ssh/.; + chmod 700 ~/.ssh; chmod 600 ~/.ssh/*; service ssh restart; + while true ; do sleep 10000; done'] + {% else %} image: yardstick-image flavor: yardstick-flavor user: ubuntu @@ -54,3 +79,4 @@ context: networks: test: cidr: "10.0.1.0/24" + {% endif %} diff --git a/samples/lmbench.yaml b/samples/lmbench.yaml index ea2966b24..7050243f9 100644 --- a/samples/lmbench.yaml +++ b/samples/lmbench.yaml @@ -9,6 +9,13 @@ --- # Sample benchmark task config file # measure memory read latency and memory bandwidth using lmbench +# can be used both on Openstack and Kubernetes with "context_type" + +{% set context_type = context_type or "Heat" %} +{% set separator = separator or "." %} +{% if context_type == "Kubernetes" %} +{% set separator = "-" %} +{% endif %} schema: "yardstick:task:0.1" @@ -19,7 +26,7 @@ scenarios: test_type: "latency" stop_size: 32.0 - host: demeter.demo + host: demeter{{ separator }}demo runner: type: Arithmetic @@ -39,7 +46,7 @@ scenarios: test_type: "bandwidth" benchmark: "wr" - host: demeter.demo + host: demeter{{ separator }}demo runner: type: Arithmetic @@ -55,7 +62,24 @@ scenarios: action: monitor context: + type: {{ context_type }} name: demo + {% if context_type == "Kubernetes" %} + servers: + demeter: + image: opnfv/yardstick-image-k8s + resources: + limits: + cpu: 1 + memory: 1Gi + requests: + cpu: 1 + memory: 1Gi + command: /bin/bash + args: ['-c', 'mkdir /root/.ssh; cp /tmp/.ssh/authorized_keys ~/.ssh/.; + chmod 700 ~/.ssh; chmod 600 ~/.ssh/*; service ssh restart; + while true ; do sleep 10000; done'] + {% else %} image: yardstick-image flavor: yardstick-flavor user: ubuntu @@ -71,6 +95,5 @@ context: networks: test: - cidr: '10.0.1.0/24' - - + cidr: "10.0.1.0/24" + {% endif %} diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml index 22216d108..d6b30a987 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml @@ -35,6 +35,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_acl-2.cfg" prox_args: @@ -43,6 +45,8 @@ scenarios: "configs/acl_rules-2.lua": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_acl-2.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml index 8c6d0a2d7..cf72113b7 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml @@ -35,6 +35,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_acl-4.cfg" prox_args: @@ -43,6 +45,8 @@ scenarios: "configs/acl_rules-2.lua": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_acl-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng-4.yaml index f86913941..cd5329a5d 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng-4.yaml @@ -30,6 +30,8 @@ scenarios: interface_speed_gbps: 10 vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_bng-4.cfg" prox_args: @@ -40,6 +42,8 @@ scenarios: prox_generate_parameter: True tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_bng-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng_qos-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng_qos-4.yaml index 707fc1d30..873696f93 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng_qos-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng_qos-4.yaml @@ -30,6 +30,8 @@ scenarios: interface_speed_gbps: 10 vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_bng_qos-4.cfg" prox_args: @@ -41,6 +43,8 @@ scenarios: prox_generate_parameter: True tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_bng_qos-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml index 5cc4f3cc4..2f253b711 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_buffering-1.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_buffering-1.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml index 69778ed8c..e47bfadb8 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml @@ -29,12 +29,16 @@ scenarios: interface_speed_gbps: 10 vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l2fwd-2.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l2fwd-2.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml index 84edcd47d..405ab4534 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml @@ -29,18 +29,23 @@ scenarios: interface_speed_gbps: 10 vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l2fwd-4.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l2fwd-4.cfg" prox_args: "-e": "" "-t": "" + runner: type: ProxDuration # sampling interval diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-2.yaml index 0354dc78c..916c80959 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-2.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l2fwd_multiflow-2.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l2fwd_multiflow-2.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-4.yaml index ec49be722..c9eb556e4 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-4.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l2fwd_multiflow-4.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l2fwd_multiflow-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml index 8ee90ff93..b3a265bff 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l2fwd_pktTouch-2.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l2fwd_pktTouch-2.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml index 94f3a5629..6f6f87052 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l2fwd_pktTouch-4.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l2fwd_pktTouch-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml index 8d116bbde..c255a578c 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml @@ -27,6 +27,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l3fwd-2.cfg" prox_args: @@ -36,6 +38,8 @@ scenarios: prox_generate_parameter: True tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l3fwd-2.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml index af69ab518..3e6d344f3 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml @@ -27,6 +27,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l3fwd-4.cfg" prox_args: @@ -36,6 +38,8 @@ scenarios: prox_generate_parameter: True tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l3fwd-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lb-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lb-4.yaml index c1969d441..5af76e085 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lb-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lb-4.yaml @@ -32,6 +32,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_lb-4.cfg" prox_args: @@ -40,6 +42,8 @@ scenarios: "configs/tuples.lua": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_lb-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lw_aftr-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lw_aftr-4.yaml index c190910c9..2691eaf84 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lw_aftr-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lw_aftr-4.yaml @@ -27,6 +27,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_lw_aftr-4.cfg" prox_args: @@ -35,6 +37,8 @@ scenarios: "configs/ip6_tun_bind_65k.lua" : "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_lw_aftr-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml index e74e59ada..7084fc10c 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_mpls_tag_untag-2.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_mpls_tag_untag-2.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml index 9c5edc117..a314a0049 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_mpls_tag_untag-4.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_mpls_tag_untag-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp-2.yaml index 1cf9d809d..deb8e374e 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp-2.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_none-2.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_all-2.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_vpe-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_vpe-4.yaml index 7b64f21bc..abb74ec0a 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_vpe-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_vpe-4.yaml @@ -27,6 +27,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_vpe-4.cfg" prox_args: @@ -40,6 +42,8 @@ scenarios: prox_generate_parameter: True tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_vpe-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml index e8701638b..a1f61a479 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml @@ -35,6 +35,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_acl-2.cfg" prox_args: @@ -43,6 +45,8 @@ scenarios: "configs/acl_rules-2.lua" : "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_acl-2.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml index eaa940185..816ff493e 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml @@ -35,6 +35,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_acl-4.cfg" prox_args: @@ -42,6 +44,8 @@ scenarios: prox_files: "configs/acl_rules-2.lua" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_acl-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng-4.yaml index d580bd8cc..54c333cba 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng-4.yaml @@ -30,6 +30,8 @@ scenarios: interface_speed_gbps: 10 vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_bng-4.cfg" prox_args: @@ -40,6 +42,8 @@ scenarios: prox_generate_parameter: True tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_bng-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml index 7f447b164..549af6827 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml @@ -30,6 +30,8 @@ scenarios: interface_speed_gbps: 10 vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_bng_qos-4.cfg" prox_args: @@ -41,6 +43,8 @@ scenarios: prox_generate_parameter: True tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_bng_qos-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml index 31b872dd4..52a044913 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_buffering-1.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_buffering-1.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml index 68218f312..37235f052 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l2fwd-2.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l2fwd-2.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml index 55f794325..9079a705a 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l2fwd-4.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l2fwd-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-2.yaml index 776ddf1d2..10e655687 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-2.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l2fwd_multiflow-2.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l2fwd_multiflow-2.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-4.yaml index 4a20fad84..807ee20e7 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-4.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l2fwd_multiflow-4.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l2fwd_multiflow-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml index db140d3ed..f761cc805 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l2fwd_pktTouch-2.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l2fwd_pktTouch-2.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml index a3ac21a59..29205480e 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l2fwd_pktTouch-4.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l2fwd_pktTouch-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml index 5003ef66c..cd600135f 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml @@ -27,6 +27,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l3fwd-2.cfg" prox_args: @@ -36,6 +38,8 @@ scenarios: prox_generate_parameter: True tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l3fwd-2.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml index 7d7d2b02a..86e6a31ec 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml @@ -27,6 +27,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_l3fwd-4.cfg" prox_args: @@ -36,6 +38,8 @@ scenarios: prox_generate_parameter: True tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_l3fwd-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_lb-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_lb-4.yaml index c34b4d99a..b00c79230 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_lb-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_lb-4.yaml @@ -27,6 +27,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_lb-4.cfg" prox_args: @@ -35,6 +37,8 @@ scenarios: "configs/tuples.lua": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_lb-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_lw_aftr-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_lw_aftr-4.yaml index 2aa5cebe3..595b137e1 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_lw_aftr-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_lw_aftr-4.yaml @@ -27,6 +27,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_lw_aftr-4.cfg" prox_args: @@ -35,6 +37,8 @@ scenarios: "configs/ip6_tun_bind_65k.lua" : "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_lw_aftr-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml index e5e94ad29..71795146f 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_mpls_tag_untag-2.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_mpls_tag_untag-2.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml index 24f7ce4b7..41567018a 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml @@ -27,12 +27,16 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_mpls_tag_untag-4.cfg" prox_args: "-t": "" tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_mpls_tag_untag-4.cfg" prox_args: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_vpe-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_vpe-4.yaml index 29277ca94..6683b6048 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_vpe-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_vpe-4.yaml @@ -27,6 +27,8 @@ scenarios: options: vnf__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/handle_vpe-4.cfg" prox_args: @@ -40,6 +42,8 @@ scenarios: prox_generate_parameter: True tg__0: + collectd: + interval: 1 prox_path: /opt/nsb_bin/prox prox_config: "configs/gen_vpe-4.cfg" prox_args: diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml index 906793740..f71c08861 100644 --- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml +++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml @@ -53,7 +53,8 @@ uplink_0: srcip4: "{{get(flow, 'flow.src_ip_0', '1.1.1.1-1.15.255.255') }}" dstip4: "{{get(flow, 'flow.dst_ip_0', '90.90.1.1-90.105.255.255') }}" count: "{{get(flow, 'flow.count', '1') }}" - seed: "{{get(flow, 'flow.seed', '1') }}" + srcseed: "{{get(flow, 'flow.srcseed', '1') }}" + dstseed: "{{get(flow, 'flow.dstseed', '1') }}" ttl: 32 dscp: 0 outer_l4: @@ -86,7 +87,8 @@ downlink_0: dstip4: "{{get(flow, 'flow.public_ip_0', '90.90.1.1-90.105.255.255') }}" {% endif %} count: "{{get(flow, 'flow.count', '1') }}" - seed: "{{get(flow, 'flow.seed', '1') }}" + srcseed: "{{get(flow, 'flow.srcseed', '1') }}" + dstseed: "{{get(flow, 'flow.dstseed', '1') }}" ttl: 32 dscp: 0 outer_l4: @@ -116,7 +118,8 @@ uplink_1: srcip4: "{{get(flow, 'flow.src_ip_1', '1.1.1.1-1.15.255.255') }}" dstip4: "{{get(flow, 'flow.dst_ip_1', '90.90.1.1-90.105.255.255') }}" count: "{{get(flow, 'flow.count', '1') }}" - seed: "{{get(flow, 'flow.seed', '1') }}" + srcseed: "{{get(flow, 'flow.srcseed', '1') }}" + dstseed: "{{get(flow, 'flow.dstseed', '1') }}" ttl: 32 dscp: 0 outer_l4: @@ -149,7 +152,8 @@ downlink_1: dstip4: "{{get(flow, 'flow.public_ip_1', '90.90.1.1-90.105.255.255') }}" {% endif %} count: "{{get(flow, 'flow.count', '1') }}" - seed: "{{get(flow, 'flow.seed', '1') }}" + srcseed: "{{get(flow, 'flow.srcseed', '1') }}" + dstseed: "{{get(flow, 'flow.dstseed', '1') }}" ttl: 32 dscp: 0 outer_l4: diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_cgnapt.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_cgnapt.yaml index 6e2f8ec7c..9e8f67216 100644 --- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_cgnapt.yaml +++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_cgnapt.yaml @@ -51,7 +51,8 @@ uplink_0: srcip4: "{{get(flow, 'flow.src_ip_0', '1.1.1.1-1.15.255.255') }}" dstip4: "{{get(flow, 'flow.dst_ip_0', '90.90.1.1-90.105.255.255') }}" count: "{{get(flow, 'flow.count', '1') }}" - seed: "{{get(flow, 'flow.seed', '1') }}" + srcseed: "{{get(flow, 'flow.srcseed', '1') }}" + dstseed: "{{get(flow, 'flow.dstseed', '1') }}" ttl: 32 dscp: 0 outer_l4: @@ -79,7 +80,8 @@ downlink_0: srcip4: "{{get(flow, 'flow.dst_ip_0', '1.1.1.1-1.15.255.255') }}" dstip4: "{{get(flow, 'flow.public_ip_0', '10.0.2.1-10.0.2.255') }}" count: "{{get(flow, 'flow.count', '1') }}" - seed: "{{get(flow, 'flow.seed', '1') }}" + srcseed: "{{get(flow, 'flow.srcseed', '1') }}" + dstseed: "{{get(flow, 'flow.dstseed', '1') }}" ttl: 32 dscp: 0 outer_l4: @@ -107,7 +109,8 @@ uplink_1: srcip4: "{{get(flow, 'flow.src_ip_1', '1.1.1.1-1.15.255.255') }}" dstip4: "{{get(flow, 'flow.dst_ip_1', '90.90.1.1-90.105.255.255') }}" count: "{{get(flow, 'flow.count', '1') }}" - seed: "{{get(flow, 'flow.seed', '1') }}" + srcseed: "{{get(flow, 'flow.srcseed', '1') }}" + dstseed: "{{get(flow, 'flow.dstseed', '1') }}" ttl: 32 dscp: 0 outer_l4: @@ -135,7 +138,8 @@ downlink_1: srcip4: "{{get(flow, 'flow.dst_ip_1', '1.1.1.1-1.15.255.255') }}" dstip4: "{{get(flow, 'flow.public_ip_1', '10.0.2.1-10.0.2.255') }}" count: "{{get(flow, 'flow.count', '1') }}" - seed: "{{get(flow, 'flow.seed', '1') }}" + srcseed: "{{get(flow, 'flow.srcseed', '1') }}" + dstseed: "{{get(flow, 'flow.dstseed', '1') }}" ttl: 32 dscp: 0 outer_l4: diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml index cfc5f1ea3..7942fbf4d 100644 --- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml +++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml @@ -73,7 +73,8 @@ uplink_0: srcip4: "{{get(flow, 'flow.src_ip_0', '192.168.0.0-192.168.255.255') }}" dstip4: "{{get(flow, 'flow.dst_ip_0', '192.16.0.0-192.16.0.31') }}" count: "{{get(flow, 'flow.count', '1') }}" - seed: "{{get(flow, 'flow.seed', '1') }}" + srcseed: "{{get(flow, 'flow.srcseed', '1') }}" + dstseed: "{{get(flow, 'flow.dstseed', '1') }}" ttl: 32 dscp: 32 @@ -100,7 +101,8 @@ downlink_0: srcip4: "{{get(flow, 'flow.dst_ip_0', '192.16.0.0-192.16.0.31') }}" dstip4: "{{get(flow, 'flow.src_ip_0', '192.168.0.0-192.168.255.255') }}" count: "{{get(flow, 'flow.count', '1') }}" - seed: "{{get(flow, 'flow.seed', '1') }}" + srcseed: "{{get(flow, 'flow.srcseed', '1') }}" + dstseed: "{{get(flow, 'flow.dstseed', '1') }}" ttl: 32 dscp: 32 @@ -137,7 +139,8 @@ uplink_1: srcip4: "{{get(flow, 'flow.srcip_1', '192.168.0.0-192.168.255.255') }}" dstip4: "{{get(flow, 'flow.dstip_1', '192.16.0.0-192.16.0.31') }}" count: "{{get(flow, 'flow.count', '1') }}" - seed: "{{get(flow, 'flow.seed', '1') }}" + srcseed: "{{get(flow, 'flow.srcseed', '1') }}" + dstseed: "{{get(flow, 'flow.dstseed', '1') }}" ttl: 32 dscp: 32 @@ -164,7 +167,8 @@ downlink_1: srcip4: "{{get(flow, 'flow.dst_ip_1', '192.16.0.0-192.16.0.31') }}" dstip4: "{{get(flow, 'flow.src_ip_1', '192.168.0.0-192.168.255.255') }}" count: "{{get(flow, 'flow.count', '1') }}" - seed: "{{get(flow, 'flow.seed', '1') }}" + srcseed: "{{get(flow, 'flow.srcseed', '1') }}" + dstseed: "{{get(flow, 'flow.dstseed', '1') }}" ttl: 32 dscp: 32 |