summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-08-02Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/apex from branch 'master' - Merge "nosdn-fdio scenario fix" - nosdn-fdio scenario fix apex-puppet-tripleo: Ie336c22b366bd478963ca14e25d645fec0cded7a Change-Id: I0b9212023eea28ff15e1e2f020a8bbd37cb2bcff Signed-off-by: Feng Pan <fpan@redhat.com>
2017-08-02Update git submodulesNarinder Gupta1-0/+0
* Update docs/submodules/joid from branch 'master' - modfied the mod of the scripts in executing mode. Change-Id: I18b3992076b253fc6282dd0694b6a17fc6271335 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
2017-08-02Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Fix adding right deb repo based on the distro we are running on" - Fix adding right deb repo based on the distro we are running on JIRA: YARDSTICK-669 Change-Id: I0f3848b7803bc62c88effd00e850755e514893c4 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-08-02Update git submodulesAakashKT1-0/+0
* Update docs/submodules/joid from branch 'master' - Scripts for deploying clearwater on kubernetes-cluster (with loadbalancer) Change-Id: I3baca4c8ed73c8154ee2627fc62d81cb694c0726 Signed-off-by: Aakash KT <aakash.kt@research.iiit.ac.in>
2017-08-02Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/apex from branch 'master' - Merge "Add overlay_ip_version config for IPv6 tenant networks" - Add overlay_ip_version config for IPv6 tenant networks Change-Id: I03b28bdcc6d0649920fd58fb3400b2a4e5891e68 Signed-off-by: Feng Pan <fpan@redhat.com>
2017-08-02Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Changed heat_utils#get_stack_by_name to get_stack." - Changed heat_utils#get_stack_by_name to get_stack. Added stack_settings parameter to allow for more robust queries based on the known settings as required. JIRA: SNAPS-158 Change-Id: I538826f822307365b1afe997b71280b9ea500eab Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-08-02Update git submodulesNarinder Gupta1-0/+0
* Update docs/submodules/joid from branch 'master' - Adding the OS_DOMAIN_PROJECT_ID Change-Id: I0428b5ac9748615f2ca53761f9833eb8a376fbe6 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
2017-08-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "reclass: opendaylight: Use UCA default repos" - reclass: opendaylight: Use UCA default repos Current opendaylight pillar enforces a full apt repository cleanup, removing Ubuntu Cloud Archive (UCA) repos in favor of adding pre-hardcoded Ubuntu archive repos. Unlike UCA, main Ubuntu archive is split based on target arch, the main archive.ubuntu.com holding only x86 packages, while the other archs are hosted on ports.ubuntu.com. This leads to adding (only) x86-specific repositories to our AArch64 UCA image. Mitigate this by ommiting "system.linux.system.repo.ubuntu" from the opendaylight pillar, leaving the default UCA repos in place. Change-Id: Ia7033bcb544d8752d5557bbabc92c92c5008b00c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "mcp/config: Move scenario defs to separate dir" - mcp/config: Move scenario defs to separate dir Prepare for adding baremetal scenarios by moving existing scenario definitions (intended for deploys on virtual PODs) to their own subdirectory. Change-Id: Iaa75e0b0a9876e4f263fc6bbae796d97848ef99b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-02Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - [odl-router] Bring up public network on computes * apply provider mappings on compute nodes as well * set default route of computes to gateway node Change-Id: I5715e34fd8ecbed87bd7f1b1ed488766af711bae Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-08-02Update git submodulesliyin1-0/+0
* Update docs/submodules/bottlenecks from branch 'master' - Add modify output file function JIRA: BOTTLENECK-176 Add function which could modify outfile name. Also a bug fix about yardstick docker version should be danube.3.1 Change-Id: I0e0bb5b26cae44358311d17932c698505560974c Signed-off-by: liyin <liyin11@huawei.com>
2017-08-02Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "use template to replace duplicate xml file" - use template to replace duplicate xml file Change-Id: I9764612171ef3bf2cdfc652420a2b162fcbfab43 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-02Update git submodulesMaryam Tahhan1-0/+0
* Update docs/submodules/barometer from branch 'master' - ci: fix snmp-agent commit ID Fix the commit ID used to build collectd to make sure that the snmp-agent gets built. Change-Id: I4ffef1ee8649800c44eb256d70dbcf15a0445a8d Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2017-08-02Update git submodulesYu Yang (Gabriel)1-0/+0
* Update docs/submodules/bottlenecks from branch 'master' - Merge "Add yardstick danube3.1 support." - Add yardstick danube3.1 support. JIRA: BOTTLENECK-173 This patch will add a result handle for Yardstick danube This is only for bottlenecks danube to use. This will change time to 2 min to wait for Yardstick result back Change-Id: Icbd9d89f3e3816df947eaf6f70a12c86f74a2812 Signed-off-by: Ace Lee <liyin11@huawei.com>
2017-08-02Update git submodulesYu Yang (Gabriel)1-0/+0
* Update docs/submodules/bottlenecks from branch 'master' - Merge "Bottlenecks testcase rebuild" - Bottlenecks testcase rebuild JIRA: BOTTLENECK-175 After this patch, Bottlenecks will try to find the stress of the openstack system. we try to create 20 stacks one time. And 20 stacks the other time. we will try to find if openstack will pass threshhold twice. This patch only affact latest version Change-Id: I6146cf5c6fe0ac4968337cc36e07f715b64191d0 Signed-off-by: Ace Lee <liyin11@huawei.com>
2017-08-02Update git submodulesxudan1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Bugfix: Build docker image failed because of lacking of packages JIRA: DOVETAIL-475 1. Dovetail fails to build Docker image. CI Link: https://build.opnfv.org/ci/view/dovetail/job/dovetail-docker-build-push-master/162/console Traceback: Running setup.py install for cryptography c/_cffi_backend.c:15:17: fatal error: ffi.h: No such file or directory 2. Refer to https://cryptography.io/en/latest/installation/ For Debian and Ubuntu, the following command will ensure that the required dependencies are installed: sudo apt-get install build-essential libssl-dev libffi-dev python-dev Change-Id: Icb705823c58d8a557175d48b00745119c0a6b3b9 Signed-off-by: xudan <xudan16@huawei.com>
2017-08-02Update git submoduleshongbo tian1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Merge "mandatory vping test case added to proposed_tests" - mandatory vping test case added to proposed_tests JIRA: DOVETAIL-446 1.add vping to proposed_tests 2.delete out-dated nfvi test cases Change-Id: I181b00b02abe6fed4ff51e947576c1b71321cdd2 Signed-off-by: MatthewLi <lijun_1203@126.com>
2017-08-02Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add task-args(from yaml file) candidates in /api/v2/yardstick/testcases API" - Add task-args(from yaml file) candidates in /api/v2/yardstick/testcases API JIRA: YARDSTICK-766 We have the demand to get all task-args candidates in test case yaml file, so that user get easily change it. The response will like: { 'status': 1, 'result': { 'testcase': case content, 'args': { 'image': {'description': '', 'type': 'String'} } } } In this patch, I add jinja2schema 0.1.4 in requirements.txt. Change-Id: I450082402370add5ab29090286f026fe3cc8c36e Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-08-02Update git submodulesGuo Ruijing1-0/+0
* Update docs/submodules/openretriever from branch 'master' - Add ping vnf Change-Id: Ia58832589385f2be2309f60f0567fae3635c7833 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2017-08-02Update git submoduleshongbo tian1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Merge "WIP: Test case description for vping test cases" - WIP: Test case description for vping test cases Adding test case descriptions for both vping test cases implemented in Functest. Test case 1 makes use of the config drive mechanism of Nova to pass a test script. Test case 2 uses SSH to transfer and execute a script on one VM. Change-Id: Ic8be6ad4dfd4b0e7661064506b0ae92db2fc1463 Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
2017-08-02Update git submodulesYang Yu1-0/+0
* Update docs/submodules/bottlenecks from branch 'master' - Add support for arbitary DB reporting JIRA: BOTTLENECK-158 Support for arbitary DB reporting. TestperfDB and Dovetail DB are within currently consideration. Change-Id: I4373e5f295d26155e2b4fda59044cc4e922c3557 Signed-off-by: Yang Yu <Gabriel.yuyang@huawei.com>
2017-08-02Update git submodulesYujun Zhang1-0/+0
* Update docs/submodules/qtip from branch 'master' - Merge "Replace example with test result from zte apex virtual pod" - Replace example with test result from zte apex virtual pod Change-Id: I69fe891bcedca43688dd438ecbe7ac0b45d0c1ba Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
2017-08-02Update git submodulesYujun Zhang1-0/+0
* Update docs/submodules/qtip from branch 'master' - Merge "revert the usage of qgrid since it is not supported by nbviewer" - revert the usage of qgrid since it is not supported by nbviewer Change-Id: I870bc80064fa202beab6e4715e4f197826bee8c2 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
2017-08-02Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add spec cpu2006 test case" - Add spec cpu2006 test case JIRA: YARDSTICK-764 This work is about support run SPEC CPU2006 benchmark. users must get a "cpu2006-1.2.iso" from the SPEC website, save it under the /home/opnfv/yardstick/yardstick/resources folder (e.g. /home/opnfv/yardstick/yardstick/resources/cpu2006-1.2.iso), user may also supply a runspec cfg file (e.g. /home/opnfv/yardstick/yardstick/resources/files/yardstick_spec_cpu2006.cfg). Change-Id: If4aecc1c14635a07589555196d2edc8bd37d7bdb Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-08-01Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - p/fuel: ci/deploy.sh: Fix vgabios missing link Creating vgabios's missing link in /usr/share/qemu requires sudo. Change-Id: I34dbd55facbccf361d94fa8341e99b76d5bf6276 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-01Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: enables barometer scenarios in daily Change-Id: I959a46ed619d55df3a8c6bd3b3300bad4432b911 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-08-01Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/apex from branch 'master' - Merge "Adds Barometer service" - Adds Barometer service Adds Barometer service as a deploy option to Compute nodes by specifying barometer as true in deploy settings. Barometer packages are installed only for x86_64. Adds scenarios os-nosdn-bar-ha and os-nosdn-bar-noha. Add scenarios to opnfv-apex-common.spec. Temporarily remove references to snmp packages. apex-tripleo-heat-templates: I397d2557639c87ab8afacd076a5b9fd7c056dce7 apex-puppet-tripleo: I878ff8d1e0a8b96f3380bb77f168cd5a4c3f6543 Puppet module is at: https://github.com/johnhinman/puppet-barometer. Change-Id: Ic087c2052f7849ee2cf6c63224558c2b36a8ca1f Signed-off-by: jhinman1 <john.hinman@intel.com>
2017-08-01Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - p/fuel: ci/deploy.sh: Fix deploy without sudo Previous rebase left out the "sudo" invocation for apt-get/yum calls. Change-Id: I97c9785dae88afae6c1aa8a2faf2e5a10f9451a6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-01Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "fuel: s/danube/euphrates/, disable triggers" - fuel: s/danube/euphrates/, disable triggers While at it, also rename some leftover "danube" reference for the armband project. Change-Id: Icddcf19ca9dfd7880ae2f78ed690988bded25abd Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-01Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/releng from branch 'master' - fuel, armband: Drop "-H" arg, fix bridge default MCP does not have a self-test healtcheck suite, similar to old Fuel, so we dropped the "-H" deploy argument (which used to disable healtcheck autorun). Adjust deploy command to reflect this installer change. While at it, fix leftover "pxebr" default installer parameter, which we missed in the previous commit where we changed the default only in releng deploy scripts. Change-Id: I55e1f5cad17687bdf304fbf04d67366dd32ed42a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-01Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - p/fuel: Rebase, drop upstream clone Now that Fuel@OPNFV supports submodule patching again, bring back `make fuel-patches-import`. Change-Id: Ic6f9870d94b6d302f1ebcdc21d54a83f62910af9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-01Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - ci/deploy.sh: Fix "notify" on dumb terminals Dumb terminals (which do not support colors), like "vt220", make `tput setaf` return with an error code, hence bypassing the actual print. Change-Id: Id838583beb30a810aec478ed80d452c6f3203e0f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-01Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - salt.sh: Drop upstream clone in favor of local git salt.sh currently clones the full Fuel@OPNFV git repo from upstream public mirror, preventing us from testing locally edited or new patches. Instead, bring back git submodule handling from old f_repos, clone and patch each submodule locally, then copy the whole parent repo over to cfg01. This is also a first step towards implementing offline deploy support. NOTE: This adds new deploy prerequisite packages: - git (for submodule clone/update); - make (for submodule patching); - rsync (for parent repo replication to cfg01); NOTE: Parent repository is expected to be a git repo, in order to work with git submodules. While at it, perform some minor related changes: - add deploy artifacts (ISOs, qcow2 files) to .gitignore, also used to filter-out such files during rsync to cfg01; - remove obsolete Fuel patches (old f_repos mechanism); - rename "reclass-system-salt-model" submodule; Change-Id: I6210d80d41010b2802e4f1b31acf249a18db7963 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - mcp/scripts: shellcheck cleanup Change-Id: I280d540b461341e14de654186016248eba4d3521 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - ci/deploy.sh: MCP cleanup, sanity checks - disable false-positive shellcheck errors; - fix obsolete backtick usage; - move obsolete arguments to separate section; - add color-enabled "notify" macro for warn/err messages; - remove obsolete code intended for old Fuel; - fix quoting and double-quoting shellcheck warnings; - minor code changes for better readability; - remove "no healthcheck" flag (obsolete); - add mandantory arguments validation; Change-Id: I991836adc8d76466f2b83b1e472bb9ef6989fff3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - ci/deploy.sh: Rework bridge arguments for MCP Change-Id: I20d6dedeaa31f7986eaa35be49c5388c3fdb4b83 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-01Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "fuel, armband: Temporarily remove pxebr deploy arg" - fuel, armband: Temporarily remove pxebr deploy arg Fuel and implicitly Armband switched to a newer format for parsing the "-B" deploy arg, used to pass bridge(s) information. For now, we will default to ",,,", which is equivalent to not setting any default value for any of the 4 possible bridges. NOTE: Armband overrides this on a per-pod basis, since bridge information is POD specific in our lab. Change-Id: I3635b0eb6f8233cf99022a97d5642f2e49197e3b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-01Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Armband: Disable CI triggers for stable branch" - Armband: Disable CI triggers for stable branch - rename "danube" to "euphrates"; - disable "euphrates", to be enabled when ready; Change-Id: Id4932986e19c664b28749d0b6926d825ea632250 Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-01Update git submodulessaksham1151-0/+0
* Update docs/submodules/storperf from branch 'master' - header.html for reporting page JIRA: STORPERF-169 Change-Id: I47814ada495ff1a18b20d34007ab37f84b265f01 Signed-off-by: saksham115 <saksham.agrawal@research.iiit.ac.in>
2017-08-01Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - lib.sh: Use host-passthrough when spawning VMs virsh defaults to using "host-model" instead of "host-passthrough", which not only might lead to a small performance hit on x86, it is also causing compatibility issues with libvirt 3.x. Address this by explicitly requesting "host-passthrough" as the CPU model for virt-install. Change-Id: Ia7c5e8ff906c02fed2193c268cbb3594c5607bc6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-01Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - test_env_action: speedup unittest, don't sleep Change-Id: Ib662032e5133b8fead1c6858905bd13ca40f4dd6 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-01Update git submodulesahothan1-0/+0
* Update docs/submodules/nfvbench from branch 'master' - Initial code drop from Cisco Change-Id: Ie2993886dc8e95c5f73ccdb871add8b96ffcc849 Signed-off-by: ahothan <ahothan@cisco.com>
2017-08-01Update git submodulesJingLu51-0/+0
* Update docs/submodules/yardstick from branch 'master' - Bugfix: port_security_enabled issue JIRA: YARDSTICK-765 When port_security_enabled is not set, VMs are assigned with security group 'default'. When using 'default' security group, all egress traffic and intercommunication in the default group are allowed and all ingress from outside of the default group is dropped by default (in the default security group). This causes yardstick cannot ssh into VMs. If port_security_enabled is not set, we should still add the security group that created by yardstick to the VMs. Change-Id: Ifd22fb452e0077581b6900f8f51c4e3c342a30aa Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-08-01Update git submodulesspisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Fixed logging out the OSCreds. Change-Id: Id5675ff37c1d7e98eceb923194f190e2d5bc1d4d Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-08-01Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/apex from branch 'master' - Merge "Correcting keystone authtoken params for congress" - Correcting keystone authtoken params for congress apex-tripleo-heat-templates: Ibada3c58e2ba870defef356363dbf54d02c8a965 JIRA: APEX-495 Change-Id: I372c1362f4f967345bf4fa6b2b7762155ee33aa3 Signed-off-by: Dan Radez <dradez@redhat.com>
2017-08-01Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Changed keystone_utils#get_project to accept settings" - Changed keystone_utils#get_project to accept settings Added project_settings parameter to allow for more robust queries based on the known settings as required. JIRA: SNAPS-159 Change-Id: I56ecf0cc34bbb91c4cfe2afe83971b614ec80a39 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-08-01Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Added image_settings parameter to get_image()." - Added image_settings parameter to get_image(). With the ImageSettings object, was able to add logic to filter on the image format field in addition to the name. JIRA: SNAPS-157 Change-Id: I6fc51a9d4d03dc9971005ee738e6592d8ed70485 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-08-01Merge "Jira: DAISY-36 Add Daisy doc links for E release"Sofia Wallin6-1/+24
2017-08-01Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Remove useless parameters and rename some parameters in get_conf.py" - Remove useless parameters and rename some parameters in get_conf.py Change-Id: I47949f44ea609932059374b128018e36590e88fd Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-01Update git submodulesdongwenjuan1-0/+0
* Update docs/submodules/doctor from branch 'master' - refactor local installer JIRA: DOCTOR-100 Change-Id: I1e2c53f7a716156e35386d42c0df32a228a78fab Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
2017-08-01Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Fixed test description for snaps_smoke." - Fixed test description for snaps_smoke. Change-Id: Ia533337a07c3a47579d0fa97b6bb3b4b3daf94e5 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-08-01Update git submoduleszhihui wu1-0/+0
* Update docs/submodules/qtip from branch 'master' - Merge "run storperf test by using these scripts" - run storperf test by using these scripts Local test with apex is OK. JIRA:QTIP-248 Change-Id: I47c55ddd88f9722ce83b73a4d7ec91ece2aab2ed Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
2017-08-01Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Fix typo in patch 38381 JIRA: DAISY-56 controller01 -> $name Change-Id: Icd959ca55079a6ac0bfbd181ff134d7decfb89f5 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>