Merge "Added http concurrency test suite for agnostic VNF"

4 files changed, 173 insertions, 0 deletions

diff --git a/samples/vnf_samples/nsut/agnostic/HTTP_requests_concurrency.yaml b/samples/vnf_samples/nsut/agnostic/HTTP_requests_concurrency.yaml
new file mode 100755
index 000000000..1e9b1e8a0
--- /dev/null
+++ b/samples/vnf_samples/nsut/agnostic/HTTP_requests_concurrency.yaml
@@ -0,0 +1,56 @@
+# Copyright (c) 2018 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 imp

+# See the License for the specific language governing permissions and

+# limitations under the License.

+

+schema: "nsb:traffic_profile:0.1"

+

+name:            TrafficProfileGenericHTTP

+description:     Traffic profile to run HTTP test

+traffic_profile:

+  traffic_type: TrafficProfileGenericHTTP

+

+uplink_0:

+    ip:

+        address: "152.16.100.32"          # must be in same subnet with gateway

+        subnet_prefix: 24                 # subnet prefix

+        mac: "Auto"                       # port mac addr or auto to generate automatically

+        gateway: <GATEWAY_ADDR>           # will be taken from pod file

+

+    http_client:

+        simulated_users: {{ get(simulated_users, 'simulated_users.uplink_0', '65000') }} # number of threads to be run

+        page_object:  {{ get(page_object, 'page_object.uplink_0', '/1b.html') }} # http locator to be read

+

+downlink_0:

+    ip:

+        address: "152.40.40.32"           # must be in same subnet with gateway

+        subnet_prefix: 24                 # subnet prefix

+        mac: "Auto"                       # port mac addr or auto to generate automatically

+        gateway: <GATEWAY_ADDR>           # will be taken from pod file

+

+uplink_1:

+    ip:

+        address: "12.12.12.32"

+        subnet_prefix: 24

+        mac: "00:00:00:00:00:01"

+        gateway: <GATEWAY_ADDR>

+

+    http_client:

+        simulated_users: {{ get(simulated_users, 'simulated_users.uplink_1', '65000') }} # number of threads to be run

+        page_object:  {{ get(page_object, 'page_object.uplink_1', '/1b.html') }} # http locator to be read

+

+downlink_1:

+    ip:

+        address: "13.13.13.32"

+        subnet_prefix: 24

+        mac: "00:00:00:00:00:02"

+        gateway: <GATEWAY_ADDR>
\ No newline at end of file
diff --git a/samples/vnf_samples/nsut/agnostic/agnostic_vnf_topology_ixload_2ports.yaml b/samples/vnf_samples/nsut/agnostic/agnostic_vnf_topology_ixload_2ports.yaml
new file mode 100755
index 000000000..80f6dcf67
--- /dev/null
+++ b/samples/vnf_samples/nsut/agnostic/agnostic_vnf_topology_ixload_2ports.yaml
@@ -0,0 +1,50 @@
+# Copyright (c) 2018 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.
+
+nsd:nsd-catalog:
+    nsd:
+    -   id: agnostic-topology
+        name: agnostic-topology
+        short-name: agnostic-topology
+        description: scenario with HTTP and Agnostic VNF
+        constituent-vnfd:
+        -   member-vnf-index: '1'
+            vnfd-id-ref: tg__0
+            VNF model: ../../vnf_descriptors/tg_ixload.yaml
+        -   member-vnf-index: '2'
+            vnfd-id-ref: vnf__0
+            VNF model: ../../vnf_descriptors/agnostic_vnf.yaml
+
+        vld:
+        -   id: uplink_0
+            name: tg__0 to vnf__0 link 1
+            type: ELAN
+            vnfd-connection-point-ref:
+            -   member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe0
+                vnfd-id-ref: tg__0                   # HTTP Client
+            -   member-vnf-index-ref: '2'
+                vnfd-connection-point-ref: xe0
+                vnfd-id-ref: vnf__0                  # VNF
+
+        -   id: downlink_0
+            name: vnf__0 to tg__0 link 2
+            type: ELAN
+            vnfd-connection-point-ref:
+            -   member-vnf-index-ref: '2'
+                vnfd-connection-point-ref: xe1
+                vnfd-id-ref: vnf__0                  # HTTP Server
+            -   member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe1
+                vnfd-id-ref: tg__0                   # VNF
diff --git a/samples/vnf_samples/nsut/agnostic/tc_baremetal_http_ixload__Requests_Concurrency_suite.yaml b/samples/vnf_samples/nsut/agnostic/tc_baremetal_http_ixload__Requests_Concurrency_suite.yaml
new file mode 100755
index 000000000..d3c75eb25
--- /dev/null
+++ b/samples/vnf_samples/nsut/agnostic/tc_baremetal_http_ixload__Requests_Concurrency_suite.yaml
@@ -0,0 +1,27 @@
+# Copyright (c) 2018 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:suite:0.1"

+

+name: "http test suite"

+test_cases_dir: "samples/"

+test_cases:

+-

+  file_name: vnf_samples/nsut/agnostic/tc_baremetal_http_ixload__Requests_Concurrency_template.yaml

+  task_args:

+    default: '{"page": "/1b.html", "users" : "5000"}'

+-

+  file_name: vnf_samples/nsut/agnostic/tc_baremetal_http_ixload__Requests_Concurrency_template.yaml

+  task_args:

+    default: '{"page": "/1b.html", "users" : "6000"}'

diff --git a/samples/vnf_samples/nsut/agnostic/tc_baremetal_http_ixload__Requests_Concurrency_template.yaml b/samples/vnf_samples/nsut/agnostic/tc_baremetal_http_ixload__Requests_Concurrency_template.yaml
new file mode 100755
index 000000000..de2a779f8
--- /dev/null
+++ b/samples/vnf_samples/nsut/agnostic/tc_baremetal_http_ixload__Requests_Concurrency_template.yaml
@@ -0,0 +1,40 @@
+# Copyright (c) 2018 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

+{% set users = users or "10000" %}

+{% set page = page or "/1b.html" %}

+scenarios:

+- type: NSPerf

+  traffic_profile: "HTTP_requests_concurrency.yaml"

+  topology: agnostic_vnf_topology_ixload_2ports.yaml

+  nodes:

+    tg__0: trafficgen_1.yardstick

+    vnf__0: vnf.yardstick

+  options:

+    simulated_users:

+      uplink: [{{users}}]

+    page_object:

+      uplink: [{{page}}]

+    vnf__0: []

+  runner:

+    type: Duration

+    duration: 2

+  ixia_profile: ../../traffic_profiles/vfw/HTTP-vFW_IPv4_2Ports_Concurrency.rxf # Need vlan update

+context:

+  type: Node

+  name: yardstick

+  nfvi_type: baremetal

+  file: /etc/yardstick/nodes/pod_ixia.yaml