diff options
36 files changed, 1406 insertions, 148 deletions
diff --git a/config/config.yaml b/config/config.yaml index 76e42b30..f85599c1 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -13,4 +13,7 @@ common_config: pod_info: '/tmp/pod.yaml' yardstick_rc_dir: '/etc/yardstick/openstack.creds' releng_dir: '/home/opnfv/releng' - fetch_os_file: 'utils/fetch_os_creds.sh'
\ No newline at end of file + fetch_os_file: 'utils/fetch_os_creds.sh' + yardstick_image_dir: '/tmp/yardstick.img' + image_url: 'http://artifacts.opnfv.org/yardstick/image/yardstick-nsb-image.img' + yardstick_image_name: 'bottlenecks_yardstick' diff --git a/docs/testing/developer/devguide/index.rst b/docs/testing/developer/devguide/index.rst index d3c871e4..37a4ea09 100644 --- a/docs/testing/developer/devguide/index.rst +++ b/docs/testing/developer/devguide/index.rst @@ -11,4 +11,5 @@ Bottlenecks Developer Guide ./quick_start.rst ./framework_guide.rst + ./unit_coverage_test.rst ./package_guide.rst diff --git a/docs/testing/developer/devguide/unit_coverage_test.rst b/docs/testing/developer/devguide/unit_coverage_test.rst new file mode 100644 index 00000000..87096fca --- /dev/null +++ b/docs/testing/developer/devguide/unit_coverage_test.rst @@ -0,0 +1,190 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) Huawei Technologies Co.,Ltd and others. + +**************************************** +Bottlenecks - Unit & Coverage Test Guide +**************************************** + + +Introduction of the Rationale and Framework +=========================================== + +What are Unit & Coverage Tests +------------------------------ + +A unit test is an automated code-level test for a small and fairly isolated +part of functionality, mostly in terms of functions. +They should interact with external resources at their minimum, and includes +testing every corner cases and cases that do not work. + +Unit tests should always be pretty simple, by intent. There are +a couple of ways to integrate unit tests into your development style `[1]`_: + +* Test Driven Development, where unit tests are written prior to the functionality they're testing + +* During refactoring, where existing code -- sometimes code without any automated tests to start with -- is retrofitted with unit tests as part of the refactoring process + +* Bug fix testing, where bugs are first pinpointed by a targetted test and then fixed + +* Straight test enhanced development, where tests are written organically as the code evolves. + +Comprehensive and integrally designed unit tests serves valuably as +validator of your APIs, fuctionalities and the workflow that acctually +make them executable. It will make it possibe to deliver your codes +more quickly. + +In the meanwhile, Coverage Test is the tool for measuring code coverage of Python programs. Accompany with Unit Test, it monitors your program, noting which parts of the code have been executed, then analyzes the source to identify code that could have been executed but was not. + +Coverage measurement is typically used to gauge the effectiveness of tests. It can show which parts of your code are being exercised by tests, and which are not. + +Why We Use a Framework and Nose +------------------------------- + +People use unit test discovery and execution frameworks +so that they can forcus on add tests to existing code, +then the tests could be tirggerd, +resulting report could be obtained automatically. + +In addition to adding and running your tests, +frameworks can run tests selectively according to your requirements, add coverage and profiling information, generate comprehensive reports. + +There are many unit test frameworks in Python, and more arise every day. +It will take you some time to be falimiar with those +that are famous from among the ever-arising frameworks. +However, to us, it always matters more that you are actually +writing tests for your codes than how you write them. +Plus, nose is quite stable, it's been used by many projects and it could be adapted easily to mimic any other unit test discovery framework pretty easily. +So, why not? + +Principles of the Tests +----------------------- + +Before you actually implement test codes for your software, +please keep the following principles in mind `[2]`_ + +* A testing unit should focus on one tiny bit of functionality and prove it correct. + +* Each test unit must be fully independent. This is usually handled by setUp() and tearDown() methods. + +* Try hard to make tests that run fast. + +* Learn your tools and learn how to run a single test or a test case. Then, when developing a function inside a module, run this function’s tests frequently, ideally automatically when you save the code. + +* Always run the full test suite before a coding session, and run it again after. This will give you more confidence that you did not break anything in the rest of the code. + +* It is a good idea to implement a hook that runs all tests before pushing code to a shared repository. + +* If you are in the middle of a development session and have to interrupt your work, it is a good idea to write a broken unit test about what you want to develop next. When coming back to work, you will have a pointer to where you were and get back on track faster. + +* The first step when you are debugging your code is to write a new test pinpointing the bug, while it is not always possible to do. + +* Use long and descriptive names for testing functions. These function names are displayed when a test fails, and should be as descriptive as possible. + +* Welly designed tests could acts as an introduction to new developers (read tests or write tests first before going into functionality development) and demonstrations for maintainers. + + +Offline Test +============ + +There only are a few guidance for developing and testing your code on your +local server assuming that you already have python installed. +For more detailed introduction, +please refer to the wesites of nose and coverage `[3]`_ `[4]`_. + +Install Nose +------------ + +Install Nose using your OS's package manager. For example: + +.. code-block:: bash + + pip install nose + +As to creating tests and a quick start, please refer to `[5]`_ + +Run Tests +--------- + +Nose comes with a command line utility called 'nosetests'. +The simplest usage is to call nosetests from within your project directory +and pass a 'tests' directory as an argument. For example, + +.. code-block:: bash + + nosetests tests + +The outputs could be similar to the following summary: + +.. code-block:: bash + + % nosetests tests + .... + ---------------------------------------------------------------------- + Ran 4 tests in 0.003s OK + +Adding Code Coverage +-------------------- + +Coverage is the metric that could complete your unit tests by overseeing +your test codes themselves. +Nose support coverage test according the Coverage.py. + +.. code-block:: bash + + pip install coverage + +To generate a coverage report using the nosetests utility, +simply add the --with-coverage. By default, coverage generates data +for all modules found in the current directory. + +.. code-block:: bash + + nosetests --with-coverage + +% nosetests --with-coverage --cover-package a + +The --cover-package switch can be used multiple times to restrain the tests +only looking into the 3rd party package to avoid useless information. + +.. code-block:: bash + + nosetests --with-coverage --cover-package a --cover-package b + .... + Name Stmts Miss Cover Missing + ------------------------------------- + a 8 0 100% + ---------------------------------------------------------------------- + Ran 4 tests in 0.006sOK + + +OPNFV CI Verify Job +=================== + +Assuming that you have already got the main idea of unit testing +and start to programing you own tests under Bottlenecks repo. +The most important thing that should be clarified is that +unit tests under Bottlenecks should be either excutable offline and +by OPNFV CI pipeline. +When you submit patches to Bottlenecks repo, your patch should following certain ruls to enable the tests: + +* The Bottlenecks unit tests are triggered by OPNFV verify job of CI when you upload files to "test" directory. + +* You should add your --cover-package and test directory in ./verify.sh according to the above guides + +After meeting the two rules, your patch will automatically validated by +nose tests executed by OPNFV verify job. + + +Reference +========= + +_`[1]`: http://ivory.idyll.org/articles/nose-intro.html + +_`[2]`: https://github.com/kennethreitz/python-guide/blob/master/docs/writing/tests.rst + +_`[3]`: http://nose.readthedocs.io/en/latest/ + +_`[4]`: https://coverage.readthedocs.io/en/coverage-4.4.2 + +_`[5]`: http://blog.jameskyle.org/2010/10/nose-unit-testing-quick-start/ diff --git a/requirements/verify.txt b/requirements/verify.txt index e8d51f47..3c63c8ff 100644 --- a/requirements/verify.txt +++ b/requirements/verify.txt @@ -6,5 +6,8 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +# This file is for verify job excuted by OPNFV CI -flake8==3.0.4
\ No newline at end of file +flake8==3.0.4 +nose==1.3.7 +coverage==4.4.2 diff --git a/test/__init__.py b/test/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/test/__init__.py diff --git a/testsuites/posca/testcase_cfg/posca_factor_multistack_storage.yaml b/testsuites/posca/testcase_cfg/posca_factor_multistack_storage.yaml new file mode 100644 index 00000000..e2f48438 --- /dev/null +++ b/testsuites/posca/testcase_cfg/posca_factor_multistack_storage.yaml @@ -0,0 +1,35 @@ +############################################################################## +# 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 +############################################################################## + +load_manager: + scenarios: + tool: fio + test_times: 10 + #this "rw" value could be write read rw rr or randrw + rw: 'randrw' + bs: '4k' + size: '20g' + rwmixwrite: '50' + num_thread: 1, 2 + num_stack: 1 + volume_num: '1' + num_jobs: '1' + direct: '1' + volume_size: 50 + + runners: + stack_create: yardstick + flavor: + yardstick_test_dir: "samples" + yardstick_testcase: "storage_bottlenecks" + +contexts: + dashboard: "Bottlenecks-ELK" + yardstick: "Bottlenecks-Yardstick" + yardstick_envpre: True diff --git a/testsuites/posca/testcase_cfg/posca_factor_multistack_storage_parallel.yaml b/testsuites/posca/testcase_cfg/posca_factor_multistack_storage_parallel.yaml new file mode 100644 index 00000000..b55b826c --- /dev/null +++ b/testsuites/posca/testcase_cfg/posca_factor_multistack_storage_parallel.yaml @@ -0,0 +1,33 @@ +############################################################################## +# 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 +############################################################################## + +load_manager: + scenarios: + tool: fio + # for this option we provide " write, read, rw, rr" + rw: "randrw" + bs: "4k" + size: "20g" + rwmixwrite: "50" + num_stack: 1, 3 + volume_num: "1" + num_jobs: "1" + direct: "1" + volume_size: 50 + + runners: + stack_create: yardstick + flavor: + yardstick_test_dir: "samples" + yardstick_testcase: "storage_bottlenecks" + +contexts: + dashboard: "Bottlenecks-ELK" + yardstick: "Bottlenecks-Yardstick" + yardstick_envpre: True diff --git a/testsuites/posca/testcase_cfg/posca_factor_soak_throughputs.yaml b/testsuites/posca/testcase_cfg/posca_factor_soak_throughputs.yaml new file mode 100644 index 00000000..346c4106 --- /dev/null +++ b/testsuites/posca/testcase_cfg/posca_factor_soak_throughputs.yaml @@ -0,0 +1,35 @@ +############################################################################## +# 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 +############################################################################## + +# Sample config file for life-cycle throuphputs baseline test +# Each vm pair will have its ttl (time to live) and creation delay +# (lazy creation delay) specified. +# Multiple context are used to specify the host and target VMs. + +load_manager: + scenarios: + tool: netperf + test_duration_hours: 1 + vim_pair_ttl: 300 + vim_pair_lazy_cre_delay: 2 + package_size: + threshhold: + package_loss: 0% + latency: 300 + + runners: + stack_create: yardstick + flavor: + yardstick_test_dir: "samples" + yardstick_testcase: "netperf_soak" + +contexts: + dashboard: "Bottlenecks-ELK" + yardstick: "Bottlenecks-Yardstick" + yardstick_envpre: True diff --git a/testsuites/posca/testcase_cfg/posca_feature_moon_resources.yaml b/testsuites/posca/testcase_cfg/posca_feature_moon_resources.yaml index d6b325f7..bbf65ba7 100644 --- a/testsuites/posca/testcase_cfg/posca_feature_moon_resources.yaml +++ b/testsuites/posca/testcase_cfg/posca_feature_moon_resources.yaml @@ -11,20 +11,27 @@ load_manager: scenarios: tool: https request # info that the cpus and memes have the same number of data. + pdp_name: pdp + policy_name: "MLS Policy example" + model_name: MLS tenants: 1,5,10,20 + subject_number: 10 + object_number: 10 + timeout: 0.2 runners: stack_create: yardstick Debug: False yardstick_test_dir: "samples" - yardstick_testcase: "bottlenecks_moon_resources" - - runner_exta: - # info this section is for yardstick do some exta env prepare. - installation_method: yardstick - installation_type: testpmd + yardstick_testcase: "moon_resource" contexts: # info that dashboard if have data, we will create the data dashboard. dashboard: "Bottlenecks-ELK" - yardstick: "Bottlenecks-yardstick"
\ No newline at end of file + yardstick: "Bottlenecks-yardstick" + moon_monitoring: True + moon_environment: + ip: "192.168.37.205" + user: "root" + password: "root" + consul_port: 30005 diff --git a/testsuites/posca/testcase_cfg/posca_feature_moon_tenants.yaml b/testsuites/posca/testcase_cfg/posca_feature_moon_tenants.yaml index 3b621a99..7feb6e4e 100644 --- a/testsuites/posca/testcase_cfg/posca_feature_moon_tenants.yaml +++ b/testsuites/posca/testcase_cfg/posca_feature_moon_tenants.yaml @@ -11,25 +11,30 @@ load_manager: scenarios: tool: https request # info that the cpus and memes have the same number of data. - resources: 20 - initial: 0 - threshhold: 5 - timeout: 30 + pdp_name: pdp + policy_name: "MLS Policy example" + model_name: MLS + subject_number: 20 + object_number: 20 + timeout: 0.003 + initial_tenants: 0 + steps_tenants: 1 + tolerate_time: 20 SLA: 5 - runners: stack_create: yardstick Debug: False yardstick_test_dir: "samples" - yardstick_testcase: "bottlenecks_moon_tenants" - - runner_exta: - # info this section is for yardstick do some exta env prepare. - installation_method: yardstick - installation_type: testpmd + yardstick_testcase: "moon_tenant" contexts: # info that dashboard if have data, we will create the data dashboard. dashboard: "Bottlenecks-ELK" - yardstick: "Bottlenecks-yardstick"
\ No newline at end of file + yardstick: "Bottlenecks-yardstick" + moon_monitoring: True + moon_environment: + ip: "192.168.37.205" + user: "root" + password: "root" + consul_port: 30005 diff --git a/testsuites/posca/testcase_dashboard/posca_feature_moon.py b/testsuites/posca/testcase_dashboard/posca_feature_moon.py new file mode 100644 index 00000000..6819ea84 --- /dev/null +++ b/testsuites/posca/testcase_dashboard/posca_feature_moon.py @@ -0,0 +1,121 @@ +#!/usr/bin/python +############################################################################## +# Copyright (c) 2015 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 +############################################################################## +'''This file realize a function of creating dashboard of stress ping test''' +import ConfigParser +from elasticsearch import Elasticsearch +import json +import os +import utils.logger as log +from utils.parser import Parser as conf_parser + +LOG = log.Logger(__name__).getLogger() +config = ConfigParser.ConfigParser() +es = Elasticsearch() +dashboard_path = os.path.join(conf_parser.test_dir, + "posca", + "testcase_dashboard") +dashboard_dir = dashboard_path + "/" + + +def dashboard_send_data(runner_config, test_data): + global es + print runner_config + es_ip = runner_config['dashboard_ip'].split(':') + es = Elasticsearch([{'host': es_ip[0]}]) + print test_data["test_body"] + res = es.index(index="bottlenecks", + doc_type=test_data["testcase"], + body=test_data["test_body"][0]) + if res['created'] == "False": + LOG.error("date send to kibana have errors ", test_data["data_body"]) + + +def posca_moon_init(runner_config): + global es + es_ip = runner_config['dashboard_ip'].split(':') + es = Elasticsearch([{'host': es_ip[0]}]) + # Create bottlenecks index + with open(dashboard_dir + 'posca_feature_moon_index_pattern.json')\ + as index_pattern: + doc = json.load(index_pattern) + res = es.index( + index=".kibana", + doc_type="index-pattern", + id="bottlenecks", + body=doc) + if res['created'] == "True": + LOG.info("bottlenecks index-pattern has created") + else: + LOG.info("bottlenecks index-pattern has existed") + + with open(dashboard_dir + 'posca_system_bandwidth_config.json')\ + as index_config: + doc = json.load(index_config) + res = es.index(index=".kibana", doc_type="config", id="4.6.1", body=doc) + if res['created'] == "True": + LOG.info("bottlenecks config has created") + else: + LOG.info("bottlenecks config has existed") + + # Configure discover panel + with open(dashboard_dir + 'posca_feature_moon_discover.json')\ + as index_discover: + doc = json.load(index_discover) + res = es.index( + index=".kibana", + doc_type="search", + id="moon", + body=doc) + if res['created'] == "True": + LOG.info("moon testcase search has created") + else: + LOG.info("moon testcase search has existed") + + # Create testing data in line graph + with open(dashboard_dir + 'posca_feature_moon_resources_histogram.json')\ + as line_data: + doc = json.load(line_data) + res = es.index( + index=".kibana", + doc_type="visualization", + id="resources", + body=doc) + if res['created'] == "True": + LOG.info("moon resources visualization has created") + else: + LOG.info("moon resources visualization has existed") + + # Create comparison results in line chart + with open(dashboard_dir + 'posca_feature_moon_tenants_histogram.json')\ + as line_char: + doc = json.load(line_char) + res = es.index( + index=".kibana", + doc_type="visualization", + id="tenants", + body=doc) + if res['created'] == "True": + LOG.info("moon tenants visualization has created") + else: + LOG.info("moon tenants visualization has existed") + + # Create dashboard + with open(dashboard_dir + 'posca_feature_moon_dashboard.json')\ + as dashboard: + doc = json.load(dashboard) + res = es.index( + index=".kibana", + doc_type="dashboard", + id="moon", + body=doc) + if res['created'] == "True": + LOG.info("moon testcases dashboard has created") + else: + LOG.info("moon testcases dashboard has existed") diff --git a/testsuites/posca/testcase_dashboard/posca_feature_moon_dashboard.json b/testsuites/posca/testcase_dashboard/posca_feature_moon_dashboard.json new file mode 100644 index 00000000..53a4a750 --- /dev/null +++ b/testsuites/posca/testcase_dashboard/posca_feature_moon_dashboard.json @@ -0,0 +1,13 @@ +{ + "title": "moon", + "hits": 0, + "description": "", + "panelsJSON": "[{\"id\":\"resources\",\"type\":\"visualization\",\"panelIndex\":1,\"size_x\":8,\"size_y\":7,\"col\":1,\"row\":1},{\"id\":\"tenants\",\"type\":\"visualization\",\"panelIndex\":2,\"size_x\":3,\"size_y\":7,\"col\":9,\"row\":1}]", + "optionsJSON": "{\"darkTheme\":false}", + "uiStateJSON": "{}", + "version": 1, + "timeRestore": false, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}}}]}" + } +}
\ No newline at end of file diff --git a/testsuites/posca/testcase_dashboard/posca_feature_moon_index_pattern.json b/testsuites/posca/testcase_dashboard/posca_feature_moon_index_pattern.json new file mode 100644 index 00000000..2bff871a --- /dev/null +++ b/testsuites/posca/testcase_dashboard/posca_feature_moon_index_pattern.json @@ -0,0 +1,4 @@ +{ + "title": "bottlenecks", + "fields": "[{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"tenant_max\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"max_user\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"tenant_number\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]" +}
\ No newline at end of file diff --git a/testsuites/posca/testcase_dashboard/posca_feature_moon_resources_histogram.json b/testsuites/posca/testcase_dashboard/posca_feature_moon_resources_histogram.json new file mode 100644 index 00000000..c8977a72 --- /dev/null +++ b/testsuites/posca/testcase_dashboard/posca_feature_moon_resources_histogram.json @@ -0,0 +1,11 @@ +{ + "title": "resources", + "visState": "{\"title\":\"New Visualization\",\"type\":\"histogram\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"scale\":\"linear\",\"mode\":\"stacked\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"max_user\"}},{\"id\":\"2\",\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"tenant_number\",\"size\":5,\"order\":\"asc\",\"orderBy\":\"_term\"}}],\"listeners\":{}}", + "uiStateJSON": "{}", + "description": "", + "savedSearchId": "moon", + "version": 1, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"filter\":[]}" + } +}
\ No newline at end of file diff --git a/testsuites/posca/testcase_dashboard/posca_feature_moon_tenants_discover.json b/testsuites/posca/testcase_dashboard/posca_feature_moon_tenants_discover.json new file mode 100644 index 00000000..03360f89 --- /dev/null +++ b/testsuites/posca/testcase_dashboard/posca_feature_moon_tenants_discover.json @@ -0,0 +1,23 @@ +{ + "_index": ".kibana", + "_type": "search", + "_id": "tenants", + "_version": 1, + "found": true, + "_source": { + "title": "tenants", + "description": "", + "hits": 0, + "columns": [ + "_source" + ], + "sort": [ + "_score", + "desc" + ], + "version": 1, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"index\":\"bottlenecks\",\"filter\":[],\"highlight\":{\"pre_tags\":[\"@kibana-highlighted-field@\"],\"post_tags\":[\"@/kibana-highlighted-field@\"],\"fields\":{\"*\":{}},\"require_field_match\":false,\"fragment_size\":2147483647},\"query\":{\"query_string\":{\"query\":\"_type:posca_factor_moon_tenants\",\"analyze_wildcard\":true}}}" + } + } +}
\ No newline at end of file diff --git a/testsuites/posca/testcase_dashboard/posca_feature_moon_tenants_histogram.json b/testsuites/posca/testcase_dashboard/posca_feature_moon_tenants_histogram.json new file mode 100644 index 00000000..a731acfc --- /dev/null +++ b/testsuites/posca/testcase_dashboard/posca_feature_moon_tenants_histogram.json @@ -0,0 +1,11 @@ +{ + "title": "tenants", + "visState": "{\"title\":\"New Visualization\",\"type\":\"histogram\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"scale\":\"linear\",\"mode\":\"stacked\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"tenant_max\"}}],\"listeners\":{}}", + "uiStateJSON": "{}", + "description": "", + "savedSearchId": "moon", + "version": 1, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"filter\":[]}" + } +}
\ No newline at end of file diff --git a/testsuites/posca/testcase_dashboard/posca_moon_resources.py b/testsuites/posca/testcase_dashboard/posca_moon_resources.py new file mode 100644 index 00000000..446faccc --- /dev/null +++ b/testsuites/posca/testcase_dashboard/posca_moon_resources.py @@ -0,0 +1,36 @@ +#!/usr/bin/python +############################################################################## +# Copyright (c) 2015 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 +############################################################################## +'''This file realize a function of creating dashboard of stress ping test''' +import ConfigParser +from elasticsearch import Elasticsearch +import os +import utils.logger as log +from utils.parser import Parser as conf_parser + +LOG = log.Logger(__name__).getLogger() +config = ConfigParser.ConfigParser() +es = Elasticsearch() +dashboard_path = os.path.join(conf_parser.test_dir, + "posca", + "testcase_dashboard") +dashboard_dir = dashboard_path + "/" + + +def dashboard_send_data(runner_config, test_data): + global es + print runner_config + es_ip = runner_config['dashboard_ip'].split(':') + es = Elasticsearch([{'host': es_ip[0]}]) + print test_data["test_body"] + res = es.index(index="bottlenecks", + doc_type=test_data["testcase"], + body=test_data["test_body"][0]) + if res['created'] == "False": + LOG.error("date send to kibana have errors ", test_data["data_body"]) diff --git a/testsuites/posca/testcase_dashboard/posca_moon_tenants.py b/testsuites/posca/testcase_dashboard/posca_moon_tenants.py new file mode 100644 index 00000000..446faccc --- /dev/null +++ b/testsuites/posca/testcase_dashboard/posca_moon_tenants.py @@ -0,0 +1,36 @@ +#!/usr/bin/python +############################################################################## +# Copyright (c) 2015 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 +############################################################################## +'''This file realize a function of creating dashboard of stress ping test''' +import ConfigParser +from elasticsearch import Elasticsearch +import os +import utils.logger as log +from utils.parser import Parser as conf_parser + +LOG = log.Logger(__name__).getLogger() +config = ConfigParser.ConfigParser() +es = Elasticsearch() +dashboard_path = os.path.join(conf_parser.test_dir, + "posca", + "testcase_dashboard") +dashboard_dir = dashboard_path + "/" + + +def dashboard_send_data(runner_config, test_data): + global es + print runner_config + es_ip = runner_config['dashboard_ip'].split(':') + es = Elasticsearch([{'host': es_ip[0]}]) + print test_data["test_body"] + res = es.index(index="bottlenecks", + doc_type=test_data["testcase"], + body=test_data["test_body"][0]) + if res['created'] == "False": + LOG.error("date send to kibana have errors ", test_data["data_body"]) diff --git a/testsuites/posca/testcase_script/posca_factor_multistack_storage.py b/testsuites/posca/testcase_script/posca_factor_multistack_storage.py new file mode 100644 index 00000000..34ee225c --- /dev/null +++ b/testsuites/posca/testcase_script/posca_factor_multistack_storage.py @@ -0,0 +1,236 @@ +#!/usr/bin/env python +############################################################################## +# 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 +############################################################################## +'''This file realize the function of run posca multistack storage stress test +This file contain several part: +First is create a script to realize several threading run''' + +import utils.logger as log +import uuid +import json +import os +import time +import threading +import datetime +import Queue +from utils.parser import Parser as conf_parser +import utils.env_prepare.quota_prepare as quota_prepare +import utils.env_prepare.stack_prepare as stack_prepare +import utils.infra_setup.runner.yardstick as yardstick_task + +import utils.infra_setup.runner.docker_env as docker_env + +# -------------------------------------------------- +# logging configuration +# -------------------------------------------------- +LOG = log.Logger(__name__).getLogger() + +test_dict = { + "action": "runTestCase", + "args": { + "opts": { + "task-args": {} + }, + "testcase": "multistack_storage_bottlenecks" + } +} +testfile = os.path.basename(__file__) +testcase, file_format = os.path.splitext(testfile) +cidr = "/home/opnfv/repos/yardstick/samples/storage_bottlenecks.yaml" +runner_DEBUG = True +q = Queue.Queue() +final_result = Queue.Queue() + + +def env_pre(test_config): + test_yardstick = False + if "yardstick" in test_config["contexts"].keys(): + test_yardstick = True + stack_prepare._prepare_env_daemon(test_yardstick) + quota_prepare.quota_env_prepare() + LOG.info("yardstick environment prepare!") + if(test_config["contexts"]['yardstick_envpre']): + stdout = yardstick_task.yardstick_image_prepare() + LOG.debug(stdout) + + +def testcase_parser(out_file="yardstick.out", **parameter_info): + cmd = yardstick_task.yardstick_command_parser(debug=runner_DEBUG, + cidr=cidr, + outfile=out_file, + parameter=parameter_info) + return cmd + + +def do_test(test_config): + out_file = ("/tmp/yardstick_" + str(uuid.uuid4()) + ".out") + yardstick_container = docker_env.yardstick_info['container'] + cmd = testcase_parser(out_file=out_file, **test_config) + print(cmd) + stdout = docker_env.docker_exec_cmd(yardstick_container, cmd) + LOG.info(stdout) + loop_value = 0 + while loop_value < 60: + time.sleep(2) + loop_value = loop_value + 1 + with open(out_file) as f: + data = json.load(f) + if data["result"]["criteria"] == "PASS": + LOG.info("yardstick run success") + LOG.info("%s" % data["result"]["testcases"]) + break + else: + LOG.error("yardstick error exit") + break + + save_data = final_config_to_result(test_config, data) + return save_data + + +def config_to_result(num, out_num, during_date): + testdata = {} + test_result = {} + final_data = {} + + final_data["read_iops"] = 0 + final_data["read_bw"] = 0 + final_data["read_lat"] = 0 + final_data["write_iops"] = 0 + final_data["write_bw"] = 0 + final_data["write_lat"] = 0 + + test_result["number_of_stacks"] = float(num) + test_result["success_times"] = out_num + test_result["success_rate"] = out_num / num + test_result["duration_time"] = during_date + testdata["data_body"] = test_result + testdata["testcase"] = testcase + + while not final_result.empty(): + data = final_result.get() + final_data["read_iops"] += data["read_iops"] + final_data["read_bw"] += data["read_bw"] + if final_data["read_lat"] is 0: + final_data["read_lat"] = data["read_lat"] + else: + final_data["read_lat"] += data["read_lat"] + final_data["read_lat"] = final_data["read_lat"]/2 + final_data["write_iops"] += data["write_iops"] + final_data["write_bw"] += data["read_iops"] + if final_data["write_lat"] is 0: + final_data["write_lat"] = data["write_lat"] + else: + final_data["write_lat"] += data["write_lat"] + final_data["write_lat"] = final_data["write_lat"]/2 + + testdata["test_value"] = final_data + LOG.info("Final testdata is %s" % testdata) + return testdata + + +def final_config_to_result(test_config, test_result): + out_data = test_result["result"]["testcases"] + test_data = out_data["storage_bottlenecks"]["tc_data"] + testdata = {} + testdata["read_iops"] = 0 + testdata["read_bw"] = 0 + testdata["read_lat"] = 0 + testdata["write_iops"] = 0 + testdata["write_bw"] = 0 + testdata["write_lat"] = 0 + print(testdata["read_iops"]) + for result in test_data: + testdata["read_iops"] += result["data"]["read_iops"] + testdata["read_bw"] += result["data"]["read_bw"] + if testdata["read_lat"] is 0: + testdata["read_lat"] = result["data"]["read_lat"] + else: + testdata["read_lat"] += result["data"]["read_lat"] + testdata["read_lat"] = testdata["read_lat"]/2 + testdata["write_iops"] += result["data"]["write_iops"] + testdata["write_bw"] += result["data"]["write_bw"] + if testdata["write_lat"] is 0: + testdata["write_lat"] = result["data"]["write_lat"] + else: + testdata["write_lat"] += result["data"]["write_lat"] + testdata["write_lat"] = testdata["write_lat"]/2 + final_result.put(testdata) + q.put(1) + return testdata + + +def func_run(con_dic): + test_date = do_test(con_dic) + return test_date + + +def run(test_config): + con_dic = test_config["load_manager"] + scenarios_conf = con_dic["scenarios"] + + if test_config["contexts"]["yardstick_ip"] is None: + con_dic["contexts"]["yardstick_ip"] =\ + conf_parser.ip_parser("yardstick_test_ip") + + env_pre(test_config) + LOG.info("yardstick environment prepare done!") + + stack_num = scenarios_conf["num_stack"] + test_num = conf_parser.str_to_list(scenarios_conf["num_thread"]) + rw = scenarios_conf["rw"] + bs = scenarios_conf["bs"] + size = scenarios_conf["size"] + rwmixwrite = scenarios_conf["rwmixwrite"] + numjobs = scenarios_conf["num_jobs"] + direct = scenarios_conf["direct"] + volume_num = scenarios_conf["volume_num"] + volume_size = scenarios_conf["volume_size"] + + for value in test_num: + result = [] + out_num = 0 + num = int(value) + # pool = multiprocessing.Pool(processes=num) + threadings = [] + LOG.info("begin to run %s thread" % num) + + starttime = datetime.datetime.now() + + for i in xrange(0, num): + case_config = {"stack_num": int(stack_num), + "volume_num": volume_num, + "rw": rw, + "bs": bs, + "size": size, + "rwmixwrite": rwmixwrite, + "numjobs": numjobs, + "direct": direct, + "volume_size": int(volume_size)} + tmp_thread = threading.Thread(target=func_run, args=(case_config,)) + threadings.append(tmp_thread) + tmp_thread.start() + + for one_thread in threadings: + one_thread.join() + while not q.empty(): + result.append(q.get()) + for item in result: + out_num = out_num + float(item) + + print(result) + + endtime = datetime.datetime.now() + LOG.info("%s thread success %d times" % (num, out_num)) + during_date = (endtime - starttime).seconds + + data_reply = config_to_result(num, out_num, during_date) + conf_parser.result_to_file(data_reply, test_config["out_file"]) + + LOG.info('END POSCA stress multistack storage test') + return data_reply diff --git a/testsuites/posca/testcase_script/posca_factor_multistack_storage_parallel.py b/testsuites/posca/testcase_script/posca_factor_multistack_storage_parallel.py new file mode 100644 index 00000000..8c623d41 --- /dev/null +++ b/testsuites/posca/testcase_script/posca_factor_multistack_storage_parallel.py @@ -0,0 +1,164 @@ +#!/usr/bin/env python +############################################################################## +# 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 +############################################################################## +'''This file realize the function of run posca multistack storage stress test +This file contain several part: +First is create a script to realize several threading run''' + +import utils.logger as log +import uuid +import json +import os +import time +from utils.parser import Parser as conf_parser +import utils.env_prepare.quota_prepare as quota_prepare +import utils.env_prepare.stack_prepare as stack_prepare +import utils.infra_setup.runner.yardstick as yardstick_task + +import utils.infra_setup.runner.docker_env as docker_env + +# -------------------------------------------------- +# logging configuration +# -------------------------------------------------- +LOG = log.Logger(__name__).getLogger() + +test_dict = { + "action": "runTestCase", + "args": { + "opts": { + "task-args": {} + }, + "testcase": "multistack_storage_bottlenecks_parallel" + } +} +testfile = os.path.basename(__file__) +testcase, file_format = os.path.splitext(testfile) +cidr = "/home/opnfv/repos/yardstick/samples/storage_bottlenecks.yaml" +runner_DEBUG = True + + +def env_pre(test_config): + test_yardstick = False + if "yardstick" in test_config["contexts"].keys(): + test_yardstick = True + stack_prepare._prepare_env_daemon(test_yardstick) + quota_prepare.quota_env_prepare() + if(test_config["contexts"]['yardstick_envpre']): + LOG.info("yardstick environment prepare!") + stdout = yardstick_task.yardstick_image_prepare() + LOG.debug(stdout) + + +def testcase_parser(out_file="yardstick.out", **parameter_info): + cmd = yardstick_task.yardstick_command_parser(debug=runner_DEBUG, + cidr=cidr, + outfile=out_file, + parameter=parameter_info) + return cmd + + +def do_test(test_config): + out_file = ("/tmp/yardstick_" + str(uuid.uuid4()) + ".out") + yardstick_container = docker_env.yardstick_info['container'] + cmd = testcase_parser(out_file=out_file, **test_config) + print(cmd) + stdout = docker_env.docker_exec_cmd(yardstick_container, cmd) + LOG.info(stdout) + loop_value = 0 + while loop_value < 60: + time.sleep(2) + loop_value = loop_value + 1 + with open(out_file) as f: + data = json.load(f) + if data["result"]["criteria"] == "PASS": + LOG.info("yardstick run success") + LOG.info("%s" % data["result"]["testcases"]) + break + else: + LOG.error("yardstick error exit") + break + + save_data = config_to_result(test_config, data) + LOG.info(save_data) + return save_data + + +def config_to_result(test_config, test_result): + print(test_result) + out_data = test_result["result"]["testcases"] + test_data = out_data["storage_bottlenecks"]["tc_data"] + testdata = {} + testdata["read_iops"] = 0 + testdata["read_bw"] = 0 + testdata["read_lat"] = 0 + testdata["write_iops"] = 0 + testdata["write_bw"] = 0 + testdata["write_lat"] = 0 + print(testdata["read_iops"]) + for result in test_data: + testdata["read_iops"] += result["data"]["read_iops"] + testdata["read_bw"] += result["data"]["read_bw"] + if testdata["read_lat"] is 0: + testdata["read_lat"] = result["data"]["read_lat"] + else: + testdata["read_lat"] += result["data"]["read_lat"] + testdata["read_lat"] = testdata["read_lat"]/2 + testdata["write_iops"] += result["data"]["write_iops"] + testdata["write_bw"] += result["data"]["write_bw"] + if testdata["write_lat"] is 0: + testdata["write_lat"] = result["data"]["write_lat"] + else: + testdata["write_lat"] += result["data"]["write_lat"] + testdata["write_lat"] = testdata["write_lat"]/2 + return testdata + + +def run(test_config): + con_dic = test_config["load_manager"] + scenarios_conf = con_dic["scenarios"] + + if test_config["contexts"]["yardstick_ip"] is None: + con_dic["contexts"]["yardstick_ip"] =\ + conf_parser.ip_parser("yardstick_test_ip") + + env_pre(test_config) + LOG.info("yardstick environment prepare done!") + + test_num = conf_parser.str_to_list(scenarios_conf["num_stack"]) + rw = scenarios_conf["rw"] + bs = scenarios_conf["bs"] + size = scenarios_conf["size"] + rwmixwrite = scenarios_conf["rwmixwrite"] + numjobs = scenarios_conf["num_jobs"] + direct = scenarios_conf["direct"] + volume_num = scenarios_conf["volume_num"] + volume_size = scenarios_conf["volume_size"] + + result = [] + + for value in test_num: + case_config = {"stack_num": int(value), + "volume_num": volume_num, + "rw": rw, + "bs": bs, + "size": size, + "rwmixwrite": rwmixwrite, + "numjobs": numjobs, + "direct": direct, + "volume_size": int(volume_size)} + data_reply = do_test(case_config) + result.append(data_reply) + + LOG.info("%s stack successful run" % (value)) + + conf_parser.result_to_file(data_reply, test_config["out_file"]) + + LOG.info('END POSCA stress multistack storage parallel testcase') + LOG.info("The result data is %s", result) + return result diff --git a/testsuites/posca/testcase_script/posca_factor_ping.py b/testsuites/posca/testcase_script/posca_factor_ping.py index 3a2277cf..4ee43964 100644 --- a/testsuites/posca/testcase_script/posca_factor_ping.py +++ b/testsuites/posca/testcase_script/posca_factor_ping.py @@ -23,6 +23,7 @@ import Queue from utils.parser import Parser as conf_parser import utils.env_prepare.quota_prepare as quota_prepare import utils.env_prepare.stack_prepare as stack_prepare +import utils.infra_setup.runner.yardstick as runner_yardstick import testsuites.posca.testcase_dashboard.posca_stress_ping as DashBoard import utils.infra_setup.runner.docker_env as docker_env @@ -42,6 +43,8 @@ test_dict = { } testfile = os.path.basename(__file__) testcase, file_format = os.path.splitext(testfile) +cidr = "/home/opnfv/repos/yardstick/samples/ping_bottlenecks.yaml" +runner_DEBUG = True q = Queue.Queue() @@ -52,20 +55,21 @@ def env_pre(test_config): test_yardstick = True stack_prepare._prepare_env_daemon(test_yardstick) quota_prepare.quota_env_prepare() - cmd = ('yardstick env prepare') LOG.info("yardstick environment prepare!") if(test_config["contexts"]['yardstick_envpre']): - yardstick_container = docker_env.yardstick_info['container'] - stdout = docker_env.docker_exec_cmd(yardstick_container, cmd) + stdout = runner_yardstick.yardstick_image_prepare() LOG.debug(stdout) def do_test(): func_name = sys._getframe().f_code.co_name out_file = ("/tmp/yardstick_" + str(uuid.uuid4()) + ".out") + parameter_info = {} yardstick_container = docker_env.yardstick_info['container'] - cmd = ('yardstick task start /home/opnfv/repos/yardstick/' - 'samples/ping_bottlenecks.yaml --output-file ' + out_file) + cmd = runner_yardstick.yardstick_command_parser(debug=runner_DEBUG, + cidr=cidr, + outfile=out_file, + parameter=parameter_info) stdout = docker_env.docker_exec_cmd(yardstick_container, cmd) LOG.info(stdout) out_value = 0 @@ -75,11 +79,11 @@ def do_test(): loop_value = loop_value + 1 with open(out_file) as f: data = json.load(f) - if data["status"] == 1: + if data["result"]["criteria"] == "PASS": LOG.info("yardstick run success") out_value = 1 break - elif data["status"] == 2: + else: LOG.error("yardstick error exit") out_value = 0 break diff --git a/testsuites/posca/testcase_script/posca_factor_soak_throughputs.py b/testsuites/posca/testcase_script/posca_factor_soak_throughputs.py new file mode 100644 index 00000000..b45ce932 --- /dev/null +++ b/testsuites/posca/testcase_script/posca_factor_soak_throughputs.py @@ -0,0 +1,132 @@ +#!/usr/bin/env python +############################################################################## +# 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 +############################################################################## +'''This file is to do data-plane baseline test for +VM pair life-cycle events using netperf. +Testing steps are summarized below: +1. run_test load testcase configuration +2. Bottlenecks eliminates the environments limits/constraints +3. Bottlenecks tells Yardstick to prepare environment +4. Bottlenecks tells Yardstick to run test + 3.1 to create stack + 3.2 to install netperf + 3.3 to send/forward packets for t2 seconds + 3.4 record results and detroy stack + 3.4 after every t1 seconds goto 3.1 and repeat the workflow +5. Bottlenecks collects testing results from Yardstick +6. Bottlenecks tells Yardstick to stop when time ends + or system fails the test +7. Bottlenecks sends testing data to bottlenecks-elk''' + +import utils.logger as log +import uuid +import json +import os +import sys +import time +# import threading +# import datetime +import Queue +# from utils.parser import Parser as conf_parser +import utils.env_prepare.quota_prepare as quota_prepare +import utils.env_prepare.stack_prepare as stack_prepare +import utils.infra_setup.runner.yardstick as runner_yardstick + +# import testsuites.posca.testcase_dashboard.posca_factor_throughputs as DashBoard # noqa +import utils.infra_setup.runner.docker_env as docker_env + +# -------------------------------------------------- +# logging configuration +# -------------------------------------------------- +LOG = log.Logger(__name__).getLogger() + +test_dict = { + "action": "runTestCase", + "args": { + "opts": { + "task-args": {} + }, + "testcase": "netperf_bottlenecks" + } +} +testfile = os.path.basename(__file__) +testcase, file_format = os.path.splitext(testfile) +cidr = "/home/opnfv/repos/yardstick/samples/netperf_soak.yaml" +runner_DEBUG = True + +q = Queue.Queue() + + +def env_pre(test_config): + test_yardstick = False + if "yardstick" in test_config["contexts"].keys(): + test_yardstick = True + stack_prepare._prepare_env_daemon(test_yardstick) + quota_prepare.quota_env_prepare() + LOG.info("yardstick environment prepare!") + if(test_config["contexts"]['yardstick_envpre']): + stdout = runner_yardstick.yardstick_image_prepare() + LOG.debug(stdout) + + +def do_test(con_dic): + func_name = sys._getframe().f_code.co_name + out_file = ("/tmp/yardstick_" + str(uuid.uuid4()) + ".out") + parameter_info = dict(test_time=con_dic["scenarios"]["vim_pair_ttl"]) + yardstick_container = docker_env.yardstick_info['container'] + cmd = runner_yardstick.yardstick_command_parser(debug=runner_DEBUG, + cidr=cidr, + outfile=out_file, + parameter=parameter_info) + stdout = docker_env.docker_exec_cmd(yardstick_container, cmd) + LOG.info(stdout) + out_value = 0 + loop_value = 0 + while loop_value < 60: + time.sleep(2) + loop_value = loop_value + 1 + with open(out_file) as f: + data = json.load(f) + if data["status"] == 1: + LOG.info("Success run yardstick netperf_soak test!") + out_value = 1 + break + elif data["status"] == 2: + LOG.error("Failed run yardstick netperf_soak test!") + out_value = 0 + break + q.put((out_value, func_name)) + return out_value + + +def config_to_result(num, out_num, during_date, result): + testdata = {} + test_result = {} + test_result["number_of_stacks"] = float(num) + test_result["success_times"] = out_num + test_result["success_rate"] = out_num / num + test_result["duration_time"] = during_date + test_result["result"] = result + testdata["data_body"] = test_result + testdata["testcase"] = testcase + return testdata + + +def func_run(con_dic): + test_date = do_test(con_dic) + return test_date + + +def run(test_config): + con_dic = test_config["load_manager"] + + env_pre(test_config) + LOG.info("yardstick environment prepare done!") + + return func_run(con_dic) diff --git a/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py b/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py index 1a54554c..9d8b0ec6 100644 --- a/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py +++ b/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py @@ -79,10 +79,10 @@ def do_test(test_config, Use_Dashboard, context_conf): with open(out_file) as f: data = json.load(f) if data["status"] == 1: - LOG.info("yardstick run success") + LOG.info("Success run yardstick netperf_bottlenecks test!") break elif data["status"] == 2: - LOG.error("yardstick error exit") + LOG.error("Failed to run yardstick netperf_bottlenecks test!") exit() save_data = config_to_result(test_config, data['result'][1]) diff --git a/testsuites/posca/testcase_script/posca_feature_moon_resources.py b/testsuites/posca/testcase_script/posca_feature_moon_resources.py index 3c66c7b9..8b23824c 100644 --- a/testsuites/posca/testcase_script/posca_feature_moon_resources.py +++ b/testsuites/posca/testcase_script/posca_feature_moon_resources.py @@ -18,8 +18,9 @@ import uuid import json import utils.logger as log from utils.parser import Parser as conf_parser -import utils.env_prepare.stack_prepare as stack_prepare +import utils.env_prepare.moon_prepare as moon_env import utils.infra_setup.runner.docker_env as docker_env +import testsuites.posca.testcase_dashboard.posca_feature_moon as DashBoard import utils.infra_setup.runner.yardstick as yardstick_task # -------------------------------------------------- @@ -29,35 +30,35 @@ LOG = log.Logger(__name__).getLogger() testfile = os.path.basename(__file__) testcase, file_format = os.path.splitext(testfile) -# cidr = "/home/opnfv/repos/yardstick/samples/pvp_throughput_bottlenecks.yaml" runner_DEBUG = True -def env_pre(con_dic): - LOG.info("yardstick environment prepare!") - stack_prepare._prepare_env_daemon(True) +def env_pre(test_config): + if "moon_monitoring" in test_config["contexts"].keys(): + if test_config["contexts"]['moon_envpre'] is True: + moon_environment = test_config["contexts"]['moon_environment'] + moon_env.moon_envprepare(moon_environment) + LOG.info("moon environment prepare!") def config_to_result(test_config, test_result): - final_data = [] - print(test_result) + final_data = {} + final_data["testcase"] = "posca_factor_moon_resources" + final_data["test_body"] = [] out_data = test_result["result"]["testcases"] - test_data = out_data["pvp_throughput_bottlenecks"]["tc_data"] + test_data = out_data["moon_resource"]["tc_data"] for result in test_data: testdata = {} - testdata["vcpu"] = test_config["vcpu"] - testdata["memory"] = test_config["memory"] - testdata["nrFlows"] = result["data"]["nrFlows"] - testdata["packet_size"] = result["data"]["packet_size"] - testdata["throughput"] = result["data"]["throughput_rx_mbps"] - final_data.append(testdata) + testdata["tenant_number"] = int(test_config["tenant_number"]) + testdata["max_user"] = result["data"]["max_user"] + final_data["test_body"].append(testdata) return final_data def testcase_parser(runner_conf, out_file="yardstick.out", **parameter_info): cidr = "/home/opnfv/repos/yardstick/" + \ - runner_conf["yardstick_test_dir"] + \ - runner_conf["yardstick_testcase"] + runner_conf["yardstick_test_dir"] + "/" + \ + runner_conf["yardstick_testcase"] + ".yaml" cmd = yardstick_task.yardstick_command_parser(debug=runner_DEBUG, cidr=cidr, outfile=out_file, @@ -84,24 +85,21 @@ def do_test(runner_conf, test_config, Use_Dashboard, context_conf): elif data["status"] == 2: LOG.error("yardstick error exit") exit() - # data = json.load(output) save_data = config_to_result(test_config, data) if Use_Dashboard is True: print("use dashboard") - # DashBoard.dashboard_send_data(context_conf, save_data) - - # return save_data["data_body"] + DashBoard.dashboard_send_data(context_conf, save_data) return save_data def run(test_config): load_config = test_config["load_manager"] scenarios_conf = load_config["scenarios"] - runner_conf = test_config["runners"] + runner_conf = load_config["runners"] + contexts_conf = test_config["contexts"] Use_Dashboard = False - - env_pre(None) + env_pre(test_config) if test_config["contexts"]["yardstick_ip"] is None: load_config["contexts"]["yardstick_ip"] =\ conf_parser.ip_parser("yardstick_test_ip") @@ -112,9 +110,14 @@ def run(test_config): conf_parser.ip_parser("dashboard") LOG.info("Create Dashboard data") Use_Dashboard = True - # DashBoard.dashboard_system_bandwidth(test_config["contexts"]) + DashBoard.posca_moon_init(test_config["contexts"]) tenants_conf = conf_parser.str_to_list(scenarios_conf["tenants"]) + subject_number = int(scenarios_conf["subject_number"]) + object_number = int(scenarios_conf["object_number"]) + timeout = scenarios_conf["timeout"] + consul_host = contexts_conf["moon_environment"]["ip"] + consul_port = contexts_conf["moon_environment"]["consul_port"] load_config["result_file"] = os.path.dirname( os.path.abspath(__file__)) + "/test_case/result" @@ -122,7 +125,13 @@ def run(test_config): result = [] for tenants in tenants_conf: - case_config = {"tenants": tenants} + print tenants + case_config = {"tenant_number": tenants, + "subject_number": subject_number, + "object_number": object_number, + "timeout": timeout, + "consul_host": consul_host, + "consul_port": consul_port} data_reply = do_test(runner_conf, case_config, Use_Dashboard, test_config["contexts"]) diff --git a/testsuites/posca/testcase_script/posca_feature_moon_tenants.py b/testsuites/posca/testcase_script/posca_feature_moon_tenants.py index 8f4061df..e932575c 100644 --- a/testsuites/posca/testcase_script/posca_feature_moon_tenants.py +++ b/testsuites/posca/testcase_script/posca_feature_moon_tenants.py @@ -15,14 +15,15 @@ This test is using yardstick as a tool to begin test.''' import os import time import uuid -import json import Queue import multiprocessing import utils.logger as log from utils.parser import Parser as conf_parser -import utils.env_prepare.stack_prepare as stack_prepare +import utils.env_prepare.moon_prepare as moon_env import utils.infra_setup.runner.docker_env as docker_env + import utils.infra_setup.runner.yardstick as yardstick_task +import testsuites.posca.testcase_dashboard.posca_feature_moon as DashBoard # -------------------------------------------------- # logging configuration @@ -31,36 +32,31 @@ LOG = log.Logger(__name__).getLogger() testfile = os.path.basename(__file__) testcase, file_format = os.path.splitext(testfile) -# cidr = "/home/opnfv/repos/yardstick/samples/pvp_throughput_bottlenecks.yaml" -runner_switch = True runner_DEBUG = True +manager = multiprocessing.Manager() +switch = manager.Value('tmp', 0) -def env_pre(con_dic): +def env_pre(test_config): + if "moon_monitoring" in test_config["contexts"].keys(): + if test_config["contexts"]['moon_envpre'] is True: + moon_environment = test_config["contexts"]['moon_environment'] + moon_env.moon_envprepare(moon_environment) LOG.info("yardstick environment prepare!") - stack_prepare._prepare_env_daemon(True) - - -def config_to_result(test_config, test_result): - final_data = [] - print(test_result) - out_data = test_result["result"]["testcases"] - test_data = out_data["pvp_throughput_bottlenecks"]["tc_data"] - for result in test_data: - testdata = {} - testdata["vcpu"] = test_config["vcpu"] - testdata["memory"] = test_config["memory"] - testdata["nrFlows"] = result["data"]["nrFlows"] - testdata["packet_size"] = result["data"]["packet_size"] - testdata["throughput"] = result["data"]["throughput_rx_mbps"] - final_data.append(testdata) + + +def config_to_result(test_result): + final_data = {} + final_data["testcase"] = "posca_factor_moon_tenants" + final_data["test_body"] = [] + final_data["test_body"].append(test_result) return final_data def testcase_parser(runner_conf, out_file="yardstick.out", **parameter_info): cidr = "/home/opnfv/repos/yardstick/" + \ - runner_conf["yardstick_test_dir"] + \ - runner_conf["yardstick_testcase"] + runner_conf["yardstick_test_dir"] + "/" + \ + runner_conf["yardstick_testcase"] + ".yaml" cmd = yardstick_task.yardstick_command_parser(debug=runner_DEBUG, cidr=cidr, outfile=out_file, @@ -75,36 +71,19 @@ def do_test(runner_conf, test_config, Use_Dashboard, context_conf): print(cmd) stdout = docker_env.docker_exec_cmd(yardstick_container, cmd) LOG.info(stdout) - loop_value = 0 - while loop_value < 60: - time.sleep(2) - loop_value = loop_value + 1 - with open(out_file) as f: - data = json.load(f) - if data["status"] == 1: - LOG.info("yardstick run success") - break - elif data["status"] == 2: - LOG.error("yardstick error exit") - exit() - # data = json.load(output) - - save_data = config_to_result(test_config, data) - if Use_Dashboard is True: - print("use dashboard") - # DashBoard.dashboard_send_data(context_conf, save_data) - - # return save_data["data_body"] - return save_data + switch.value += 1 + save_date = [] + return save_date def run(test_config): load_config = test_config["load_manager"] scenarios_conf = load_config["scenarios"] - runner_conf = test_config["runners"] + contexts_conf = test_config["contexts"] + runner_conf = load_config["runners"] Use_Dashboard = False - env_pre(None) + env_pre(test_config) if test_config["contexts"]["yardstick_ip"] is None: load_config["contexts"]["yardstick_ip"] =\ conf_parser.ip_parser("yardstick_test_ip") @@ -115,15 +94,22 @@ def run(test_config): conf_parser.ip_parser("dashboard") LOG.info("Create Dashboard data") Use_Dashboard = True - # DashBoard.dashboard_system_bandwidth(test_config["contexts"]) - - resources = conf_parser.str_to_list(scenarios_conf["resources"]) - initial = conf_parser.str_to_list(scenarios_conf["initial"]) - threshhold = conf_parser.str_to_list(scenarios_conf["threshhold"]) - timeout = conf_parser.str_to_list(scenarios_conf["timeout"]) - SLA = conf_parser.str_to_list(scenarios_conf["SLA"]) - case_config = {"SLA": SLA, - "resources": resources} + DashBoard.posca_moon_init(test_config["contexts"]) + + subject_number = int(scenarios_conf["subject_number"]) + object_number = int(scenarios_conf["object_number"]) + timeout = scenarios_conf["timeout"] + consul_host = contexts_conf["moon_environment"]["ip"] + consul_port = contexts_conf["moon_environment"]["consul_port"] + + initial = scenarios_conf["initial_tenants"] + threshhold = scenarios_conf["steps_tenants"] + tolerate_time = scenarios_conf["tolerate_time"] + case_config = {"subject_number": subject_number, + "object_number": object_number, + "timeout": timeout, + "consul_host": consul_host, + "consul_port": consul_port} process_queue = Queue.Queue() @@ -136,8 +122,8 @@ def run(test_config): tenant_number = threshhold else: tenant_number = initial - - while runner_switch is True: + while switch.value == 0: + LOG.info("Start %d process", tenant_number) for tenant in range(0, tenant_number): process = multiprocessing.Process(target=do_test, args=(runner_conf, @@ -150,7 +136,7 @@ def run(test_config): result = result + tenant_number tenant_number = threshhold - time.sleep(timeout) + time.sleep(tolerate_time) while process_queue.qsize(): process = process_queue.get() @@ -161,6 +147,12 @@ def run(test_config): else: result = result - threshhold + testdate = {"tenant_max": result} + testresult = config_to_result(testdate) LOG.info("Finished bottlenecks testcase") - LOG.info("The result data is %s", result) - return result + LOG.info("The result data is %d", result) + if Use_Dashboard is True: + print "Use Dashboard" + DashBoard.dashboard_send_data(test_config["contexts"], testresult) + + return testresult diff --git a/testsuites/posca/testcase_script/posca_feature_testpmd_scale_up.py b/testsuites/posca/testcase_script/posca_feature_testpmd_scale_up.py index 830ff73f..08c4cbe9 100644 --- a/testsuites/posca/testcase_script/posca_feature_testpmd_scale_up.py +++ b/testsuites/posca/testcase_script/posca_feature_testpmd_scale_up.py @@ -81,14 +81,10 @@ def do_test(test_config, Use_Dashboard, context_conf): elif data["status"] == 2: LOG.error("yardstick error exit") exit() - # data = json.load(output) save_data = config_to_result(test_config, data) if Use_Dashboard is True: print("use dashboard") - # DashBoard.dashboard_send_data(context_conf, save_data) - - # return save_data["data_body"] return save_data @@ -108,7 +104,6 @@ def run(test_config): conf_parser.ip_parser("dashboard") LOG.info("Create Dashboard data") Use_Dashboard = True - # DashBoard.dashboard_system_bandwidth(test_config["contexts"]) cpus = conf_parser.str_to_list(scenarios_conf["cpus"]) mems = conf_parser.str_to_list(scenarios_conf["mems"]) diff --git a/testsuites/posca/testcase_script/posca_feature_vnf_scale_out.py b/testsuites/posca/testcase_script/posca_feature_vnf_scale_out.py index 6d53515f..417cf2b9 100644 --- a/testsuites/posca/testcase_script/posca_feature_vnf_scale_out.py +++ b/testsuites/posca/testcase_script/posca_feature_vnf_scale_out.py @@ -46,12 +46,9 @@ def env_pre(test_config): print(test_yardstick) stack_prepare._prepare_env_daemon(test_yardstick) quota_prepare.quota_env_prepare() - cmd = ('yardstick env prepare') LOG.info("yardstick environment prepare!") - print docker_env.yardstick_info['container'] if(test_config["contexts"]['yardstick_envpre']): - yardstick_container = docker_env.yardstick_info['container'] - stdout = docker_env.docker_exec_cmd(yardstick_container, cmd) + stdout = yardstick_task.yardstick_image_prepare() LOG.debug(stdout) @@ -99,16 +96,11 @@ def do_test(test_config, Use_Dashboard, context_conf): elif data["status"] == 2: LOG.error("yardstick error exit") exit() - # data = json.load(output) save_data = config_to_result(test_config, data) - print("^^^^^^^^^^^^^^^^^^^^^^^^^") - print save_data if Use_Dashboard is True: print("use dashboard") - # DashBoard.dashboard_send_data(context_conf, save_data) - # return save_data["data_body"] return save_data diff --git a/testsuites/run_testsuite.py b/testsuites/run_testsuite.py index 2e82b205..0f03d3e7 100644 --- a/testsuites/run_testsuite.py +++ b/testsuites/run_testsuite.py @@ -36,6 +36,15 @@ LOG = log.Logger(__name__).getLogger() # ------------------------------------------------------ +def copy_hosts_file(): + LOG.info("Begin copying hosts file to Bottlenecks-Yardstick") + os.system('cp /etc/hosts /tmp/hosts') + yardstick_docker = docker_env.docker_find('Bottlenecks-Yardstick') + cp_cmd = 'sudo cp -f /tmp/hosts /etc/hosts' + docker_env.docker_exec_cmd(yardstick_docker, cp_cmd) + LOG.info("Done with copying hosts file to Bottlenecks-Yardstick") + + def posca_testcase_run(testsuite, testcase_script, test_config): module_string = "testsuites.%s.testcase_script.%s" % (testsuite, @@ -107,10 +116,12 @@ def testsuite_run(test_level, test_name, REPORT="False"): conf_parser.Parser.testcase_out_dir(testcase) start_date = datetime.datetime.now() docker_env_prepare(config[testcase]) - try: - posca_testcase_run(tester_parser[0], testcase, config[testcase]) - except Exception, e: - LOG.warning('e.message:\t%s', e.message) + copy_hosts_file() + #try: + # posca_testcase_run(tester_parser[0], testcase, config[testcase]) + #except Exception, e: + # LOG.warning('e.message:\t%s', e.message) + posca_testcase_run(tester_parser[0], testcase, config[testcase]) stop_date = datetime.datetime.now() LOG.info("End of %s testcase in POSCA testsuite", testcase) criteria = "FAIL" diff --git a/utils/env_prepare/moon_prepare.bash b/utils/env_prepare/moon_prepare.bash new file mode 100644 index 00000000..7625418c --- /dev/null +++ b/utils/env_prepare/moon_prepare.bash @@ -0,0 +1,35 @@ +#!/bin/bash +############################################################################## +# Copyright (c) 2018 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 +############################################################################## +if grep -q "cadvisor" /etc/systemd/system/kubelet.service.d/10-kubeadm.conf +then + sed -e "/cadvisor-port=0/d" -i /etc/systemd/system/kubelet.service.d/10-kubeadm.conf + systemctl daemon-reload + systemctl restart kubelet + +fi +if kubectl get po -n monitoring |grep prometheus-k8s |grep -q Running +then + echo "monitoring k8s deployment has been done" +else + git clone https://github.com/coreos/prometheus-operator.git + cd prometheus-operator + kubectl apply -n kube-system -f bundle.yaml + cd contrib/kube-prometheus + sleep 10 + hack/cluster-monitoring/deploy +fi + +while ! $(kubectl get po -n monitoring |grep prometheus-k8s |grep -q Running);do + echo "waiting for monitoring deployment finish!" + sleep 10 +done + +echo "waiting for monitoring tool works" +sleep 60 diff --git a/utils/env_prepare/moon_prepare.py b/utils/env_prepare/moon_prepare.py new file mode 100644 index 00000000..41739454 --- /dev/null +++ b/utils/env_prepare/moon_prepare.py @@ -0,0 +1,25 @@ +#!/usr/bin/env python +############################################################################## +# Copyright (c) 2018 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 +############################################################################## +import utils.infra_setup.passwordless_SSH.ssh as localssh + + +def moon_envprepare(host_info): + if ("password") in host_info: + client = localssh.SSH(user=host_info["user"], + host=host_info["ip"], + password=host_info["password"]) + else: + client = localssh.SSH(user=host_info["user"], + host=host_info["ip"], + key_filename=host_info["keyfile"]) + with open("/home/opnfv/bottlenecks/utils/env_prepare/moon_prepare.bash", + "rb") as stdin_file: + client.run("cat > ~/bottlenecks_envprepare.bash", stdin=stdin_file) + client.execute("sudo bash ~/bottlenecks_envprepare.bash") diff --git a/utils/env_prepare/quota_prepare.py b/utils/env_prepare/quota_prepare.py index 267e70ab..8dcdf3d6 100644 --- a/utils/env_prepare/quota_prepare.py +++ b/utils/env_prepare/quota_prepare.py @@ -42,14 +42,37 @@ nova_quota = {"ram": -1, "injected_file_path_bytes": -1} +def check_https_enabled(): + LOG.debug("Check if https is enabled in OpenStack") + os_auth_url = os.getenv('OS_AUTH_URL') + if os_auth_url.startswith('https'): + LOG.debug("https is enabled") + return True + LOG.debug("https is not enabled") + return False + + def quota_env_prepare(): + https_enabled = check_https_enabled() + insecure_option = '' + insecure = os.getenv('OS_INSECURE',) + if https_enabled: + LOG.info("https is enabled") + if insecure: + if insecure.lower() == "true": + insecure_option = ' --insecure ' + else: + LOG.warn("Env variable OS_INSECURE is {}: if https + no " + "credential used, it should be set as True." + .format(insecure)) + tenant_name = os.getenv("OS_TENANT_NAME") - cmd = ("openstack project list | grep " + + cmd = ("openstack {} project list | grep ".format(insecure_option) + tenant_name + " | awk '{print $2}'") result = commands.getstatusoutput(cmd) - if result[0] == 0: + if result[0] == 0 and 'exception' not in result[1]: LOG.info("Get %s project id is %s" % (tenant_name, result[1])) else: LOG.error("can't get openstack project id") diff --git a/utils/env_prepare/stack_prepare.py b/utils/env_prepare/stack_prepare.py index 25c2a29b..6b9bc510 100644 --- a/utils/env_prepare/stack_prepare.py +++ b/utils/env_prepare/stack_prepare.py @@ -14,6 +14,7 @@ from utils.logger import Logger from utils.parser import Parser as config import utils.infra_setup.heat.manager as utils import utils.infra_setup.runner.docker_env as docker_env +import utils.infra_setup.heat.manager as client_manager LOG = Logger(__name__).getLogger() @@ -73,7 +74,14 @@ def _source_file(rc_file): p = subprocess.Popen(". %s; env" % rc_file, stdout=subprocess.PIPE, shell=True) output = p.communicate()[0] - env = dict((line.split('=', 1) for line in output.splitlines())) + output_lines = output.splitlines() + env = list() + for line in output_lines: + if '=' in line: + env.append(tuple(line.split('=', 1))) + + env = dict(env) +# env = dict((line.split('=', 1) for line in output_lines)) os.environ.update(env) return env @@ -93,3 +101,30 @@ def _append_external_network(rc_file): except OSError as e: if e.errno != errno.EEXIST: raise + + +def prepare_image(image_name, image_dir): + glance_client = client_manager._get_glance_client() + if not os.path.isfile(image_dir): + LOG.error("Error: file %s does not exist.", image_dir) + return None + try: + images = glance_client.images.list() + image_id = next((i.id for i in images if i.name == image_name), None) + if image_id is not None: + LOG.info("Image %s already exists.", image_name) + else: + LOG.info("Creating image '%s' from '%s'...", image_name, image_dir) + + image = glance_client.images.create( + name=image_name, visibility="public", disk_format="qcow2", + container_format="bare") + image_id = image.id + with open(image_dir) as image_data: + glance_client.images.upload(image_id, image_data) + return image_id + except Exception: # pylint: disable=broad-except + LOG.error( + "Error [create_glance_image(glance_client, '%s', '%s')]", + image_name, image_dir) + return None diff --git a/utils/infra_setup/heat/manager.py b/utils/infra_setup/heat/manager.py index 5c181ae6..1a360b78 100644 --- a/utils/infra_setup/heat/manager.py +++ b/utils/infra_setup/heat/manager.py @@ -35,7 +35,7 @@ def _get_neutron_client(): return neutron_client -def stack_create_images( +def create_images( imagefile=None, image_name="bottlenecks_image"): print "========== Create image in OS ==========" diff --git a/utils/infra_setup/runner/yardstick.py b/utils/infra_setup/runner/yardstick.py index 559b9c10..616bcc52 100644 --- a/utils/infra_setup/runner/yardstick.py +++ b/utils/infra_setup/runner/yardstick.py @@ -15,15 +15,27 @@ At present, This file contain the following function: 4.how the process of task.''' import sys +import os import time import requests import json +import urllib import utils.logger as logger +from utils.parser import Parser as config +import utils.env_prepare.stack_prepare as env headers = {"Content-Type": "application/json"} LOG = logger.Logger(__name__).getLogger() +def yardstick_image_prepare(): + if not os.path.exists(config.bottlenecks_config["yardstick_image_dir"]): + urllib.urlretrieve(config.bottlenecks_config["image_url"], + config.bottlenecks_config["yardstick_image_dir"]) + env.prepare_image(config.bottlenecks_config["yardstick_image_name"], + config.bottlenecks_config["yardstick_image_dir"]) + + def yardstick_command_parser(debug, cidr, outfile, parameter): cmd = "yardstick" if debug: @@ -31,6 +43,9 @@ def yardstick_command_parser(debug, cidr, outfile, parameter): cmd += " task start " cmd += str(cidr) cmd += " --output-file " + outfile + image_name = config.bottlenecks_config["yardstick_image_name"] + parameter["image_name"] = image_name + print parameter if parameter is not None: cmd += " --task-args " + '"' + str(parameter) + '"' return cmd diff --git a/utils/parser.py b/utils/parser.py index b46a3b91..c0c10721 100644 --- a/utils/parser.py +++ b/utils/parser.py @@ -45,6 +45,11 @@ class Parser(): cls.bottlenecks_config["pod_info"] = common_config['pod_info'] cls.bottlenecks_config["yardstick_rc_dir"] = \ common_config['yardstick_rc_dir'] + cls.bottlenecks_config["yardstick_image_dir"] = \ + common_config['yardstick_image_dir'] + cls.bottlenecks_config["image_url"] = common_config['image_url'] + cls.bottlenecks_config["yardstick_image_name"] = \ + common_config['yardstick_image_name'] cls.config_dir_check(cls.bottlenecks_config["log_dir"]) @classmethod @@ -14,7 +14,9 @@ getopts ":f" FILE_OPTION run_flake8() { - echo "Running flake8 ... " + echo "=========================================" + echo "Running flake8 for python style check: " + echo "-----------------------------------------" logfile=flake8_verify.log if [ $FILE_OPTION == "f" ]; then flake8 --append-config=flake8_cfg testsuites/posca/ utils/ > $logfile @@ -29,20 +31,36 @@ run_flake8() { fi exit 1 else - echo "OK" + echo "The patch has passed python style check " + echo "===================END===================" fi } -run_tests() { - echo "Running unittest ... " - #will add future -} -run_coverage() { - echo "Running coverage ..." - #will add future +run_nosetests() { + echo "=========================================" + echo "Running unit and coverage test: " + echo "-----------------------------------------" + nosetests --with-coverage --cover-tests \ + --cover-min-percentage 100 \ + test/__init__.py \ + testsuites/posca/__init__.py testsuites/__init__.py \ + testsuites/posca/testcase_cfg/__init__.py \ + testsuites/posca/testcase_dashboard/__init__.py \ + testsuites/posca/testcase_script/__init__.py \ + utils/__init__.py \ + utils/dashboard/__init__.py \ + utils/env_prepare/__init__.py \ + utils/infra_setup/__init__.py \ + monitor/__init__.py \ + monitor/config/__init__.py + echo "===================END===================" + } + +for((i=1;i<=1;i++));do echo -e "\n";done run_flake8 -run_tests -run_coverage + +for((i=1;i<=1;i++));do echo -e "\n";done +run_nosetests |