summaryrefslogtreecommitdiffstats
path: root/docs/submodules
AgeCommit message (Collapse)AuthorFilesLines
2018-04-13Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "Remove duplicated info line for bifrost version" - Remove duplicated info line for bifrost version Change-Id: If49cebc6ac6b1a80fbddceaf55a2cf1df299583a Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-04-13Update git submodulesAsteroide1-0/+0
* Update docs/submodules/moon from branch 'master' - Merge "Add more tests and fix bug in moon_orchestrator" - Add more tests and fix bug in moon_orchestrator adding more validation adding more test cases covering pods, slaves applying comments mentioned Change-Id: I7e58f184a3f216fc3740097244a5538c184bd940 Signed-off-by: ReemMahmoud <rfawzy.ext@orange.com>
2018-04-13Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Print the stack traceback when cleaning" - Print the stack traceback when cleaning Change-Id: I8279844f0e42378b4fe550696608054cd7418a12 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-13Update git submodulesRodolfo Alonso Hernandez1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Bugfix: to list all used loop device" - Bugfix: to list all used loop device Bug fix in script "build_yardstick_image.yml", to - Use option "-a" to list all used loop devices, to be more compatible. - Ignore the error and continue, if the debug command failed. JIRA: YARDSTICK-1121 Change-Id: I24aaebb2ffe3107ca5c619401725aa8c8e1af295 Signed-off-by: ting wu <ting.wu@enea.com> - Bugfix: k8 scenario fix JIRA: YARDSTICK-1109 Change-Id: Ic61a63099c3d2d4af5fa5634299e4b2946d53eaf Signed-off-by: rexlee8776 <limingjiang@huawei.com> (cherry picked from commit 3b1316647b50bc3bbb1eb6216aa07fd4dff34edf) - docker/supervisor.sh: Fix condition block end Fixes: 18546b4f Change-Id: I51fcb48e790ff7c57273a3f6712ccb2b9bc4aa32 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit ead90064d12be552bd334828d41ffffa75fad01b) - [AArch64] Dockerfile: Fix malformed patch Change-Id: Ia2dfc6c4def8e71e36747b8f27cbf22700f676b1 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 161f7d676b4404a5445681a7871e086b751fdafc)
2018-04-13Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Create CI job for network testing" - Create CI job for network testing JIRA: QTIP-297 Change-Id: Ie3002ab4eae57d79d0edeb9c39c2ab273c5c3915 Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
2018-04-13Update git submoduleszhihui wu1-0/+0
* Update docs/submodules/releng from branch 'master' - [qtip] enable fraser ci jobs Change-Id: Ic9bf36c63592eac60406d362bedf1c6bd352ab9c Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
2018-04-13Update git submoduleszhihui wu1-0/+0
* Update docs/submodules/qtip from branch 'master' - Revert "delete the code which will not included in Fraser" This reverts commit b34030013f9af4c40fd79850a85957c842e76595. Change-Id: Ief09eaa4b009a47d7509f548fc1117bb4839d2ba Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
2018-04-13Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "Redirect virsh output to /dev/null in cleanup script" - Redirect virsh output to /dev/null in cleanup script deploy-scenario:k8-nosdn-nofeature installer-type:kubespray Change-Id: I540eb8bad2f35d7029ae8a2148c431f7664fbad0 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-04-13Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "bugfix: run doctor tests parallelly" - bugfix: run doctor tests parallelly Currently doctor job uses multiple 'multijob' in builders to virify tests in different installers, these multijobs run in sequentially which will cost a long time. These jobs are not related to each other in different installer. Change-Id: Idce03920ec6244a9ce288c940a24d0707af1a694 Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
2018-04-13Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Doctor job bugfix: fix the scenario" - Doctor job bugfix: fix the scenario Use these scenario which can trigger doctor jobs running in functest Change-Id: I66df099c3923b9c47aab9f9f8685052bd33331f7 Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
2018-04-13Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Enable all yardstick tasks on baremetal for daisy" - Enable all yardstick tasks on baremetal for daisy currently only master job is enabled. Change-Id: I7da6a1a3a8e8faf08cde34d9a20219346070151b Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2018-04-13Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/clover from branch 'master' - Updated from global requirements Change-Id: Ieeaf87ab920f1862e3a1b9ac3316d387ff64954f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-13Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "Switch to Gerrit for scenario source urls" - Switch to Gerrit for scenario source urls In the past, there were cases where the Git mirrors were out of sync with Gerrit which caused the use of outdated repos. This change switches all scenarios to Gerrit. Apart from that, it also aligns the urls across all scenarios. Change-Id: I5301630a71446df8668f16c81bf26d81bcea8031 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-04-13Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Bugfix: Can't get image list in API" - Bugfix: Can't get image list in API JIRA: YARDSTICK-1110 To match OpenStack Pike release, we upgrade novaclient from 7.1.1 to 9.1.1. And the client interface has changed, it no longer has nova_client.images attribute. So I use shade instead. Later will change all same issue. Change-Id: Ie4f54069d4346e44e2ad925439930504b945cbad Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2018-04-13Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[daisy] Move more CI resource to Fraser branch" - [daisy] Move more CI resource to Fraser branch Temporary disable master branch job on zte-pod2 to make room for Fraser branch job. Change-Id: I9f2eea0e1c85eab741f80e6db6b773eec71c39f1 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-04-12Update git submodulesFeng Pan1-0/+0
* Update docs/submodules/releng from branch 'master' - APEX: Fix gate check scenario detection - Change scenario parsing to allow k8s scenarios in gate jobs. - Remove scenario detection in shell scripts. Also changes network setting file for fd.io scenarios as we don't use separate config files any more. Change-Id: Icbcc6cb7b6b66c7cc43f5d6c58dd97730e41ea5f Signed-off-by: Feng Pan <fpan@redhat.com>
2018-04-12Update git submodulesagardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - JOID PDF-IDF support for intel-pod18 More info in gerrit comments. Remove joid from all other idfs other than intel/pod18 add installer: ['apex', 'compass4nfv', 'daisy', 'fuel'] where missing Change-Id: I2afc415599070e210736c5fc304f7cb150f05029 Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-12Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Update to stable/queens It allows getting first results before the blackout between MS0 and MS2.1. Testcases could work thanks to backward compatibility provided by openstack clients. It disables all features which are not synced (patches are under review). It will ease verifying installers which are following master because it reduces the gap between releases. Change-Id: If0893f6dbaed76d4bafbd10a4f0934e6c5057477 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-12Update git submodulesmortenhillbom1-0/+0
* Update docs/submodules/nfvbench from branch 'master' - NFVBENCH-84 Report results with requested L2 frame size Change-Id: Ie7a8795cd0cb16b881a4e2aec68ff1e3dd6741b1 Signed-off-by: mortenhillbom <mhillbom@cisco.com>
2018-04-12Update git submodulesAaron Smith1-0/+0
* Update docs/submodules/barometer from branch 'master' - Merge "docs: Updating Compass4nfv installer support in Fraser" - docs: Updating Compass4nfv installer support in Fraser Updates the following doc with barometer-collectd container support as well as Grafana and InfluxDB support in Compass4nfv installer: docs/release/configguide/postinstall.rst Change-Id: Id2c7e1167b0fd99f9200510de7caaa7b25052a5f Signed-off-by: Ramamani Yeleswarapu <ramamani.yeleswarapu@intel.com>
2018-04-12Update git submoduleswutianwei1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Create the k8-canal-nofeature scenario add the k8-nosdn-noeature and k8-canal-nofeature roles under scenarios directory run different roles to configure the k8s-cluster according to the deploy scenario installer-type:kubespray deploy-scenario:k8-canal-nofeature Change-Id: Ia96b01f79fb058e045c5b7d9d9aecb7f15a21e63 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-04-12Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Remove euphrates jobs" - Remove euphrates jobs Change-Id: I167bbea911fb3aee6fa21b7ff28b18d7fae61bb9 Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-12Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Remove euphrates jobs" - Remove euphrates jobs Change-Id: I0a5a6d584b3740d88dc4f342ffc1d107962762e6 Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-12Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Remove euphrates jobs" - Remove euphrates jobs Change-Id: I21c5ab27243bd50dee76d8b10c10ae0fb8aa5f1d Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-12Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Remove euphrates from domino" - Remove euphrates from domino Domino is not in the fraser release. This is part of a cleanup to remove euphrates jobs Change-Id: Ica789accd0148cf847c3498d151bd8ae0b59e8bd Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-12Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Move DEPLOY_SCENARIO out of testapi-parameters" - Move DEPLOY_SCENARIO out of testapi-parameters These have been moved back into installer-params.yml and added to the daisy jobs where 'testapi-parameters' is being used. Including this in the list of parameters would cause duplication as most installers already include 'DEPLOY_SCENARIO' as a parameter. The 'DEPLOY_SCENARIO' parameter is also sometimes defined through a macro, which could cause second declaration of DEPLOY_SCENARIO (defaulting to 'os-nosdn-nofeature-ha') to always be used. Documentation has been added to the parameter to explain the related macros and how they should be used. Change-Id: I9aef031dbcf523ae2db15695ce294bd85025530d Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-04-12Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Remove euphrates jobs" - Remove euphrates jobs Change-Id: I63fdf2826d2077465f264f082dc1a15eafc2b05a Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-12Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Remove euphrates jobs" - Remove euphrates jobs Change-Id: I5e5f66b1226291934fecca6fcf83dd649fb82f0e Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-12Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Remove euphrates jobs" - Remove euphrates jobs Change-Id: Idbe3be3da5ddf0fb9b1649002d7cf6bd8babc817 Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-12Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Remove Euphrates jobs" - Remove Euphrates jobs Change-Id: I8a223d7f9a0458f9cc01a2fedcb630b711b4465f Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-12Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Fixed bug when use_keystone parameter is False." - Fixed bug when use_keystone parameter is False. When false, the self.keystone member is None and now it is being used in many more places with some of the other changes during the Fraser release JIRA: SNAPS-299 Change-Id: I752afb127287036a16f3c9b00e6feae9cab80143 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2018-04-12Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Fixing security group in CreateInstanceTwoNetTests" - Fixing security group in CreateInstanceTwoNetTests The test CreateInstanceTwoNetTests does define and create a security group and a corresponding rule but never associates them with the created instances. Moreover, some commercial systems require explicit egress rules in addition to ingress rules in order to allow traffic to pass. Anm egress rule has been added. JIRA: SNAPS-300 Change-Id: Ie0da75781f8b4e97af11e4e7588c7a53acad59ac Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
2018-04-12Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/snaps from branch 'master' - Updated from global requirements Change-Id: Ib6c90b7a0fc5f23a9882c3ca4cc4d3031cebe5b9 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-12Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/doctor from branch 'master' - Updated from global requirements Change-Id: I3ba9e49daddda8d8824991591def0114dc4d6011 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-12Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng from branch 'master' - jjb: xci: xci-run-functest: Escape the 'var' variable Commit 33073c5a3426c1867411db446bc9e5d84d2a7747 ("jjb: xci: xci-run-functest.sh: Ensure env vars are quoted during reload") added support for reloading the OPNFV host environment in a safe way but that didn't work because the internal '$var' variable was not escaped so it was evaluated on the local host instead of the remote one. This fixes the problem by properly escaping the variable. Change-Id: I7c90ae18f77aca076579f70c7c0e9a72aaaad7c8 Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-04-12Update git submodulesFeng Pan1-0/+0
* Update docs/submodules/apex from branch 'master' - Enable nosdn-fdio scenarios for Fraser release - Update neutron NSDriver patch - Update os-net-config to fix config errors for vpp uio-driver - Update puppet-tripleo to add configuration of physnets and type_driver in vpp agent - Update THT to change VPP environment file for vpp-agent, and add common.yaml for vpp interface mapping - Update VPP and networking-vpp version to 18.01 - Fix networking-vpp rpm build to enable proper uninstall. - Update networking settings file to use ovs_bridge as default external interface type JIRA: APEX-578 JIRA: APEX-568 JIRA: APEX-576 JIRA: APEX-577 apex-os-net-config: I915d5455acb8d496438b9c9e851639d3a43e6fa9 apex-puppet-tripleo: I472879b8f67e64b571638a0385943597a9120e6c apex-tripleo-heat-templates: I5dfaf85d67fb038109edaf5c5d8a3e901b9148f4 Change-Id: I369bee232bfafef260d2ef19ac32614fdc487271 Signed-off-by: Feng Pan <fpan@redhat.com>
2018-04-12Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng from branch 'master' - jjb: xci: xci-run-functest.sh: Ensure env vars are quoted during reload The output of the 'env' command does not use quotes when printing the env variables so trying to source the xci.env file will lead to problems like the following one: /home/devuser/releng-xci/.cache/xci.env: line 17: PROFILEREAD: readonly variable /home/devuser/releng-xci/.cache/xci.env: line 20: 50340: command not found /home/devuser/releng-xci/.cache/xci.env: line 40: controller00: command not found /home/devuser/releng-xci/.cache/xci.env: line 48: on: command not found /home/devuser/releng-xci/.cache/xci.env: line 55: Francisco/O=IT/CN=xci.releng.opnfv.org: No such file or directory /home/devuser/releng-xci/.cache/xci.env: line 75: a: command not found /home/devuser/releng-xci/.cache/xci.env: line 88: -I: command not found /home/devuser/releng-xci/.cache/xci.env: line 90: 50340: command not found /home/devuser/releng-xci/.cache/xci.env: line 92: -e: command not found /home/devuser/releng-xci/.cache/xci.env: line 95: fg: no job control /home/devuser/releng-xci/.cache/xci.env: line 101: fg: no job control As such, we need to ensure that variables are properly quoted when exported. Change-Id: Ie98d8c921bae849d6bffd3858f67708f417b1d0f Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-04-12Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Updated from global requirements Change-Id: I16a3f29be0f4e2c8bdcbd9be265fbf3a250cd6ad Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-12Update git submodulesManuel Buil1-0/+0
* Update docs/submodules/sfc from branch 'master' - Changing README Change-Id: Ia2112794ef542ff91af1a547d814a0f0c737dd54 Signed-off-by: Manuel Buil <mbuil@suse.com>
2018-04-12Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/barometer from branch 'master' - Updated from global requirements Change-Id: Iec6300fbae08a9d924bf9db8b9b9702bc568844b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-12Update git submodulesGuillermo Herrero1-0/+0
* Update docs/submodules/pharos from branch 'master' - [IDF] arm-pod6: Adjust CPU pinning variables For non-dpdk scenarios we define as cpu config: 0-7 for OS 8-47 for nova For dpdk scenarios we define as cpu config: 0-7 for OS 8-11 for DPDK drivers and processes 12-47 for nova Change-Id: Ia9d7cfaee76f996993b94a52e1484752157a23cd Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2018-04-12Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Update prepare-functest role for k8s and fix fetching xci.env This change updates prepare-functest role for testing k8s scenarios using functest healthcheck. The changes include - update tasks to skip checking/creation of public gateway which is needed for OpenStack based scenarios - update run-functest.sh.j2 template and set the used docker image name based on FUNCTEST_SUITE_NAME that is going to be used - update run-functest.sh.j2 template and add commands needed to run tests using functest-kubernetes-${FUNCTEST_SUITE_NAME} docker image - update env.j2 to exclude setting the var EXTERNAL_NETWORK which is needed for OpenStack based scenarios Apart from updating the the prepare-functest role, a bug has also been fixed by adding the fetching of xci.env for installer kubespray. installer-type:kubespray deploy-scenario:k8-nosdn-nofeature Change-Id: Ia701db9748ea9509a2dc165341285fb189aa7266 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com> - Set additional variables for functest CI_LOOP, NODE_NAME, and BUILD_TAG are needed for logging info to console. FUNCTEST_MODE and FUNCTEST_SUITE_NAME are important for stating what level of testing we do for verify and merge jobs. Change-Id: Iaa5499155b4b94a1cfc6b5c70fe6f8f7417502a6 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-04-12Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Stop maintaining Euphrates (EOL)" - Stop maintaining Euphrates (EOL) Change-Id: Ibd6a523aa9da3aa6c2622a5f183102ffdbc3ccb8 Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-12Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Create Xtesting Fraser jjobs" - Create Xtesting Fraser jjobs Change-Id: I761ec6f28ab4b2d7dc47250d49730dbe302221e0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-04-12Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Clean up opendaylight configuration * remove client patch (has been merged to upstream) * websocket now is disabled by default * purge deprecated/unneeded features (odl-mdsal-apidocs, odl-dlux-all) Change-Id: Id247a3c74e66730049bfeafc4a5164aad0d9b662 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
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>