summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-11-08Update git submodulesBrinda Santh1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 6036cedf9984e8b22f15e25595c57026de9d690c - Fix missing status event type workflow response. Issue-ID: CCSDK-1896 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: Iffb4c5e9d4e5788895bda6c7ee4197ee9e0bd60e
2019-11-07Update git submodulesPierre Rioux1-0/+0
* Update docs/submodules/logging-analytics.git from branch 'master' to 1a764c63f3055107b5f490146b3ab2919012f0aa - Merge "minor logging change" - minor logging change Setting X-InvocationID header for outgoing request changed from info to trace Issue-ID: LOG-1186 Signed-off-by: Smokowski, Kevin (ks6305) <kevin.smokowski@att.com> Change-Id: I73bb6fdd21015a89a7fc16c4e93d810bc9755b40
2019-11-07Update git submodulesSmokowski, Kevin (ks6305)1-0/+0
* Update docs/submodules/logging-analytics.git from branch 'master' to a7b956be29b54cc626621ea1388c7fa8bdc45efb - HttpURLConnection metric support add java.net.HttpURLConnection metric util Issue-ID: LOG-1172 Signed-off-by: Smokowski, Kevin (ks6305) <kevin.smokowski@att.com> Change-Id: I60b1c59d1dd40f44a92dc1e92e406129830abf91
2019-11-07Update git submodulesOfir Sonsino1-0/+0
* Update docs/submodules/sdc/sdc-tosca.git from branch 'master' to 2c4bf50d490f7cf320c44152ed3d557ca9733534
2019-11-07Update git submodulesJessica Wagantall1-0/+0
* Update docs/submodules/sdc/sdc-tosca.git from branch 'master' to 498894427c5101d6395d2c6bdf4365ec45f0e07c - Cleanup existing jtosca files They need to be brought up back again along with its history. Issue-ID: SDC-2457 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2019-11-07Update git submodulesSamuli Silvius1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to c09ef4adbb8bb87f414902d6d85c754f5054189f - Merge "Update build documentation" - Update build documentation Add note for using root shell Add example for populate local nexus Use absolute path in package.py script Remove Appendix Add clone oom with all submodules Fix example for pulling images in list Signed-off-by: Denis Kasanic <d.kasanic@partner.samsung.com> Change-Id: I8859ba42420d351ce12347cd63bf11f95a4b528d Issue-ID: OOM-2158 Issue-ID: OOM-2160
2019-11-07Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to e141aad67e997015bbb6798c790e6702d1894115 - Merge "remove unused columns infra active requests" - remove unused columns infra active requests Removed unused columns in db across codebase Issue-ID: SO-2516 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: Ieedb61ed371bc3626ef94df0bf88b7a9cf139c82
2019-11-07Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 039059d50b8d72bd66febc8c9c9cdc19f7d1411c - Merge "Call WorkflowActionTasks.sendErrorSyncAck()" - Call WorkflowActionTasks.sendErrorSyncAck() Call WorkflowActionTasks.sendErrorSyncAck() instead of WorkflowActionTasks.sendSyncAck() from WorkflowActionBB in error handling subroutine. Call WorkflowActionTasks.sendErrorSyncAck() instead of WorkflowActionTasks.sendSyncAck() from WorkflowActionBB in error handling subroutine. Issue-ID: SO-2489 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I8c1c2bb6af70d5e76cfbfd3ce54fb506ab653cf7
2019-11-07Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 8d6ab97663555f9b5798069d524e3f92bc32b90b - Merge "Updated logging library version to 1.6.2-SNAPSHOT" - Updated logging library version to 1.6.2-SNAPSHOT Updated logging library version to 1.6.2-SNAPSHOT Issue-ID: SO-2509 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I59e59dc4998897d96c2966e13f947b695c050a5c
2019-11-07Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to f890e0788a23de5114a3fc2ac7ec1ce1c10f859f - Merge "- Updated to include getEntity extract" - - Updated to include getEntity extract - Updated to include getEntity extract nodeTemplates. Issue-ID: SO-2511 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: Ie6ee3a5966f1c4f8384723bc82ec972eef87fe8f
2019-11-07Update git submodulesMax Benjamin1-0/+0
* Update docs/submodules/so.git from branch 'master' to 4a024537f577ebbbfeb93ccd1eee8d6cd644df06 - Merge "Heatbridge: Unable to proceed with any of the function related to Orchestration Service" - Heatbridge: Unable to proceed with any of the function related to Orchestration Service known issue https://github.com/ContainX/openstack4j/issues/1238 Issue-ID: SO-2495 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca> Change-Id: Ie4df2b430bf088b0073855c241eba60cf7611422
2019-11-07Update git submodulesIttay Stern1-0/+0
* Update docs/submodules/vid.git from branch 'master' to 97d42f7035ade2c171c349d01cfcd9b61b71dd52 - fix - when retrieve topology we are using threadPool and the MDC values are not updated This time for homing-by-vnf-id parallel requests. Issue-ID: VID-253 Change-Id: Ic0be1470445c6fef0e18f9b9d8f1604df508265b Signed-off-by: Ittay Stern <ittay.stern@att.com>
2019-11-07Update git submodulesShankaranarayanan Puzhavakath Narayanan1-0/+0
* Update docs/submodules/optf/osdf.git from branch 'master' to 5293a382b6463069d4a2cc87806426d74833aa2e - Merge "Add onap log spec 1.2 for osdf" - Add onap log spec 1.2 for osdf OPTFRA-319 OPTFRA-607 and OPTFRA-629 included in this fix Change-Id: Ieeeaa0417ffa41360d790c01b0ef1404960e6b6a Signed-off-by: vrvarma <vv8305@att.com> Issue-ID: OPTFRA-319
2019-11-07Update git submodulesRitu Sood1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to e3af69fe78abcbb88380ce5d557d93ebd2700ffd - Merge "Optimizing the plugin option in containerized installer" - Optimizing the plugin option in containerized installer Issue-ID: MULTICLOUD-919 Signed-off-by: r.kuralamudhan <kuralamudhan.ramakrishnan@intel.com> Change-Id: I6850c2673b1d5e8e7ccc9d036a0a68fa896aa3ab
2019-11-07Update git submodulesKiran Kamineni1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to 10f7e1c6f3046873b05f118f48cb3daef5feee14 - Add race condition detection Add the -race flag to detect any race conditions in the k8splugin code It is enabled only for tests right now because of performance impact on builds. Issue-ID: MULTICLOUD-870 Change-Id: I53a90df39d2d8b51cbdb6c320f2247721ed98a07 Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
2019-11-07Update git submodulesJimmy Forsyth1-0/+0
* Update docs/submodules/aai/aai-common.git from branch 'master' to a5d4adc4185af54a19de5de748c728875511c790 - Add parent and update modules to use it Issue-ID: AAI-2699 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I288cb51a4f654387d6ca078f7b4357e8ce2e43c5
2019-11-07Update git submodulesJim Hahn1-0/+0
* Update docs/submodules/policy/engine.git from branch 'master' to a2a198f3f8330b6973c6ab36692250b72eaafeed - Turn on lombok code coverage for policy-engine If this backfires, we can turn it back off again. Issue-ID: POLICY-2131 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I7375bf4a3fa63a7791c30b3a73813bff1a69055e
2019-11-07Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 5bdb14011023be31471622a92b98493a04da0281 - Merge "Fix the nginx config" - Fix the nginx config Fix nginx config so that AAF can work through it Issue-ID: CLAMP-519 Change-Id: Ica2d3ea6f6c4b19e019f3e7cf30e5b1372f07255 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2019-11-07Update git submodulesTaka Cho1-0/+0
* Update docs/submodules/ccsdk/distribution.git from branch 'master' to ef127a5f590c092e5020d8ecd6cf10eaa8329ddc - migrate ansible server python scripts to python3 python3 is required for R6 release Change-Id: I94decf6ead79119f90f5fa70578b4cea8a3e58b7 Issue-ID: CCSDK-1893 Signed-off-by: Taka Cho <takamune.cho@att.com>
2019-11-07Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 9e374a0b49cdfd3594a32ff062e210765cad14ea - Merge "Update on Health-api" - Update on Health-api -add Combined health check -add combined metrics check Issue-ID: CCSDK-1669 Signed-off-by: Shaaban Ebrahim <shaaban.eltanany.ext@orange.com> Change-Id: Idb3c7f67b3f22bd6069f75c193ae458c346fb2ac
2019-11-07Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 59d3681b80e9b5f9e69b4492138ab1f056a0351d - Merge "Extension support for db configuration." - Extension support for db configuration. Issue-ID: CCSDK-1046 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I404855eac4520f79ac33f70710dcdb6ae285891d
2019-11-07Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 043b76ce214017bdc97e15600c1d17b10f60916a - Merge "Refractor rest log tracing filter for reuse." - Refractor rest log tracing filter for reuse. Issue-ID: CCSDK-1046 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I0ef0627851041b80f63c907c165c9eff5972a973
2019-11-07Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to dd785b270c9215297ca9c498a966c5f84e883bbe - Merge "Add missing property metadata DSL fun." - Add missing property metadata DSL fun. Issue-ID: CCSDK-1576 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I814731382976111b8102070de536ecbe4338699a
2019-11-07Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to fea07ea9ca84ea193380034b2b58d588071e7720 - Merge "netconf lib bugfixes: invoke_rpc + timeouts." - netconf lib bugfixes: invoke_rpc + timeouts. Issue-ID: CCSDK-1886 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: I0a33199d4b4cbd5e3355d1e7596d22bd7cdbd075
2019-11-07Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 715f0ac873dd0301ed85e873a09d4323fef4d40e - Change Oparent Update oparent to 2.1.0 Issue-ID: CLAMP-531 Change-Id: I2b4d71c58fdd96ceae1551258e198d16c8bb21a8 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2019-11-07Update git submodulesIttay Stern1-0/+0
* Update docs/submodules/vid.git from branch 'master' to ebef5249cb9d282ace976feac8517a7b44add450 - Merge "Validations in different tests for audit log" - Validations in different tests for audit log ChangeManagementApi/UserApi to verify incoming requests in audit log. Refactor assert message and contains method for validation Add audit logging validation to Health Check test Refactor audit log validation according to code review comments Fix the test of Add audit logging validation to Health Check test Issue-ID: VID-253 Signed-off-by: Amir Skalka <amir.skalka@intl.att.com> Change-Id: I0379520054b65f2141745579a14690bdc4824655
2019-11-07Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to a6eaf2d99f3b709dffaa65132d0e4b8fba277aba - Merge "Fixed typo..." - Fixed typo... Issue-ID: CCSDK-1908 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: I962db89c620c46f8979df03c20c26d3bfc32fb73
2019-11-07Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 1e1ac926da3bc75e55a435a4b71b53642c0ccca8 - Merge "add search by meta data in cds-ui server and blueprint processor Issue-ID: CCSDK-1770" - add search by meta data in cds-ui server and blueprint processor Issue-ID: CCSDK-1770 Signed-off-by: Shaaban Ebrahim <shaaban.eltanany.ext@orange.com> Change-Id: I8ac77ab4903e3141d065a61bf28404f3d16077cd
2019-11-07Update git submodulesBen David, Elad (eb7504)1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 3042f71ec5761450e46a3f22c3eb46a117771145 - Align Sdc warnings with VNF Requirements Change-Id: Ic133faed7f8b612279de0eb836e88e9ea6b694d7 Issue-ID: SDC-2647 Signed-off-by: Ben David, Elad (eb7504) <eb7504@intl.att.com>
2019-11-07Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 77b0be1b734ae1f785fb35a59387ac5fbcf19266 - Merge "Move to JDK 13" - Move to JDK 13 Do the required changes to move to JDK 13 Issue-ID: CLAMP-327 Change-Id: Ia7840851eeefc6c00e3e49eacb2e49cc27a0b2f0 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2019-11-07Update git submodulesMorgan Richomme1-0/+0
* Update docs/submodules/oom.git from branch 'master' to f1b86032285298313a0cf071ae02d60e2b4c2188 - Merge "NBI to SDC: API is HTTPS with port 8443" - NBI to SDC: API is HTTPS with port 8443 Issue-ID: EXTAPI-341 Signed-off-by: MatthieuGeerebaert <matthieu.geerebaert@orange.com> Change-Id: I94b41e338d80939934c7d42fd518d0984cf89b92
2019-11-07Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 303ba789e58c1f1a425f7c8b8bcfbbe5cbcffb9e - Merge "Remove unused properties from config files" - Remove unused properties from config files DB and auth credentials are never extracted from this file thus it's better to remove them to avoid confusion. Issue-ID: OOM-2051 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I66b0cb61b17439496ed0e0c8d9529ad730823d61
2019-11-07Update git submodulesEylon Malin1-0/+0
* Update docs/submodules/vid.git from branch 'master' to 31e625a118836d02a95b18ff806903ed23deb25d - API test can get VID URI protocol from system property Issue-ID: VID-701 Change-Id: I47c4e50f8cdc333284615b80df64542b696d2674 Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
2019-11-07Update git submodulesxu ran1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 214d67b1555d4018c2189dd641aee27ed2b3e230 - Merge "alarm component- spec changes" - alarm component- spec changes Added provider for Util class Issue-ID: USECASEUI-280 Change-Id: If3c1ca05b4a5a0193869e7b9233b904cc6cd70ba Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-11-07Update git submodulesxu ran1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 11104e223d3c075144b3cd5bd49892e783773136 - Merge "pie component- spec changes" - pie component- spec changes Added NgxEchartsModule to imports. Issue-ID: USECASEUI-280 Change-Id: Ie650241660eb8e4d8636f39ad444e12123a6c7ed Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-11-07Update git submodulesArundathi Patil1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to a957153093c974b0554a9c6244f852cc0063d843 - ccvpn-detail component- test file error fix Fixed multiple errors in ccvpn-detail component spec file Issue-ID: USECASEUI-280 Change-Id: I9bb7540e4ba4b13c7df926d2d54c1afe5be89ea9 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-11-06Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 88e3ef2d396bc91051b182d11a2d490bf37abf08 - Merge "Rolling upgrade support for in-flight requests" - Rolling upgrade support for in-flight requests Three entry points are being handled : 1 - REST endpoint 2 - gRPC endpoint 3 - Kafka consumer We make use of Phaser object to make sure the PreDestroy callback wait for all requests to be executed before stopping the process. The docker image was also modified to make sure the java process becomes PID 1 in the container in order to catch the SIGTERM signal which triggers the PreDestroy callback of Spring. This was done by using the "exec" command in bash. Issue-ID: CCSDK-1885 Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca> Change-Id: I3e2a72e26a4c8b7768ebc374ea40aa8d55fb6761
2019-11-06Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to a835890f817a1e3627c281e98ab786ee7bf8c2ba - Merge "Removing dead code... DME2 does nothing..." - Removing dead code... DME2 does nothing... Issue-ID: CCSDK-1897 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: I5b9abb83f9c2e2a4329a393fb8c0fa10801a770c
2019-11-06Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 8ce7fa4bf8b410d28985ddb3d6490e84e76d9478 - Merge "add get blueprints API with pagination and sorting" - add get blueprints API with pagination and sorting Issue-ID: CCSDK-1770 Signed-off-by: Ahmed Abbas <ahmad.helmy@orange.com> Change-Id: Ia9bd9b78df1d7dc5c0b6e67af2d58922f9c9a935
2019-11-06Update git submodulesliamfallon1-0/+0
* Update docs/submodules/policy/engine.git from branch 'master' to f4ec47c009cdc385a7efed02dda5d26f2ec31b57 - JUnit/SONAR/Checkstyle in ONAP-REST First batch of JPA pojos Lombok'd and some missing coverage updated I'll be interested to see how Lomboking code shows up in SONAR, I have not added much JUnit here but I have reduced a good bit of source code, let's see what happens. Issue-ID: POLICY-2131 Change-Id: I8f270ef57282f63821c1eb94dd6b50f8ae541028 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-06Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to ad6322617d0a3630177de53caf04cec51c44464c - Merge "Upgrade the libs" - Upgrade the libs Upgrade the version of some libraries for NPM so for React UI Issue-ID: CLAMP-544 Change-Id: Ie5238c699a2b441892e6e12f3a6f17640d26b10c Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2019-11-06Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 5d48ab5ace51317e9d73bf246c1befe4442a65ad - Merge "Add Npm repo script" - Add Npm repo script Add npm repo script in the build to decide which nexus repo must be used depending of the version Issue-ID: CLAMP-450 Change-Id: Ic00974d1bedf9da947748dd9f5224fbc78f7f425 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2019-11-06Update git submodulesOleg Mitsura1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 94f1bfcc93e46dc08f806e9a3b495abc9d9bf53d - netconf retry disconnect() Issue-ID: CCSDK-1908 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: I90ca822c042ec84fda717a152c4f699bacdd87ad
2019-11-06Update git submodulesInstrumental1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to 333a035c095351e496328ec72c82beb65507e71b - Fix Merge error Issue-ID: AAF-1040 Change-Id: I98e8184c0ecf92e87f0fa43a05b09071ae7dd8a2 Signed-off-by: Instrumental <jonathan.gathman@att.com>
2019-11-06Update git submodulesMichal Ptacek1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to 7168a9a9e41d9aa1c2b5a69e0886893038b8bc68 - Updating instructions for vFWCL on ElAlto Commit contains also some patch files due to POLICY-2191, this is expected to be removed shortly after new drools image is created. Issue-ID: OOM-1996 Change-Id: Ia2db50fc6dc66ea0c7598d6859eb08007b59a0b9 Signed-off-by: Michal Ptacek <m.ptacek@partner.samsung.com>
2019-11-06Update git submodulesyangyan1-0/+0
* Update docs/submodules/integration.git from branch 'master' to 48e2fd833c8ef9ea59f7312f5aea2cd9a2a22f1e - Update postman data about pnf package onboard in VFC Change-Id: Icc9b004e99c330bb24ec864d85039366ce9dd55c Issue-ID: INT-1364 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2019-11-06Update git submodulesyangyan1-0/+0
* Update docs/submodules/integration.git from branch 'master' to c0562226ef40214b109575283fa698aafd84bf4c - Update postman data about vnf package onboard in VFC Change-Id: I9d15f923f39dbdb93b3aea9888cc8cd780e09172 Issue-ID: INT-1364 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2019-11-06Update git submodulesyangyan1-0/+0
* Update docs/submodules/integration.git from branch 'master' to fa458b2a3200920b24294273079935b4995afc0f - Update postman data about ns package onboard in VFC Change-Id: I89f51d25c55c12d3c394e86852f6bf58dc333956 Issue-ID: INT-1364 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2019-11-06Update git submodulesyangyan1-0/+0
* Update docs/submodules/integration.git from branch 'master' to e6a413f89db47a917263feed474511bb9a9a6ad9 - Update postman data about catalog package onboard in VFC Change-Id: I83798b06f37f7f1cc88e18e1ddd17141105b9fe7 Issue-ID: INT-1364 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2019-11-06Update git submodulesyangyan1-0/+0
* Update docs/submodules/integration.git from branch 'master' to d533888f3c2dbb62b7b1eeddf159438b1e4ef96a - Update postman data about ns_instance in VFC Change-Id: I89978b74fb278948f0deb459ed726f83392b48cd Issue-ID: INT-1364 Signed-off-by: yangyan <yangyanyj@chinamobile.com>