summaryrefslogtreecommitdiffstats
path: root/docs/submodules/aai
AgeCommit message (Collapse)AuthorFilesLines
2018-02-24Updated git submodulesLiZi1-0/+0
Project: aai/esr-server master b0512c0b66d91ca71a53e4f4b9073a2b509d0eaf Fix the security issue of esr server. Fix the security issue CVE-2016-3720 and CVE-2017-17485 Change-Id: I3f7d0c4fb841d72e2b463091a5c4b5e5e81f0611 Issue-ID: AAI-592 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-02-23Updated git submodulesJimmy Forsyth1-0/+0
Project: aai/aai-common master d785026550b7ca735ea4666fd7f1b1136b284674 Update v1.1.1 patch release notes Issue-ID: AAI-672 Change-Id: I93135b613be776bf00c64f006a57c11820ee2197 Signed-off-by: Jimmy Forsyth <jf2512@att.com> (cherry picked from commit cc5e615ea72c1c794aa137197637352fbf98de8a)
2018-02-22Updated git submodulesJimmy Forsyth1-0/+0
Project: aai/aai-common master 8e75ff915223a40b56f515f2cff75728032ad55d Revert to pre-nexusIQ updates Issue-ID: AAI-586 Change-Id: I7b3f40e0b8317c562715cb44964a8396fb06dd54 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2018-02-21Updated git submodulesrenealr1-0/+0
Project: aai/sparky-be master 4c8c916b9dfcac969d4966ea85cf08f0d4ff7726 remove printing a stacktrace Issue-ID: AAI-788 Change-Id: I5d52bea1bef671abc2eeace4027535d0d5313940 Signed-off-by: renealr <reneal.rogers@amdocs.com>
2018-02-21Updated git submodulesrenealr1-0/+0
Project: aai/sparky-be master e6f45969b521b66e1d72822157f0d8252e751bde fix the cookie decryption logic Issue-ID: AAI-788 Change-Id: Ife47fe5e6f75ee1187c5385bca0ce53db4eff37f Signed-off-by: renealr <reneal.rogers@amdocs.com>
2018-02-21Updated git submodulesJimmy Forsyth1-0/+0
Project: aai/aai-common master 380acc42607eac609bbb057de7378b66c20d03fe Update versions for NexusIQ Change-Id: I1af4a4067f6673b0bbea45a23669741df70992c7 Issue-ID: AAI-586 Issue-ID: AAI-629 Issue-ID: AAI-633 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2018-02-20Updated git submodulesVenkata Harish K Kajur1-0/+0
Project: aai/aai-common master 40ab97c079ed7bc2625b8186ae95c7faabe69e3a Add the v13 xml schema and version update Issue-ID: AAI-536 Change-Id: I2ea654af0be91d233cc6cd5d50ee0186ef3a9a89 Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
2018-02-13Updated git submodulesVenkata Harish K Kajur1-0/+0
Project: aai/aai-common master 5cc2d9e747d6ed60b1b761b8dfa1b06703d6a348 Update the version to 1.2.1-SNAPSHOT Issue-ID: AAI-493 Change-Id: I03a5288824e74d4965116f24d7bd13817491a937 Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
2018-02-08Updated git submodulesPrasadNaidu1-0/+0
Project: aai/aai-common master 1554ce7da9c8b86ce11e7d3f53052b659ab2a120 Add the @Override annotation Add the @Override annotation above this method signature GraphTraversalBuilder.java:L349 Sonar Link : https://sonar.onap.org/component_issues/index?id=org.onap.aai.aai-common%3Aaai-common#resolved=false|severities=MAJOR|rules=squid%3AS1161|assignees=_me_%2CPrasadNaidu Location : src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.javaChange-Id: I8852e515b3d2038268c0558979006be8b4d9ac69 Change-Id: I949f5e6ec1692e4397064bfafdad3d453eaed9eb Issue-ID: AAI-740 Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
2018-02-08Updated git submodulesSteven Blimkie1-0/+0
Project: aai/sparky-be master 570fbbc23ea65c4cdb10da04e37263f489b9b357 Merge "Update Sparky README files" Update Sparky README files Issue-ID: AAI-743 Change-Id: Ia9f450e6571d85b0bed5b4b9dd7d38a98513313f Signed-off-by: dave.adams (da490c) <dave.adams@amdocs.com>
2018-02-08Updated git submodulesdave.adams (da490c)1-0/+0
Project: aai/sparky-be master 8b644f1f0f654f00dcb486abffc05c6a73065aaf Adding more sparky junit coverage Issue-ID: AAI-741 Change-Id: Id4137e7ef61e0066a39d98bcd8b9c0ec5b034d1e Signed-off-by: dave.adams (da490c) <dave.adams@amdocs.com>
2018-02-07Updated git submodulesricharv1-0/+0
Project: aai/sparky-be master a23ea1abfc73e3baca3bbf982de1caffbb2f94cf Increasing test coverage Issue-ID: AAI-741 Change-Id: Iecc07f9d4ff78c3ffde00ef5bb387a975289ce83 Signed-off-by: richarv <richard.vondadelszen@amdocs.com>
2018-02-07Updated git submodulesLizi1-0/+0
Project: aai/esr-server master b595576737ce9cf1b1e1db3589f549ca36bc73f6 Fix the bug about register MSB. When register service to MSB, esr-server still will register to MSB automaticly Change-Id: I69769906e87e6b8c9658b05de60af45ed2b47e82 Issue-ID: AAI-738 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-06Updated git submodulesSalma, Attaran1-0/+0
Project: aai/sparky-be master fc82c51d2a399813bfb55ede8ab341400dfce03a Cleaning code Change-Id: Idc82bf8f84a0b6268ae10ea12d1bec670509a58a Signed-off-by: Salma, Attaran <salma.attaran@amdocs.com> Issue-ID: AAI-733
2018-02-06Updated git submodulesLizi1-0/+0
Project: aai/esr-server master a1b75c86ea8a32971a8bef5f75167569b69f5fb6 Display ESR API with swagger When ESR registered to MSB. The API of esr-server can be visited from MSB portal through swagger Change-Id: I142b79c00920697839f55eac95b50a6072d19ca4 Issue-ID: AAI-735 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-06Updated git submodulesLizi1-0/+0
Project: aai/esr-server master 9c05d63a363a0b6a161f5f4d94d5cd893f582806 Remove the unused variable in vnfmManagerUtil Fix the sonar issue: https://sonar.onap.org/component_issues?id=org.onap.aai.esr-server%3Aaai-esr-server#resolved=false|severities=MAJOR Change-Id: I2e6a6ff49f91053020eed7ba1daf98c401887170 Issue-ID: AAI-734 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-06Updated git submodulesLizi1-0/+0
Project: aai/esr-server master 8ed87e2493fc517daa9255f73b13b14faa48b20f Remove the unused variable Fix sonar issue https://sonar.onap.org/component_issues?id=org.onap.aai.esr-server%3Aaai-esr-server#severities=MAJOR|resolved=false Change-Id: I07cb02bfad47e245e0a76030524a1db15948eb2a Issue-ID: AAI-734 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-06Updated git submodulesLizi1-0/+0
Project: aai/esr-server master df3d2cc8479e289cd0c0461075f54fb02acf2ce0 Add a constructive funtion, fix sonar issue. Fix the sonar issue https://sonar.onap.org/component_issues?id=org.onap.aai.esr-server%3Aaai-esr-server#resolved=false|severities=MAJOR Change-Id: I172a75efd156c29faa5b146d73ee1d9d09b5e40a Issue-ID: AAI-734 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-06Updated git submodulesLizi1-0/+0
Project: aai/esr-server master f316de26b8d0028cb1eed863039492c5d07e23c5 Rename variable,fix sonar issue. Fix the sonar issue https://sonar.onap.org/component_issues?id=org.onap.aai.esr-server%3Aaai-esr-server#resolved=false|severities=MAJOR Change-Id: I18298cfa2366e95a0bdd254498a4d9c8940dd181 Issue-ID: AAI-734 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-06Updated git submodulesLizi1-0/+0
Project: aai/esr-server master 06ef81a00bde473248f4e447d48ce0c4dc1ce993 Fix the sonar issue. Change-Id: I6894d0773ef37acea819897cd80a4aa0d2b785af Issue-ID: AAI-734 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-06Updated git submodulesLi Zi1-0/+0
Project: aai/esr-gui master b4c1ca64cd0b7635cb762c6431765cba168ae149 Merge "Sonar Major" Sonar Major Replace == with === commonUtil.js:L89 Sonar Link : https://sonar.onap.org/component_issues/index?id=org.onap.aai.esr-gui%3Aaai-esr-gui#resolved=false|severities=MAJOR|assignees=PrasadNaidu Location : src/main/webapp/extsys/ems/js/commonUtil.jsChange-Id: I4360ba702951cab1daa1bb92d57f43a3fc1389a8 Change-Id: I9df044d1e18c1cd58306ac351eaaf2ddc105f113 Issue-ID: AAI-731 Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
2018-02-06Updated git submodulesLi Zi1-0/+0
Project: aai/esr-gui master 18396b34b9b92e2ba64fc51d29a9b3c4b820cde7 Merge "Sonar Major" Sonar Major Replace == with === commonUtil.js:L47 Sonar Link : https://sonar.onap.org/component_issues/index?id=org.onap.aai.esr-gui%3Aaai-esr-gui#resolved=false|severities=MAJOR Location : src/main/webapp/extsys/ems/js/commonUtil.jsChange-Id: I1f0960a64f18ad22872f025899249ffa47dab526 Change-Id: Iab29d3ac7a6049a0c482f87fb312ab7db8a11d78 Issue-ID: AAI-730 Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
2018-02-06Updated git submodulesLi Zi1-0/+0
Project: aai/esr-gui master af05f8d10f4596547b2888ae0d6d4b90f3c72b4b Merge "Sonar Major" Sonar Major Replace != with !== commonUtil.js:L22 Sonar Link : https://sonar.onap.org/component_issues/index?id=org.onap.aai.esr-gui%3Aaai-esr-gui#resolved=false|severities=MAJOR|assignees=PrasadNaidu Location : src/main/webapp/extsys/ems/js/commonUtil.js Change-Id: Ia3a84e08e88b04ee0cea325308f5236d942f8d5b Issue-ID: AAI-729 Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
2018-02-05Updated git submodulesPrasadNaidu1-0/+0
Project: aai/esr-gui master 378b74b36f7acc7cd68bdac170348e62c4c5ceeb Sonar Major Replace == with === commonUtil.js:L18 Sonar link : https://sonar.onap.org/component_issues/index?id=org.onap.aai.esr-gui%3Aaai-esr-gui#resolved=false|severities=MAJOR|rules=javascript%3AEqEqEq%2Cjavascript%3ABitwiseOperators Location : src/main/webapp/extsys/ems/js/commonUtil.js Change-Id: I3736d67a3c437a4d895bf3e6b995231497f457fc Issue-ID: AAI-727 Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
2018-02-02Add aai/event-client as submoduleLee, Tian (tl5884)1-0/+0
Change-Id: Idc01e0dc54a6d55b8aaf4b3e425553f817d18587 Issue-ID: AAI-700 Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
2018-02-02Updated git submodulesPrasadNaidu1-0/+0
Project: aai/esr-server master 9770fc1f6ba50a4607f248f37c100785007ba7e1 Sonar Minor Rename this field to match the regular expression AaiCommon.java:L24 Sonar link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.esr-server%3Aaai-esr-server#resolved=false|severities=MINOR|rules=squid%3AS3008 Location: src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java Change-Id: Id6b6db3ac750c1dadc851822ad59e9d3c97fbddf Issue-ID: AAI-697 Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
2018-02-01Updated git submodulesJames Forsyth1-0/+0
Project: aai/aai-common master 7530f3a5fd81ce79baca86e70709bad399cc4ec1 Merge "Fixes in ManageTitanSchema" Fixes in ManageTitanSchema Change-Id: I4bf936db39c3ce134f53fd5a885f590d82c108aa Issue-ID: AAI-708 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-02-01Updated git submodulesJames Forsyth1-0/+0
Project: aai/aai-common master 83fd6e96a90e20b90839098ae854fdb2f2706a83 Merge "Fix in URIToObject" Fix in URIToObject Change-Id: Icbb4b80412202b445b4c8a61a26dd00484233b06 Issue-ID: AAI-725 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-02-01Updated git submodulesJames Forsyth1-0/+0
Project: aai/aai-common master d5accac42af8e5b7e73ea99c779a5b8a255be184 Merge changes Merge "Fix in CNName" Fix in CNName Change-Id: Iae265c4ad5891d14d9c56915e50878fa9b053a1c Issue-ID: AAI-724 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-02-01Updated git submodulesJames Forsyth1-0/+0
Project: aai/aai-common master 7b1ebd04bf514fd9c011dd415b4992ea8beae1aa Merge "Fix in InjectKeysFromURI" Fix in InjectKeysFromURI Change-Id: I9113bdf8b87441c792bf151124fcf603ab8b5424 Issue-ID: AAI-716 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-02-01Updated git submodulesJames Forsyth1-0/+0
Project: aai/aai-common master 20b8a65f9dff129be91734445917aa2360fbf94c Merge "Fixes in PojoStrategy" Fixes in PojoStrategy Change-Id: Ia6a5b98bad3cffd9aa92c50fa0783423a15f5a9d Issue-ID: AAI-715 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-02-01Updated git submodulesJames Forsyth1-0/+0
Project: aai/aai-common master ce6a7fd941d113704bb923d34826074c792f2eca Merge "Fix in PojoInjestor" Fix in PojoInjestor Change-Id: I78bbe797d4eff5aa02c08ab719594784d4d322f5 Issue-ID: AAI-714 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-02-01Updated git submodulesJames Forsyth1-0/+0
Project: aai/aai-common master 9c495f25f048af390a7aee649faabc44d3148047 Merge "Fixes in MoxyStrategy" Fixes in MoxyStrategy Change-Id: I72248e1bb8423f24194cc69b63c3623732e2a065 Issue-ID: AAI-712 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-02-01Updated git submodulesJames Forsyth1-0/+0
Project: aai/aai-common master f9b6b7961bac66288b6241ce7c2fbfed24fb30b9 Merge "Fixes in JSONStrategy" Fixes in JSONStrategy Change-Id: If961ca134c14239608331ca3a0251e8d0597a42d Issue-ID: AAI-711 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-02-01Updated git submodulesJames Forsyth1-0/+0
Project: aai/aai-common master 6fa93a71a0e219853d99097f121a4318082e911f Merge "Fixes in Introspector" Fixes in Introspector Change-Id: Ic042ad232df1553984d51d3837b36bb886a316fd Issue-ID: AAI-709 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-02-01Updated git submodulesJames Forsyth1-0/+0
Project: aai/aai-common master 0b55ed7b4fcc789da52d9d131fde407cc93583d2 Merge "Fix in AuditOXM" Fix in AuditOXM Change-Id: I625e40de92f1ac71113b56bf330c18041164551e Issue-ID: AAI-707 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-02-01Updated git submodulesburdziak1-0/+0
Project: aai/aai-common master be11a57ad69af3bb8019adfb67578936b0e1eec0 Fix in HttpsAuthClient Change-Id: Ifa266c4b86d81c114956028fa2d7c59e4a0aaaae Issue-ID: AAI-705 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-02-01Updated git submodulesLi Zi1-0/+0
Project: aai/esr-server master a80431d4cd84ed93d17ecd9f01ca311e6deb60a9 Merge "Add a private constructor" Add a private constructor Add a private constructor to hide the implicit public one MsbConfig.java Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.esr-server%3Aaai-esr-server#resolved=false|severities=MAJOR|assignees=PrasadNaidu Location: src/main/java/org/onap/aai/esr/common/MsbConfig.java Change-Id: I1a71ffa16a9b57d75a98138492155133e07bf4dc Issue-ID: AAI-713 Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
2018-02-01Updated git submodulesLi Zi1-0/+0
Project: aai/esr-server master 20c270053efed3721b8df55cf7a3b8c344c0f842 Merge "Fix the sonar issue." Fix the sonar issue. Change-Id: I9f75b3e54ca634c268a8d3f14c29db03d6e263b7 Issue-ID: AAI-723 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-01Updated git submodulesLi Zi1-0/+0
Project: aai/esr-server master 65d614f77561e8c8bb68e383f5de2fd47dd57eed Merge "sonar critical for Design" sonar critical for Design Added a private constructor to hide the implicit public one Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.esr-server%3Aaai-esr-server#severities=CRITICAL%2CMAJOR|resolved=false|assignees=dthakur Location: src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java Line No-18 Change-Id: I3f47b6de765f6b14871d58c3c9b0d8d0360a76be Issue-ID: AAI-718 Signed-off-by: Dushyant Singh Thakur <dt00503496@techmahindra.com>
2018-01-31Updated git submodulesPaquette, Francis1-0/+0
Project: aai/sparky-be master 10f3bd738258130fa1558dd8ae8ba2a1342993ab Fixed a curruption that occurs on startup The start script was adding the 2 extra lines right after the last character in the file. The extra line in the file will ensure that it will be added at the end. Also, the start script now ensures that only 1 copy of these added attributes exist in the file. Issue-ID: AAI-717 Change-Id: I5deb2d9e74d48f3c4d2351582f05468590d0b72e Signed-off-by: Paquette, Francis <francis.paquette@amdocs.com>
2018-01-31Updated git submodulesLi Zi1-0/+0
Project: aai/esr-server master 4c2b187e47275f6c984fb0887feef81e705018a2 Merge "Fix the security issue about hibernate and ant." Fix the security issue about hibernate and ant. Change-Id: Ie2ca3b5e369d709a9d57e514313fe6419f75018a Issue-ID: AAI-592 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-01-31Updated git submodulesLi Zi1-0/+0
Project: aai/esr-server master 6bc8b3c6f31ba7f3a7fe199ee5116832c0fc1daf Merge "Sonar Minor: Remove the thrown runtime exception." Sonar Minor: Remove the thrown runtime exception. Remove the declaration of thrown runtime exception. Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.esr-server%3Aaai-esr-server-parent#resolved=false|severities=MINOR Location: src/main/java/org/onap/aai/esr/externalservice/aai/ThirdpartySdncRegisterProvider.java Line No:53 Issue-ID: AAI-624 Change-Id: Ief9b736eebcb1e55bbc61e3a4d223368f97ee19a Signed-off-by: aishkashyap <as00476394@techmahindra.com>
2018-01-30Updated git submodulesPaquette, Francis1-0/+0
Project: aai/sparky-be master 9a5553c1f23da07abea1b5a911fbfa6955d38f36 Fixed fortify scan issues Removed an unused file. If a redirect URL is bad, then do not send it back as payload in the response. Issue-ID: AAI-701 Change-Id: I060c7a192d226b09d3b1a30e8037f964625b6b75 Signed-off-by: Paquette, Francis <francis.paquette@amdocs.com>
2018-01-30Updated git submodulesLizi1-0/+0
Project: aai/esr-gui master 0d47ccca144711771e584e596393200e75ab1f5e Add license definition. Change-Id: I636f131b02ec0aafa8217077989588cfb5cb7e9d Issue-ID: AAI-704 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-01-30Updated git submodulesLizi1-0/+0
Project: aai/esr-server master a79deea30c433e878f5da45e0565a5c04ccba57a Add license definition. Change-Id: I243cd21cd5d2d56f7c9b93c754fb4d48876c07b4 Issue-ID: AAI-703 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-01-30Updated git submodulesLi Zi1-0/+0
Project: aai/esr-server master 602b54865f4f47b491848b83417c5c0d05bfebe7 Merge "Remove this unused import java.util.ArrayList" Remove this unused import java.util.ArrayList Remove this unused import java.util.ArrayList VimRegisterInfo.java:L18 Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.esr-server%3Aaai-esr-server#assigned=false|resolved=false|severities=MINOR Location: src\main\java\org\onap\aai\esr\entity\rest\VimRegisterInfo.java Change-Id: I55354dfaad886dade9310776a5fa1af798ac33df Issue-ID: AAI-688 Signed-off-by: Swapnali Pode <SP00501638@techmahindra.com>
2018-01-30Updated git submodulesLi Zi1-0/+0
Project: aai/esr-server master 031f91bada11ac58f5ccba64c9588c94c7996bab Merge "Move string literal to left side of comparison" Move string literal to left side of comparison Move true string literal on the left side of this string comparison ExtsysApp.java:L56 Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.esr-server%3Aaai-esr-server#resolved=false|assignees=swapnalipode Location: src/main/java/org/onap/aai/esr/ExtsysApp.java Change-Id: I82e43ca7a68322c6d409ecc113932e289721c374 Issue-ID: AAI-691 Signed-off-by: Swapnali Pode <SP00501638@techmahindra.com>
2018-01-30Updated git submodulesSwapnali Pode1-0/+0
Project: aai/esr-server master 261a5b36c80fb94dccaa23b868f5ef0d71463134 Add a private constructor to hide implicit public Add a private constructor to hide the implicit public one Config.java:L22 Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.esr-server%3Aaai-esr-server#severities=MAJOR|resolved=false Location: src/main/java/org/onap/aai/esr/common/Config.java Change-Id: I6247597bebe48365a7fa34ab539b2fddf8d15da7 Issue-ID: AAI-694 Signed-off-by: Swapnali Pode <SP00501638@techmahindra.com>
2018-01-26Updated git submodulesLizi1-0/+0
Project: aai/esr-server master 554dec8527b2a280a268a498aa8501f2f9582991 Fix an unit error. Change-Id: I0da4787b793245ca2a9d73ea3ba81fb5a464221e Issue-ID: AAI-500 Signed-off-by: Lizi <li.zi30@zte.com.cn>