summaryrefslogtreecommitdiffstats
path: root/docs/submodules
AgeCommit message (Collapse)AuthorFilesLines
2019-04-16Update git submodulesPamela Dragosh1-0/+0
* Update docs/submodules/policy/apex-pdp.git from branch 'master' to f2eb200778b2805f145d55f39ab61ac8c36826c3 - Merge "One year cert with new component names" - One year cert with new component names Change-Id: Ia3025f2a0eada4f53623bb45d5849ceddf368925 Issue-ID: POLICY-1580 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2019-04-16Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 4dae1b2293ac35a68b59b3f936102a2d24538b24 - Merge "CDS index content" - CDS index content Change-Id: I031b0b07fa09cb1db329ed091083c5f10de4e1fd Issue-ID: CCSDK-1221 Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
2019-04-16Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 583ab2d2660ea46d67301c239cbafa70f0aed075 - Merge "Test template- display message" - Test template- display message Add code to display custom message to user in test screen Issue-ID: CCSDK-1227 Change-Id: Ief1492722f30a5dd6f2bb43e984f2ed72a2f21bd Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-04-16Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 8344dc8ae21ece556581b9820b0f018e68ae4a0d - Merge "Fixed issue ccsdk-1223" - Fixed issue ccsdk-1223 User was unable to add folde/file in the root level of the file-manegr. fixed this issue Issue-ID: CCSDK-1223 Change-Id: I6f9960d3d8545b364385cc235f9117a488a5cef1 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-04-16Update git submodulesPamela Dragosh1-0/+0
* Update docs/submodules/policy/apex-pdp.git from branch 'master' to ad9e9c590b5aadbd5f95fb6f93718f7922762cf1 - Merge "Fix Security and Unit Test DB issues" - Fix Security and Unit Test DB issues This review removes more links to the Zookeeper version 3.5.4-beta with Zookeeper version 3.4.14. It also replaces the Derby in-memory database with the H2 in memory database for unit tests. Issue-ID: POLICY-1540 Change-Id: Ic44f2e866644114b7c0cf66aac7e528017b8206b Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-04-16Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 114206c8104c7815851f411342c0e2bd5cffa096 - Merge "fixed alert box issue" - fixed alert box issue moved alert box to right place (inside the subscriber) Issue-ID: CCSDK-1212 Change-Id: Ifbddfde3f9aff8a2f50c76c4513da149c60ee665 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-04-16Update git submodulesDominic Lunanuova1-0/+0
* Update docs/submodules/dmaap/dbcapi.git from branch 'master' to e43ce2a29d9060da4d7fcea985334a49033c2bdb - Merge "switch to valid aaf url property" - switch to valid aaf url property Change-Id: Iea17c7c00b29c994d92ff98e4756bf3d904a2458 Issue-ID: DMAAP-1168 Signed-off-by: Tomek Kaminski <tomasz.kaminski@nokia.com>
2019-04-16Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to ed0e88d17989f36501ce0995c336fafcce55e3eb - Merge "Install SDNR OOF PCI feature in SDNC bootup" - Install SDNR OOF PCI feature in SDNC bootup Modification to startODL.sh file to install sdnr-northbound-all feature Change-Id: If7656b0614aec7f23f3e44634cd42098633003d0 Issue-ID: SDNC-730 Signed-off-by: SandeepLinux <sandeep.shah2@techmahindra.com>
2019-04-16Update git submodulespkaras1-0/+0
* Update docs/submodules/dmaap/dbcapi.git from branch 'master' to ece3a625175df4d74d890d67f584560630e9ed33 - AllowAll api policy added Change-Id: I1673b5647b0917ca18fe9b814d876a07d881021a Issue-ID: DMAAP-1166 Signed-off-by: piotr.karas <piotr.karas@nokia.com>
2019-04-16Update git submodulespkaras1-0/+0
* Update docs/submodules/dmaap/buscontroller.git from branch 'master' to a433b642cff989aabc4c3f918daaa90377a92453 - AllowAll api policy added Change-Id: Idf191809302c723b0e18e1c4f9b3c1c712b16919 Issue-ID: DMAAP-1166 Signed-off-by: piotr.karas <piotr.karas@nokia.com>
2019-04-16Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/features.git from branch 'master' to 7ab848ccda31cef44d4a817f22f2edd5a3d4a205 - Merge "SDN-R read2docs" - SDN-R read2docs Add docs folder and project with src Change-Id: I0299c5984c747a40a8dd1e3f79479b9e9d729d50 Issue-ID: SDNC-683 Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
2019-04-16Update git submodulesSamuli Silvius1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to cceed25e6c773c18e479e246ddeadebc82870f70 - Molecule test run wrappers against CI Add ci-molecule.sh script to work as an interface towards CI pipe for running Molecule tests. Issue-ID: OOM-1749 Change-Id: Ib6e74d9b03b569a172a606f4db41b707602bf279 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
2019-04-16Update git submodulesprakash.e1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to 3da4178f0341a8c897770c3f2aeb7e13806dd3d6 - unused parameter tenant-id is removed unused parameter tenant-id in vpn-deactivate DG is removed and tmp.nidx is modified to tmp.vidx Change-Id: Ibd8629b2309ae0f34a49ba8f9f50094d60728a50 Issue-ID: SDNC-659 Signed-off-by: Prakash.E <prakash.e@huawei.com>
2019-04-16Update git submodulesprakash.e1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to 58a3b6851697cd28042583d6f60a6845694a2f74 - context-parameter returned to caller DG is not correct parameter tmp.vidx is used in vpn-activate DG, updated validate-vpn DG by returning tmp.vidx inplace of tmp.nidx Change-Id: I42ddac5eb6384dd01992c2bbb387a3cc14aade54 Issue-ID: SDNC-659 Signed-off-by: Prakash.E <prakash.e@huawei.com>
2019-04-16Update git submodulesprakash.e1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to fac6813d763bd635d66fd2e213330bc2e6501b77 - Fix Authorization Failed issue in SDWAN VPN activate Fixed vpn-activate DG by calling sdwan-get-tenant-auth DG to fix Authorization issue Change-Id: I0ced9b9a1630baaffdee7402e609de9c64f97ed4 Issue-ID: SDNC-659 Signed-off-by: Prakash.E <prakash.e@huawei.com>
2019-04-16Update git submodulesprakash.e1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to 4b685f825bedb03d135f7f5c9b07f52efd718953 - Fix SDWAN VPN-create DG to update relationship-list in AAI update AAI with generic-vnf and sdwan-vpn relationship-list Change-Id: I8ae2ddcf8d92078b15d9523b07901ae6e2c99b68 Issue-ID: SDNC-659 Signed-off-by: Prakash.E <prakash.e@huawei.com>
2019-04-16Update git submodulesKotagiri, Ramprasad (rp5662)1-0/+0
* Update docs/submodules/ccsdk/dashboard.git from branch 'master' to f067b587f817d91d6715c348233240b59b5df2ef - update ca certs trust store Update docker container script to update DCAE ca cert Fix the page title on the landing page Issue-ID: CCSDK-1011 Change-Id: I7e09b43d5cd6e25b242dfdd2c6c1c0819013e1fc Signed-off-by: Kotagiri, Ramprasad (rp5662) <rp5662@att.com>
2019-04-16Update git submodulesa.sreekumar1-0/+0
* Update docs/submodules/policy/apex-pdp.git from branch 'master' to 00ee73f723560c825818eab41a4d3db9785627d4 - Changes for RestServer support and some sonar fix 1) Changes to add RestServer to the PDP-A for healthcheck. 2) Adding Junit testcases. 3) Fixing some sonar issues. 4) Fixing checkstyle issues. Change-Id: I03530190c733432d219284dda9d9d4cc32ab0773 Issue-ID: POLICY-1632 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-04-16Update git submodulesSeshu Kumar M1-0/+0
* Update docs/submodules/so.git from branch 'master' to e50d79d578bc524d54dad066c69cb65eb907a07c - Merge "License agreement changes" - License agreement changes License agreement changes Issue-ID: SO-1481 Signed-off-by: sunilb <sb00577584@techmahindra.com> Change-Id: I475d25bb040907a0c48b579f6d3091c41ccfec25
2019-04-16Update git submodulesBartek Grzybowski1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to 8aee0eede3cff78304000ac64768b224aad32045 - Fix for running Molecule on Centos host On Centos7.6 /dev/loop* device nodes are created dynamically upon alocation (by default there is no /dev/loop<N> device nodes) - this has effect of failing to allocate those in Docker container, even when run in privileged mode. Change-Id: If2c852de3a74ea7fe1df9f5c863f184b9bc13acb Issue-ID: OOM-1774 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
2019-04-16Update git submodulesseshukm1-0/+0
* Update docs/submodules/so.git from branch 'master' to f930985d800bc1984dd6b2ec57c16bf6b2df7ca7 - update Dublin SO arch details Issue-ID: SO-675 Change-Id: I7f9ac7d81a4b58f86ed8e0b22519f46966ca14ae Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2019-04-16Update git submodulesIsaac Manuel Raj1-0/+0
* Update docs/submodules/so/libs.git from branch 'master' to a5c64f249297b8473c436b9cb995ce9339c88fdf - Change member variable to transient for serializable class Made member variable to transient to enhance performance for serializable class. Issue-ID: SO-1490 Change-Id: Idc34bd665a90c97c2c291030f08e3049ddfff0b6 Signed-off-by: Isaac Manuel Raj <isaac.manuelraj@huawei.com>
2019-04-16Update git submodulesIsaac Manuel Raj1-0/+0
* Update docs/submodules/so/libs.git from branch 'master' to 84b3969c3661a62447ff406abf21ddc004ff673a - Code Enhancement (Sonar Fixes) Sonar Issues Fixes Issue-ID: SO-1490 Change-Id: Ic23fb3b0ad0d1cf9ed7d35a247addfb7457810f8 Signed-off-by: Isaac Manuel Raj <isaac.manuelraj@huawei.com>
2019-04-16Update git submodulesseshukm1-0/+0
* Update docs/submodules/so.git from branch 'master' to ad176ba6a1ad9332e80592bdf2e2bbbc4fed7b87 - update the SO arch for Dublin Issue-ID: SO-675 docs/images/SO_Architecture_1.png Change-Id: Ic101073737242809c54cba6b0f35088506b53ea4 Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2019-04-16Update git submodulesLianhao Lu1-0/+0
* Update docs/submodules/policy/distribution.git from branch 'master' to b9572fadc14d054dbfc2dcce3ee2df663e250f04 - Fix more sonar issues Fixed the sonar issues: S134, S3725, S2129. Issue-ID: POLICY-1638 Change-Id: I1a91b8e5e071a770faf8182e8ac1ada04b63599e Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
2019-04-16Update git submodulesSamuli Silvius1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to 747a8e202cf5f959206ad1af2bf38f7ea1a6440f - Molecule container for running Molecule Add own Dockerfile and build script for creating customized molecule runner image from Molecule image provided by https://quay.io/repository/ansible/molecule. Customization enables running of molecule container with current host's user to avoid root owned files bloating to developer's machine. Add wrapper script molecule.sh to utilize custom image and suitable for testing offline-installer roles. Issue-ID: OOM-1768 Change-Id: I14ed75decb8fa637c044675543de56f1c0796271 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
2019-04-16Update git submodulesKanagaraj Manickam1-0/+0
* Update docs/submodules/cli.git from branch 'master' to 34605c95ea7a9af4c4b86a4b5dee81a40d60686f - Merge changes I29728c5d,Ic02b092e * changes: Add oclip service entry Add dublin in OCS yaml names - Add oclip service entry Issue-ID: CLI-154 Change-Id: I29728c5d002b9bd37b3b82c78cfc45d81644a564 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> - Add dublin in OCS yaml names Issue-ID: CLI-154 Change-Id: Ic02b092ee7c14a99190f8360ebeed5c94797aba8 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
2019-04-16Update git submodulesXue Gao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 6aabe34a66cfc4eca0152a873161461322f1adb4 - Merge "Removed code duplication in PolicyClient" - Removed code duplication in PolicyClient Removed code duplication in PolicyClient according to Sonar analysis Change-Id: I7fd7bdee228eb80661a8416ffc0aab0b2e8c7e04 Issue-ID: CLAMP-343 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
2019-04-16Update git submodulesSamuli Silvius1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to 379df9c2c4159b615b09aa12b9ef1590a989cb85 - Molecule tests for certificates role Issue-ID: OOM-1762 Change-Id: Ic13d7ec775a52ad95fc0388e8b84ea8ab7367666 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
2019-04-16Update git submodulesSamuli Silvius1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to bf6776cc01865b8ba392fdbec18e28bf2a362b05 - Molecule tests for docker role Issue-ID: OOM-1759 Change-Id: I9e1ee7f248147b3f7229625c7a20fa84e8e67aac Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
2019-04-16Update git submodulesMichal Ptacek1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to e3c829675916391011e86ee78a404570b99bc51a - Merge "Molecule tests for resource-data role" - Molecule tests for resource-data role Initial molecule tests. Tests now ssh transfer but test files fully supports also testing nfs transfer. Creating nfs transfer as separate scenario later when find out better ways to share common code. Issue-ID: OOM-1754 Change-Id: Ia728ecfed4378c01f7e305d5a4446b0172fe42d9 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
2019-04-16Update git submodulesMichal Ptacek1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to c7501485d81a9a967b50b71d5a19867d1cf309f1 - Merge "Molecule tests for firewall role" - Molecule tests for firewall role Issue-ID: OOM-1757 Change-Id: I48639bd0fb67383a58f736aa1c12c38e3ddc9ab0 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
2019-04-16Update git submodulesMichal Ptacek1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to 50487218e4cddd1261d4d41c27ae4eba54d1ffab - Merge "Molecule role tests for setup role" - Molecule role tests for setup role Issue-ID: OOM-1742 Change-Id: I3087952f3d4e5de20af83e714c0d5444999a5ee2 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
2019-04-16Update git submodulesMichal Ptacek1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to 765c16bf21409add3b3810a5b3f025345215039f - Merge "Molecule tests for package-repository role" - Molecule tests for package-repository role Issue-ID: OOM-1755 Change-Id: Iac20072200f24a3102c9ed2edf5c5aa8054dd9c2 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
2019-04-16Update git submodulesagileone1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 821ddb419fb27d73bd00ef802a9c0fd1bf824bd6 - Adds a new artifact for controller blueprint Defines CONTROLLER_BLUEPRINT_ARCHIVE artifact type for PNF and VF. Issue-ID: SDC-2139 Change-Id: Ib28bb25a6751b053ffe50323bb7c16576bc181f4 Signed-off-by: agileone <serge@agilitae.com>
2019-04-16Update git submodulesVictor Gao1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to b99e5e9473e4a3abdc5980abf6a9132249e913b8 - Support BBS Modeling in SDC Change-Id: I9d5e960ed7ae46ea94d52fd14438f01948ff53dc Issue-ID: SDC-2228 Signed-off-by: Victor Gao <victor.gao@huawei.com>
2019-04-16Update git submodulesVidyashree Rama1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to d5f36a1f874e7045abec81dac2e249aa5e5be051 - Fix Checkstyle issues Fix Checkstyle issues Issue-ID: CLAMP-328 Change-Id: Idecd87abbf3765a7e77e2219df1063e732bb04b0 Signed-off-by: Vidyashree Rama <vidyashree.rama@huawei.com>
2019-04-16Update git submodulesefiacor1-0/+0
* Update docs/submodules/dmaap/datarouter.git from branch 'master' to 1c11ab87dd4954903734c8a95a17a56aefea4758 - pom updates for version settings Refactored some of the fabric8 also. Change-Id: Ib5a62cab9d917728d42f54a1bbe42b937d48793e Issue-ID: DMAAP-854 Signed-off-by: efiacor <fiachra.corcoran@est.tech>
2019-04-16Update git submodulesKanagaraj Manickam1-0/+0
* Update docs/submodules/cli.git from branch 'master' to 90cfd4e7091c8cc551443c1a82149fbe29fd1940 - Merge "CLI command to delete cloud subscription" - CLI command to delete cloud subscription Change-Id: I3597e8188c75af48690a4ae0fa323a1ff5363126 Issue-ID: CLI-160 Signed-off-by: Itohan Ukponmwan <itohan.ukponmwan@intel.com>
2019-04-16Update git submodulesXue Gao1-0/+0
* Update docs/submodules/oom.git from branch 'master' to b78ad8b04fff7bf5a97b828dbea6ab0a9e5817be - Merge "Update CLAMP mariadb version to 10.3.12" - Update CLAMP mariadb version to 10.3.12 Update to new mariadb version for Dublin along with a few SQL updates. Issue-ID: CLAMP-324 Change-Id: Ia0a095111332768af97d82f606d7c1048bfd812c Signed-off-by: ChrisC <christophe.closset@intl.att.com>
2019-04-16Update git submodulesyunlong ying1-0/+0
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master' to 46901da51522e44fbac7290e28d72945b5ce47e1 - Merge "update vfc doc" - update vfc doc Issue-ID: VFC-1345 Change-Id: If5d4500623a71a765d9963055f05c5d28c5c7055 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2019-04-16Update git submodulesTomáš Levora1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to 0c4706b81b274d2cf5c0172b48672b8f9e4a2d4d - Merge "Add monitoring script for deployment progress" - Add monitoring script for deployment progress Issue-ID: OOM-1724 Change-Id: Ie634a441641abd3afd4093661c5d4f57245946ee Signed-off-by: Milan Verespej <m.verespej@partner.samsung.com>
2019-04-16Update git submodulesBin Yang1-0/+0
* Update docs/submodules/multicloud/framework.git from branch 'master' to e8697face7909927a9ddb418f116c76e3c6d8c8f - Merge "Fix the sonar issue and clm issue" - Fix the sonar issue and clm issue . Fix the bugs by using try-with-resources method . Add unit test for GsonUtil . Fix the org.springframework : spring-web issue by removing the dependency in forwarding plugin Change-Id: I01f6461ea2a0f0363247dd3571dd56dcf68a7f90 Issue-ID: MULTICLOUD-569 Signed-off-by: liboNet <libo.zhu@intel.com>
2019-04-16Update git submodulesfujinhua1-0/+0
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master' to dfe17e42ca2c6236a55f47a40a120a2a143b839d - Fix docker init sh for nslcm Change-Id: Ia94ec527150cffdd503a71b248968b7a98abf2c4 Issue-ID: VFC-1306 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
2019-04-16Update git submodulesKiran Kamineni1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to ef27495f054957e387c4f078dc9b9af9e40a2acc - Fix build error Build is broken because of some changes that were merged without being rebased on dependent patches. Issue-ID: MULTICLOUD-350 Change-Id: If8bd455103dea3191fedb39ea525efaafb145953 Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
2019-04-16Update git submodulesyunlong ying1-0/+0
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master' to 9a34158a3b25cc04d3a4a3771091bd243becdf09 - Merge "Add db migrations py for nslcm" - Add db migrations py for nslcm Change-Id: I86904200460392e4c643a6222d109f9378a3d38c Issue-ID: VFC-1306 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
2019-04-16Update git submodulesyangyan1-0/+0
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master' to c1e3d72d21dc250e81a21e714a86245495d26006 - rm python manage.py --fake from project Change-Id: I8e92f5a2955ff3080a40bef90f7898d0a216b28f Issue-ID: VFC-1359 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2019-04-16Update git submodulesguochuyicmri1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 1d4225938f4975fa49d8ed8718f878f682d9b2bd - Service instance lifecycle management Change-Id: Ia4d422bcd68f12942fbcf5b9a7c19d713f927270 Issue-ID: USECASEUI-218 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-04-16Update git submodulesDominic Lunanuova1-0/+0
* Update docs/submodules/dmaap/buscontroller.git from branch 'master' to 920ddde631bf110d129d480c81d2ca2347fcb669 - Merge "Fix for missing aaf_env in CADI props" - Fix for missing aaf_env in CADI props Change-Id: I8573ee3b9942d296759a459a37333d5fe78d2b97 Issue-ID: DMAAP-1165 Signed-off-by: Tomek Kaminski <tomasz.kaminski@nokia.com>
2019-04-16Update git submodulesyangyan1-0/+0
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master' to 54204dfec22dff809cb0bbb1589cfb7f0d2dd82f - update VF-C doc Issue-ID: VFC-1345 Change-Id: I7a23d48fced2db1562156fba3da8044fc2e8edb7 Signed-off-by: yangyan <yangyanyj@chinamobile.com>