From 6dc6f437c71e0c0569fd8977f2c166e7d6880e7a Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Fri, 25 Aug 2017 07:42:04 +0000 Subject: Create test suite k8-nosdn-lb-noha run with k8s context JIRA: YARDSTICK-800 We have k8-nosdn-lb-noha scenario with kubernetes deployment. So we need to add k8-nosdn-lb-noha test suite to run test case. Change-Id: Id6dc73ad999733ddfa2e03673c20f7e92a8250a3 Signed-off-by: chenjiankun --- samples/container_ping_vm.yaml | 57 ---------------------- samples/ping_k8s.yaml | 46 ----------------- tests/opnfv/test_cases/opnfv_yardstick_tc080.yaml | 46 +++++++++++++++++ tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml | 57 ++++++++++++++++++++++ .../test_suites/opnfv_k8-nosdn-lb-noha_daily.yaml | 18 +++++++ 5 files changed, 121 insertions(+), 103 deletions(-) delete mode 100644 samples/container_ping_vm.yaml delete mode 100644 samples/ping_k8s.yaml create mode 100644 tests/opnfv/test_cases/opnfv_yardstick_tc080.yaml create mode 100644 tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml create mode 100644 tests/opnfv/test_suites/opnfv_k8-nosdn-lb-noha_daily.yaml diff --git a/samples/container_ping_vm.yaml b/samples/container_ping_vm.yaml deleted file mode 100644 index 4b7b64f68..000000000 --- a/samples/container_ping_vm.yaml +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Huawei AB and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# Sample benchmark task config file -# measure network latency using ping in container - -schema: "yardstick:task:0.1" - -scenarios: -- - type: Ping - options: - packetsize: 200 - - host: host-k8s - target: target.openstack - - runner: - type: Duration - duration: 60 - interval: 1 - - sla: - max_rtt: 10 - action: monitor - -contexts: -- - type: Kubernetes - name: k8s - - servers: - host: - image: openretriever/yardstick - command: /bin/bash - args: ['-c', 'chmod 700 ~/.ssh; chmod 600 ~/.ssh/*; service ssh restart;while true ; do sleep 10000; done'] -- - type: Heat - name: openstack - image: cirros-0.3.5 - flavor: yardstick-flavor - user: cirros - - servers: - target: - floating_ip: true - - networks: - test: - cidr: '10.0.1.0/24' diff --git a/samples/ping_k8s.yaml b/samples/ping_k8s.yaml deleted file mode 100644 index 503fe6a45..000000000 --- a/samples/ping_k8s.yaml +++ /dev/null @@ -1,46 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Huawei AB and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# Sample benchmark task config file -# measure network latency using ping in container - -schema: "yardstick:task:0.1" - -scenarios: -- - type: Ping - options: - packetsize: 200 - - host: host-k8s - target: target-k8s - - runner: - type: Duration - duration: 60 - interval: 1 - - sla: - max_rtt: 10 - action: monitor - -context: - type: Kubernetes - name: k8s - - servers: - host: - image: openretriever/yardstick - command: /bin/bash - args: ['-c', 'chmod 700 ~/.ssh; chmod 600 ~/.ssh/*; service ssh restart;while true ; do sleep 10000; done'] - target: - image: openretriever/yardstick - command: /bin/bash - args: ['-c', 'chmod 700 ~/.ssh; chmod 600 ~/.ssh/*; service ssh restart;while true ; do sleep 10000; done'] diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc080.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc080.yaml new file mode 100644 index 000000000..503fe6a45 --- /dev/null +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc080.yaml @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2017 Huawei AB and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- +# Sample benchmark task config file +# measure network latency using ping in container + +schema: "yardstick:task:0.1" + +scenarios: +- + type: Ping + options: + packetsize: 200 + + host: host-k8s + target: target-k8s + + runner: + type: Duration + duration: 60 + interval: 1 + + sla: + max_rtt: 10 + action: monitor + +context: + type: Kubernetes + name: k8s + + servers: + host: + image: openretriever/yardstick + command: /bin/bash + args: ['-c', 'chmod 700 ~/.ssh; chmod 600 ~/.ssh/*; service ssh restart;while true ; do sleep 10000; done'] + target: + image: openretriever/yardstick + command: /bin/bash + args: ['-c', 'chmod 700 ~/.ssh; chmod 600 ~/.ssh/*; service ssh restart;while true ; do sleep 10000; done'] diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml new file mode 100644 index 000000000..d99757e47 --- /dev/null +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml @@ -0,0 +1,57 @@ +############################################################################## +# Copyright (c) 2017 Huawei AB and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- +# Sample benchmark task config file +# measure network latency using ping betwwen container and VM + +schema: "yardstick:task:0.1" + +scenarios: +- + type: Ping + options: + packetsize: 200 + + host: host-k8s + target: target.openstack + + runner: + type: Duration + duration: 60 + interval: 1 + + sla: + max_rtt: 10 + action: monitor + +contexts: +- + type: Kubernetes + name: k8s + + servers: + host: + image: openretriever/yardstick + command: /bin/bash + args: ['-c', 'chmod 700 ~/.ssh; chmod 600 ~/.ssh/*; service ssh restart;while true ; do sleep 10000; done'] +- + type: Heat + name: openstack + image: cirros-0.3.5 + flavor: yardstick-flavor + user: cirros + + servers: + target: + floating_ip: true + + networks: + test: + cidr: '10.0.1.0/24' diff --git a/tests/opnfv/test_suites/opnfv_k8-nosdn-lb-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_k8-nosdn-lb-noha_daily.yaml new file mode 100644 index 000000000..08a075845 --- /dev/null +++ b/tests/opnfv/test_suites/opnfv_k8-nosdn-lb-noha_daily.yaml @@ -0,0 +1,18 @@ +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +# k8 nosdn lb noha daily task suite + +schema: "yardstick:suite:0.1" + +name: "k8-nosdn-lb-noha" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc080.yaml -- cgit 1.2.3-korg