summaryrefslogtreecommitdiffstats
path: root/docs
AgeCommit message (Collapse)AuthorFilesLines
2019-05-12Update git submodulesYang Xu1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 249d12af969a3efaab1aba6c4e3775b60223d552 - Merge "Update CLAMP images tags" - Update CLAMP images tags Update to RC images for clamp (4.0.1) Issue-ID: CLAMP-377 Change-Id: I3b890652ebd7bb045976c19263b0dadf3f291642 Signed-off-by: ChrisC <christophe.closset@intl.att.com>
2019-05-11Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 7bace3db55c2ca51431e88191cc7a8587d7aa508 - Merge "Fixed the parsing path for CBA archive" - Fixed the parsing path for CBA archive - Added the parsing path as per the new requirements. - Error handling logic if the parser fails to find the CBA archive or fails to store/read cba or csar archive Change-Id: I33de939cb39f7d9afb68230b226f8ee6d7544fe4 Issue-ID:CCSDK-1318 Signed-off-by: prathamesh morde <prathamesh.morde@bell.ca>
2019-05-11Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 1bfd44ec0b1ebcfb5d1c12e71de76a9bf4860de9 - Merge "Fixed defect CCSDK-1299" - Fixed defect CCSDK-1299 fixed defect ccsdk-1299 Issue-ID: CCSDK-1299 Change-Id: Ie0e02564cbf62fdc8314086d70bc3b7b38122323 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-05-11Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to c42000581122d0580dce2f038be1b10af9cb3e64 - Merge "UT for Blueprint core" - UT for Blueprint core CustomFunctions and BluePrintContext Issue-ID: CCSDK-1244 Change-Id: I0d676714684ffc9f913f8e296b73f867278df8c2 Signed-off-by: Rami <rmohamed.ext@orange.com>
2019-05-11Update git submodulesfujinhua1-0/+0
* Update docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git from branch 'master' to fd3012251e1d13ae301d19a543fefa80b3cb83db - Refactor codes for ztevnfmdriver Change-Id: I8ef334360cc103d33677f8e96a4c071925ffcca7 Issue-ID: VFC-1306 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
2019-05-11Update git submodulesTao Shen1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to a14b29c7a22bbb7f453bf2bb89ec692694243073 - Merge "Migrate to gerrit-maven-stage (UI)" - Migrate to gerrit-maven-stage (UI) Update oparent version to 2.0.0 which supports global-jjb maven-stage job. Change-Id: I9d57e7e89cc48d7c29aa805307129a17181eb898 Issue-ID: CIMAN-234 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2019-05-11Update git submodulesguochuyicmri1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 8c7857b2f978ae0d19e95cc637eb4afe8fca6f96 - Package management interface development Change-Id: I1e6a4688dcfa223e8916854442acc6e423556363 Issue-ID: USECASEUI-211 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-05-11Update git submodulesguochuyicmri1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to b620f286935956f24defada1820219b1046db424 - Fix instance instantiation for CCVPN Change-Id: I968bc2e518d5c901d2a083c52e027f98dfcd3df7 Issue-ID: USECASEUI-220 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-05-11Update git submodulesguochuyicmri1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 914cd5ee96a46fd175e89574780c8758cae3f411 - Dashboard interface front-end development Change-Id: I3ad996be3d2512b4538fc8ebf46a56b09b5f9160 Issue-ID: USECASEUI-214 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-05-11Update git submodulesguochuyicmri1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to f3103ea58186a7213fd92f6b2403dd71aaac38dd - Service instance lifecycle management Change-Id: Ie9cf576639071694b6cbfeb7eb5e033d21a3f6b9 Issue-ID: USECASEUI-218 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-05-10Update git submodulesJessica Wagantall1-0/+0
* Update docs/submodules/integration.git from branch 'master' to 7d140fdfdffbd54bcc1dfcd7ba7762daa74017b3 - Migrate to gerrit-maven-stage (INT) Update oparent version to 2.0.0 which supports global-jjb maven-stage job. Change-Id: I86889fc9fa03d65be0b790898f88dd98a6547c2e Issue-ID: CIMAN-234 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2019-05-10Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/integration.git from branch 'master' to e095b67857f4bad35a366659d3d0f428f2747afb - Don't treat error reply as a proper JDWP handshake As it turned out thanks to Yan Yang some ONAP services tend to return a propr JDWP handshake as a part of their error message. Let's filter out those services by checking number of lines returned by the server. We expect that proper JDWP handshake won't be longer than a single line. Issue-ID: SECCOM-231 Change-Id: I4b8950ebdf5fe118ec5f2dd5f4de583211784fb2 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
2019-05-10Update git submodulesliboNet1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 4b81b5a6a5c420121c27fe5ff3f54cfcc86a6132 - integrate artifact broker into multicloud plugins add config.json for each multicloud plugin update deployment to add it as sidecar update the values.yaml of multicloud to store image name remove the hardcode namespace fix typo and use 1.3.1 image tag Change-Id: I6cc9e381ea655b1d75760b013d2be693b0c0575c Issue-ID: MULTICLOUD-597 Signed-off-by: liboNet <libo.zhu@intel.com>
2019-05-10Update git submodulesSamuli Silvius1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to e7fd64586455a7c1270c1b1c846c19e030780315 - Merge "Don't set 'container' env in Molecule containers" - Don't set 'container' env in Molecule containers Molecule role tests that use pre build images had superfluous 'container' env variable declaration. It's not needed as this env is already set in Dockerfiles, for both: pre-built and custom built images. Change-Id: Iee9cc38919da894ee6cc6a2a5f1acc60d76865de Issue-ID: OOM-1841 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
2019-05-10Update git submodulesMike Elliott1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 6e520f189fbd1cfab2359763e454eff07bbc68a6 - Merge "Changes related to TLS implemenation for oof-has" - Changes related to TLS implemenation for oof-has update oof certificates to add has hostnames updating oof certs to the latest generated date Change-Id: Ib9191d66eb491975f74062ee5e28b762d9cce9c1 Issue-ID: OPTFRA-461 Signed-off-by: Ikramullah, Ikram <ikram@research.att.com> Signed-off-by: Shankar Narayanan <snarayanan@research.att.com>
2019-05-10Update git submodulessunil.unnava1-0/+0
* Update docs/submodules/integration.git from branch 'master' to 743ad0551bb67c8cf7b9d37effbf03c25444c8e2 - Update DMaaP MR image versions to match with oom Issue-ID: DMAAP-1199 Change-Id: Ie3fd8882e0c741ac29e6e2e9b8523ecb5ba94997 Signed-off-by: sunil.unnava <sunil.unnava@att.com> Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2019-05-10Update git submodulesMike Elliott1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 0e4ba436188c1c957b4e03551238976d5511b842 - Merge "Update CMSO OOM to use HTTPS and AAF" - Update CMSO OOM to use HTTPS and AAF Fixes OPTFRA-484 and OPTFRA-390 Issue-ID: OPTFRA-391 Change-Id: I2b65743e38464aac8dbc8cf81419e9ce36769b7d Signed-off-by: Jerry Flood <jflood@att.com>
2019-05-10Update git submodulesAlexis de Talhouët1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 097f466da7029eca31530572cec3fb1a6ad768b6 - Merge "Use released version of ESR" - Use released version of ESR Issue-ID: AAI-2403 Change-Id: I3435903e055268309fb67503b095b28422b707df Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2019-05-10Update git submodulesAlexis de Talhouët1-0/+0
* Update docs/submodules/oom.git from branch 'master' to eba568006b7877288b99ff0fe10c6c3f28614d32 - Merge "robot_variable_for_hvves_testsuite" - robot_variable_for_hvves_testsuite Issue-ID: DCAEGEN2-1448 Change-Id: I306abc4fdbdafe7fbb0eadc9d372515fb3fa2896 Signed-off-by: marekpl <marek.pondel@nokia.com>
2019-05-10Update git submodulesstark, steven1-0/+0
* Update docs/submodules/vvp/documentation.git from branch 'master' to bf29a4651bff59e27df10caffb14eedb0fbb3900 - [VVP] updating VVP release notes for Dublin Change-Id: I0e9cbb7c7df302861fbec8ea8d0bdd61becfa9aa Issue-ID: VVP-208 Signed-off-by: stark, steven <steven.stark@att.com>
2019-05-10Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 2627001834084af2e31a6c8c49503919a114b9c3 - Merge "Update Rainy day handling to be more robust" - Update Rainy day handling to be more robust Clean up unused tests and code, update UT Fix issue with junits and conflicts on id field Update Rainy day handling to be more robust Change-Id: I2ce9a1288457017613dece19357e44b8566867c5 Issue-ID: SO-1866 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-10Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 28a0ce73a022a5ccecadae6b3172beb15e3f46ab - Merge "Updated closing gateway to be inclusive instead." - Updated closing gateway to be inclusive instead. Updated closing gateway to be inclusive instead. Change-Id: If877bf71b406d00f7a0e277b88f9e3064e642be0 Issue-ID: SO-1868 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-10Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 4b5bf1b5bbee86cfc3efedb5be78e797c697f7c5 - Merge "Remove triple logging of VNF adapter response" - Remove triple logging of VNF adapter response Remove triple logging of VNF adapter response to bpel Change-Id: Ia8f3d3b9b76616e9dcc9f638ba5ca58dcac3ab8b Issue-ID: SO-1863 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-10Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to bb79b68af3c008a6f490d0c1dc5bd7861b456faf - Merge "APIH should ensure valid requestId UUID" - APIH should ensure valid requestId UUID Added logic to check if the requestId sent in GET orchestrationRequest query is a valid UUID. Updated existing unit tests and added a new test for invalid UUID scenario. Change-Id: I424bef8aa75dd7e47de8145603899820dfb99725 Issue-ID: SO-1865 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-10Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 32bce33b95c56e745fa9de5e27367202d647aa8b - Merge "Added to write variablles on audit failure" - Added to write variablles on audit failure Added to write variablles on audit failure so bpmn knows whether success or not. Change-Id: I1eb0827a10ee75f4ee89bfb36d13035a2612e032 Issue-ID: SO-1862 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-10Update git submodulesPlummer, Brittany1-0/+0
* Update docs/submodules/so.git from branch 'master' to 252fe7c546853aaa0b8360cf837f0b653e624494 - Created custom BadResponseException class Created custom BadResponseException class Change-Id: I9b7288c5c489e155a84f2b98956df8f3f8f53bb4 Issue-ID: SO-1864 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-10Update git submodulesguochuyicmri1-0/+0
* Update docs/submodules/integration.git from branch 'master' to 98d46f36f18c7e4ef8837d408ef3f6e621997504 - Upgrade usecase-ui version to 2.0.0 Change-Id: I65775825e328869a4a209c2f914a6316a364ff07 Issue-ID: USECASEUI-259 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-05-10Update git submodulessunil.unnava1-0/+0
* Update docs/submodules/integration.git from branch 'master' to 82f48ce106aa8c6097ddfaaff6d8e7a4fd227ee0 - Update DMaaP MR versions Issue-ID: DMAAP-1199 Change-Id: I984d827fc9074155620325cb443cb741570a4f09 Signed-off-by: sunil.unnava <sunil.unnava@att.com> Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2019-05-10Update git submodulesGary Wu1-0/+0
* Update docs/submodules/integration.git from branch 'master' to d5417574dfdbdec98bbb9c612a496459d0cec9af - Merge "update vfc stating version" - update vfc stating version Issue-ID: VFC-1384 Change-Id: I9da262951ba29e80ac02277f878b0a1ad16074f7 Signed-off-by: yangyanyj <yangyanyj@chinamobile.com>
2019-05-10Update git submodulesGary Wu1-0/+0
* Update docs/submodules/integration.git from branch 'master' to 201d86116d8f944e17cfc2f798e318c6be1ddefd - Merge "Update DMaaP DR versions to match oom" - Update DMaaP DR versions to match oom Change-Id: I7c9ec93b79aaaee2e63ea7911df0dd99e0a756fb Issue-ID: DMAAP-1198 Signed-off-by: econwar <conor.ward@est.tech>
2019-05-10Update git submodulessunil.unnava1-0/+0
* Update docs/submodules/dmaap/messagerouter/messageservice.git from branch 'master' to 8537f3c5ee8bf3897404dff5442c6a10f4d1420d - clean MR codebase Issue-ID: DMAAP-1199 Change-Id: Ieff7939b02a8987b6101dd1c0ec886b474f1fa82 Signed-off-by: sunil.unnava <sunil.unnava@att.com>
2019-05-10Update git submoduleseeginux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 32ad89be8692a1a6d510af6ac116523bcbdd216b - update cds bueprint name Update cds blueprint name to grpc service name Issue-ID: SO-1855 Change-Id: I079246cae3ba8471fffa95dbb11091cd53a94168 Signed-off-by: eeginux <henry.xie@est.tech>
2019-05-10Update git submodulesSamuli Silvius1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to 45550572193ba5f91ec045c25e073b4f65a86dd4 - Molecule test for resources playbook. Issue-ID: OOM-1813 Change-Id: I5c070f1ed20bf29b432c91e9de5d861267802b6d Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
2019-05-10Update git submodulesJakub Dudycz1-0/+0
* Update docs/submodules/dcaegen2.git from branch 'master' to 0c99792d581e9bd829b0ce61698dd20cd310f544 - Enhance HV-VES documentation Change-Id: Iba32c9a19ea3d11c4e541f90ee1afa57176fe7f7 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com> Issue-ID: DCAEGEN2-1493
2019-05-10Update git submodulesAlexis de Talhouët1-0/+0
* Update docs/submodules/oom.git from branch 'master' to e3a509f71ccd320c8b644db07b5edd775faf030f - Merge "Update env value for blueprint processor http endpoint" - Update env value for blueprint processor http endpoint Issue-ID: CCSDK-1292 Change-Id: Icc97df921abf06a20e71b15c02a82a5f12d329f8 Signed-off-by: Nirvan Ramjuttun <nirvan.ramjuttun@amdocs.com>
2019-05-10Update git submodulesAlexis de Talhouët1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 4cded0610213100d7e62ad10e35422cd03d741b3 - Merge "change usecase-ui-server api url" - change usecase-ui-server api url Change-Id: Ib56a22795a17b72dd8bcc5726802a6b56b4a8060 Issue-ID: USECASEUI-260 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-05-10Update git submodulesAlexis de Talhouët1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 4e782a3510e4e7aaed1b48e371f8536fdd27be53 - Merge "Remove obsolete warning about concurrent executions" - Remove obsolete warning about concurrent executions Remove warning about unparameterized --display as it is now parameterized (this commit is a follow-up to comments in already merged https://gerrit.onap.org/r/#/c/87357/) Added also brackets for namespace parameter in usage guide Change-Id: I78a753b026e3e9b410798687b28ad0ca1115703e Issue-ID: OOM-1844 Signed-off-by: kaihlavi <l.kaihlavirt@partner.samsung.com>
2019-05-10Update git submodulesAlexis de Talhouët1-0/+0
* Update docs/submodules/oom.git from branch 'master' to dee2e72c2d979433e50e1d2a619c81d681513ba7 - Merge "Change to fix db connection issues in xacml-pdp" - Change to fix db connection issues in xacml-pdp Added xacml.properties file with proper jdbc url that includes the {{ .Values.global.mariadb.nameOverride }} value This is only half the fix, please reference review for xacml-pdp repo for full fix. Change-Id: Ic73864439b9437e812c135f24a093ba9f969b6ee Issue-ID: POLICY-1760 Signed-off-by: Michael Mokry <michael.mokry@att.com>
2019-05-10Update git submodulesManoop Talasila1-0/+0
* Update docs/submodules/portal.git from branch 'master' to 306d89bd2673a76939e57186d15ffcd2a504d498 - Merge "Added Functional Menu Entries, del bad thumbnail" - Added Functional Menu Entries, del bad thumbnail Issue-ID: PORTAL-515 Change-Id: Ibac6ae65fc4df39a7bab2a98946d664bf47413b8 Signed-off-by: Welch, Lorraine (lb2391) <lb2391@att.com>
2019-05-10Update git submodulesMichal Ptacek1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to d7de59b8d75014a60dfbc6f37aff96a105fa9a79 - Merge "Updating offline platform with latest 3.0.2" - Updating offline platform with latest 3.0.2 - Adding missing artifacts into onap_3.0.x-http_files.list - Some fine-tuning of examples in DOCs Issue-ID: OOM-1805 Change-Id: Ic5a55590a9fa9a244c43aff6a63554aefaea6cc5 Signed-off-by: Michal Ptacek <m.ptacek@partner.samsung.com>
2019-05-10Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to b9bb7f60815cd1e07b81d72b34ea1dcb4fa8d8c9 - Merge "use logger to log exception" - use logger to log exception sonar link:https://sonar.onap.org/project/issues?id=org.onap.so%3Aso&resolved=false&types=VULNERABILITY Issue-ID: SO-1859 Change-Id: I599ca396db3d24cbef56bb3aea8f83b2d52ff26d Signed-off-by: arindamm <arind.mondal@samsung.com>
2019-05-10Update git submodulesKanagaraj M1-0/+0
* Update docs/submodules/cli.git from branch 'master' to b6a27e640cba472d090090e990fae8856a6871f3 - Fix VNFSDK issues Issue-ID: CLI-129 Change-Id: I281911c247ce21d723601b04ae125c95095c9a52 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
2019-05-10Update git submodulesguochuyicmri1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to c7a9cb23b403083f6a8b9d5b9a8a6de25e5c1502 - Service instance lifecycle management Change-Id: I5513d8f59b02ae400e5b406e46a27967af23621d Issue-ID: USECASEUI-218 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-05-10Update git submodulesguochuyicmri1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to f87f67dbc1d5ba8dc7991d1552f6637d8ef12f65 - Fix instance instantiation for CCVPN Change-Id: Iecaf51bb804ab694a880a072b19bf21918bc63cb Issue-ID: USECASEUI-220 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-05-10Update git submodulesfujinhua1-0/+0
* Update docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git from branch 'master' to b49601d123e836b65361313bd8530bb5e51ccdc6 - Fix bugs for ztevnfmdriver Change-Id: Idbe4f35159a842707518132c656f049d0fa3c256 Issue-ID: VFC-1306 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
2019-05-10Update git submodulesmaopeng zhang1-0/+0
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master' to 8a9940b47bb0dd1604a18758426d8a77686838a8 - Merge "Fix bugs for nslcm" - Fix bugs for nslcm Change-Id: I60f60edfcf1c7add9c8daa712b03c898501c8125 Issue-ID: VFC-1306 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
2019-05-10Update git submodulesmaopeng zhang1-0/+0
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master' to cf9e69882bff369c948e8157273dd850a9c930cc - Merge "Fix bugs for nslcm" - Fix bugs for nslcm Change-Id: Ic781ac72c492a8c88d4dbda6d3721ebea833ca65 Issue-ID: VFC-1306 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
2019-05-10Update git submodulesmaopeng zhang1-0/+0
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master' to 9908dbec29def4af83eaac4f5e468b3eb262a544 - Merge "Fix bugs for nslcm" - Fix bugs for nslcm Change-Id: I05d080d32a36eba308be33d99383f3ca2c6c2fed Issue-ID: VFC-1306 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
2019-05-10Update git submodulesfujinhua1-0/+0
* Update docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git from branch 'master' to f49c18fffa543805bc2f87792c0dbc17a914edd8 - Fix bugs for ztevnfmdriver Change-Id: I685864a837953b4be9085c50474a7993378eeea4 Issue-ID: VFC-1306 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
2019-05-10Update git submodulesguochuyicmri1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to c70c8626fa9857b905db1f80a5bfe21c0b45ed32 - User and service type management interface Change-Id: I0ddf34298d6a1acc81f4fa355f277da0aacc123a Issue-ID: USECASEUI-212 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>