summaryrefslogtreecommitdiffstats
path: root/docs/submodules
AgeCommit message (Collapse)AuthorFilesLines
2020-04-28Update git submodulesLukasz Muszkieta1-0/+0
* Update docs/submodules/so.git from branch 'master' to aefb6fd6b91be3aa44b5e8183fa1c9e471853c29 - Merge "add junit coverage" - add junit coverage Issue-ID: SO-1576 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com> Change-Id: I993537873f19329753a958faf708119b5aafa9b7
2020-04-28Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 33a4512b6eb6204e2209a788b06153a889629f4e - Refactor CsarUtils::getEntryData Change-Id: I1732ae05cfbe93c1bef8c249e16088a0cad34106 Issue-ID: SDC-2812 Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
2020-04-28Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 76593bfbb1a233d76367abe903734c13b75f3a35 - Refactor CsarUtils::populateZip Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I136ebda0ff92d6c42368f102ccf2b10f37524808 Issue-ID: SDC-2812
2020-04-28Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 83df155640dd015d68f01f784dfab24d4c252af1 - Remove csvReportFilePath from ValidationConfigManager This commit aims to extract the csvReportFilePath field from ValidationConfigManager in order to improve testability. This commit contains multiple minor modifications resulting from bubbling up the csvReportFilePath static field to where it is actually set. Put differently, most of the modifications result from changing the signature of the functions which formerly relied on ValidationConfigManager.getCSVReportFilePath. Change-Id: I82c3b0fca8a0f407319e40ecfff45e89ec1d4323 Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Issue-ID: SDC-2499
2020-04-28Update git submodulesChuyi Guo1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 71508d68626d2a38abc3ad9c896061feab719a42 - Merge "fix: Fix the bug that the model msg is error when deleting the vnf package" - fix: Fix the bug that the model msg is error when deleting the vnf package Change-Id: I95baaba0184434c0609a9efe1cf0161377726eeb Issue-ID: USECASEUI-305 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-04-28Update git submodulesBogumil Zebek1-0/+0
* Update docs/submodules/aaf/certservice.git from branch 'master' to b237c345a2bca5cd8630bf18cf8dde1ada5c8a41 - Update release note Issue-ID: AAF-1132 Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com> Change-Id: Ic8d37e5033e17412f14fd373ea5d260f0d3730f3
2020-04-28Update git submodulesOfir Sonsino1-0/+0
* Update docs/submodules/sdc/sdc-distribution-client.git from branch 'master' to c7bd0548fd6f1dff6170f2767d9428264e19bc92 - Releasing 1.4.1 Change-Id: Idbe8853c72b799ada2dc25cbab442ed46548aaac Issue-ID: SDC-2721 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2020-04-28Update git submodulesroot1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 6714c077a8b9380776def2fd9e39bd4d694678fc - Changes for MDONS usecase Change-Id: I0845854224ec78ed21e64ccfd7f2c1b710221b7c Issue-ID: USECASEUI-371 Signed-off-by: root <preethamshyam.sathiyaseelan@us.fujitsu.com>
2020-04-28Update git submodulesxu ran1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 1aed3b28640e3616164b241cb5b5220e5a7d3b35 - Merge "Changes for MDONS usecase" - Changes for MDONS usecase Change-Id: I9c795fa2041c195ca29300398fb89b1cc3606ae7 Issue-ID: USECASEUI-371 Signed-off-by: root <preethamshyam.sathiyaseelan@us.fujitsu.com>
2020-04-28Update git submodulescyuamber1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to e978667f57e600c89e7ee421366dc37ef2685121 - fix: Fix bugs image for services-list Change-Id: Ic7b3240781509a892a01cd3dbc8ba53cae96bba0 Issue-ID: USECASEUI-305 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-04-28Update git submodulesAlexey Sandler1-0/+0
* Update docs/submodules/vid.git from branch 'master' to b4af2036941854aa45aa9d53e06bd92de5a842d3 - Can't delete the second vfModule in drawing board - fix. Given two vfModules created under the same vnf, when try to delete the second vfModule its status not updated to deleted. Issue-ID: VID-819 Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com> Change-Id: Ie0c349d78940161d66a125782d917d28988e3c9d Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
2020-04-28Update git submodulesJohn J. Franey1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to f85e8b191aedc1e5a751a54184427fb0a65c8a0a - release 2.1.21 Issue-ID: AAF-1136 Signed-off-by: John J. Franey <john.franey@att.com> Change-Id: Icee87694c61ff095095aeb0f766673eb7e785117
2020-04-28Update git submodulescyuamber1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to b9d20d917c0e2864c221a6b073b355ca57228637 - fix: Fix bugs of Wrong number of services displayed for services-list Change-Id: I07070e1786e5406c76232d97953a0f54cb30474e Issue-ID: USECASEUI-438 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-04-28Update git submodulescyuamber1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 9f2baeca378ab8f465e07a1a09be2dba8f2a15aa - fix: Fix bugs reported after deleting all customers of management page Change-Id: I6182cab33998860e4b53ace8b394655457f82170 Issue-ID: USECASEUI-305 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-04-28Update git submodulescyuamber1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 46c4844ebb561c9f879c8fe74ce4d8a688eef486 - fix: Fix the problem that the picture cannot be displayed of ns create model page Change-Id: I68cb06a60dbd6ae3c8a7f2495466f863a2407548 Issue-ID: USECASEUI-370 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-04-28Update git submodulescyuamber1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to c46bae2a8435ae6e27e242c0a158f4c99214461f - fix: fix bugs of adding customers Change-Id: I177fc3a15aa49beefc3ea5c372a2e60dc594c90d Issue-ID: USECASEUI-306 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-04-28Update git submodulesdyh1-0/+0
* Update docs/submodules/modeling/etsicatalog.git from branch 'master' to 0a89108e137a56bc9fb55fe3b0e49459b6e403ee - fix value of MSB address Issue-ID: MODELING-356 Change-Id: I2f4d489167a847a293d34b2a97d9c9fecf25e6be Signed-off-by: dyh <dengyuanhong@chinamobile.com>
2020-04-27Update git submodulesBenjamin, Max (mb388a)1-0/+0
* Update docs/submodules/so.git from branch 'master' to 0151f5c120f7d325a337efd522f7b46b0f027a1f - Renamed duplidate flyway migration Two migrations with the same name were merged independently Issue-ID: SO-2828 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I304a5f3498cf4b8e7e6f4600ae1a0017bf443723
2020-04-27Update git submodulesPatrick Brady1-0/+0
* Update docs/submodules/appc/deployment.git from branch 'master' to dd9a643303f4abbce8d11d44811b5c50b251e46a - Docs: Update index file Update the docs index file to include the new guides. Change-Id: Idd94c3c173e5142b0f8cd92ab1b15995cbf61a58 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1774
2020-04-27Update git submodulesPatrick Brady1-0/+0
* Update docs/submodules/appc/deployment.git from branch 'master' to a5dcaaa959e28efab6a746d018de8fd01cc059f0 - Docs: Rename version increment guide Change-Id: Iddaae9927aa9b9f87169060199738de6491864e6 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1873
2020-04-27Update git submodulesRitu Sood1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to b8b6eaeea2fdbb6b3c2a4d079603b9f09bda995d - Merge "Install criproxy binary in /usr/local/bin instead of /tmp. Issue-ID: MULTICLOUD-1051" - Install criproxy binary in /usr/local/bin instead of /tmp. Issue-ID: MULTICLOUD-1051 Signed-off-by: Eric Tang <qcorba@gmail.com> Change-Id: I96443ee539de0e2a18011148f86f97e70634cae3 Signed-off-by: Eric Tang <qcorba@gmail.com>
2020-04-27Update git submodulesTony Hansen1-0/+0
* Update docs/submodules/dcaegen2.git from branch 'master' to 1d9549e5adf1feab7a5b269e3748b5027fec3746 - Merge "dcae r6 doc updates cont." - dcae r6 doc updates cont. Change-Id: I2303d59ad9491c555adb70de57eb14ab1fa7233c Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-1891 Signed-off-by: VENKATESH KUMAR <vv770d@att.com>
2020-04-27Update git submodulesa.sreekumar1-0/+0
* Update docs/submodules/policy/parent.git from branch 'master' to afa8f83e956647dff10134cc3575e8e8173061c9 - Updating group update request json in PAP documentation Issue-ID: POLICY-2515 Change-Id: I2861d81d58acbf88ecb8e7d2b51bb95c52ce20c5 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2020-04-27Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 5523a23a5d8a66f690fc2dec7975cb8bfb8db975 - Merge "Fix bugs reported by sonar/nexus-iq" - Fix bugs reported by sonar/nexus-iq Rollback fixes for Nexus-iq, it does not help Issue-ID: CLAMP-841 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I280c4cf612298d1cda64b8ed39a0a416f936fdc4
2020-04-27Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 965914be0781fb320ce84126ed03f8e5cc1f7dde - Merge "Fix bugs reported by sonar/nexus-iq" - Fix bugs reported by sonar/nexus-iq Fix bugs reported by sonar as critical, major, ... Issue-ID: CLAMP-841 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I23122c064b64ebe2a2c8c33540c4be0b0895157d
2020-04-27Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 79ec04301a726e8c48f1275877cb852d2d74adc0 - Work around potential NullPointerExceptions in HeatTreeManagerUtil - Replace null return values with empty Map objects Issue-ID: SDC-2928 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I3357a8789a00201a7ffda1dbf0be5f08cbb9c33b
2020-04-27Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 80a6f12466e31e76ffd0edf46934cae22b2bf171 - Merge "Fix bugs reported by sonar/nexus-iq" - Fix bugs reported by sonar/nexus-iq Fix bugs reported by sonar as critical, major, ... Issue-ID: CLAMP-841 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I3ec04016541e4a644c02e5c4601c0ee608eb0ca3
2020-04-27Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 01443d4c9bb69f75070b4b42ee531cb445ed77a4 - Fix bugs reported by sonar Fix bugs reported by sonar as critical, major, ... Issue-ID: CLAMP-841 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I7c33f83bc79be0b3b14b4f58f50a59471f3ab11d
2020-04-27Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 400f7fc1b63616e0146605b67883e6ceff0ae619 - Prepare 5.0.6 Prepare 5.0.6 Clamp release Issue-ID: CLAMP-833 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I459df08e623318e1b07912cccec5143d4f67008c
2020-04-27Update git submodulesJean-Yves Geury1-0/+0
* Update docs/submodules/dcaegen2.git from branch 'master' to 119b02361f6eb3d9f34202d2ae4c2dab467dfadd - bbs-ep documentation updates for DCAEGEN2-2105 - installation documentation Updates for bbs-ep installation from blueprint repository. Issue-ID: DCAEGEN2-2105 Signed-off-by: Geury <jean-yves.geury@nokia.com> Change-Id: I1bf163e53fbc3fe6631980e53c2bb95f92ba3d27
2020-04-27Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to f69c491ed06b017fe439ff8ff48ac896e93d0f52 - Merge "[APPC] Enable password generation for sdnctl" - [APPC] Enable password generation for sdnctl Start using auto-generated password for sdnctl db instead of using the one hardcoded in values.yaml Issue-ID: OOM-2275 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I0a3b526387830d2bf44e88281896d0b87a92ce94
2020-04-27Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to c5082347acfd7b2272066de857c61e370a345b49 - Merge "[APPC] Enable password generation for appcctl" - [APPC] Enable password generation for appcctl Start using auto-generated password for appcctl db instead of using the one hardcoded in values.yaml Issue-ID: OOM-2275 Change-Id: I3884a5b30a47d602b28136f984ebe4492ec43fb2 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
2020-04-27Update git submodulesPatrick Brady1-0/+0
* Update docs/submodules/appc/deployment.git from branch 'master' to cc4386a0a36a6c24f4f3639bb9ffb3b58d2056e8 - Docs: New versioning guide A new guide to describe the process of incrementing APPC versions after a release is made. Change-Id: I13ca4c9a15cf2a61b04ec231dce924a7ca0792b0 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1873
2020-04-27Update git submodulesPatrick Brady1-0/+0
* Update docs/submodules/appc/deployment.git from branch 'master' to 44c82ed0a2a99485f0051f1b88e728e4c18b1d3c - Docs: New releasing guide New guide on how to perform the release process. Change-Id: I2935f3644de89deb5b45cf84e63b8f048ab26931 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1872
2020-04-27Update git submodulesJames Forsyth1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 069b37742d1b6d4db1cc32ae8617bf59d30d03b2 - Update git submodules * Update kubernetes/aai from branch 'master' to 2d6141ab8bd7bfe58f5da0483e578032226e7ebb - Merge "Use released 1.6.8 container" - Use released 1.6.8 container Issue-ID: AAI-2883 Issue-ID: AAI-2593 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I0dd8217c2fee8596e663d65206f92bc5446f02ea
2020-04-27Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 38dfe516feabe7bdb41c3c6ccd4fd6bba28588a6 - Merge "[CLAMP] use common templates for logs" - [CLAMP] use common templates for logs Using the common templates for centralized logging. Issue-ID: OOM-2370 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I4824e11bd2be971d15e3a39510f544d2c36b05fd
2020-04-27Update git submodulesmrichomme1-0/+0
* Update docs/submodules/integration.git from branch 'master' to 151f6bd9846696668cdf395706dfc567442823e4 - Exclude VFC-redis from xfail list Issue-ID: INT-1564 Signed-off-by: mrichomme <morgan.richomme@orange.com> Change-Id: I32d9e25e4d4d0bfab7fdfa5979db266a0826604c Signed-off-by: mrichomme <morgan.richomme@orange.com>
2020-04-27Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to c5c722c70df7be7ed0693b8169d876aa57b202c4 - Merge "[POLICY] fix: Process also content of pd-pdp" - [POLICY] fix: Process also content of pd-pdp By mistake we've been processing only pe volume but recently we removed hardcoded passwords also from other files in pe-pdp. To fix this let's improve our init container and process files in both volumes. Issue-ID: POLICY-2516 Change-Id: Id97a64708803b72ab88362ccc5b88970661146e6 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
2020-04-27Update git submodulesXue Gao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 615eb9bc91c2e685c4eebb96b44b157fd71fa8f0 - Merge changes Id525d532,I91723b83 * changes: Fix bugs reported by sonar Fix bugs reported by sonar - Fix bugs reported by sonar Fix bugs reported by sonar as critical, major, ... Issue-ID: CLAMP-841 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Id525d532d4f405216da44f95503e06e172458e70 - Fix bugs reported by sonar Fix bugs reported by sonar as critical, major, ... Issue-ID: CLAMP-841 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I91723b83289e25d6e27b0c925107e50314f441fc
2020-04-27Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 4a4d45fadfbb61e8e147f2b62e5dab5ac55403e8 - Enabling JS in SonarCloud Configures jest test coverage and missing sonar properties for javascript file scan and report. Change-Id: I9170a176cc4e580ac14f669c334ee949942503f6 Issue-ID: SDC-2741 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-27Update git submodulesmrichomme1-0/+0
* Update docs/submodules/oom.git from branch 'master' to b122e0d4d6b42dc7d92435a8d6b0e0b644f90ebb - Update git submodules * Update kubernetes/robot from branch 'master' to b73d77ca2e9df3d7300ca85b5593d89a9271d13a - Bump teststuite 1.6.0 to OOM Master Issue-ID: INT-1558 Signed-off-by: mrichomme <morgan.richomme@orange.com> Change-Id: Iaf544043476e03589464d8e47ba4f89f7cbd8e5d
2020-04-27Update git submodulesyangyan1-0/+0
* Update docs/submodules/cli.git from branch 'master' to 80abcefc5fb61361f9b28a34077f75ce68058db6 - Update vfc cli command Change-Id: If65da8d9a72a7d39508136903b851e04e6258e52 Issue-ID: CLI-268 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2020-04-27Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to bebff57a6a661825d26a17813fe4a3230ac6f9db - Fix null pointer warning - Check name and value in method setToscaPresentationValue Issue-ID: SDC-2926 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I0d66b29c84139afff92065769bf1b79082959333
2020-04-27Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 3c80616437c89c14b3734a3876b48faafd2129e9 - Add null test to ComponentBusinessLogic - Added test in `getFilteredComponentInstanceProperties` for null value - Removed nested `if` statements in `isMatchingComplexPropertyByRecursively` Issue-ID: SDC-2907 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I13a47b0dfe7aa6dec845a856c58bba8be5c1eead
2020-04-26Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 8ddc6c9609581167a35404289e5015097346fea9 - Update WORKFLOW Artifact Type configuration To add an operation with an existing Workflow in a RESOURCE, the Artifact Type WORKFLOW needs to support the extension "bpmn" and the component type "RESOURCE". Change-Id: Ic7eb9afe3ced0348f7aadcc43edf121a0bdcf015 Issue-ID: SDC-2954 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-26Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to c9e4d0ec9f9d3ac9f420c12573964e511baf8831 - Fix potential NPE in ArtifactsBusinessLogic Fixes potential NPE in ArtifactsBusinessLogic introduced by SDC-2754. Change-Id: If53915ffc41ddd0dbcf00ea318cdae6f1b5471ad Issue-ID: SDC-2959 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-25Update git submodulesSai Gandham1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to d7c1a1b6c4218e3f470f86e4ff67fdcdc86f0ea5 - Merge "Add StandAlone Unix Configurations Include scripts, podman starts, minor code changes." - Add StandAlone Unix Configurations Include scripts, podman starts, minor code changes. Issue-ID: AAF-1137 Signed-off-by: Jonathan Gathman <jgonap@stl.gathman.org> Change-Id: Ief72d93e607dbe62875f592978ee15084c8310d2
2020-04-25Update git submodulesJohn J. Franey1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to e4220946ef3feb864ed45e4fc14682be2016dc1b - Enable deploy plugin in all poms. maven will then push all the artifacts to nexus when the deploy goal is invoked. Issue-ID: AAF-1136 Signed-off-by: John J. Franey <john.franey@att.com> Change-Id: I1957cf2daf60507edae65e8cacf7730bf08a6adb
2020-04-24Update git submodulesManjunath Ranganathaiah1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to 8d2d1c91442bf52b35a23ae0f49badb58a0b56cd - Fix missing key error while getting resource inst Issue-ID: MULTICLOUD-1005 Signed-off-by: Manjunath Ranganathaiah <manjunath.ranganathaiah@intel.com> Change-Id: I79e9090769f9ef2ce979d5f1a3b5264171164ae0
2020-04-24Update git submodulesHePeng1-0/+0
* Update docs/submodules/aai/esr-gui.git from branch 'master' to 37690e1d995c19a32bfbe149ceb8446897865001 - Add NFVO GUI internationalization File NFVO lacks a internationalization Chinese attribute file,completes it. Issue-ID: AAI-2847 Change-Id: Ic97ecb3b0029f50591e677391fa0fc194e98917e Signed-off-by: HePeng <he.peng6@zte.com.cn>