summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-04-25Update git submodulessunil.unnava1-0/+0
* Update docs/submodules/dmaap/messagerouter/messageservice.git from branch 'master' to 23f58b6aecad96d2129956b683cf5c039634d5a9 - add swagger API to documentation Issue-ID: DMAAP-922 Change-Id: I44916797377a0d19246245817d8339f47b5e5a50 Signed-off-by: sunil.unnava <su622b@att.com>
2019-04-25Update git submodulesJerry Flood1-0/+0
* Update docs/submodules/optf/cmso.git from branch 'master' to 131273f73ec21a5632de9069f8b04f75631ce790 - Remove dead code. Add robot tests Move interface mocking test code from cmso to robot. Issue-ID: OPTFRA-474 Change-Id: Ib98f0b16d783e01f888279266dfdee858e30b787 Signed-off-by: Jerry Flood <jflood@att.com>
2019-04-25Update git submodulesKiran Kamineni1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to 6e08385919be58ae316a637d21b43ee7aa8df39c - Updated go.sum created from 1.12.4 Updated go.sum generated from build based on 1.12.4 Issue-ID: MULTICLOUD-587 Change-Id: I92474c20cc58f2b3e7d0085ed57548c19aa896d8 Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
2019-04-25Update git submodulesAlexis de Talhouët1-0/+0
* Update docs/submodules/oom.git from branch 'master' to de14462441f052a24e7eed2ab30c0e944ce63e06 - Merge "Fixed issue found in integration testing" - Fixed issue found in integration testing Change-Id: I50e55e1323f2fe336ae1e2cfe2c0bfa6263c8068 Issue-ID: SO-1814 Signed-off-by: MichaelMorris <michael.morris@est.tech>
2019-04-25Update git submodulesTaka Cho1-0/+0
* Update docs/submodules/appc.git from branch 'master' to 38967864705064cba34ec5a964eb675a62c3b555 - remove commons-codec hardcoded remove 1.9 version commons-codec Change-Id: I8ea5ca9c017b2d2b8917e38e2666996c5227d40b Issue-ID: APPC-1579 Signed-off-by: Taka Cho <takamune.cho@att.com>
2019-04-25Update git submodulesTimoney, Dan (dt5972)1-0/+0
* Update docs/submodules/ccsdk/parent.git from branch 'master' to f8840e74a020b6dba102d5b6ff38dbd1adfcf055 - Update CCSDK versions Update CCSDK versions to released 0.4.2 version in parent pom Change-Id: I7eb14bb6e09d0e76ef9b5c45daa543f11fba0bd4 Issue-ID: CCSDK-1222 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-04-25Update git submodulesIkram Ikramullah1-0/+0
* Update docs/submodules/optf/has.git from branch 'master' to a57cb7ccf199061067b009a472b30ea7ad023d6a - Added the missing arguments required for image building Change-Id: Ibe8dab7327485d06d5632e27879291282530c22f Issue-ID: OPTFRA-461 Signed-off-by: Ikram Ikramullah <ikram@research.att.com>
2019-04-25Update git submodulesprathamesh morde1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 2c2280f95720534a872a87d799d575a2b3e10677 - Update the package name in logback.xml And fix property name mis-match Change-Id: Id6d3187c6fd4067b64685a0eff9f7a7922eb06ca Issue-ID: CCSDK-1288 Signed-off-by: prathamesh morde <prathamesh.morde@bell.ca>
2019-04-25Update git submodulesMarco Platania1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 8265fac8ef1c8f4fcb8efbf594aef71288c387b4 - Update policy name in policyTypes.json Change-Id: Ic85397e450293647b2f3d262a58848a7f2e952db Issue-ID: SDC-2251 Signed-off-by: Marco Platania <platania@research.att.com>
2019-04-25Update git submodulesYang Xu1-0/+0
* Update docs/submodules/integration.git from branch 'master' to c12b184ae4be01578088e861289c20b95c1c485b - Sync up OOM image update to manifest-staging Change-Id: Id38f6ee0fb61aed849f80ff6579f854e12605166 Issue-ID: INT-1047 Signed-off-by: Yang Xu <yang.xu3@huawei.com>
2019-04-25Merge "Migration of Service Design from Wiki to Readthedocs User guide"Rich Bennett9-0/+177
2019-04-25Merge "Migration of Service Design from Wiki to Readthedocs User Guide"Rich Bennett2-0/+135
2019-04-25Update git submodulesYang Xu1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 906595fd0986f3be0733116edb312a5d7aa4547d - Bump up CLAMP image Change-Id: I6a49d62a097102e7b14707582a98720493fc422b Issue-ID: CLAMP-358 Signed-off-by: Yang Xu <yang.xu3@huawei.com>
2019-04-25Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 6ab49d0f6bedcbc2ccd817df113265d32f421414 - Merge "Resource dictionary- removed uncessary code" - Resource dictionary- removed uncessary code Removed hardcoded values Issue-ID: CCSDK-1217 Change-Id: I356d8876a183b2d4df2e23bdd6781de4f47bf8bf Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-04-25Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to af1db7274571e7b7fd349efd42423e7106f2d07d - Merge "Resource dictionary: backend URL changes" - Resource dictionary: backend URL changes Changed the resource dictionay search by tags backend url Issue-ID: CCSDK-1217 Change-Id: I6c6b8a7536481c2b30c933cf28269db7d2ecd735 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-04-25Update git submodulesprakash.e1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to 570153b334e64246b2eff459d18d6eac6df70e22 - Fix SDWAN site role passed to controller SDWAN site role dsvpn-hub and sdwan-edge is not fetched and passed to controller. Now it is fetched in for loop and passed to controller. Change-Id: I85b7be5bdc802fa7144631aeaf3cf19bc3fde979 Issue-ID: SDNC-659 Signed-off-by: Prakash.E <prakash.e@huawei.com>
2019-04-25Update git submodulesAlexis de Talhouët1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to dea21123218a3ac602f9a859ffddae8e72e4194d - Finalize ansible usage Change-Id: Iaca6bb573e31607eaa9a3a603e1e4beae60c817c Issue-ID: CCSDK-1215 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-04-25Update git submodulesSeshu Kumar M1-0/+0
* Update docs/submodules/so.git from branch 'master' to 71e617b9e2fcd24c05579bf41e65db4273f05e77 - Merge "Reorder modifiers. Reorder modifiers to complt with Java code specifications Issue-ID: SO-1490" - Reorder modifiers. Reorder modifiers to complt with Java code specifications Issue-ID: SO-1490 Change-Id: Ic8adde29c0bc8b3d039e3f0f1c8837f53dd10aee Signed-off-by: h00397475 <hena.choudhury@huawei.com>
2019-04-25Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 5c4a55d1477fcd6a440abfded7dcea2ab02cd5e0 - Merge "Remove DCAE image from update" - Remove DCAE image from update Change-Id: Ifa98f8610b0a96a28f3a3ded7cb65663e9455158 Issue-ID: INT-1042 Signed-off-by: Yang Xu <yang.xu3@huawei.com>
2019-04-25Update git submodulesSeshu Kumar M1-0/+0
* Update docs/submodules/so.git from branch 'master' to 89637ecf97fe217f76a5c0db3f20561c65206267 - Merge "Reorder java modifiers. Reorder modifiers to complt with Java code specifications Issue-ID: SO-1490" - Reorder java modifiers. Reorder modifiers to complt with Java code specifications Issue-ID: SO-1490 Change-Id: Idcd8c8dcd2a664310007d3e965700363672cbea3 Signed-off-by: h00397475 <hena.choudhury@huawei.com>
2019-04-25Update git submodulesMike Elliott1-0/+0
* Update docs/submodules/oom.git from branch 'master' to e5fa9fbdcbb3dfc403c33bb9b559c2e81291899e - Merge "update dashboard input" - update dashboard input CM version update (new types) TLS container version update (bbsep san) Version update for bootstrap Change-Id: I58342d527b8f58e52c65dad65fff51df4d45ea67 Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com> Issue-ID: DCAEGEN2-1270 Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
2019-04-25Update git submodulesSeshu Kumar M1-0/+0
* Update docs/submodules/so.git from branch 'master' to 569e6fd0b9109b04fff6a8816217f845d0ea6f3b - Merge "Reorder modifiers. Reorder modifiers to complt with Java code specifications Issue-ID: SO-1490" - Reorder modifiers. Reorder modifiers to complt with Java code specifications Issue-ID: SO-1490 Change-Id: I5d5e0d0520c5a5c1e90033df3d185ce95a01ca0d Signed-off-by: h00397475 <hena.choudhury@huawei.com>
2019-04-25Update git submodulesa.sreekumar1-0/+0
* Update docs/submodules/policy/apex-pdp.git from branch 'master' to f6da9a3bafb6f4c30e7bb3accd4e17fdaaf5ce92 - Changes to fix PDP-A not going to ACTIVE state PDP-A state will now change to ACTIVE even when the policy list is empty. When the state is ACTIVE and PAP sends a PDP_UPDATE with policies, PDP-A will start executing the policies. Change-Id: Icb5b139939698920d4fa3991dcca33536c6caefc Issue-ID: POLICY-1674 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-04-25Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to 8e1a5cefb9b8892854aa11dbf48174adc259835f - Merge "Fixed vf-module-topology DG with valid request-action" - Fixed vf-module-topology DG with valid request-action New request-actions added in GENERIC-RESOURCE-API.yang. CreateSDWANSiteInstance, ActivateSDWANSiteInstance, DeactivateSDWANSiteInstance, DeleteSDWANSiteInstance are added and it is replaced in vf-module-topology DG Change-Id: I0898056cb43763ff04eda0e503bc05706b283f3d Issue-ID: SDNC-659 Signed-off-by: Prakash.E <prakash.e@huawei.com>
2019-04-25Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 79895ed99627931ab6c934dab074e36c3e9e06a4 - Merge "Added content to CDS index page" - Added content to CDS index page Change-Id: Ie9c33493b2e2716d446cc0b99fdb594b4a6dde8c Issue-ID: CCSDk-1286 Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
2019-04-25Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to 3911362969fc1d329cb9fbc07b414be70820a780 - Merge "SDWAN port templates" - SDWAN port templates SDWAN port templates added based on the IPMode static or dhcp Change-Id: Ib6d9e2dd13d92d49a1323525646c01bf795346c1 Issue-ID: SDNC-653 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
2019-04-25Update git submodulesTimoney, Dan (dt5972)1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 68500192d7e77bca74e411b1fda38b4a4f598dc5 - Fix docker tag command-executor was using the default timestamp format when creating docker tag, which is invalid and breaks docker build. Added maven property setting to change timestamp format to remove offending dashes. Change-Id: I102340d493a5b9c03ca1a9e10f1bd51fc4b582d1 Issue-ID: CCSDK-1287 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-04-25Update git submodulesPawel Wieczorek1-0/+0
* Update docs/submodules/portal.git from branch 'master' to b04f71de6f585687eb81333ab1fd909df0d8b71f - Use all available information in audit log output Comment is now also appended to the audit log. Issue-ID: PORTAL-553 Change-Id: Ia30d6f61b04131d4456dfc55575b1f7678e26967 Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
2019-04-25Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 046eb620661451d3d62638d5253d3e112f565d1a - Merge "Sniro BB now supports sole service proxies" - Sniro BB now supports sole service proxies Enhanced sniro BB to account for sole service proxies to support 1908. Change-Id: I4bf57c7c43de755be03d2284cde321d182255ceb Issue-ID: SO-1790 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-25Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 0000db36706fcffc58645a7c21eb336d0edf5906 - Merge "Add SO update config file -application.yaml file" - Add SO update config file -application.yaml file Added to Dublin branch- update the catalog-db-adapter -application.yaml file Remove the below line for flyway so that repeatable scripts are run. repeatableSqlMigrationPrefix: RATT Issue-ID: SO-1804 Signed-off-by: Bonkur, Venkat (vb8416) <vb8416@att.com> Change-Id: I54bd6d178d9f4c6854421f099bf393599d46d58f - Merge "Fix issue where null variable causes task to not" into dublin - Merge "Moved base client to new location" into dublin - Fix issue where null variable causes task to not fixed formatting of newly added files Fix issue where null variable causes task to not complete Change-Id: If2361a0834220c2e2738917a2e5bf9b012570929 Issue-ID: SO-1806 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com> - Moved base client to new location Change-Id: I0d8ab71393935ca791d37bb23340f96b921f5505 Issue-ID: SO-1791 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com> - always convert values toString for xml marshalling always convert values toString for xml marshalling added in null check and object mapper call Change-Id: Ie91c313dce110d53586e6773e2223d63be799a54 Issue-ID: SO-1786 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-25Update git submodulesYan Yang1-0/+0
* Update docs/submodules/so.git from branch 'master' to 1058540684e0d35dcd4d1623f217db3c150ba8d6 - Merge "add resourceInput in vnfc Issue-ID: SO-1393" - add resourceInput in vnfc Issue-ID: SO-1393 Change-Id: I643f49df545bef92f0f0e931f7b7ce1a5dbc21c0 Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-04-25Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 338c218458d6a671dd754ee5c151517685376bd9 - Fix policy calls Fix policy calls so that the url is now right + update camel version to latest Issue-ID: CLAMP-357 Change-Id: Iffc83f53eb2361d7551b43b28c8e822fbf38c619 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2019-04-25Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 12700b07bf4850f7de97b69e9b2fcc96e0540b21 - Rework code for policy type Rework unit tests + test resources and code for policy type renaming Issue-ID: CLAMP-356 Change-Id: Id64c620b42347d6f5535523f33a0a04a54a60fa2 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2019-04-25Update git submodulesSeshu Kumar M1-0/+0
* Update docs/submodules/so.git from branch 'master' to 4b0fade5e1609330c0e8bae1bb9451c9d4d74732 - Merge "String literal to be on the left side of string compariosion." - String literal to be on the left side of string compariosion. String literal should be on the left side of string comparision as per guidelines. Issue-ID: SO-1490 Change-Id: I294cbbb2fe7dae9c68b7b20e9b3a0d1d75824ba0 Signed-off-by: h00397475 <hena.choudhury@huawei.com>
2019-04-25Update git submodulesSeshu Kumar M1-0/+0
* Update docs/submodules/so.git from branch 'master' to 17a1aca5fc9b0fb3ee19ecbbc8a9c65e085b7759 - Merge "SDNCRestClient - sonar fixes" - SDNCRestClient - sonar fixes SDNCRestClient - sonar fixes Issue-ID: SO-1811 Change-Id: I7348e35a325c523648696a2321d873f481a0b36d Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-04-25Update git submodulesSeshu Kumar M1-0/+0
* Update docs/submodules/so.git from branch 'master' to daeb1fb80b53634a90e83e9583e30deb1b0dbfdd - Merge "MsoVnfAdapterImpl - sonar fix" - MsoVnfAdapterImpl - sonar fix MsoVnfAdapterImpl - sonar fix Issue-ID: SO-1811 Change-Id: Ic3bebd30e4f65b9ba5732c43cfd8baf0050e3b7b Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-04-25Update git submodulesNITIN KAWA1-0/+0
* Update docs/submodules/so.git from branch 'master' to 82e2784d2af663b9f8433ac74187710886059ca9 - Removal of unused local variables. Removed useless assignment to local variables and reordered the modifiers as per java language specification. Issue-ID: SO-1490 Change-Id: I43f25854d60cd25fb472618e21f2c1c91bc1c457 Signed-off-by: NITIN KAWA <nitin.kawa@huawei.com>
2019-04-25Update git submodulesGuangrongFu1-0/+0
* Update docs/submodules/holmes/rule-management.git from branch 'master' to e50f6e8abddad4e2ad7fa83f32ab55af184d951c - Revert "Updatd the expiry date of the cert" This reverts commit e58fa5068aae786979af87907f93146eba2672fa. Change-Id: Ied10ae5cb7c2a7ca42ebe6ca3b520f3bf6df0d0f Issue-ID: HOLMES-215 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2019-04-25Update git submodulesGuangrongFu1-0/+0
* Update docs/submodules/holmes/engine-management.git from branch 'master' to 691870a10f5401c9561fbe1494294d5191889410 - Revert "Updatd the expiry date of the cert" This reverts commit c7420bbe5ab1764a04b8a0a81d264f24b8307b93. Change-Id: Ib4572153e930199626bf00ffa49cfd38845319d6 Issue-ID: HOLMES-215 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2019-04-25Update git submodulesMichal Ptacek1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to cb94aefb4ef22fdf435578e676823a6b9600cbb9 - Merge "Replace VNC server docker image" - Replace VNC server docker image Replace VNC server docker image based on CentOS (consol/centos-icewm-vnc:1.4.0) by the one based on Ubuntu (consol/centos-icewm-vnc:1.4.0) - Ubuntu based image is smaller and the VNC server does not work in the current CentOS based image. Solves OOM-1819 Issue-ID: OOM-1821 Change-Id: I9e06ab8bfccb11ae8950717db5339062704a31f9 Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com>
2019-04-25Update git submodulesGuangrongFu1-0/+0
* Update docs/submodules/holmes/engine-management.git from branch 'master' to 4a3f55693f0673722cabb6661fb48d9019bf2c20 - Fixed some vulnerability issues Change-Id: Ida0008d6fd5084d4d2bed5428065c86aad32ee99 Issue-ID: HOLMES-217 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2019-04-25Update git submodulesGuangrongFu1-0/+0
* Update docs/submodules/holmes/rule-management.git from branch 'master' to f2a9c249053587deb31420de52db2f0c0bfcde9f - Fixed some vulnerability issues Change-Id: I806a265e1d486e6b606708e5271c22f6b3ee373a Issue-ID: HOLMES-217 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2019-04-25Update git submodulesAdam Krysiak1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 7fe3f4b2e79bfe1421bd4d6c33b35d4fd3d18e65 - Merge "Added more unit tests to reach the minimum threshold of 65 % coverage" - Added more unit tests to reach the minimum threshold of 65 % coverage Added unit tests for the class TcaPolicyDeleteDelegate Change-Id: Iadd6e6f0600f3400f29ad21d7b84da09945b36cc Issue-ID: CLAMP-355 Signed-off-by: p.borelowski <p.borelowski@partner.samsung.com>
2019-04-25Update git submodulesGuangrongFu1-0/+0
* Update docs/submodules/holmes/rule-management.git from branch 'master' to 4c2200249065bb1291b476a9936028029626a8f1 - Fixed the docker build problem Change-Id: I90678be9853e00200664f24b85c6289f72576b22 Issue-ID: HOLMES-218 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2019-04-25Update git submodulesGuangrongFu1-0/+0
* Update docs/submodules/holmes/engine-management.git from branch 'master' to c80b5653aa98b8f9745675a9b60b5b9400aa1d3e - Fixed the docker build problem Change-Id: I2b67d558b7201d083de9094b3a27a994159af055 Issue-ID: HOLMES-218 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2019-04-25Update git submodulesMarco Platania1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 50552ece388dc60d15ed743f06afc477635f7218 - Fix policy definition in normative types Change "onap.policy.monitoring.cdap.tca.hi.lo.app" to "onap.policies.monitoring.cdap.tca.hi.lo.app" Change-Id: I354184909472fea07fe566a2f9fdb832aca5675d Issue-ID: SDC-2251 Signed-off-by: Marco Platania <platania@research.att.com>
2019-04-25Update git submodulesGuangrongFu1-0/+0
* Update docs/submodules/holmes/engine-management.git from branch 'master' to f99ee485e1973ab462d8a0ccd86e2240109d85d7 - Updated the version of jetty-http Change-Id: I11effca24a0b7a72a2e96f1a74d31c4138305fe9 Issue-ID: HOLMES-217 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2019-04-25Update git submodulesGuangrongFu1-0/+0
* Update docs/submodules/holmes/rule-management.git from branch 'master' to e19a1115bb056b002b42c7b15afa0226877c7f46 - Updated the version of jetty-http and commons-codec Change-Id: I477b64d353e9657815b662dbed013445b0cbae98 Issue-ID: HOLMES-217 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2019-04-25Update git submodulesGuangrongFu1-0/+0
* Update docs/submodules/holmes/rule-management.git from branch 'master' to e58fa5068aae786979af87907f93146eba2672fa - Updatd the expiry date of the cert Change-Id: Ife209a3373939b12544d96309f460d860f88fe5e Issue-ID: HOLMES-215 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2019-04-25Update git submodulesGuangrongFu1-0/+0
* Update docs/submodules/holmes/engine-management.git from branch 'master' to c7420bbe5ab1764a04b8a0a81d264f24b8307b93 - Updatd the expiry date of the cert Change-Id: Iaaa823bd8c14b589b7bb2af2bdadc1ea05e8eba9 Issue-ID: HOLMES-215 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>