Merge "Concurrency testcases to be configured over cli"

11 files changed, 1 insertions, 340 deletions

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
index a87996c1a..000000000
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1024k_Requests-65000_Concurrency.yaml
+++ /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
-
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
index 7a9a265d6..3596a1d15 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
@@ -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
index 82cdd6210..000000000
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_256k_Requests-65000_Concurrency.yaml
+++ /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
index 00131b5f9..000000000
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_4k_Requests-65000_Concurrency.yaml
+++ /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
index 8fcd66e31..000000000
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_512k_Requests-65000_Concurrency.yaml
+++ /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
index 3b354243b..000000000
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_64k_Requests-65000_Concurrency.yaml
+++ /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
index bfc75982f..000000000
--- a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1024K-requests_65000_concurrency.yaml
+++ /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
index 100257533..000000000
--- a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_256K-requests_65000_concurrency.yaml
+++ /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
index a62aeb210..000000000
--- a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_4K-requests_65000_concurrency.yaml
+++ /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
index 9fd76354f..000000000
--- a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_512K-requests_65000_concurrency.yaml
+++ /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
index 4585b31e9..000000000
--- a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_64K-requests_65000_concurrency.yaml
+++ /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"