summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-05-27Add ONAP Security Advisories as a submoduleKrzysztof Opasiak3-0/+4
Issue-ID: SECCOM-239 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I60e416923958da4d6189101b7671cafff0504151
2019-05-27Update git submodulesyxpoke1-0/+0
* Update docs/submodules/modeling/modelspec.git from branch 'dublin' to cf5773fa7c8c2864dc698e1747c657d81189d4b2 - Update rst document for Dublin release Issue-ID: MODELING-161 Change-Id: I2ac29fe7b5fd9a5838c5c7658712c6fb7202ade6 Signed-off-by: yxpoke <yangxu5@huawei.com>
2019-05-27Update git submoduleseconwar1-0/+0
* Update docs/submodules/dmaap/datarouter.git from branch 'dublin' to 71070b470c785793f7d37598da3ecc16d26459b0 - Add dublin version to docker-compose file Change-Id: I739a664b0eecb46d0f31403d909b4caa00995573 Issue-ID: DMAAP-1204 Signed-off-by: econwar <conor.ward@est.tech>
2019-05-26Update git submodulesIttay Stern1-0/+0
* Update docs/submodules/vid.git from branch 'dublin' to f0c604f86f5613e4709cc5595b2fae8512217e7c - Differentiate cloudRegions with same name and different owner Replaces change I22c0b07173950c253a9272b8a96ab63e006efa49 Resolves defect: Issue-ID: VID-482 Change-Id: I38c2f6a86a044297b1b76c1316e50cacb0264da9 Signed-off-by: Ittay Stern <ittay.stern@att.com>
2019-05-24Update git submodulesPatrick Brady1-0/+0
* Update docs/submodules/appc.git from branch 'dublin' to 19004ea518572ba03c8969c7d2c0e2228ef2d86f - Increment versions after release Change-Id: Ibbfb7a72fe793d06caa8be064f5b1dd768ca0dda Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1595
2019-05-24Update git submodulesMarcus Williams1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to f3df9d1ef3e181aaef270744722b116ff5b02468 - Merge "Fix Missing Import in OofHoming.groovy" into dublin - Fix Missing Import in OofHoming.groovy Issue-ID: SO-1926 Change-Id: Idee7eb0ab789fd8ac335b8c97b344b6e4f4b7fba Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2019-05-24Update git submodulesMarcus Williams1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to aaa066071c3000f90a376bd22180ad7f235e148c - Merge "Typo in bpmn mso-request-id variable name" into dublin - Typo in bpmn mso-request-id variable name Change-Id: I50e7f33a3a38e77c84874d75ab33c5f9bb693f8b Issue-ID: SO-1922 Signed-off-by: Yang Xu <yang.xu3@huawei.com>
2019-05-24Update git submodulesVijay VK1-0/+0
* Update docs/submodules/dcaegen2.git from branch 'dublin' to 6cdebe0d51014c9cfbbee0b63f31f671a25f4f7a - Fix doc issues Change-Id: I711a40a64a1d47b50f0923ba67b02ad121ace5b4 Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-1505 - dcae r4 doc updates Change-Id: I341f10a9eace4facac5aec3a3ff56cb89ef005e8 Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-1505 Signed-off-by: VENKATESH KUMAR <vv770d@att.com>
2019-05-24Update git submodulesTimoney, Dan (dt5972)1-0/+0
* Update docs/submodules/ccsdk/distribution.git from branch 'dublin' to 1c87c62a02eeb2ea20608d977372a9e3553e43f3 - Create release 0.4.3 of CCSDK Update version of parent pom to released 1.2.3 version Change-Id: If48f426b4580ef6c57d2e7abd608564d4b445631 Issue-ID: CCSDK-1362 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-05-24Update git submodulesTimoney, Dan (dt5972)1-0/+0
* Update docs/submodules/ccsdk/features.git from branch 'dublin' to 5a168786b6880a27dbc982bf4f5381df812b36f1 - Create release 0.4.3 of CCSDK Update version of parent pom to released 1.2.3 version Change-Id: I0d86fc17c52a7a75ae0128f806ab77367ea9ce07 Issue-ID: CCSDK-1362 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-05-24Update git submodulesByung-Woo Jun1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to c87ff0e93628fb35fecb1a7798d4fc99ea7cac90 - Merge "Update the version to release" into dublin - Update the version to release Issue-ID: SO-1921 Change-Id: Ib178c25b1d8704f77efa7499d724e0dead85728a Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2019-05-24Update git submodulesMichaelMorris1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to 1e3588de060764bd3b5f054c83e2ab5dfa6bb815 - Calls to/from VNFM fail Issue-ID: SO-1909 Change-Id: I2f8a19dfd456316e5436be4e85d8a384d7d5ed6f Signed-off-by: MichaelMorris <michael.morris@est.tech> (cherry picked from commit a7160456335b2ce3710efd00658711d431eac0b4)
2019-05-23Update git submodulesTimoney, Dan (dt5972)1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'dublin' to 7679f2d1b19d8192e7a88e9b66687f7960315353 - Create release 0.4.3 of CCSDK Update version of parent pom to released 1.2.3 version Change-Id: I55b87bc73835fa450a89c731f4a1629df040cdd5 Issue-ID: CCSDK-1362 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-05-23Update git submodulesTimoney, Dan (dt5972)1-0/+0
* Update docs/submodules/ccsdk/apps.git from branch 'dublin' to 4028825069900f1c720b60039d1524919676838c - Create release 0.4.3 of CCSDK Update version of parent pom to released 1.2.3 version Change-Id: I83e8c496881d10b1a2acef7b5c352c091bba56d9 Issue-ID: CCSDK-1362 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-05-23Update git submodulesElena Kuleshov1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to b87ccbbf96a0eac4261f5a2d51c03e18b4243ddb - Handle case of null requestInfo Handle case of null requestInfo Issue-ID: SO-1918 Signed-off-by: Kuleshov, Elena <evn@att.com> Change-Id: Ie8a0dd9e27734d96442eceaa378e5d1e64667b06
2019-05-23Update git submodulesTimoney, Dan (dt5972)1-0/+0
* Update docs/submodules/ccsdk/parent.git from branch 'dublin' to dc230cb43b0d36105f4b1c226f6ef407ecf497f2 - Create release 0.4.3 of CCSDK Update versions in parent poms to 0.4.3 release version Change-Id: I0217091045fc5cfaee9856dc924a46320103934e Issue-ID: CCSDK-1362 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-05-23Merge "Update SettingUP" into dublinRich Bennett3-545/+20
2019-05-23Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to 16c6cc1e5cdaad24b92114ebf6c5396453194778 - Merge "exception handling" into dublin - exception handling Update the appc client jar version Throw exception for non success cds call Fix CreateVcpeResCustServiceSimplifiedTest IT Issue-ID: SO-1857 SO-1779 Change-Id: Ifee080600051c92fd964a92d16efb67e4ab05d5d Signed-off-by: eeginux <henry.xie@est.tech>
2019-05-23Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to 864ce56c3daff6a6a1f4b9ae1ebcb24c2aa87f2a - Merge "Add SO Update the repeatable Macro - northbound_request_ref_lookup" into dublin - Add SO Update the repeatable Macro - northbound_request_ref_lookup Added dublin - Update repeatable Macro not to lose the ability to drive flows differently based on service type. UPDATE northbound_request_ref_lookup SET SERVICE_TYPE = '*' WHERE SERVICE_TYPE = NULL; Issue-ID: SO-1892 Signed-off-by: Bonkur, Venkat (vb8416) <vb8416@att.com> Change-Id: I3fa58559fe4596b3a0e184a8391ac93fb9496a26
2019-05-23Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to 338c7e73b789c0a6d95081ab1a13ae7baf00f950 - Merge "Send syncAck on first Activity" into dublin - Send syncAck on first Activity Send syncAck on first Activity Issue-ID: SO-1905 Signed-off-by: Kuleshov, Elena <evn@att.com> Change-Id: I0965b8247aa88a19be4417e2b5d58bce2d5dab27
2019-05-23Update git submodulesWojciech Sliwka1-0/+0
* Update docs/submodules/vid.git from branch 'dublin' to 065ca8e7d4851dc30683aed9dfc7771cb9e14d6e - Merge "Revert "Differentiate cloudRegions with same name and different owner"" into dublin - Revert "Differentiate cloudRegions with same name and different owner" This reverts commit 17532bb4f1f4600327a697355a1a66a5126fe506. Issue-ID: VID-482 Change-Id: I513efb9bf20647bc9131bc2f46176b9c34961671 Signed-off-by: Ittay Stern <ittay.stern@att.com>
2019-05-23Update SettingUPEric Debeau3-545/+20
Upadte ONAP footprint Update Components versions Remove Heat installation Remove individual installation Issue-ID: DOC-427 Signed-off-by: Eric Debeau <eric.debeau@orange.com> Change-Id: I85e720a9a27fc17b3ebc63e04d76beace4da3117 (cherry picked from commit 4378efdf61bcf5c901690e2acf39a5bfc9d61003)
2019-05-23Update git submodulesojasdubey1-0/+0
* Update docs/submodules/sdc.git from branch 'dublin' to e50b5687b62edbafa12bf3825b0441077c5a4820 - Fix service proxy node type Added properties, interfaces and requirements of the child service to the node type of proxy in the parent Change-Id: I23bb2ddce6cf621d166ffec3031148860d0f4321 Issue-ID: SDC-2313 Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
2019-05-23Update git submodulesIttay Stern1-0/+0
* Update docs/submodules/vid.git from branch 'dublin' to bf6341397284b03c6a2fa9c71adc02c90a0887a3 - Bump VID version to 4.2.0 Issue-ID: VID-482 Change-Id: I90808fb78cb68914df64faa6ac34416336f4d72a Signed-off-by: Ittay Stern <ittay.stern@att.com>
2019-05-23Update git submodulesIttay Stern1-0/+0
* Update docs/submodules/vid.git from branch 'dublin' to 17532bb4f1f4600327a697355a1a66a5126fe506 - Differentiate cloudRegions with same name and different owner Resolves defect: Issue-ID: VID-482 Change-Id: I22c0b07173950c253a9272b8a96ab63e006efa49 Signed-off-by: Ittay Stern <ittay.stern@att.com>
2019-05-22Update git submodulesMarcus Williams1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to b533bd8b7626e28ee708734065b4462ae368f121 - Merge "removed unused CatalogDbUtils instantiation" into dublin - removed unused CatalogDbUtils instantiation Issue-ID: SO-1910 Signed-off-by: MariosIakovidis <marios.iakovidis@huawei.com> Change-Id: I50a2c75e2ce59a4eb7b6fb60076a34cae5482344
2019-05-22Update git submodulesTaka Cho1-0/+0
* Update docs/submodules/appc.git from branch 'dublin' to bf0229c185ed5a94eca7c35d3e85bf6a4bf4a849 - fix CDT doc image reference rename to image41 Issue-ID: APPC-1295 Change-Id: Iee331769a9a0e46e87631c14849142033b855e34 Signed-off-by: Taka Cho <takamune.cho@att.com>
2019-05-22Merge "Resync dublin branch" into dublinRich Bennett29-1/+1
2019-05-22Resync dublin branchRich Bennett30-1/+1
Add new dublin branch contributing repos SO EXTERNALAPI Advance master branch references to current HEAD of master Turn off publishing of system messages/warnings Issue-ID: DOC-467 Signed-off-by: Rich Bennett <rb2745@att.com> Change-Id: If76ffe7049c4dcf90bb0a76d9d2c69619affa8ff
2019-05-22Update git submodulesElena Kuleshov1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to 152fb54b77e845e9e0aa7b6295442f1e8c2c3e1f - Add WORKFLOW artifactType to SDC Config Add WORKFLOW artifactType to SDC Config Issue-ID: SO-1911 Signed-off-by: Kuleshov, Elena <evn@att.com> Change-Id: I8933438ae63ca73605a05fec5467806f41fbda10
2019-05-22Update git submodulesPatrick Brady1-0/+0
* Update docs/submodules/appc.git from branch 'dublin' to 5a7e36dbde00bda4f13d65252d5447f2bc882407 - Fix escapeInternalJson method The method incorrectly handled cases where the json string contained json objects internally. These cases should be handled correctly now. Change-Id: I43b40414526bcb6577242ab737097dfb9119e618 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1576 (cherry picked from commit fc2018739d072a0287b84ff78c94572bce5aba7c)
2019-05-22Update git submodulesAlexis de Talhouët1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'dublin' to e13b5e218086b77688b7e0e387281ba73427bded - Fix payload has not been init in aysnc Change-Id: I6c8c0fca6ffd7f7cc9814a5b88889c5f67cbd52f Issue-ID: CCSDK-1354 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-05-22Update git submodulesBenjamin, Max (mb388a)1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to 65d71e97406a9a9b1c56475855f1d2e59adeec81 - HttpLookupUri is now serializable again cachedValue is now transient added custom serialization created serialization unit test for ServiceInstancesUri Change-Id: Idbc414a8483a4eae9c93ae8b06a1e77cbe683ca8 Issue-ID: SO-1906 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-22Update git submoduleskaihlavi1-0/+0
* Update docs/submodules/sdc.git from branch 'dublin' to d00c7d99c6c2a8a4f7929db90a4de1e6bd6c3dfa - Fix minor typos in documentation Change-Id: I0c1468fc0f7f9a03ee7c23c2ca1b9debd136c671 Issue-ID: SDC-2315 Signed-off-by: kaihlavi <l.kaihlavirt@partner.samsung.com> (cherry picked from commit e9135d23dcf8f7822ed46a1031d078d3d295f6a7)
2019-05-22Update git submodulesLukasz Rajewski1-0/+0
* Update docs/submodules/appc.git from branch 'dublin' to 8f397a4c22050bd76262c90a0739cad0ef89d989 - Fix for support of InventoryNames This change addes support for InventoryNames parameter in LCM request going to Ansible server Change-Id: I9aea0b5407460d5dc0b2691e73ba795f8fe2af15 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com> Issue-ID: APPC-1612
2019-05-22Update git submodulesEric Multanen1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to 8e8476033905ac1e07e5cb22e7fe193bcc8ae903 - Fix CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT distribute Add CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT type so it does not cancel the distribution of services. Change-Id: I68fe4892156312233fe677c0826e95c8aaa8da02 Issue-ID: SO-1907 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
2019-05-22Update git submodulesOleg Mitsura1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'dublin' to 8a44d244e220de18f0add7b1771344b1b41cacd2 - BlueprintWebClientService: added return status Issue-ID: CCSDK-1331 Change-Id: I8dab8ad4eaebf1863f11c4d38c52cf7f64b0a4d5 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> (cherry picked from commit 9eb8b8a88bfac860a94b62b203b00c64330a1be7)
2019-05-21Update git submodulesIttay Stern1-0/+0
* Update docs/submodules/vid.git from branch 'dublin' to c92d5b7df3e9fb4dee1285e1f32f6cc85034a2b8 - Bump VID version to 4.1.0 Issue-ID: VID-481 Change-Id: I7aeede2772cdb1932ff6182be8d7eadcaa3b34a5 Signed-off-by: Ittay Stern <ittay.stern@att.com> - Support service models with policy Upgrade sdc-tosca to 1.5.1 Issue-ID: VID-481 Change-Id: I75f0df4cae73257fc6aa58b9f5f627901c2c61c5 Signed-off-by: Ittay Stern <ittay.stern@att.com> - Run npm install as a frontend-maven-plugin goal Without this, "prebuild" step is using local npm, instead of frontend-maven-plugin one: npm ERR! Linux 4.4.0-134-generic npm ERR! argv "/usr/bin/nodejs" "/usr/bin/npm" "install" npm ERR! node v4.2.6 npm ERR! npm v3.5.2 Issue-ID: VID-391 (cherry picked from commit 779c51de46cf55648036361bb33e0470b28756ca) Change-Id: Iabadec524798481dbbe1a341b12fb33229cc9335 Signed-off-by: Ittay Stern <ittay.stern@att.com> - Revert "Migrate to gerrit-maven-stage (VID)" This reverts commit 44505674 Change-Id: Iadd431f9439e9cb44ca3637378f068547752dfd8 Issue-ID: CIMAN-234 Signed-off-by: Ittay Stern <ittay.stern@att.com>
2019-05-21Update git submodulesTaka Cho1-0/+0
* Update docs/submodules/appc.git from branch 'dublin' to f99c213c3bd266a0145093020ca08200daaf3b67 - update APPC CDT GUI guide added Admin tab user guide Issue-ID: APPC-1295 Change-Id: I21c7d3163796f405f809fb6c8a47537b736b1277 Signed-off-by: Taka Cho <takamune.cho@att.com>
2019-05-21Update git submodulesavigaffa1-0/+0
* Update docs/submodules/sdc.git from branch 'dublin' to 1ce83426e53b5d6b887e4e4a0e5799e02be7f683 - Rename "Ecomp Generated Naming" to "Generated Naming" Rename "Ecomp Generated Naming" to "Generated Naming" in create service screen Change-Id: I402fe5444033d82bbb5ee51c496d1970713e033c Issue-ID: SDC-2318 Signed-off-by: avigaffa <avi.gaffa@amdocs.com>
2019-05-21Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to e91f705e913d875426aeadde5a78cbca3d9a9504 - Merge "Change serviceInstance CM retrieval" into dublin - Change serviceInstance CM retrieval Change serviceInstance CM retrieval Issue-ID: SO-1903 Signed-off-by: Kuleshov, Elena <evn@att.com> Change-Id: I6bc1e3f0d219d6c9feff083ce43cd6afdec1c439
2019-05-21Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to 3d4a7677036912b5745e4357576e2375a762ee8f - Merge "Missing modifications for DistributeTraffic actions" into dublin - Missing modifications for DistributeTraffic actions Added input parameters for DistributeTraffic and DistributeTrafficCheck action Change-Id: I423979f6e8a682bff2aaff02bba4d79d2fbe22c8 Issue-ID: SO-1553 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
2019-05-21Update git submodulesSmokowski, Steve (ss835w)1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to f18614794608d81d6a6b868fa2e580e44e7ee6a8 - Set Variable Fix issue here variable is not set if SI is found. Issue-ID: SO-1419 Change-Id: If9a75fc57e280c2aba5361096e4ebf01ab13056f Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-05-21Update git submodulesBonkur, Venkat (vb8416)1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to 8e40406c6dd82de42d592ca8abb6203697b0aa8b - Add SO WFD activity BBs to building_block_detail Added dublin-WFD activity BBs to building_block_detaili tbl Also updated the resource_type to NO_VALIDATE where target_action is CUSTOM During the execute of the Activity building blocks for the Workflow Designer running into orchestrationStatusValidation exception as it could not find the activity's name in building_block_detail table. Updated the test/resources/data.sql to reflect the above changes Issue-ID: SO-1901 Signed-off-by: Bonkur, Venkat (vb8416) <vb8416@att.com> Change-Id: I9a5c60fc818ec4abc18005e3ef9b8c7b3313f55d
2019-05-20Update git submodulesElena Kuleshov1-0/+0
* Update docs/submodules/so.git from branch 'dublin' to 969333e6374d3e2259ab5fbbdbcbb3f4c12a134e - Check for null requestInfo Check for null requestInfo Issue-ID: SO-1900 Signed-off-by: Kuleshov, Elena <evn@att.com> Change-Id: I2a3eb7ddbee396b19bcc71a2f647b9cf90082ed4
2019-05-20Update git submodulesTaka Cho1-0/+0
* Update docs/submodules/appc/deployment.git from branch 'dublin' to 9432224c24d34a38b5c6a89ea5dfe8b5686c6f6a - fix netconf for vFW in Dublin, we changed to stream-count:stream-count/streams Issue-ID: APPC-1610 Change-Id: If2e1d127594ec0aa5d2297e9f71e6e3911e5ef12 Signed-off-by: Taka Cho <takamune.cho@att.com>
2019-05-20Update git submodulesmiriame1-0/+0
* Update docs/submodules/sdc.git from branch 'dublin' to 9b8c4cc7504a5dc459d9401733a63ffd99e148c3 - fix bug [SDC-2317] - Auto collapse properties tables after sorting by capability column is not applied Change-Id: I1c67560d53b18c91f0c47d5c3885492541b43f86 Issue-ID: SDC-2317 Signed-off-by: miriame <miriam.eini@amdocs.com>
2019-05-20Update git submodulesmiriame1-0/+0
* Update docs/submodules/sdc.git from branch 'dublin' to 7b9415d18d42329ac46c506e5728689b2cce01e3 - fix bug [SDC-2316] - Unable to select a type from Operation screen when using Capabilities Properties Change-Id: I3ceb94e5b927c48794d9a51b1a1c3c32d0457d45 Issue-ID: SDC-2316 Signed-off-by: miriame <miriam.eini@amdocs.com>
2019-05-20Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/appc.git from branch 'dublin' to 335579d35c4930b2b32cbb55efc3af665aeca4e7 - Fix base64 dependency Issue-ID: APPC-1604 Change-Id: I7063bbfdcf1ca293d9775b7c21c3bc094ad02c3c Signed-off-by: Brian Freeman <bf1936@att.com>
2019-05-19Update git submodulessarada prasad sahoo1-0/+0
* Update docs/submodules/sdc.git from branch 'dublin' to 170c00339b660025266affe31b5519ae5635ebb7 - Test case failure CSAR file corrected Fix the vSBC CSAR file as per NFV SOL0001 v2.5.1 Change-Id: I637312e91452ffa47f5a9fd14152c3966a39beaf Issue-ID: SDC-2170 Signed-off-by: sarada prasad sahoo <sarada.prasad.sahoo@huawei.com> (cherry picked from commit d642660b5eeed87a3f1de737e7cf7840fd2bf121)