summaryrefslogtreecommitdiffstats
path: root/docs
AgeCommit message (Collapse)AuthorFilesLines
2020-04-24Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to c86d7262d03b299dc635b3ba68e4a7c2c0fd6a6e - Merge "Secure Kafka Authentication" - Secure Kafka Authentication Implementation of kafka secure authentication : - SSL - SASL(SCRAM) & SSL Issue-ID: CCSDK-2313 Change-Id: I4b2fc7abab7478e360ebf461608a620d75708f54 Signed-off-by: Julien Fontaine <julien.fontaine@bell.ca>
2020-04-24Update git submodulesLiam Fallon1-0/+0
* Update docs/submodules/policy/parent.git from branch 'master' to dd15e836428e90647d29c21be2d032cd8d7f5b9a - Merge "Exclude glassfish jaxb" - Exclude glassfish jaxb Added exclusion for glassfish jaxb to eliminate security issue. Issue-ID: POLICY-2521 Change-Id: I16016514c5e033be208c79877900d7e9dc0c3d21 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-04-24Update git submodulesPamela Dragosh1-0/+0
* Update docs/submodules/policy/parent.git from branch 'master' to a885667157879d5ca8ba17786af635f0b5983ce5 - Merge "Fix documentation errors" - Fix documentation errors This also updates the XACML PDP documentation. Issue-ID: POLICY-2500 Change-Id: Ice086fa39040fbee899652faa0a079192a122f03 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-04-24Update git submodulesjhh1-0/+0
* Update docs/submodules/policy/engine.git from branch 'master' to 663156eea876121cecc341e642100d11c1e20f9e - remove invocation of push-policies.sh in legacy pap Issue-ID: POLICY-2518 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Ia760f391a4ff97b16530842ed7e33c93966532c1 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2020-04-24Update git submodulesdfarrelly1-0/+0
* Update docs/submodules/dcaegen2.git from branch 'master' to 4e457425203cd42635eeea0bde044abf8b119946 - [PMSH] Update PMSH Frankfurt docs Issue-ID: DCAEGEN2-1820 Signed-off-by: dfarrelly <david.farrelly@est.tech> Change-Id: I0ef088ae7f6a97ab101a7097e6ea9bf81424c343
2020-04-24Update git submodulesJohn J. Franey1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to 6a12a6f42bdb2c1a13498f88000bada9b09c683f - push release 2.1.20 to nexus repository Issue-ID: AAF-1124 Signed-off-by: John J. Franey <john.franey@att.com> Change-Id: I8c1dd0bf927461030ab6e7633280f262858f73d8
2020-04-24Update git submodulescyuamber1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 5da70916a3eb0295daf5e715b3ee69aa082e41ad - docs: add functional description of user guide Change-Id: I31d83330733dc18150317abd3adc8ebfd813da05 Issue-ID: USECASEUI-435 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-04-24Update git submodulescyuamber1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 19a25dcc90e8af496279d6c456246e663b16c3f5 - docs: change the structure of uui docs Change-Id: I4147423de4b763a3cec106a66a1cf6c4477feadb Issue-ID: USECASEUI-420 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-04-24Update git submodulesHuabing Zhao1-0/+0
* Update docs/submodules/msb/apigateway.git from branch 'master' to 3ba6d415c7dfcde1f81473a452b08e26aad7fc75 - release 1.2.7 Issue-ID: MSB-467 Signed-off-by: Huabing Zhao <zhao.huabing@zte.com.cn> Change-Id: I40fdcf94f30cd73cdf9fc7695d6be4bc50024ead
2020-04-23Update git submodulesRitu Sood1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to 7e20d29b2d82f4ebbe347b7ed39a1c5d51752314 - Merge "Added intentResolver" - Added intentResolver IntentResolver shall collect the clusterdetails for each of the app where it needs to be deployed. This shall be called by the instantiation code. Issue-ID: MULTICLOUD-1041 Signed-off-by: Rajamohan Raj <rajamohan.raj@intel.com> Change-Id: I7d29901e46a5349ef502786c187c1c88bea61a12
2020-04-23Update git submodulesJohn J. Franey1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to 6216814d263834a61708ec1cf002365f4ad6f969 - fix: stage a release candidate for 2.1.20 Issue-ID: AAF-1124 Signed-off-by: John J. Franey <john.franey@att.com> Change-Id: I401b5b5c6589757d15027e0ad4b96f0061016be9
2020-04-23Update git submodulesRitu Sood1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to 334322f5995394dfa6a948101064634eaaf5f0b5 - Merge "Controller API support" - Controller API support Add controller API support as baseline for adding gRPC framework. Issue-ID: MULTICLOUD-1019 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com> Change-Id: Ifd522a0eefbb8e54be45cc62003d3809283c9bfe
2020-04-23Update git submodulesRitu Sood1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to b54eda4919487b700554a27cb46b6e6b465ad180 - Merge "Add code to apply workload network annotations" - Add code to apply workload network annotations Apply workload network intents to indicated resources in the AppContext. This will add/update network annotations for pods or resources that have pod templates. Issue-ID: MULTICLOUD-1029 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com> Change-Id: I9ae4387a8c28a95510406da361cfef3f8257bc80
2020-04-23Update git submodulesRitu Sood1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to bdb527826000c1ab7e832b2bf5fd188f72e3bfb9 - Merge "Upgrate the out-of-date link in virtlet test" - Upgrate the out-of-date link in virtlet test The fedora 29 image link is out of date. It is not reachable now. So upgrade the link to fedora 31. Issue-ID: MULTICLOUD-1057 Signed-off-by: Yao Le <le.yao@intel.com> Change-Id: I5f384cb906bf080c55ea4ea2a27b1514722c8b76
2020-04-23Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to e24e6d4e66fecbb9f5ef8e45517a6e6646648990 - Merge "[DMaaP MR] Remove "lost+found" in kafka PVC" - [DMaaP MR] Remove "lost+found" in kafka PVC When using a storage class, kafka data is set on top of a partition and then 'lost+found' ext4 folder, which is automatically created, is seen as a topic but with bad naming. So we remove this folder in the init script. Issue-ID: OOM-1227 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: If04304326fc5478f791d8290b8ceb39753c59c2f
2020-04-23Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to a3210a7f84335fe4626ccd52ff5d633e7fd3c70e - Merge "[POLICY] Remove hardcoded credentials from policy-xacml-pdp" - [POLICY] Remove hardcoded credentials from policy-xacml-pdp This patch remove hardcoded healthcheck credentials from policy-xacml-pdp Issue-ID: OOM-2342 Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com> Change-Id: I49db16a852412bad79f092232bcd2ba97eac7170
2020-04-23Update git submodulesCheung, Pat (kc1472)1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to cfddfad6cdbe087a0b75c5df73cf059dbe2d700f - self-serve DG bugfix fix cds ra response to yang model mapping Issue-ID: SDNC-1140 Signed-off-by: Cheung, Pat (kc1472) <kc1472@att.com> Change-Id: I54cdb6fec0bd448b99344868e894bf65dc2f26fc
2020-04-23Update git submodulesPatrick Brady1-0/+0
* Update docs/submodules/appc/deployment.git from branch 'master' to 3cee7d0e79833de9e3af12172e02827660972c72 - Docs: New Building Guidelines doc This guide covers how to build appc and the docker images. Change-Id: I51b6f4d1e3a8a34a1386ba367edad0752f434a53 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1871
2020-04-23Update git submodulesPatrick Brady1-0/+0
* Update docs/submodules/appc/deployment.git from branch 'master' to 101c60280a717dfc23833c28737998d20836d92c - Docs: Update copyright on deployment guide The copyright date was not updated as part of the deployment guide updates, as it should have been. Change-Id: I1b46b043e66e254e92d5a20ed9a4be527453e6d2 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1863
2020-04-23Update git submoduleszhaoliping1231-0/+0
* Update docs/submodules/cli.git from branch 'master' to 070a79ca528ce774a8ace8abef7f83897e32efbf - Update vfc cli Issue-ID: CLI-268 Change-Id: Ib66d4cd23b811aee91630608d85a5df797f7d06e Signed-off-by: zhaoliping123 <zhaoliping@chinamobile.com>
2020-04-23Update git submodulesMorgan Richomme1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 2aceb30bd007dbe558419210f2f3a0753b909d98 - Merge "Update CDS application.properties" - Update CDS application.properties Add property to disable publish audit service Add property to disable output logs from cmd-exec Issue-ID: CCSDK-2183 Signed-off-by: Julien Fontaine <julien.fontaine@bell.ca> Change-Id: Ie64c9110568ebc0ef4ca7fdf75d312dde4a7f893
2020-04-23Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to f08bff64a1f54e9e8ff5920963247b1a0cfe535b - Merge "Junit for SdcListenerException" - Junit for SdcListenerException Issue-ID: CCSDK-2305 Change-Id: I369e98e0c9b57e3b1e6a52c073f91fa355057508 Signed-off-by: ezhil <ezhrajam@in.ibm.com>
2020-04-23Update git submodulesstark, steven1-0/+0
* Update docs/submodules/integration.git from branch 'master' to d5d74c7ce5f071d2e0417cc3b4b86073fd9b41cc - [INT] updating aks install w/ master pass - Also updating openstack cli to py3 to fix import issues Issue-ID: INT-1557 Signed-off-by: stark, steven <steven.stark@att.com> Change-Id: I99cbc68614e0fcc8fd0572fd7c44c7cd431b215b
2020-04-23Update git submodulesChristophe Closset1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 740a4cb495e6069d3d5cb3b93ca35594f64a3419 - Merge "Release 5.0.5" - Release 5.0.5 Make a release of the stable code in 5.0.5 Issue-ID: CLAMP-833 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ideb631c61c389a45f91f21edcf2f4612189b4b5a
2020-04-23Update git submodulesChristophe Closset1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 7ecef7df7c4f73a61619690b83209d79b00516f9 - Merge "Release 5.0.5" - Release 5.0.5 Make a release of the stable code in 5.0.5 Issue-ID: CLAMP-833 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I9c3c25510196e1ceed5a245a7e71f067a7a20604
2020-04-23Update git submodulesefiacor1-0/+0
* Update docs/submodules/dmaap/datarouter.git from branch 'master' to 5906de2465975e42e4983abe411f30fa16050fdf - Fix sonar issues and reporting Signed-off-by: efiacor <fiachra.corcoran@est.tech> Change-Id: I29aa54e62d2dfaa6eddb16eb67c325254dfc0e06 Issue-ID: DMAAP-1426
2020-04-23Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to fbabf1304f1eae3c9c9868a6e033758820ae326c - [Sniro] Disable Sniro-emulator in "onap-all" Sniro emulator is not a component which will be part of the release. As such, we don't start it even in "all" ONAP. Issue-ID: OOM-2372 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: Ib544f93ca51a42cd0b39637c14555cb9a3ecfda0
2020-04-23Update git submodulesChristophe Closset1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 6c42be8a5b9a90c3a2c2907174d4264cf5606ac4 - Merge "Fix entityId bug" - Fix entityId bug A user defined entry has been added to the entity id by default, so that json editor falls back to that value when re-editing the policies Issue-ID: CLAMP-829 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I593163f87df9f97a19964428bf2016154dc9576d
2020-04-23Update git submodulesChristophe Closset1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to e57ccc972e080ce039d7a1325332fcae3b75bbf1 - Merge "Fix refresh action" - Fix refresh action Fix the refresh action so that it well retriggered cds call when required, otherwise the refresh button is useless + get out the cds code from service installer Issue-ID: CLAMP-818 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ia5784d75e1bd158ff775674fe6bf0c2c39b55ad4
2020-04-23Update git submodulesChristophe Closset1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to b954df81bb47b3ff115207a2436f1b61eaeafad2 - Merge "Fix bug when adding op policy" - Fix bug when adding op policy The fix to prevent multiple op policy modle to be inserted introduced another bug, this pr fixes it Issue-ID: CLAMP-828 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I90432688df48cbf2b456efae5e4191e2909077cc
2020-04-23Update git submodulesBartek Grzybowski1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to add0093a314f7d9a6b91b57004d44ce21a98f64e - Merge "Adding Ubuntu support in Ansible - resource-data role" - Adding Ubuntu support in Ansible - resource-data role Extending ansible playbooks of ubuntu support. Creating new test with Ubuntu image for Molecule in resource-data role. Issue-ID: OOM-1671 Signed-off-by: Jan Benedikt <j.benedikt@partner.samsung.com> Change-Id: I7b6852cb235a2983f5cc6eb6a3bfa122d6a1fd2e
2020-04-23Update git submodulesJan Benedikt1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to e23ab1061b2ad64c8cd5c5d53d6ceb0da5e0baa2 - Adding Ubuntu support in Ansible - nginx role Extending ansible playbooks of ubuntu support. Creating new test with Ubuntu image for Molecule in nginx role. Issue-ID: OOM-1671 Signed-off-by: Jan Benedikt <j.benedikt@partner.samsung.com> Change-Id: I5f6a5aedfd9a2e17d3b1bb711d3e85a242b5e2d5
2020-04-23Update git submodulesJohn J. Franey1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to df9bf07b55ab41d9d69df04cd41e5bc4c9095893 - stage a release candidate for 2.1.20 Issue-ID: AAF-1124 Signed-off-by: John J. Franey <john.franey@att.com> Change-Id: Ic4eb1e777946c9a009759684eb807287634c8050
2020-04-23Update git submodulesTomasz Wrobel1-0/+0
* Update docs/submodules/aaf/certservice.git from branch 'master' to c1ad93cac1e7b7a900c86e7c1bff4a01555fd5fb - Update CertClient Documentation Update and Move CertClient description to usage page, add empty troubleshooting page. Issue-ID: AAF-1091 Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com> Change-Id: I0b9ef819875f5c20942208957b828185d08b8950
2020-04-23Update git submodulesBogumil Zebek1-0/+0
* Update docs/submodules/aaf/certservice.git from branch 'master' to de4c90d4db5f0f1eaf614f6b03851d1bc1b95abd - Merge "Add mTLS certificates generation documentation" - Add mTLS certificates generation documentation Signed-off-by: Adam Wudzinski <Adam.Wudzinski@nokia.com> Issue-ID: AAF-1091 Change-Id: I69199e98a50c2e18be7b45bf6097842459247d6e
2020-04-23Update git submodulesBogumil Zebek1-0/+0
* Update docs/submodules/aaf/certservice.git from branch 'master' to 25f2d8db814436bd941edd4cd7f5f5d09a1a0b00 - Merge "Update documentation related to configuration" - Update documentation related to configuration Signed-off-by: Adam Wudzinski <Adam.Wudzinski@nokia.com> Issue-ID: AAF-1091 Change-Id: I3b14febcf84a966d3d17b41c6500ec4fefdb62de
2020-04-23Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 3bb06374d5b6747d32ea9554259596d0a45fadc2 - Added early check for null value for `containerV` - Formatting code following project's code style - Added early check for null value for `containerV` Issue-ID: SDC-2905 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I648e9a4a04be3f2e7cd3e30a70c04de2257a99d3
2020-04-23Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to a994931dc349c93ba9b5c9bc7b517b9dd89a10cc - Minor cleanups for BasicAuthenticationFilter - Changed String representing encoding to Java's StandardCharsets.UTF_8 - Added explicit else condition in order to not rely on `abortWith`'s side effects Issue-ID: SDC-2917 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I81cb94c399ff1d810e85c7b63fde195928ab1b08
2020-04-23Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to c829bbcfc9505a3ebf6035b53274f8bf22c34cff - Add null tests - Change `isPropertiesListSizesNotEquals` to `isPropertiesListSizesEquals` - Added assertions to silence SonarCloud Issue-ID: SDC-2914 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I88003de54aea6c28575fecf0f41b4c5ef36ef154
2020-04-23Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 8def03ae0703c3629fcb5ac023fbe9a1eaead4b7 - Fix null pointer exception warnings Issue-ID: SDC-2911 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: Ic7f0ef631ed98e8baf2ea32b6bfc56a7142738f8
2020-04-23Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to cda9d2a5fa771830fa493bd3885178a4e4987c8c - Handle null condition in TopologyTemplateOperation - check if instanceId null in method isNotEmptyMapOfProperties Issue-ID: SDC-2920 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I70667142ed51834de638903ccae4ffcb896cccab
2020-04-23Update git submodulesHuabing Zhao1-0/+0
* Update docs/submodules/msb/apigateway.git from branch 'master' to 62669dc8a4e92f9619e354d8dca94bc1831a5296 - release 1.2.7 Issue-ID: MSB-467 Signed-off-by: Huabing Zhao <zhao.huabing@zte.com.cn> Change-Id: I66cb66aa3c815d7baa47969a3239f06ed7eb2ae8
2020-04-22Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 996ab96fabdf0fbba8d8f1430a7a2c6825e6ca4f - Merge "[POLICY] Remove hardcoded credentials from policy-api" - [POLICY] Remove hardcoded credentials from policy-api This patch remove hardcoded healthcheck credentials from policy-api. Issue-ID: OOM-2342 Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com> Change-Id: Ifc12d78fc1f7f00dd1466c32553453f0273661a3
2020-04-22Update git submodulesRam Krishna Verma1-0/+0
* Update docs/submodules/policy/parent.git from branch 'master' to efa0bc72fe511e53a4446367fc3e75da68e55f44 - policy/distribution document updates Issue-ID: POLICY-2515 Change-Id: I0a5845ea83af9a7b9bdaaf8016efcf11814243c3 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-04-22Update git submodulesxuegao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to f1692af8bcc02c6a7335078160463025b85eba68 - Remove bugs and vulnerabilities Remove bugs and vulnerabilities based on the sonar report Issue-ID: CLAMP-841 Change-Id: I49d0eeeedf69a0cbe3adf49cf115ab25aec7adfd Signed-off-by: xuegao <xg353y@intl.att.com>
2020-04-22Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to bcc71aeb436a39f3f90cb2fcc99b963bc31f6104 - Merge "[POMBA] Disable pomba in "onap-all"" - [POMBA] Disable pomba in "onap-all" Pomba is not a component which will be part of the release. As such, we don't start it even in "all" ONAP. Issue-ID: OOM-2371 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I400601dee8e65b1c05948e3ccad99e84eb9c9119
2020-04-22Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 927588ef469f35709f1800c5d3a4f2b563cd4528 - Merge "[APPC] use common templates for logs" - [APPC] use common templates for logs Using the common templates for centralized logging. Issue-ID: OOM-2370 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: Ib0995b754597da36d06939199738cf93398e796a
2020-04-22Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 079eb677c8338acdea23b013f6bf25d8e269f25c - Merge "[COMMON] templates for centralized logs" - [COMMON] templates for centralized logs Add three templates: * one for creating the sidecar * one for creating the configmap * one for creating the volumes Issue-ID: OOM-2370 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I34ac35a30b3ab892622431ee7c70277bc7b1f41d
2020-04-22Update git submodulesHePeng1-0/+0
* Update docs/submodules/aai/esr-gui.git from branch 'master' to 4466dbeac9a423dbf535b4830fedb64fd644650e - Remove bootstrap 3.1.1 from ESR GUI Issue-ID: AAI-2858 Change-Id: I8acbf8b6111e5c69c12265be9d0b6a8fa8234d34 Signed-off-by: HePeng <he.peng6@zte.com.cn> - Remove jQuery 1.11.0 from ESR GUI Issue-ID: AAI-2856 Change-Id: I13c671bb140a3a4ea9681365581cb246a807f527 Signed-off-by: HePeng <he.peng6@zte.com.cn>
2020-04-22Update git submodulesHePeng1-0/+0
* Update docs/submodules/aai/esr-server.git from branch 'master' to 53506cec0c9e2366e1a7bc81a554eac278b0b254 - Upversion to MSB-JAVA-SDK 1.2.5 Issue-ID: AAI-2876 Change-Id: Ic725a3b75a40c3e0f26455fe3a52fc2eb2a0dfea Signed-off-by: HePeng <he.peng6@zte.com.cn>