summaryrefslogtreecommitdiffstats
path: root/docs/submodules/yardstick
AgeCommit message (Collapse)AuthorFilesLines
2017-07-26Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - fix sriov/ovs-dpdk unittests on systems with fewer than 10 cores we need to wrap vcpupin modulo number of cores. also mock time.sleep Change-Id: I6433418a99505b469c61c81a9a023d84434fa0ee Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-26Update git submodulesJingLu51-0/+0
* Update docs/submodules/yardstick from branch 'master' - Bugfix: plugin remove command use "JUMP_HOST_IP" if ip is set to local JIRA: YARDSTICK-762 Change-Id: Id4a94ef8bbe578944e3664e5e7c24fdf7478805b Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-07-26Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Bugfix: supoort insecure mode in checking openstack environment" - Bugfix: supoort insecure mode in checking openstack environment Change-Id: I18346aa177689bc995eb7d4883f4a66383e827ba Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-07-26Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge changes from topic '35521' * changes: Setup OVS-DPDK Standalone Context Adding new SRIOV Standalone Context - Setup OVS-DPDK Standalone Context This patch performs following tasks - getting dpdk_nic_bind path - setup ovs,dpdk ports,vhostuserports, - creation of vm, - apache2 licence - test cases for ovsdpdk - Changes to standalone context - update unit test cases Change-Id: I54e4062eb440b8677625e4abe6e0579d9fd54d41 Signed-off-by: Bindya N <bindya.narayan@intel.com> - Adding new SRIOV Standalone Context This patch adds new SRIOV context to run VNFs with - random uuid generation, - mac address generation, - getting dpdk_nic_bind path, - ssh key based authentication, - printing log messages, - added apache2 licence JIRA: YARDSTICK-480 Change-Id: Ic8317eb9e7e4ecf270091c18be4782d1299ff087 Signed-off-by: Neha Vadnere <neha.r.vadnere@intel.com> Signed-off-by: Bindya N <bindya.narayan@intel.com>
2017-07-26Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "vnfdgen: replace yaml.load with yaml.safe_load" - vnfdgen: replace yaml.load with yaml.safe_load JIRA: YARDSTICK-760 Change-Id: I145c948c1f08562e12877f5d0fe7e797e9d989f9 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-26Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add intermediate variable for HA test" - Add intermediate variable for HA test JIRA: YARDSTICK-397 Change-Id: I3489893caa5b8194b63cb844325ec0b2c554aecc Signed-off-by: qiujuan <juan_qiu@tongji.edu.cn>
2017-07-25Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "update storperf installation in Yardstick" - update storperf installation in Yardstick Storper has updated its installaion step. The former used "nginx.conf" is not required any more. Change-Id: I9edd57ae7cffd3a95990844e6b775616d09132f1 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-07-25Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "support more parameters in iperf3 testcase" - support more parameters in iperf3 testcase JIRA: YARDSTICK-755 The parameters that iperf3 testcase support now maybe insufficient in some usecase. The test case should support parameters such as: windows size and length of buffer. This work is about adding more parameters that can be specified in options section in the YAML file. Change-Id: Ibc81cd1bbbc6fdd492aa67bd3acee7cd310c87ef Signed-off-by: Ace Lee <liyin11@huawei.com>
2017-07-25Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "yardstick env influxdb/grafana cmd support centos" - yardstick env influxdb/grafana cmd support centos JIRA: YARDSTICK-714 Currently yardstick env influxdb/grafana command do not support centos. Because we use the gateway ip to get the service of influxdb and grafana. But in centos, we can not access influxdb/grafana service via gateway ip. In this patch, I use docker inspect to get the ip of influxdb and grafana. So these command can support centos. Change-Id: Ie4abcb8048b92d61bc62777dfc362bb29f354b2b Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-25Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add multiqueue support" - Add multiqueue support Problem: Neither OVS nor SRIOV multi-queue is not supported. Guest VM lacks tuning to reach high throughput. Solution: (1) Build SRIOV multi-queue capable guest image by recompiling the igxbevf driver (make CFLAGS_EXTRA=-DIXGBE_ENABLE_VF_MQ install). (2) Change pktgen to send on multiple queues. (3) Add tuning in guest VM (Disable irqbalance and setup vNIC interrupt affinity to vCPUs) Update 1: Takes care comments plus adds unit test cases Update 2: Jenkins reports code coverage 81%, local reports 96%, add more unit test cases Update 3: Manually rebased to adapt to SSH.from_node() Update 4: Takes care comments for vnic_type, vnic_name Change-Id: Ieb15381c653b13697487d095efa4be6c3c49fa42 JIRA: YARDSTICK-619 Signed-off-by: Jing Zhang <jing.c.zhang@nokia.com>
2017-07-24Update git submoduleschenjiankun1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Bugfix: missing license in api directory JIRA: YARDSTICK-759 In api directory, there are many files missing license header. We need to add it. Change-Id: Ia46cf207295007d4eb7fbf0d3319611f256c36bc Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-24Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Open storperf testcase to huawei-pod2" - Open storperf testcase to huawei-pod2 JIRA: YARDSTICK-712 Change-Id: If91c936a3a59580a987cb6762db5d063edf6c9d7 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-07-24Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "base: remove redudant ip_to_convert" - base: remove redudant ip_to_convert remove extra newline as well Change-Id: I9038621720c40802aa041bad66007b38070cb26e Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-24Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Improvement: support more parameters in fio testcase" - Improvement: support more parameters in fio testcase JIRA: YARDSTICK-750 The parameters that fio testcase support now maybe insufficient in some usecase. The test case should support parameters such as: rwmixwrite, size, direct and numjobs. This work is about add more parameters that can be specified in options section in the YAML file. Change-Id: Icccf024dc78d82bc453480f3baafb8aaa5c19538 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-07-24Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "HA testcase containerized Compass support" - HA testcase containerized Compass support Compass will be containerized in Euphrates release. This work is about support HA testcase in a containerized environment. Change-Id: Ibb668c81f046d6400293f8cd58181b9f20aeebe3 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-07-21Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "heat: port_security_enabled, allowed_address_pairs, disable gateway_ip" - heat: port_security_enabled, allowed_address_pairs, disable gateway_ip xe0: cidr: '10.0.2.0/24' vld_id: public allowed_address_pairs: - ip_address: '0.0.0.0/0' xe1: cidr: '10.0.3.0/24' vld_id: private allowed_address_pairs: - ip_address: '0.0.0.0/0' We need to disable gateways on data plane interfaces With TGs and VFNs we probably don't need gateway on data interfaces Change-Id: I276a7d591a0a3ff03877c4f525303fc2874de683 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-21Update git submoduleschenjiankun1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Add API(v2) to get all task info JIRA: YARDSTICK-754 API: /api/v2/yardstick/tasks METHOD: GET Change-Id: I556b0880674d78d67e0a556c4d95f902131cd027 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to run task" - Add API(v2) to run task JIRA: YARDSTICK-741 API: /api/v2/yardstick/tasks/<task_id> METHOD: PUT PARAMS: { 'action': 'run' } Change-Id: Ia5340c6ff45e3e7e70ab4597c39476138e7016f2 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to get all images" - Add API(v2) to get all images JIRA: YARDSTICK-752 API: /api/v2/yardstick/images METHOD: GET Change-Id: I7b0bba85d875575ee684cc42cad977af91d6f84e Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to load images" - Add API(v2) to load images JIRA: YARDSTICK-751 API: /api/v2/yardstick/images/action METHOD: POST PARAMS: { 'action': 'load_image' } Change-Id: I9554f35c679ae2a861c7922080aa54a1ffc5bac7 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to add suite to task" - Add API(v2) to add suite to task JIRA: YARDSTICK-740 API: /api/v2/yardstick/tasks/<task_id> METHOD: PUT PARAMS: { 'action': 'add_suite', 'args': { 'suite_name': 'opnfv_smoke', 'suite_content': suite_content } } Change-Id: I1f81c45f143b2fea636cb87f60f2f394bf1380b1 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to delete certain test suite" - Add API(v2) to delete certain test suite JIRA: YARDSTICK-749 API: /api/v2/yardstick/testsuites/<suite_name> METHOD: DELETE Change-Id: Idfb5086ab3ac9e7ea6f9512ee5c7f02090d554c0 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to get certain test suite info" - Add API(v2) to get certain test suite info JIRA: YARDSTICK-748 API: /api/v2/yardstick/testsuites/<suite_name> METHOD: GET Change-Id: I0d60ddedff4f76504ebd2e61257bf1b9cad3b923 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to get all test suite" - Add API(v2) to get all test suite JIRA: YARDSTICK-747 API: /api/v2/yardstick/testsuites METHOD: GET Change-Id: I2375b6d2ea54704f5a2328cc8110058af038e777 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to create test suite" - Add API(v2) to create test suite JIRA: YARDSTICK-746 API: /api/v2/yardstick/testsuites/action METHOD: POST PARAMS: { 'action': 'create_suite', 'args': { 'name': 'case_name', 'testcases': [ 'opnfv_yardstick_tc002' ] } } Change-Id: I7e07c599e64e7eedda274c72344e394f5535f055 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API to delete certain test case" - Add API to delete certain test case JIRA: YARDSTICK-745 API: /api/v2/yardstick/testcases/<case_name> METHOD: DELETE Change-Id: Ic75ee60abfc00d20328ee45b9830dea1fe464482 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to get certain test case info" - Add API(v2) to get certain test case info JIRA: YARDSTICK-744 API: /api/v2/yardstick/testcases METHOD: GET Change-Id: I4b1867f713bce2f9f2342ecec8540b08b0bb3456 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to get all test case info" - Add API(v2) to get all test case info JIRA: YARDSTICK-743 API: /api/v2/yardstick/testcases METHOD: GET Change-Id: Iced97206cb4c5f68ee8a5729af937e8d45ca6e87 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to upload test case" - Add API(v2) to upload test case JIRA: YARDSTICK-742 API: /api/v2/yardstick/testcases/action METHOD: POST PARAMS: { 'action': 'upload_case', 'args': { 'file': file } } Change-Id: Id305e72a24ec28295ac4bae5e5b9ad83eb2c1e34 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to add case to task" - Add API(v2) to add case to task JIRA: YARDSTICK-739 API: /api/v2/yardstick/tasks/<task_id> METHOD: PUT PARAMS: { 'action': 'add_case', 'args': { 'case_name': 'opnfv_yardstick_tc002', 'case_content': case_content } } Change-Id: I53e71e3d662399b08029ed417b5873a4775ca32d Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to delete certain task" - Add API(v2) to delete certain task JIRA: YARDSTICK-738 API: /api/v2/yardstick/tasks/<task_id> METHOD: DELETE Change-Id: I28215d2cae63551455abacc4142cff3c4aaed281 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to get certain task info" - Add API(v2) to get certain task info JIRA: YARDSTICK-737 API: /api/v2/yardstick/tasks/<task_id> METHOD: GET Change-Id: Ia360f4bba05e196e07c9eb339061ccfbf5df8137 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to add environment to task" - Add API(v2) to add environment to task JIRA: YARDSTICK-736 API: /api/v2/yardstick/tasks/<task_id> METHOD: PUT PARAMS: { 'action': 'add_environment', 'args': { 'environment_id': environment_id } } Change-Id: Idc31cb21de882d008202b6395158e9f9aa9244db Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to create task" - Add API(v2) to create task JIRA: YARDSTICK-735 API: /api/v2/yardstick/tasks/action METHOD: POST PARAMS: { 'action': 'create_task', 'args': { 'name': 'task1', 'project_id': project_id } } Change-Id: I1f9c743f32bbcff999e37cf53ebfa96b41c61e5e Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to delete certain project" - Add API(v2) to delete certain project JIRA: YARDSTICK-734 API: /api/v2/yardstick/projects/<project_id> METHOD: DELETE Change-Id: I6628ec42aa7c4c6ab073ddc33c119ea1c03b81fe Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge changes from topics 'get_project', 'get_projects' * changes: Add API(V2) to get certain project info Add API(v2) to get all projects info - Add API(V2) to get certain project info JIRA: YARDSTICK-733 API: /api/v2/yardstick/projects/<project_id> METHOD: GET Change-Id: I20a615af96229aefac6ef86566a7b9c5d42f9633 Signed-off-by: chenjiankun <chenjiankun1@huawei.com> - Add API(v2) to get all projects info JIRA: YARDSTICK-732 API: /api/v2/yardstick/projects METHOD: GET Change-Id: Ifd67f11f516270d96c0e80b5b8c76a939583d9e5 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-21Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to create project" - Add API(v2) to create project JIRA: YARDSTICK-731 API: /api/v2/yardstick/projects/action METHOD: POST PARAMS: { 'action': 'create_project', 'args': { 'name': 'project1' } } Change-Id: I92332dec8dcf3253f0cbf1668332ce5110111d73 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-19Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to delete container" - Add API(v2) to delete container JIRA: YARDSTICK-729 API: /api/v2/yardstick/containers/<container_id> METHOD: DELETE Change-Id: I4cda76329edd7b988a357f1fcb2b5041bf48be64 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-19Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to get container info" - Add API(v2) to get container info JIRA: YARDSTICK-728 API: /api/v2/yardstick/containers/<container_id> METHOD: GET Change-Id: Iba34e6c6dd84573dc9d5914a584d920678c0de36 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-19Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to create grafana" - Add API(v2) to create grafana JIRA: YARDSTICK-727 API: /api/v2/yardstick/containers/action METHOD: POST PARAMS: { 'action': 'create_influxdb', 'args': { 'environment_id': environment_id } } Change-Id: I12fc23261ba62df6f923a4d34455ad8b46c4aa8f Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-19Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to create influxdb" - Add API(v2) to create influxdb JIRA: YARDSTICK-726 API: /api/v2/yardstick/containers/action METHOD: POST PARAMS: { 'action': 'create_influxdb', 'args': { 'environment_id': environment_id } } Change-Id: I20961fc6ae9918c894de7fabd3f81ca966bd24cd Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-19Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to delete pod" - Add API(v2) to delete pod JIRA: YARDSTICK-725 API: /api/v2/yardstick/pods/<pod_id> METHOD: DELETE Change-Id: Ib9e9f9ced455c4ee3b6e1f63d773ea2e3ee906a6 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-17Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "test_base: speedup unittest, wait for queue not empty" - test_base: speedup unittest, wait for queue not empty Change-Id: I41a72b1fd7099e404a1cf832de39f15bbc7b46e0 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "attacker_process: fix typo s/envrioment/environment/" - attacker_process: fix typo s/envrioment/environment/ Change-Id: I1e5db657eb88c73b5d9223c47e2d97dc79eec1f1 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "test_nstat: speedup unittests, sleep for 0 seconds" - test_nstat: speedup unittests, sleep for 0 seconds Change-Id: I3f961e26fb045ea7501dc3a5b630b3ef94fec3ee Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "pktgen: speedup unittest, mock time.sleep" - pktgen: speedup unittest, mock time.sleep Change-Id: I0c6f6b68b30ae72887666a3b9e994dabf7c6a71d Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "tg: speedup unittests, mock time.sleep" - tg: speedup unittests, mock time.sleep Change-Id: Ia6207c898653c3ba21b22e9c309e7abb25d5cd32 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "test_pktgen_dpdk_throughput: speedup unittest, mock time.sleep()" - test_pktgen_dpdk_throughput: speedup unittest, mock time.sleep() Change-Id: I74bbdee1a503ef9bad32db7d4444921f6730f465 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - test_heat: ipaddress expects unicode inputs weird error E AddressValueError: '10.20.0.0/15' does not appear to be an IPv4 or IPv6 network. Did you pass in a bytes (str in Python 2) instead of a unicode object? I guess we need to convert the stack.outputs mock to unicode FAILED tests/unit/benchmark/contexts/test_heat.py:137 (HeatContextTestCase.test_add_server_port) self = <tests.unit.benchmark.contexts.test_heat.HeatContextTestCase testMethod=test_add_server_port> def test_add_server_port(self): network1 = mock.MagicMock() network1.vld_id = 'vld111' network2 = mock.MagicMock() network2.vld_id = 'vld777' self.test_context.name = 'foo' self.test_context.stack = mock.MagicMock() self.test_context.networks = { 'a': network1, 'c': network2, } self.test_context.stack.outputs = { 'b': '10.20.30.45', 'b-subnet_id': 1, 'foo-a-subnet-cidr': '10.20.0.0/15', 'foo-a-subnet-gateway_ip': '10.20.30.1', 'b-mac_address': '00:01', 'b-device_id': 'dev21', 'b-network_id': 'net789', 'd': '40.30.20.15', 'd-subnet_id': 2, 'foo-c-subnet-cidr': '40.30.0.0/18', 'foo-c-subnet-gateway_ip': '40.30.20.254', 'd-mac_address': '00:10', 'd-device_id': 'dev43', 'd-network_id': 'net987', } server = mock.MagicMock() server.ports = OrderedDict([ ('a', {'stack_name': 'b'}), ('c', {'stack_name': 'd'}), ]) expected = { "private_ip": '10.20.30.45', "subnet_id": 1, "subnet_cidr": '10.20.0.0/15', "network": '10.20.0.0', "netmask": '255.254.0.0', "gateway_ip": '10.20.30.1', "mac_address": '00:01', "device_id": 'dev21', "network_id": 'net789', "network_name": 'a', "local_mac": '00:01', "local_ip": '10.20.30.45', "vld_id": 'vld111', } > self.test_context.add_server_port(server) tests/unit/benchmark/contexts/test_heat.py:186: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ yardstick/benchmark/contexts/heat.py:307: in add_server_port network_name, port['stack_name'], self.stack.outputs) yardstick/benchmark/contexts/heat.py:315: in make_interface_dict subnet_ip = ipaddress.ip_network(subnet_cidr) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ address = '10.20.0.0/15', strict = True def ip_network(address, strict=True): """Take an IP string/int and return an object of the correct type. Args: address: A string or integer, the IP network. Either IPv4 or IPv6 networks may be supplied; integers less than 2**32 will be considered to be IPv4 by default. Returns: An IPv4Network or IPv6Network object. Raises: ValueError: if the string passed isn't either a v4 or a v6 address. Or if the network has host bits set. """ try: return IPv4Network(address, strict) except (AddressValueError, NetmaskValueError): pass try: return IPv6Network(address, strict) except (AddressValueError, NetmaskValueError): pass if isinstance(address, bytes): raise AddressValueError( '%r does not appear to be an IPv4 or IPv6 network. ' 'Did you pass in a bytes (str in Python 2) instead of' > ' a unicode object?' % address) E AddressValueError: '10.20.0.0/15' does not appear to be an IPv4 or IPv6 network. Did you pass in a bytes (str in Python 2) instead of a unicode object? ../../yardstick/yardstick_venv/lib/python2.7/site-packages/ipaddress.py:199: AddressValueError Change-Id: Ie3b087a26a054203573eaa9b13c3e90152bba6a9 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "test_tg_rfc2544_trex: speedup unittest, set time.sleep(0)" - test_tg_rfc2544_trex: speedup unittest, set time.sleep(0) Change-Id: I6fdae629bdbd45cba715a838c41613b914a3abcb Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>