summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-08-31Merge "DOC - Updating location of the VNFRQTS"Rich Bennett5-18/+24
2018-08-31Updated git submodulesShashank Kumar Shankar1-0/+0
Project: multicloud/k8s master 28376cbc428324577451181f67f383ea9d8de164 Make PLUGINS_DIR to be required than optional This patch makes sure PLUGINS_DIR is not optional since its better explicitly pass the plugins directory. Change-Id: I08da5cf1563527d8b713fa106aa05b37a26c95cb Issue-ID: MULTICLOUD-301 Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>
2018-08-31Updated git submodulesVictor Morales1-0/+0
Project: multicloud/k8s master 979f6535310b683747fd23423d27e0eeb72208b7 Bump vagrant version from 2.1.2 to 2.1.4 Change-Id: Ie97897afdfca43d45a6c7055e34edee5e8ea3ce4 Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: MULTICLOUD-301
2018-08-31Updated git submodulesPatrick Brady1-0/+0
Project: appc master 23d877b95c2e535cd9483466ffc34779a29026c3 Remove excess feature files These feature stub files were accidently created, they should not be in these projects. Change-Id: Ib710d4d9be3d2f323ba2e4cfca31b2951777825f Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-1185
2018-08-31Updated git submodulesramamani yeleswarapu1-0/+0
Project: multicloud/k8s master 2f0b896a56c6297ce3434c8d5279b3440e437f18 Update KRD docs build This adds docs/index.rst with links to: - krd_architecture.rst and - sampleCommands.rst. It is now possible to generate documentation using 'tox -e docs'. Change-Id: I176a01943d36659101b3251a8756866459d5491f Signed-off-by: ramamani yeleswarapu <ramamani.yeleswarapu@intel.com> Issue-ID: MULTICLOUD-301
2018-08-31Updated git submodulesBozawglanian, Hagop (hb755d)1-0/+0
Project: vnfrqts/requirements master 7b7ff003d1133f68bdd17812112e5a5abc47a7f6 VNFRQTS - Removing Security Req Batch 1 VNFRQTS - 294, 300, 303, 306, 320, 321 Issue-ID: VNFRQTS-303 Change-Id: Ie0de5a058a72ac34cf2fe3bdd9664d19f6bb832e Signed-off-by: Bozawglanian, Hagop (hb755d) <hb755d@att.com>
2018-08-31Updated git submodulesInstrumental1-0/+0
Project: aaf/authz master e0a2e0d0c79dcaf4532d0ca3aeefd3f5546af404 Relocate JavaxMail Issue-ID: AAF-419 Change-Id: I73890b6f6db09f2f86018594bb4692a4e90a6df9 Signed-off-by: Instrumental <jonathan.gathman@att.com>
2018-08-31DOC - Updating location of the VNFRQTSBozawglanian, Hagop (hb755d)5-18/+24
Moving the level of the doc project for the VNFRQTS. Issue-ID: DOC-318 Change-Id: I28d512744048acd008dfe127a86fb0c5d1bed480 Signed-off-by: Bozawglanian, Hagop (hb755d) <hb755d@att.com>
2018-08-31Updated git submodulesJonathan Gathman1-0/+0
Project: aaf/authz master 613f761567310ffb84f55d2136ab95fc15724020 Merge "fix critical sonar" fix critical sonar -https://sonar.onap.org/project/issues?id=org.onap.aaf.authz%3Aparent&open=AWK69ZDYwGn37JfbmFHU&resolved=false&severities=CRITICAL&types=VULNERABILITY -added @Override to methods -little code style refactor -move to google style code (tabs->spaces) Change-Id: I914a5869d906c770425488f820b6e0066b5c58a4 Issue-ID: AAF-458 Signed-off-by: Tomek Kaminski <tomasz.kaminski@nokia.com>
2018-08-31Updated git submodulesJonathan Gathman1-0/+0
Project: aaf/authz master f03f66a46c5ed8adedea46956a2abc4819cfb1bd Merge "sonar fix" sonar fix https://sonar.onap.org/project/issues?id=org.onap.aaf.authz%3Aparent&open=AWKvaFNSwGn37Jfbl1QS&resolved=false&severities=CRITICAL&types=VULNERABILITY Change-Id: I56f8acc55c4a73e6b3c89327615905979307dde6 Issue-ID: AAF-459 Signed-off-by: Tomek Kaminski <tomasz.kaminski@nokia.com>
2018-08-31Updated git submodulesJonathan Gathman1-0/+0
Project: aaf/authz master 77c4d760a54c6c8ed3efb74024a11225f9573a64 Merge "critical sonar fix" critical sonar fix https://sonar.onap.org/project/issues?id=org.onap.aaf.authz%3Aparent&open=AWK69ZEIwGn37JfbmFIK&resolved=false&severities=CRITICAL&types=VULNERABILITY Change-Id: I3544147a07b691de33046d7bced785e0bc23ca38 Issue-ID: AAF-457 Signed-off-by: Tomek Kaminski <tomasz.kaminski@nokia.com>
2018-08-31Updated git submodulesRam Koya1-0/+0
Project: dmaap/dbcapi master 8b80c9a3005862032908478570f9c500bf0d9fb5 Merge "ApiAuthorizationCheckInterface-Fixed sonar issue" ApiAuthorizationCheckInterface-Fixed sonar issue Fixed sonar issue, Annotate interface with @FunctionInterface. Issue-ID: DMAAP-690 Change-Id: If351b83e6c218b0d2769dccdb9b81d2e1f5d54ac Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-08-31Updated git submodulesRam Koya1-0/+0
Project: dmaap/dbcapi master b1d42dc1c2cf6c5270a77c55e10886c12f949f8d Merge "AafDecrypt.java: Fixed sonar issue" AafDecrypt.java: Fixed sonar issue Fixed sonar issue, either log or rethrow the error Issue-ID: DMAAP-692 Change-Id: I4576608f31f27c4bc345194698596099b036af20 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-08-31Updated git submodulesRam Koya1-0/+0
Project: dmaap/dbcapi master 62221dc8148736266b5da641fbf9eebbab4b70c5 Merge "AaflurService.java: Fixed sonar issues" AaflurService.java: Fixed sonar issues Fixed sonar code-smells/issues accross this file. Issue-ID: DMAAP-691 Change-Id: I6ad3ccdb23b9a4b5edb3cee4c61c363539f9e196 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-08-31Updated git submodulesRam Koya1-0/+0
Project: dmaap/datarouter master a1cc0279360b09663c1b59fd0b89a1c2e081dfbd Merge "Add Tests to LOGJSONObjectTest" Add Tests to LOGJSONObjectTest Change-Id: I3443adf93cc36920a5b87093337909172e49c59c Signed-off-by: Kyle Stewart <kyle.stewart@ericsson.com> Issue-ID: DMAAP-101
2018-08-31Updated git submodulesRob Daugherty1-0/+0
Project: so master 00da3f4b4087e78d56f09dfe8ab01616d6ad68b0 Merge "Update Logging" Update Logging Add CXF interceptor for SOAP based logging Clean up extra logging statements Add UT to ensure MDC properly populated Change package name on Jax-RS Filter to be more accurate Issue-ID: SO-947 Change-Id: I3a2afc58de3bf370675658ce3d19cf899b90def7 Change-Id: I3a2afc58de3bf370675658ce3d19cf899b90def7 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-08-31Updated git submodulesMandeep Khinda1-0/+0
Project: oom master 48e8fe5f53f34428e4dffe7b4760586d7e48c8cd Merge "OOM installation enable VID via HTTPS" OOM installation enable VID via HTTPS Enable OOM installation to allow Portal accessing VID via HTTPS. Should be merged after https://gerrit.onap.org/r/#/c/63461/ Change-Id: If9f38d7a4bf54f62d9d7768e52d568c3d1536376 Issue-ID: VID-273 Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
2018-08-31Updated git submodulesMandeep Khinda1-0/+0
Project: oom master c9ce8f4ada3cdb2b42105bf513351b55e17a7d90 Merge "VID MSO client - enable HTTPS" VID MSO client - enable HTTPS Enable VID MSO HTTPS client. Merge after https://gerrit.onap.org/r/#/c/62279/ Change-Id: If3ac6206e53be2a1ac61adcadf7ffc423da9409a Issue-ID: VID-267 Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
2018-08-31Updated git submodulesShankaranarayanan Puzhavakath Narayanan1-0/+0
Project: optf/osdf master 2380d2c2a94be01b0609038d08bf8fcd1fc0c4e4 Merge "fix the route issue in same domain" fix the route issue in same domain Issue-ID: OPTFRA-333 Change-Id: Ic77f71d3abdab8244bdae85a11856aea24543a54 Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2018-08-31Updated git submodulesBharath Balasubramanian1-0/+0
Project: music master 60a215503f38974c409c963d3f3a8154be01bdd5 Merge "jsonSelect.java: Fixed sonar issue" jsonSelect.java: Fixed sonar issue Fixed sonar issue, either log or rethrow this error Issue-ID: MUSIC-116 Change-Id: Iace6b3251a2b3b60cfd8ce99d6a0ed8ecf80fe02 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-08-31Updated git submodulesArundathi Patil1-0/+0
Project: music master 3e8fdc36a0251dc8b6c2a4794ec96f265850a691 JsonConditional.java: Fixed sonar issue Fixed sonar issue, use transient keyword for variables. Issue-ID: MUSIC-117 Change-Id: I9c8ef0b9fb3239c98a09058cf14019df095e440b Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-08-31Updated git submodulesInstrumental1-0/+0
Project: aaf/authz master 72026fb568523f794ab9289c8f443535969b6df6 Isolate JavaxMail Issue-ID: AAF-419 Change-Id: Ic0d0a44d3078e998449fe69481281552c24083a6 Signed-off-by: Instrumental <jonathan.gathman@att.com>
2018-08-31Updated git submodulesdglFromAtt1-0/+0
Project: dmaap/dbcapi master 6c40168474af445daa4776108787e4cc5f73a26b Correct jetty server version Change-Id: Ib3ce4e4b64492facb0dfe4c7235a758bd5dada5a Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-656
2018-08-31Updated git submodulesVictor Morales1-0/+0
Project: multicloud/k8s master 574785c07010a494fbd1456d11e7c0449ad43c38 Add KRD source code This changes includes the source code created for the Kubernetes Reference Deployment(KRD) which helps to provide an automated mechanism to install and configure Kubernetes services required for the MultiCloud/K8s plugin. Change-Id: Ica49566fcd531e25846ed3e5062de2f92ec56f6c Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: MULTICLOUD-301
2018-08-31Updated git submodulesGary Wu1-0/+0
Project: integration master 3403efee23c784c0dd81caa69f0d80143a72e089 Merge "Write HV-VES testcase for SSL authorization" Write HV-VES testcase for SSL authorization Change-Id: I4eeed5d3418c80d34ba8127bbbe9c49969a033ec Issue-ID: DCAEGEN2-687 Signed-off-by: kjaniak <kornel.janiak@nokia.com>
2018-08-31Updated git submodulesGary Wu1-0/+0
Project: integration master a5a97952c32ad002e8cf1f296c279b8fdc7491ad Merge "Draft for INT-607" Draft for INT-607 Full VES schema 30.0.1 Change-Id: I1c1dc2cbbba37443f9003f64b3d5bd4943be4415 Issue-ID: INT-607 Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
2018-08-31Updated git submodulesGary Wu1-0/+0
Project: integration master 993a1015ee2ce04f97da68a2fe69e024e434d64e Merge "Add basic SDC simulator" Add basic SDC simulator Basic simulator will be used in future VID csit tests. Issue-ID: INT-642 Change-Id: Ifef909c809f3acc38be156ebb81a8992f3901504 Signed-off-by: Gabriel <adam.krysiak@nokia.com>
2018-08-31Updated git submodulesPawel Biniek1-0/+0
Project: integration master 965bd032497217f456e31686db270f3e144b4821 Write HV-VES testcase for multiple clients - renamed messages routing suite file to reflect what tests it's covering - extracted common robot keywords related to xNF simulators creation from messages routing suite to separate resource file - written test suite for handling multiple clients at once Change-Id: If80d2d91ae96a0432fd4b6e51bce26796ee9200b Issue-ID: DCAEGEN2-687 Signed-off-by: pbiniek <pawel.biniek@nokia.com> Write HV-VES message routing testcases Change-Id: Ibbee3deb1ebd5446f2251dc141a212cde892f374 Issue-ID: DCAEGEN2-687 Signed-off-by: jdudycz <jakub.dudycz@nokia.com> Add messages validation in DCAE app simulator This enhances assertions and makes sure that HV-VES does not mess with measurements sent through GPB payload Change-Id: I140e6c35abc72270e2af8c5b1749136e6732e02a Issue-ID: DCAEGEN2-687 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2018-08-31Updated git submodulesFilip Krzywka1-0/+0
Project: integration master e26347542c3e379dba7aaf840c35140e6d097d4c Start xNF simulators in HV-VES test suite - keywords for containers start-up and shutdown - keyword for sending messages from simulators to HV-VES - aligned DCAE app assertion with sent messages amount to confirm that it actually consumes messages from kafka Change-Id: I123774949925c9e97c14ed5368e8cef64a7f23b5 Issue-ID: DCAEGEN2-687 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2018-08-31Updated git submodulesFilip Krzywka1-0/+0
Project: integration master d95a67029072015b75161aa180a72f242eda90ea Configure HV-VES suite containers - populate consul with HV-VES configuration - make DCAE app simulator to consume messages from non-default kafka topic Change-Id: I13773476f271b533236c0888fa5d091a0ee46a23 Issue-ID: DCAEGEN2-687 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2018-08-31Updated git submodulesFilip Krzywka1-0/+0
Project: integration master f15077f640d033c1eb50d5496b27b6d6739d7e76 Move HV-VES CSIT testsuites This is hopefully temporary alignment with other projects made to prevent jenkins job builder from creating unnecessary jobs for dcaegen2-prh-testsuites and dcaegen2-ves-collector-testsuites. Change-Id: I57a9e63fc93bce398c614ffb5ed9a2c2f939b501 Issue-ID: DCAEGEN2-687 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2018-08-31Updated git submodulesRam Koya1-0/+0
Project: dmaap/dbcapi master dabb73bcd7bffba2153d543f847ffed7aea6f1fe Merge "MR_Cluster.java : Fixed sonar issue" MR_Cluster.java : Fixed sonar issue Fixed sonar issue, change the condition so that it does not always evaluate to false Issue-ID: DMAAP-665 Change-Id: Id3b09ec2a596cfc1d2115a8b266e4789bc82ef38 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-08-31Updated git submodulesRam Koya1-0/+0
Project: dmaap/dbcapi master 54e0dbac4ce69241629858e8962ac18e5ea3df68 Merge "TopicService: Fixed sonar issue" TopicService: Fixed sonar issue Fixed sonar issue, a nullpointer exception could be thrown Issue-ID: DMAAP-666 Change-Id: Ie8bce6e6a5a1c05cace69487ae6ece3746dd73cf Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-08-31Updated git submodulesArundathi Patil1-0/+0
Project: dmaap/dbcapi master e1ecae70942d862e81d49f73a4f7d8673d9fe7cd DmaapTimestamp.java: Fixed sonar issue Fixed sonar issue, make 'cal' a instance variable Issue-ID: DMAAP-667 Change-Id: Ia79b4d83ebd0d4629dce52dcb2b51af021fe88c9 Signed-off-by: Arundathi Patil<arundpil@in.ibm.com>
2018-08-31Updated git submodulesRam Koya1-0/+0
Project: dmaap/datarouter master 4fe3669fbd63c06ab4d87ed371a49ab2ac9b066a Merge "Sonar fix for DB.java" Sonar fix for DB.java https://sonar.onap.org/project/issues?id=org.onap.dmaap.datarouter%3Aparent&open=AWUebYr6wGn37JfbxiDE&resolved=false&severities=BLOCKER&types=BUG Issue-ID: DMAAP-680 Change-Id: I8760e8dd945e5b5e9792dfdaf3d0193f89c573a6 Signed-off-by: Amaresh Kumar <kamaresh@in.ibm.com>
2018-08-31Updated git submodulesRam Koya1-0/+0
Project: dmaap/datarouter master d88f9be17654939fe085e6dc417220b3d7486556 Merge "Sonar fix for SubLinks.java" Sonar fix for SubLinks.java https://sonar.onap.org/project/issues?id=org.onap.dmaap.datarouter%3Aparent&open=AWHFaQpEEU5FCDfKtnaF&resolved=false&severities=BLOCKER&types=BUG Issue-ID: DMAAP-681 Change-Id: Ie55fdabef3e7fa34ae6e93be82d7a1ef0a4a710c Signed-off-by: Amaresh Kumar <kamaresh@in.ibm.com>
2018-08-31Updated git submodulesRam Koya1-0/+0
Project: dmaap/datarouter master 4ee1a5058de07e0177933850b1f8e80377365e5c Merge "Fixed Sonar issue in SubDelivery.Java" Fixed Sonar issue in SubDelivery.Java https://sonar.onap.org/project/issues?id=org.onap.dmaap.datarouter%3Aparent&open=AWHFaQpSEU5FCDfKtnas&resolved=false&severities=BLOCKER&types=BUG Issue-ID: DMAAP-682 Change-Id: Ic08968dedc5cab5a21ea4476be5653c41ab71b04 Signed-off-by: Amaresh Kumar <kamaresh@in.ibm.com>
2018-08-31Updated git submodulesRam Koya1-0/+0
Project: dmaap/datarouter master 998071748faae0b0da58e6a50f8765fbd23b1969 Merge "Fixed Sonar Issues in NodeClass.java" Fixed Sonar Issues in NodeClass.java https://sonar.onap.org/project/issues?fileUuids=AWHFaQiuEU5FCDfKtnFN&id=org.onap.dmaap.datarouter%3Aparent&open=AWHFaQp1EU5FCDfKtnb5&resolved=false&severities=BLOCKER Issue-ID: DMAAP-683 Change-Id: I49551fc807d455d656eb84661b2507b85f681d4e Signed-off-by: Amaresh Kumar <kamaresh@in.ibm.com>
2018-08-31Updated git submodulesRam Koya1-0/+0
Project: dmaap/datarouter master 3429ec4ff1d54d1f477e835937b7ca16a7951740 Merge "Unit tests for ExpiryRecord" Unit tests for ExpiryRecord Change-Id: I03af7430b696c128cb587f5639c6ef4ad26d4210 Signed-off-by: Emmett Cox <emmett.cox@ericsson.com> Issue-ID: DMAAP-101
2018-08-31Updated git submodulesRam Koya1-0/+0
Project: dmaap/datarouter master 8230e5c03aae3d1f3b24e0759febce80cbe1cf65 Merge "Unit tests for DeliveryRecord" Unit tests for DeliveryRecord Change-Id: I97443e2abe8aec654e7085d1126679de456ae265 Signed-off-by: Emmett Cox <emmett.cox@ericsson.com> Issue-ID: DMAAP-101
2018-08-31Updated git submodulesRam Koya1-0/+0
Project: dmaap/datarouter master 5fd93f615e22be840bde408fafa3288845c85a92 Merge "Unit Test for PubFailRecord" Unit Test for PubFailRecord Change-Id: I14b2bd82e52c33d4ec5bcff23c47133f7052a70c Signed-off-by: Mariusz Sobucki <mariusz.sobucki@ericsson.com> Issue-ID: DMAAP-101
2018-08-31Updated git submodulesInstrumental1-0/+0
Project: aaf/authz master 9f52db1c94a0e772825cfe985c21cf0b46850d76 CLM versions Issue-ID: AAF-419 Change-Id: Id863c1b4a0370eabd1849c38e84f512d20504848 Signed-off-by: Instrumental <jonathan.gathman@att.com>
2018-08-31Updated git submoduleseconwar1-0/+0
Project: dmaap/datarouter master 8ef486fc4188fe484ab112db936f5ead2d612852 Add in memory DB to test Group Change-Id: Ibfcd6044151c5b55263c701baf8619c7a15235ff Signed-off-by: Conor Ward <conor.ward@ericsson.com> Issue-ID: DMAAP-101
2018-08-31Updated git submodulesseshukm1-0/+0
Project: so master b3b1c9fa6b788db9c1933f20b4cf85cc62656167 fix for refactored items readthedocs Updated the monitoring feature title Updated the folders for the api, devinfo and the release notes Change-Id: Ic512530157b7b6d67366227090fd704bca82f558 Issue-ID: SO-675 Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2018-08-31Updated git submodulesromaingimbert1-0/+0
Project: externalapi/nbi master 83d3d0b7511bce0a4dce7724e1e4a6b54d3b3dc4 Fix critical security issues -change pom dependencies version Change-Id: I053f46b33aeb61e10e390af039dcf19c8247b651 Issue-ID: EXTAPI-126 Signed-off-by: romaingimbert <romain.gimbert@orange.com>
2018-08-31Updated git submodulesInstrumental1-0/+0
Project: aaf/authz master 46b3a8b776c2ef64a82f55e6e3211b3cd48f8974 Sample CA Issue-ID: AAF-420 Change-Id: I1bc4b0993c542e50b7ffcc4249ba25ff5ae06cf0 Signed-off-by: Instrumental <jonathan.gathman@att.com>
2018-08-31Updated git submodulesSmokowski, Steve (ss835w)1-0/+0
Project: logging-analytics master 7e1d40b6f91c4da5b52ef98a27f938ccc6229baf Add Enum Issue-ID: LOG-638 Change-Id: I741dca8b2059c18a4b287319f792270c4a25c00f Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-08-31Updated git submodulesSandeep J1-0/+0
Project: appc master 427428023f01af5ff4d2683ce260b25f58e43865 refactored code in ExecuteNodeActionImpl.java created a method a called getVserverRelations(SvcLogicContext vnfCtx, SvcLogicContext ctx) having the logic for looping through relationship-list data, to get vserver relations. This piece of code was earlier not covered by test cases. By putting this logic in a separate method, we will be able to write a specific test case for this logic and will be able to increase the code coverage by a big amount. Issue-ID: APPC-1086 Change-Id: Iffa2a4f04a1fd2b93edc4bcdfef8625f196a305e Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-31Updated git submodulesBozawglanian, Hagop (hb755d)1-0/+0
Project: vnfrqts/requirements master d57c071136e492a4e4d2f83df389a96b16ec7bb3 VNFRQTS - Rewording Security Req Batch 2 Including changes for VNFRQTS-302, 312, 314, 322, 339 Issue-ID: VNFRQTS-302 Change-Id: I21e8efc1c305d3f2a1881bac533e665255a8c83b Signed-off-by: Bozawglanian, Hagop (hb755d) <hb755d@att.com>
2018-08-31Updated git submodulesGuangrongFu1-0/+0
Project: holmes/rule-management master a9e01a4e720ff10684a9c46e9e8ab85848d3b3a7 Add some UT codes Change-Id: I477f23f237dad9efbf473545c80e296ed992ae71 Issue-ID: HOLMES-159 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>