summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-04-12Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "xci: Log functest-kubernetes.log to console" - xci: Log functest-kubernetes.log to console Change-Id: I9576417cd2c47fd10153d841dddb334cb47c666e Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-04-12Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng from branch 'master' - jjb: xci: xci-set-scenario.sh: Fix conditional for default scenario We only set default scenario if there is not one set already so we need to check if the array is empty. Change-Id: Ic5019fb68349adaf52d669aed43574bc5eaeddc3 Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-04-12Update git submodulesLinda Wang1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "support fuel&daisy for doctor in functest" - support fuel&daisy for doctor in functest Change-Id: Ibfce5a21517e52bb5b2ea7a2d34bd22037e6964e Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
2018-04-12Update git submodulesStephen Wong1-0/+0
* Update docs/submodules/clover from branch 'master' - Merge "Update from requirements" - Update from requirements Pipfile.lock ensures a consistent environment Change-Id: Id2e544c77a67ce8fa010fba9c357735496f62a26 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
2018-04-12Update git submodulesStephen Wong1-0/+0
* Update docs/submodules/clover from branch 'master' - Merge "Create index to be included in opnfvdocs site" - Create index to be included in opnfvdocs site Change-Id: Icbfe547697a8d879f4af8d9f9fbde2211b63129c Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
2018-04-12Update git submodulesStephen Wong1-0/+0
* Update docs/submodules/clover from branch 'master' - Merge "Modified validation script for tracing to support CI" - Modified validation script for tracing to support CI - Changed default Jaeger ports to 16686 for use with basic kubernetes port-forward and CI scripts - Added CLI to validate script to disable istio service check by default. This requires at least a single http request to istio-ingress after Jaeger deployment. It can be enabled with 'python validate.py -s'. Port and IP address for Jaeger can optionally be specified with '-ip' and '-port' options - Modified tracing doc to add k8s port-forward example in addition to k8s expose Change-Id: I10fb4d3cccfa50370d44ed7446f67a49c538bba9 Signed-off-by: Eddie Arrage <eddie.arrage@huawei.com>
2018-04-12Update git submodulesMartin Klozik1-0/+0
* Update docs/submodules/vswitchperf from branch 'master' - ixia: Bugfixing and burst type enhancement A support for proper reporting of "Burst" traffic type was added. Several bugs were fixed: * RFC2544 Throughput - end of search condition was moved to avoid situation, that another iteration is executed but its results dropped * RFC2544 Throughput - pause after each iteration was added to ensure that all frames are cleared from buffers; It improves stability of results. Also "received" values are no longer higher then "sent" values. * VSPERF will report also the number of sent and received frames * VSPERF will correctly process send and received values - they were switched on several places JIRA: VSPERF-149 JIRA: VSPERF-562 Change-Id: I8a5caa6385a1ef86aa4bf4511d2753100ed0ab14 Signed-off-by: Martin Klozik <martinx.klozik@intel.com> Reviewed-by: Al Morton <acmorton@att.com> Reviewed-by: Christian Trautman <ctrautma@redhat.com> Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com> Reviewed-by: Richard Elias <richardx.elias@intel.com>
2018-04-12Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Precise vyos_vrouter logs Aborting was written even if it worked after rebooting the vm [1]. [1] https://build.opnfv.org/ci/view/functest/job/functest-daisy-baremetal-daily-master/41/console Change-Id: Idb29624b8793df5d77d401b375aa3b3176778ddf Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-11Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/sfc from branch 'master' - Merge "Auto Generated INFO.yaml file." - Auto Generated INFO.yaml file. INFO.yaml meant to be machine readable. This file was auto generated from an ldap lookup and your projects INFO file Meeting times are not currently filled out. please ammend this patchset to complete Going forward comitter promotions should be done against this file. PTLs: Must be merged for you to gain delete access on testresults.opnfv.org If project_lead: is missing (my script could not parse) please amend with same from commiters section eg: project_lead: &opnfv_$project_ptl name: 'Lead Name' email: 'lead email' id: 'lead lfid' company: 'lead company' Change-Id: Ib1d10a6653a5571b51fc559fc00bbbdde4ca7479 Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-11Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "jjb: xci: Set XCI_PATH for bifrost jobs" - jjb: xci: Set XCI_PATH for bifrost jobs The bifrost jobs are using some scripts from the releng-xci repository so we need to set the XCI_PATH variable appropriately. Change-Id: Ibfd139d2401029b2ea577c4797b68f29362356ec Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-04-11Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "jjb: xci: Only set default scenario if no scenario is set" - jjb: xci: Only set default scenario if no scenario is set Previously, the code was already setting the default scenario if we had changes outside the xci/scenario directory. However, this is somewhat problematic since scenarios may touch other files which do not necessary affect other scenarios such as anything in xci/playbooks etc. As such, lets only set a default scenario if no scenario was set up to that point. However, since installers and scenarios need to match, we also need to consider installer changes because we fallback to the default scenario. Finally, since we are filtering results with 'uniq' we can simply drop the bash regexps prior to adding the scenario to the array. Change-Id: Ie961071b3e93d04a860bb6655513654208b1a9d4 Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-04-11Update git submodulesStuart Mackie1-0/+0
* Update docs/submodules/joid from branch 'master' - Fixes for OpenContrail running on Pike in Fraser release: - 02-deploybundle.sh - updated package names - 03-maasdeploy.sh - Iterate pods create command to get past "Conflict error" - config_tpl/juju2/bundle_tpl/oclphase1.yaml - updated public keys - deploy.sh - changed usage message to reflect using ocl not opencontrail Change-Id: If2d3820a4984498813d86162a1208402aceca312 Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
2018-04-11Merge "Auto Generated INFO.yaml file"Aric Gardner1-0/+52
2018-04-11Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Apex: Fix log collection for daily job" - Apex: Fix log collection for daily job The wrong job name was being triggered so no job was running to collect logs. Change-Id: Ib58b030ac24920fc7906bff92a481407587a39bf Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-04-11Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "docker build -f should use relative path to PATH, not working directory" - docker build -f should use relative path to PATH, not working directory Change-Id: I6b35a5b36b1cc7b8ce2298388b9bb5caf9e44fc9
2018-04-11Update git submodulesRodolfo Alonso Hernandez1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Bug fix in using Unixbench" - Bug fix in using Unixbench JIRA: YARDSTICK-1117 This bug will cause the error in running unixbench. "no such file named ./run" So we have to fix it. Change-Id: I141fcb5567fbb0e3df97aee677cb946a25a9788e Signed-off-by: liyin <liyin11@huawei.com>
2018-04-11Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "jjb: xci: xci-set-scenario: Drop errexit option" - jjb: xci: xci-set-scenario: Drop errexit option Commands may exit with non-zero exit code but this could be normal (for example grep does than when it doesn't match anything). As such, lets not fail on everything but rather capture such failures and handle them appropriately. Change-Id: Icc16d0ccd09fd6f262600ae514161bfdf0c593f1 Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-04-11Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Create Xtesting stable/fraser" - Create Xtesting stable/fraser Xtesting is not directly part of Fraser but this stable branch could be required for bugfixes. stable/pike could have been selected instead but it would have raised side effects when syncing requirements or building containers. Change-Id: I407f651ba09e27a7c87cc76f7b8ccbd6c0784a48 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-11Update git submodulesJohn O Loughlin1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Upgrade collectd to version 5.8 Update collectd version to 5.8 as it's the latest stable and supports GCC 7 JIRA: YARDSTICK-1114 Change-Id: I9147b7277d87047eda729664d5ee3e8ab2c145af Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
2018-04-11Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Take all cmd status into account in juju_epc" - Take all cmd status into account in juju_epc It also puts output in functest.log instead of /dev/stdout. Change-Id: I3a4b5f81edd20a529821c5a684b3ab269b7c6796 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-11Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Stop verifying Functest Euphrates" - Stop verifying Functest Euphrates Functest Euphrates is now EOL (jjobs creating containers has already been removed) Change-Id: I668137b2701d073ce95856fa20dc54135a6cc111 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-11Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng from branch 'master' - jjb: xci: xci-run-functest.sh: Reload XCI environment for functest We should reload the XCI environment before running functest in order to ensure that playbooks have the correct information from the XCI deployment. Change-Id: Ieadeca61d3ea3e504e21aa96945ad067f20d1489 Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-04-11Update git submodulesEmma Foley1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add support for dpdk 17.05" - Add support for dpdk 17.05 Add support for dpdk 17.05. Add option to dpdk scripts to download dpdk 17.08 17.11 and 18.02. These are currently unsupported due to prox build issues. JIRA: YARDSTICK-1113 Change-Id: I585566364a4d1f04a696439af96c50c0e9d38033 Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
2018-04-11Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "xci: Enable Functest Healthcheck for Kubernetes scenarios" - xci: Enable Functest Healthcheck for Kubernetes scenarios This change enables Functest for kubernetes scenarios but any change that impacts kubernetes scenarios will fail and block the change from merging until the prepare-functest playbook and role are fixed in releng-xci. Change-Id: I046e3a0fb9a211cf9d629899017922288d466b0c Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-04-11Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Leverage on SDN_CONTROLLER_IP if fuel" - Leverage on SDN_CONTROLLER_IP if fuel It conforms with [1]. [1] https://jira.opnfv.org/browse/FUEL-352 Change-Id: Idae142de8de09203509c73c35c2e7fea5a5d880b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-11Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Remove obsolete apex processing in juju_epc" - Remove obsolete apex processing in juju_epc It has been useless since [1] was merged [1] https://jira.opnfv.org/browse/APEX-570 Change-Id: Id89b75d8cad9e180a02189450e13fa1e61b1239c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-11Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[QTIP] Enable QTIP fraser docker build job" - [QTIP] Enable QTIP fraser docker build job - enable fraser docker build job - disable euphrates docker build job Change-Id: Ieeaec7ed36ee8d77a250c0f584ea9e5985a41c8f Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
2018-04-11Update git submodulesMartin Klozik1-0/+0
* Update docs/submodules/vswitchperf from branch 'master' - Merge "Doc: Documentation of Additional tools configuration." - Doc: Documentation of Additional tools configuration. This patch adds tools.rst under docs/testing/user/configguide. tools.rst include documentation of installing and configuring Collectors, Loadgens and LLC-Cache Management. Changed Interested to Interesting and updated barometer info. Change-Id: Id8de4d25619780636d242a04304696f4093b4c07 Signed-off-by: Sridhar K. N. Rao <sridhar.rao@spirent.com>
2018-04-11Update git submodulesMartin Klozik1-0/+0
* Update docs/submodules/vswitchperf from branch 'master' - Merge "trex: Add support for burst traffic type" - trex: Add support for burst traffic type Support for burst traffic type was added into T-Rex. This traffic type is useful for tests, where a limited number of frames should be sent through DUT. JIRA: VSPERF-562 Change-Id: I03b7150e66a0210cce91b20c751b8624c16f951b Signed-off-by: Martin Klozik <martinx.klozik@intel.com> Reviewed-by: Al Morton <acmorton@att.com> Reviewed-by: Christian Trautman <ctrautma@redhat.com> Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com> Reviewed-by: Richard Elias <richardx.elias@intel.com>
2018-04-11Update git submodulesMartin Klozik1-0/+0
* Update docs/submodules/vswitchperf from branch 'master' - Merge "trex: Support of SCAPY frame definition" - trex: Support of SCAPY frame definition T-Rex implementation in vsperf was improved to support: * SCAPY frame definition, so additional network protocols can be generated by T-Rex and sent towards DUT * VLAN configuration defined by TRAFFIC['vlan'] * enable or disable L2, L3, L4 and VLAN protocols as configured by TRAFFIC dictionary VSPERF documentation was updated with examples of SCAPY frame definition usage. JIRA: VSPERF-565 Change-Id: Iff9baba47a1e83d321f6ba3c1c482965b9882241 Signed-off-by: Martin Klozik <martinx.klozik@intel.com> Reviewed-by: Al Morton <acmorton@att.com> Reviewed-by: Christian Trautman <ctrautma@redhat.com> Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com> Reviewed-by: Trevor Cooper <trevor.cooper@intel.com> Reviewed-by: Richard Elias <richardx.elias@intel.com>
2018-04-11Update git submodulesPeriyasamy Palanisamy1-0/+0
* Update docs/submodules/sdnvpn from branch 'master' - Merge "testcase_10 intermittent failure" - testcase_10 intermittent failure There are vm monitor threads running incorrectly which causes this testcase to fail intermittently. It is fixed properly now. Change-Id: I61abf7e33700abdcb2e9ab7cfa72f6e3ad6c7a67 Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
2018-04-11Update git submodulesQiaowei Ren1-0/+0
* Update docs/submodules/stor4nfv from branch 'master' - remove the command line for test case the cmd-line for k8s test case could not run normally, and so remove it here. Change-Id: I2188f09139fb41ed68976317bf027ce83053a026 Signed-off-by: Qiaowei Ren <qiaowei.ren@intel.com>
2018-04-11Update git submodulesManuel Buil1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - shabump: Bump SHA to make sfc scenario work sfc scenario fails when running the functest snaps-healthcheck. The reason is a race condition found in ODL Nitrogen. This race condition is gone in ODL Oxygen. We need latest ODL role to include the ODL Oxygen version Depends-On: I59802f467a77ae755886e4cc389c2406e9d17d4c deploy-scenario:os-odl-sfc installer-type:osa Change-Id: I6d575370834eabb1b6a0532f74e1b2fc733e500c Signed-off-by: Manuel Buil <mbuil@suse.com>
2018-04-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/clover from branch 'master' - Updated from global requirements Change-Id: I9e6c925744ed928f7a5c6fbe54942e8b3895b1b9 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-10Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "Revert "display the correct deploy scenario for the functest run"" - Revert "display the correct deploy scenario for the functest run" This reverts commit 5dc7b76e38019c059cea159769cdb2c37af98ded. OPENSTACK_OSA_VERSION was removed by this patch and that variable is needed. By looking at the patch, it seems theat variable was removed by mistake Change-Id: I73dc7a7ec393231717f847ff303f9b2f99a00cc0
2018-04-10Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Updated from global requirements Change-Id: I1eddb148ee6d1b85d3247260f9501f948ef6254f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-10Update git submodulesEddie Arrage1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Add functest healthcheck test suite - Add Functest healthcheck tier to Dovetail as new test suite - Intention is that these test cases are not part of mandatory test cases in compliance program - Use for debug and SUT pre-flight check - May consider running tc001 (connection_check) at other test execution stages to determine if SUT is still functioning, as this test takes < 10 sec (more important as test complexity increases such as in vnf test tier) - Replacement for patch: https://gerrit.opnfv.org/gerrit/#/c/52461/ - Removed CI filters, as suggested Change-Id: I2e72931b27e43359d6250f6959a17af8526c5094 Signed-off-by: Eddie Arrage <eddie.arrage@huawei.com>
2018-04-10Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Update userguide" - Update userguide Change-Id: I2725ffcb4101496c2019d22215b1585fa3444775 Signed-off-by: Linda Wang <wangwulin@huawei.com>
2018-04-10Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "create Stable Branch Jobs for nfvbench" - create Stable Branch Jobs for nfvbench Same for docker Change-Id: I48650881f5c0c8e7b4664b87b1b1a4a37c22cc8d Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-10Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "export LANG="C" rather than export LANG="c"" - export LANG="C" rather than export LANG="c" opnfv@linux-r4ap:~$ export LANG="C" opnfv@linux-r4ap:~$ perl -E exit opnfv@linux-r4ap:~$ export LANG="c" opnfv@linux-r4ap:~$ perl -E exit perl: warning: Setting locale failed. perl: warning: Please check that your locale settings: LANGUAGE = "en_US.UTF-8", LC_ALL = "", LANG = "c" are supported and installed on your system. perl: warning: Falling back to the standard locale ("C"). paste of deploy failing: https://hastebin.com/fufananewa.sql Change-Id: Id1ef2430887251044700e03fc1f294ad18adf90a Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-10Update git submodulesManuel Buil1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "xci: kubespray: Generate and use SSL certificate for HAProxy" - xci: kubespray: Generate and use SSL certificate for HAProxy In the OpenStack-Ansible installers we are using the XCI ssl certificates for the endpoints but in kubespray we are generating them on the fly. In order to keep both setups as close as possible, we can use the XCI certificates in kubespray as well. Change-Id: I1ca55127fe747618205394c02b3d44bb573435f4 Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-04-10Update git submodulesManuel Buil1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "xci: osa: Move SSL certification tasks to a new file" - xci: osa: Move SSL certification tasks to a new file The tasks for creating and managing the XCI SSL certificates can be shared between installers so move them to a common file. Change-Id: I9df82517e737681420429a992aa8d68e78528fd4 Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-04-10Update git submodulesManuel Buil1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "xci: kubespray: Use the common tasks to manage the SSH keys" - xci: kubespray: Use the common tasks to manage the SSH keys Drop the kubespray specific tasks for managing the SSH keys in favor of the common ones. Change-Id: Ib8e18fcc14c4c0126cae72740dbb33921a21af6b Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-04-10Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: Update master daily scenarios As part of our new XCI effort, we only enable upstream ODL scenarios initially. Change-Id: I737bbffce14b6c5c69dfbbb653659c7e693cb4fb Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-04-10Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - xci: osa: Fix conditional for copying OSA files to OPNFV host The conditional was wrong since it was being treated as a string instead of actually evaluating it as a boolean value. Change-Id: I59802f467a77ae755886e4cc389c2406e9d17d4c Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-04-10Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[yardstick] enable fraser docker" - [yardstick] enable fraser docker Change-Id: I47ae73da7240ee4c4e3902baa7320412a28ada6c Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2018-04-10Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Enable Apex Fraser Jobs" - Enable Apex Fraser Jobs Change-Id: Ie7bd0d3299fbbb8bc3e865612026ad479c48392d Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-10Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Create Stable Branch Jobs for calipso" - Create Stable Branch Jobs for calipso Change-Id: I2117807b8af3ee248b30747830e32b1661a23d6f Signed-off-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
2018-04-10Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[opnfvdocs] Create stable/fraser Branch" - [opnfvdocs] Create stable/fraser Branch Change-Id: I1a506b327c125d61088277d8e92b5b6ce08f4e87 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-04-10Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Update ODL to Nitrogen Change-Id: I9e194a3fba1b5f510b3bfabb1919f1fdad517e8c Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>