Merge "[dovetail] split the sla check results into process recovery and service recov...
authorRex Lee <limingjiang@huawei.com>
Thu, 24 Jan 2019 01:40:54 +0000 (01:40 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 24 Jan 2019 01:40:54 +0000 (01:40 +0000)
16 files changed:
docs/testing/user/userguide/12-nsb-overview.rst
samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_acl-scale-up.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l3fwd-scale-up.yaml
samples/vnf_samples/nsut/prox/tc_prox_sriov_acl-scale-up.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1024k_Requests-65000_Concurrency.yaml [deleted file]
samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_256k_Requests-65000_Concurrency.yaml [deleted file]
samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_4k_Requests-65000_Concurrency.yaml [deleted file]
samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_512k_Requests-65000_Concurrency.yaml [deleted file]
samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_64k_Requests-65000_Concurrency.yaml [deleted file]
samples/vnf_samples/traffic_profiles/http_tests/HTTP_1024K-requests_65000_concurrency.yaml [deleted file]
samples/vnf_samples/traffic_profiles/http_tests/HTTP_256K-requests_65000_concurrency.yaml [deleted file]
samples/vnf_samples/traffic_profiles/http_tests/HTTP_4K-requests_65000_concurrency.yaml [deleted file]
samples/vnf_samples/traffic_profiles/http_tests/HTTP_512K-requests_65000_concurrency.yaml [deleted file]
samples/vnf_samples/traffic_profiles/http_tests/HTTP_64K-requests_65000_concurrency.yaml [deleted file]
yardstick/benchmark/contexts/heat.py

index ec4df1c..70aba1e 100644 (file)
@@ -56,7 +56,7 @@ NSB extension includes:
 
 * Generic data models of Network Services, based on ETSI spec
   `ETSI GS NFV-TST 001`_
-* Standalone :term:`context` for VNF testing with SRIOV, OVS, OVS-DPDK, etc
+* Standalone :term:`context` for VNF testing SRIOV, OVS, OVS-DPDK, etc
 * Generic VNF configuration models and metrics implemented with Python
   classes
 * Traffic generator features and traffic profiles
@@ -121,6 +121,13 @@ Network Service framework performs the necessary test steps. It may involve:
 Components of Network Service
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+.. TODO: provide a list of components in this section and describe them in
+   later sub-sections
+
+.. Components are the methodology, TGs, framework extensions, KPI collection,
+   Testcases, SampleVNFs
+.. Framework extentions include: VNF models, NSPerf Scenario, contexts
+
 * *Models for Network Service benchmarking*: The Network Service benchmarking
   requires the proper modelling approach. The NSB provides models using Python
   files and defining of NSDs and VNFDs.
@@ -169,6 +176,38 @@ for every combination of test case parameters:
 
 * RFC2544 throughput for various loss rate defined (1% is a default)
 
+KPI Collection
+^^^^^^^^^^^^^^
+
+KPI collection is the process of sampling KPIs at multiple intervals to allow
+for investigation into anomalies during runtime. Some KPI intervals are
+adjustable. KPIs are collected from traffic generators and NFVI for the SUT.
+There is already some reporting in NSB available, but NSB collects all KPIs for
+analytics to process.
+
+Below is an example list of basic KPIs:
+* Throughput
+* Latency
+* Packet delay variation
+* Maximum establishment rate
+* Maximum tear-down rate
+* Maximum simultaneous number of sessions
+
+Of course, there can be many other KPIs that will be relevant for a specific
+NFVI, but in most cases these KPIs are enough to give you a basic picture of
+the SUT. NSB also uses :term:`collectd` in order to collect the KPIs. Currently
+the following collectd plug-ins are enabled for NSB testcases:
+
+* Libvirt
+* Interface stats
+* OvS events
+* vSwitch stats
+* Huge Pages
+* RAM
+* CPU usage
+* IntelĀ® PMU
+* Intel(r) RDT
+
 Graphical Overview
 ------------------
 
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_acl-scale-up.yaml b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_acl-scale-up.yaml
new file mode 100644 (file)
index 0000000..d71c4ce
--- /dev/null
@@ -0,0 +1,111 @@
+# Copyright (c) 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.
+# 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.
+
+{% set vports = vports or 2 %}
+{% set duration = duration or 300 %}
+---
+schema: "yardstick:task:0.1"
+
+scenarios:
+-
+  type: NSPerf
+  #
+  # In case where we know that all the packets generated by the generator
+  # will bw received. Then use prox_binsearch.
+  #
+  # In the case where some or all the packets generated by the generator may
+  # not be received. Please use prox_acl .. (This generates packets at
+  # a specific rate and does not change rate.
+  #
+  traffic_profile: ../../traffic_profiles/prox_acl.yaml
+  extra_args:
+    vports: {{ vports }}
+  topology: prox-tg-topology-scale-up.yaml
+
+  nodes:
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
+
+  options:
+    vnf__0:
+      prox_path: /opt/nsb_bin/prox
+      prox_config: "configs/handle_acl-{{ vports }}.cfg"
+      prox_args:
+        "-t": ""
+      prox_files:
+        "configs/acl_rules-2.lua": ""
+
+    tg__0:
+      prox_path: /opt/nsb_bin/prox
+      prox_config: "configs/gen_acl-{{ vports }}.cfg"
+      prox_args:
+        "-e": ""
+        "-t": ""
+
+  runner:
+    type: Duration
+    # we kill after duration, independent of test duration, so set this high
+    duration: {{ duration }}
+
+contexts:
+   - name: yardstick
+     type: Node
+     file: prox_tg_bm.yaml
+   - name: yardstick
+     type: StandaloneOvsDpdk
+     file: /etc/yardstick/nodes/standalone/host_ovs.yaml
+     vm_deploy: True
+     ovs_properties:
+       version:
+         ovs: 2.8.0
+         dpdk: 17.05.2
+       pmd_threads: 2
+       ram:
+         socket_0: 2048
+         socket_1: 2048
+       queues: 4
+       vpath: "/usr/local"
+     flavor:
+       images: "/var/lib/libvirt/images/yardstick-nsb-image.img"
+       ram: 16384
+       extra_specs:
+         hw:cpu_sockets: 1
+         hw:cpu_cores: 10
+         hw:cpu_threads: 2
+     servers:
+       vnf__0:
+         network_ports:
+           mgmt:
+             cidr: '1.1.1.62/24'
+{% for port_num in range((vports/2)|int) %}
+           xe{{ port_num * 2 }}:
+             - uplink_{{ port_num }}
+           xe{{ (port_num * 2) + 1 }}:
+             - downlink_{{ port_num }}
+{% endfor %}
+     networks:
+{% for port_num in range((vports/2)|int) %}
+       uplink_{{ port_num }}:
+         port_num: {{ networks.uplink[port_num].port_num }}
+         phy_port: "{{ networks.uplink[port_num].phy_port }}"
+         vpci: "{{ networks.uplink[port_num].vpci }}"
+         cidr: "{{ networks.uplink[port_num].cidr }}"
+         gateway_ip: "{{ networks.uplink[port_num].gateway_ip }}"
+       downlink_{{ port_num }}:
+         port_num: {{ networks.downlink[port_num].port_num }}
+         phy_port: "{{ networks.downlink[port_num].phy_port }}"
+         vpci: "{{ networks.downlink[port_num].vpci }}"
+         cidr: "{{ networks.downlink[port_num].cidr }}"
+         gateway_ip: "{{ networks.downlink[port_num].gateway_ip }}"
+{% endfor %}
index 4507758..f9d9b65 100644 (file)
@@ -84,24 +84,24 @@ contexts:
          network_ports:
            mgmt:
              cidr: '1.1.1.62/24'
-{% for port_num in range(1,vports,2|int) %}
-           xe{{ loop.index0 * 2 }}:
-             - uplink_{{ loop.index0 }}
-           xe{{ (loop.index0 * 2) + 1 }}:
-             - downlink_{{ loop.index0 }}
+{% for port_num in range((vports/2)|int) %}
+           xe{{ port_num * 2 }}:
+             - uplink_{{ port_num }}
+           xe{{ (port_num * 2) + 1 }}:
+             - downlink_{{ port_num }}
 {% endfor %}
      networks:
-{% for port_num in range(1,vports,2|int) %}
-       uplink_{{ loop.index0 }}:
-         port_num: {{ networks.uplink[loop.index0].port_num }}
-         phy_port: "{{ networks.uplink[loop.index0].phy_port }}"
-         vpci: "{{ networks.uplink[loop.index0].vpci }}"
-         cidr: "{{ networks.uplink[loop.index0].cidr }}"
-         gateway_ip: "{{ networks.uplink[loop.index0].gateway_ip }}"
-       downlink_{{ loop.index0 }}:
-         port_num: {{ networks.downlink[loop.index0].port_num }}
-         phy_port: "{{ networks.downlink[loop.index0].phy_port }}"
-         vpci: "{{ networks.downlink[loop.index0].vpci }}"
-         cidr: "{{ networks.downlink[loop.index0].cidr }}"
-         gateway_ip: "{{ networks.downlink[loop.index0].gateway_ip }}"
+{% for port_num in range((vports/2)|int) %}
+       uplink_{{ port_num }}:
+         port_num: {{ networks.uplink[port_num].port_num }}
+         phy_port: "{{ networks.uplink[port_num].phy_port }}"
+         vpci: "{{ networks.uplink[port_num].vpci }}"
+         cidr: "{{ networks.uplink[port_num].cidr }}"
+         gateway_ip: "{{ networks.uplink[port_num].gateway_ip }}"
+       downlink_{{ port_num }}:
+         port_num: {{ networks.downlink[port_num].port_num }}
+         phy_port: "{{ networks.downlink[port_num].phy_port }}"
+         vpci: "{{ networks.downlink[port_num].vpci }}"
+         cidr: "{{ networks.downlink[port_num].cidr }}"
+         gateway_ip: "{{ networks.downlink[port_num].gateway_ip }}"
 {% endfor %}
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_sriov_acl-scale-up.yaml b/samples/vnf_samples/nsut/prox/tc_prox_sriov_acl-scale-up.yaml
new file mode 100644 (file)
index 0000000..7e81088
--- /dev/null
@@ -0,0 +1,101 @@
+# Copyright (c) 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.
+# 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.
+
+{% set vports = vports or 2 %}
+{% set duration = duration or 300 %}
+---
+schema: "yardstick:task:0.1"
+
+scenarios:
+-
+  type: NSPerf
+  #
+  # In case where we know that all the packets generated by the generator
+  # will bw received. Then use prox_binsearch.
+  #
+  # In the case where some or all the packets generated by the generator may
+  # not be received. Please use prox_acl .. (This generates packets at
+  # a specific rate and does not change rate.
+  #
+  traffic_profile: ../../traffic_profiles/prox_acl.yaml
+  extra_args:
+    vports: {{ vports }}
+  topology: prox-tg-topology-scale-up.yaml
+
+  nodes:
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
+
+  options:
+    vnf__0:
+      prox_path: /opt/nsb_bin/prox
+      prox_config: "configs/handle_acl-{{ vports }}.cfg"
+      prox_args:
+        "-t": ""
+      prox_files:
+        "configs/acl_rules-2.lua": ""
+
+    tg__0:
+      prox_path: /opt/nsb_bin/prox
+      prox_config: "configs/gen_acl-{{ vports }}.cfg"
+      prox_args:
+        "-e": ""
+        "-t": ""
+
+  runner:
+    type: Duration
+    # we kill after duration, independent of test duration, so set this high
+    duration: {{ duration }}
+
+contexts:
+   - name: yardstick
+     type: Node
+     file: prox_tg_bm.yaml
+   - name: yardstick
+     type: StandaloneSriov
+     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
+     vm_deploy: True
+     flavor:
+       images: "/var/lib/libvirt/images/yardstick-nsb-image.img"
+       ram: 16384
+       extra_specs:
+         hw:cpu_sockets: 1
+         hw:cpu_cores: 10
+         hw:cpu_threads: 2
+       user: ""
+       password: ""
+     servers:
+       vnf__0:
+         network_ports:
+           mgmt:
+             cidr: '1.1.1.62/24'
+{% for port_num in range((vports/2)|int) %}
+           xe{{ port_num * 2 }}:
+             - uplink_{{ port_num }}
+           xe{{ (port_num * 2) + 1 }}:
+             - downlink_{{ port_num }}
+{% endfor %}
+     networks:
+{% for port_num in range((vports/2)|int) %}
+       uplink_{{ port_num }}:
+         phy_port: "{{ networks.uplink[port_num].phy_port }}"
+         vpci: "{{ networks.uplink[port_num].vpci }}"
+         cidr: "{{ networks.uplink[port_num].cidr }}"
+         gateway_ip: "{{ networks.uplink[port_num].gateway_ip }}"
+       downlink_{{ port_num }}:
+         phy_port: "{{ networks.downlink[port_num].phy_port }}"
+         vpci: "{{ networks.downlink[port_num].vpci }}"
+         cidr: "{{ networks.downlink[port_num].cidr }}"
+         gateway_ip: "{{ networks.downlink[port_num].gateway_ip }}"
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1024k_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1024k_Requests-65000_Concurrency.yaml
deleted file mode 100644 (file)
index a87996c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: "../../traffic_profiles/http_tests/HTTP_1024k-requests_65000_concurrency.yaml"
-  topology: vfw_vnf_topology_ixload.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-  options:
-    framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.0001
-    vnf__0:
-      rules: acl_1rule.yaml
-      vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
-      nfvi_enable: True
-  runner:
-    type: Duration
-    duration: 2
-  ixia_profile: ../../traffic_profiles/vfw/HTTP-vFW_IPv4_2Ports.rxf # Need vlan update
-context:
-  type: Node
-  name: yardstick
-  nfvi_type: baremetal
-  file: /etc/yardstick/nodes/pod_ixia.yaml
-
index 7a9a265..3596a1d 100644 (file)
@@ -25,7 +25,7 @@ scenarios:
     simulated_users:
       uplink: [65000]
     page_object:
-      uplink: ["/1b.html"]
+      uplink: ["/1b.html"] #supports /4k /8k /16k /32k /64k /128k....
     framesize:
       uplink: {64B: 100}
       downlink: {64B: 100}
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_256k_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_256k_Requests-65000_Concurrency.yaml
deleted file mode 100644 (file)
index 82cdd62..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: "../../traffic_profiles/http_tests/HTTP_256k-requests_65000_concurrency.yaml"
-  topology: vfw_vnf_topology_ixload.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-  options:
-    framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.0001
-    vnf__0:
-      rules: acl_1rule.yaml
-      vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
-      nfvi_enable: True
-  runner:
-    type: Duration
-    duration: 2
-  ixia_profile: ../../traffic_profiles/vfw/HTTP-vFW_IPv4_2Ports.rxf # Need vlan update
-context:
-  type: Node
-  name: yardstick
-  nfvi_type: baremetal
-  file: /etc/yardstick/nodes/pod_ixia.yaml
-
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_4k_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_4k_Requests-65000_Concurrency.yaml
deleted file mode 100644 (file)
index 00131b5..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: "../../traffic_profiles/http_tests/HTTP_4k-requests_65000_concurrency.yaml"
-  topology: vfw_vnf_topology_ixload.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-  options:
-    framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.0001
-    vnf__0:
-      rules: acl_1rule.yaml
-      vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
-      nfvi_enable: True
-  runner:
-    type: Duration
-    duration: 2
-  ixia_profile: ../../traffic_profiles/vfw/HTTP-vFW_IPv4_2Ports.rxf # Need vlan update
-context:
-  type: Node
-  name: yardstick
-  nfvi_type: baremetal
-  file: /etc/yardstick/nodes/pod_ixia.yaml
-
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_512k_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_512k_Requests-65000_Concurrency.yaml
deleted file mode 100644 (file)
index 8fcd66e..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: "../../traffic_profiles/http_tests/HTTP_512k-requests_65000_concurrency.yaml"
-  topology: vfw_vnf_topology_ixload.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-  options:
-    framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.0001
-    vnf__0:
-      rules: acl_1rule.yaml
-      vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
-      nfvi_enable: True
-  runner:
-    type: Duration
-    duration: 2
-  ixia_profile: ../../traffic_profiles/vfw/HTTP-vFW_IPv4_2Ports.rxf # Need vlan update
-context:
-  type: Node
-  name: yardstick
-  nfvi_type: baremetal
-  file: /etc/yardstick/nodes/pod_ixia.yaml
-
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_64k_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_64k_Requests-65000_Concurrency.yaml
deleted file mode 100644 (file)
index 3b35424..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: "../../traffic_profiles/http_tests/HTTP_64k-requests_65000_concurrency.yaml"
-  topology: vfw_vnf_topology_ixload.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-  options:
-    framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.0001
-    vnf__0:
-      rules: acl_1rule.yaml
-      vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
-      nfvi_enable: True
-  runner:
-    type: Duration
-    duration: 2
-  ixia_profile: ../../traffic_profiles/vfw/HTTP-vFW_IPv4_2Ports.rxf # Need vlan update
-context:
-  type: Node
-  name: yardstick
-  nfvi_type: baremetal
-  file: /etc/yardstick/nodes/pod_ixia.yaml
diff --git a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1024K-requests_65000_concurrency.yaml b/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1024K-requests_65000_concurrency.yaml
deleted file mode 100644 (file)
index bfc7598..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-schema: "nsb:traffic_profile:0.1"
-
-name:            TrafficProfileGenericHTTP
-description:     Traffic profile to run HTTP test
-traffic_profile:
-  traffic_type: TrafficProfileGenericHTTP
-
-#http client specific values
-uplink_0:
-    http_no_requests: "1000"                # number of http iterations
-    http_concurency: "65000"                  # number of threads to be run
-    http_locator:  "/1024K.bin"              # http locator to be read
-    http_peer_address: "152.40.40.20"       # address range of the servers
-    http_peer_port: "9004"                  # port range of the server
-    http_client_address: "152.16.100.20"    # address range of the servers
-    private_subnet_mask: "255.255.255.0"
-    attacker_tests: "False"                 # True : If attacker Test, False : Otherwise
-
-#http server side
-downlink_0:
-    http_locator_image_size: "1024KB"      # image size requested by http client
-    http_bind_address: "152.40.40.20"   # where address is bound
-    http_bind_port: "9004"              # when port is bound
-    public_subnet_mask: "255.255.255.0"
diff --git a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_256K-requests_65000_concurrency.yaml b/samples/vnf_samples/traffic_profiles/http_tests/HTTP_256K-requests_65000_concurrency.yaml
deleted file mode 100644 (file)
index 1002575..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-schema: "nsb:traffic_profile:0.1"
-
-name:            TrafficProfileGenericHTTP
-description:     Traffic profile to run HTTP test
-traffic_profile:
-  traffic_type: TrafficProfileGenericHTTP
-
-#http client specific values
-uplink_0:
-    http_no_requests: "1000"                # number of http iterations
-    http_concurency: "65000"                  # number of threads to be run
-    http_locator:  "/256K.bin"              # http locator to be read
-    http_peer_address: "152.40.40.20"       # address range of the servers
-    http_peer_port: "9004"                  # port range of the server
-    http_client_address: "152.16.100.20"    # address range of the servers
-    private_subnet_mask: "255.255.255.0"
-    attacker_tests: "False"                 # True : If attacker Test, False : Otherwise
-
-#http server side
-downlink_0:
-    http_locator_image_size: "256KB"      # image size requested by http client
-    http_bind_address: "152.40.40.20"   # where address is bound
-    http_bind_port: "9004"              # when port is bound
-    public_subnet_mask: "255.255.255.0"
diff --git a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_4K-requests_65000_concurrency.yaml b/samples/vnf_samples/traffic_profiles/http_tests/HTTP_4K-requests_65000_concurrency.yaml
deleted file mode 100644 (file)
index a62aeb2..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-schema: "nsb:traffic_profile:0.1"
-
-name:            TrafficProfileGenericHTTP
-description:     Traffic profile to run HTTP test
-traffic_profile:
-  traffic_type: TrafficProfileGenericHTTP
-
-#http client specific values
-uplink_0:
-    http_no_requests: "1000"                # number of http iterations
-    http_concurency: "65000"                  # number of threads to be run
-    http_locator:  "/4K.bin"              # http locator to be read
-    http_peer_address: "152.40.40.20"       # address range of the servers
-    http_peer_port: "9004"                  # port range of the server
-    http_client_address: "152.16.100.20"    # address range of the servers
-    private_subnet_mask: "255.255.255.0"
-    attacker_tests: "False"                 # True : If attacker Test, False : Otherwise
-
-#http server side
-downlink_0:
-    http_locator_image_size: "4KB"      # image size requested by http client
-    http_bind_address: "152.40.40.20"   # where address is bound
-    http_bind_port: "9004"              # when port is bound
-    public_subnet_mask: "255.255.255.0"
diff --git a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_512K-requests_65000_concurrency.yaml b/samples/vnf_samples/traffic_profiles/http_tests/HTTP_512K-requests_65000_concurrency.yaml
deleted file mode 100644 (file)
index 9fd7635..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-schema: "nsb:traffic_profile:0.1"
-
-name:            TrafficProfileGenericHTTP
-description:     Traffic profile to run HTTP test
-traffic_profile:
-  traffic_type: TrafficProfileGenericHTTP
-
-#http client specific values
-uplink_0:
-    http_no_requests: "1000"                # number of http iterations
-    http_concurency: "65000"                  # number of threads to be run
-    http_locator:  "/512K.bin"              # http locator to be read
-    http_peer_address: "152.40.40.20"       # address range of the servers
-    http_peer_port: "9004"                  # port range of the server
-    http_client_address: "152.16.100.20"    # address range of the servers
-    private_subnet_mask: "255.255.255.0"
-    attacker_tests: "False"                 # True : If attacker Test, False : Otherwise
-
-#http server side
-downlink_0:
-    http_locator_image_size: "512KB"      # image size requested by http client
-    http_bind_address: "152.40.40.20"   # where address is bound
-    http_bind_port: "9004"              # when port is bound
-    public_subnet_mask: "255.255.255.0"
diff --git a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_64K-requests_65000_concurrency.yaml b/samples/vnf_samples/traffic_profiles/http_tests/HTTP_64K-requests_65000_concurrency.yaml
deleted file mode 100644 (file)
index 4585b31..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-schema: "nsb:traffic_profile:0.1"
-
-name:            TrafficProfileGenericHTTP
-description:     Traffic profile to run HTTP test
-traffic_profile:
-  traffic_type: TrafficProfileGenericHTTP
-
-#http client specific values
-uplink_0:
-    http_no_requests: "1000"                # number of http iterations
-    http_concurency: "65000"                  # number of threads to be run
-    http_locator:  "/64K.bin"              # http locator to be read
-    http_peer_address: "152.40.40.20"       # address range of the servers
-    http_peer_port: "9004"                  # port range of the server
-    http_client_address: "152.16.100.20"    # address range of the servers
-    private_subnet_mask: "255.255.255.0"
-    attacker_tests: "False"                 # True : If attacker Test, False : Otherwise
-
-#http server side
-downlink_0:
-    http_locator_image_size: "64KB"      # image size requested by http client
-    http_bind_address: "152.40.40.20"   # where address is bound
-    http_bind_port: "9004"              # when port is bound
-    public_subnet_mask: "255.255.255.0"
index c3c5451..f4c48f4 100644 (file)
@@ -508,10 +508,12 @@ class HeatContext(Context):
         pkey = pkg_resources.resource_string(
             'yardstick.resources',
             h_join('files/yardstick_key', self.name)).decode('utf-8')
-
+        key_filename = pkg_resources.resource_filename('yardstick.resources',
+            h_join('files/yardstick_key', self.name))
         result = {
             "user": server.context.user,
             "pkey": pkey,
+            "key_filename": key_filename,
             "private_ip": server.private_ip,
             "interfaces": server.interfaces,
             "routing_table": self.generate_routing_table(server),