aboutsummaryrefslogtreecommitdiffstats
path: root/asdc-controller
AgeCommit message (Collapse)AuthorFilesLines
2018-09-25Sonar critical issuesSunilkumar Shivangouda Biradar1-5/+5
Either log or rethrow this exception Sonar Link: https://sonar.onap.org/project/issues?assignees=sunilb&id=org.onap.so%3Aso&resolved=false&severities=CRITICAL Location: src\main\java\org\onap\so\asdc\client\ASDCController.java Line No: L598 L630 L662 L708 L744 Change-Id: I40e5044236b5b4bb9c40155810569fa63c028b77 Issue-ID: SO-1088 Signed-off-by: Sunilkumar Shivangouda Biradar <sb00577584@techmahindra.com>
2018-09-20various bugfixes for casablancaBenjamin, Max (mb388a)4-21/+37
fixed unit tests after addition of A&AI edge label added option for edgelabel between vnf inst group added belongs to in connecting a vnf to instance group - Adding test for getRainyDayHandlerStatusByFlowNameAndServiceTypeAndVnfTypeAndErrorCodeAn dWorkStep method in the catalogdb client correct default RainyDay table search input updated custom resolver to include float and added comment to explain timestamp configuration added a custom resolver and updated snake yaml version Replacing bowman client with restTemplate.exchange | Add Accept and Content-Type to headers Removing the unused imports as well Implementing some review comments for hte tests being ignored Replacing bowman client with restTemplate.exchange |Fixing Junits Replacing bowman client with restTemplate.exchange | Making Data inserts to go specifically in requestDB Replacing bowman client with restTemplate.exchange | Adding Junits Replacing bowman client with restTemplate.exchange | Adding Junits Replacing bowman client with restTemplate.exchange | Adding Junits Replacing bowman client with restTemplate.exchange - Updated tosca parser version to 1.4.3 and upgraded vnfc test case with new csar to pass with latest parser code. added test case for when workflow has not called all flows fixed issue with rollback and retry in workflowaction Reverted homing changes and changes assign vnf to use the homing produced GeneralBuildingBlock. fixed unit test to build the correct format hashmap reverted extraction back to LinkedHashMap marshal sdnc output to an object removed unused variables and imports extract response code/message from embedded map add junits to parse SDNC assign response removed missed org.openecomp.mso imports from bpmn Change-Id: Ib2b6591a744ecb5b08c522494cdf1ad7dae18a08 Issue-ID: SO-1069 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-20Merge "Runtime BPMN Deployment Capability"Rob Daugherty12-0/+1214
2018-09-20Runtime BPMN Deployment CapabilityElena Kuleshov12-0/+1214
Added license header to BpmnInstaller.java ASDC Controller integration with BPMN Installer Correct a test file name in a JUnit. BPMN deployment mechanism for WorkflowDesigner Change-Id: I670406dd09b8789c86ab0b85ef122b35ea057698 Issue-ID: SO-826 Signed-off-by: Elena Kuleshov <EK1439@att.com>
2018-09-20Update LoggingSmokowski, Steve (ss835w)1-1/+7
Update logging to meet Casablanca Spec Change-Id: I029d6c63765992d6f091d96e2b4c34c60d30c484 Issue-ID: SO-947 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-09-18Merge "save csar file path add directory version"Seshu Kumar M2-2/+13
2018-09-17Fix Parse VersionSmokowski, Steve (ss835w)1-2/+2
Issue-ID: SO-1063 Change-Id: I6d627915297f9be0a383516df363d3adec8fc083 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-09-17more stability fixesBenjamin, Max (mb388a)2-17/+64
Remove conditional to not check VNF topology add empty string verification for serviceName field Add junits for CNRCR and NtwkAdptr changes. Add search in new CollNtwkResCust tbl to get NtwkResource. - Updated test data files to include 'pre-load' flag in both VfModuleOperation and NetworkOperation json test data files. - MSO to not to send <preload>boolean</from-preload> to SDNC in network-topology-opertion and vf-module-topology-operation. Updated GeneralTopologyObjectMapper to set 'from-preload' to null so that elements with Nulls are not sent to SDNC. Updated buildNetworkInformation() and buildVfModuleInformation() methods. update flow stats to not cause bpmn flow to crash Fix headers so SDNC does not return XML Add implementation of deleteVolumeGroupResponse parsing; fix JUnits that worked by accident. Change-Id: Ia96d552d731e112505fcf739029a6fd4d0134546 Issue-ID: SO-1061 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-14Merge "Removed printstacktrace from exception block"Seshu Kumar M1-1/+0
2018-09-13Stability fixesBenjamin, Max (mb388a)1-41/+51
sdnc now logs the full response message as a json removed erroneous encoding of variables with full XML Return created network from getVirtualLinkL3Network added exception logger to workflowaction aai check Check for null value for vnfcPorts before referencing it Added test case for invalid camunda response Changed to use updateStatus method Added saving for currentActiveReq and test for 401 resp Change JUnit to use expectedException and clean up unused items. Add vfModuleId to the exception message for missing model info. Report an error if VF Module model info is expected but is null. - Just renamed the Cvnfc and Vnfc set names - Updated code to check for duplicate VNFC's across multiple modules in the same VNF. - Removed commented out if statement line for ALLOTTED_RESOURCE - Reinitialize the Cvnfc and Vnfc Sets each time we iterate the VFModule loop. This will avoid the concurrent modification exception. Eliminated Ben from the sample request Changed to use else if for null check Added null check before catdb call and test case Fix implementation of a call to VNF Adapter for DeleteVolumeGroupBB. Update the method to no call save and do a put Revert usage of PUT method, use save instead Change-Id: I9f69fb68d0639c23b8e1de6931938119bd3ac54b Issue-ID: SO-1032 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-12Removed printstacktrace from exception blockChandan Ghosh1-1/+0
Removed printstacktrace from exception block in DistributionClientEmulator.java Issue-ID: SO-1027 Change-Id: Ie8cefda90171d6478be007ba0525cf266e2547f0 Signed-off-by: Chandan Ghosh <cghosh12@in.ibm.com>
2018-09-10sparate beans and repositoriesBenjamin, Max (mb388a)1-4/+4
Seperate out Beans and repositories for RequestDB Change-Id: I67d6597d580e9828b6bb8faafaea7e09cc6467c0 Issue-ID: SO-999 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-08stability fixesBenjamin, Max (mb388a)2-14/+44
fixed bean error fixed execution variable name do not explicitly set hibernate objects Removed remaing references to tunnel-xconnect fixed virtual link case Change-Id: Ia5a59794e84beadcbf259efb899878cc4465ca57 Issue-ID: SO-997 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-08added generic fabric support to SOBenjamin, Max (mb388a)8-31/+363
Fix Autoincrement of ID field in table Fix accidental removal of method Update usage of requestdb client removed unused imports in common tasks and test Fix broken branch, have unit tests pass references the Epic branch Fix broken branch from compiling committing classpath for vfc adapter cause its not going away added in the fail case for when there are no profiles removed second set of adapters in application test yml removed double adapters in request db application test added jpa repo dependency to the so bpmn folder pom add creation timestamp column to the table added in null checks for Config returned from policy switched to string in requestprocess with jenerate switched to string in requestprocess with jenerate updated aai version in common pom to 605 from 591 renamed the db scripts for flyway sync to register added endpoint to application test yml for failing test ... Change-Id: I800f837ea75d7cdff740dc3a387e4d7654cfd085 Issue-ID: SO-972 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-29Fix for the license issueseshukm1-0/+0
Issue-ID: SO-915 Change-Id: I8212e0723924b56d77be8f26536a5e69823418a1 Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2018-08-28Fixed Sonar isssueGOPINATH MATHIVANAN1-6/+9
Fixed Sonar issue by adding a logge message in the catch block of exception. Issue-ID: SO-917 Change-Id: I6163d5bd0706d1b426b9dd3cbdc709d2418a1e70 Signed-off-by: GOPINATH MATHIVANAN <gopinath.mathivanan@in.ibm.com>
2018-08-24request db access converted to restBenjamin, Max (mb388a)1-0/+4
[MSO-5031]_updated_JUnits_to_assert_request_body_for_requestDb_client Marking JPARepositories as Remote Rest repositories for TenantIsolationRunnable class | Minor refactoring Add request DB Config to ATT specific ASDC controller test yaml Adding requestDB Endpoint to yaml so as to pass the tests of asdc controller Adding requestDB Endpoint to yaml so as to pass the tests Adding requestDB Endpoint to yaml so as to pass the tests Handling the build failure due to mock mismatch Handling the build failure due to conflicting beans and additional minor refactoring Handling the build failure due to conflicting beans Adding RequestDB endpoint to yaml files for running tests Removing non-entity classes from ClassURLMapper class Marking JPARepositories as Remote Rest repositories for TenantIsolationRunnable class | Fixing minor Bug Marking JPARepositories as Remote Rest repositories for TenantIsolationRunnable class | Fixing junits Marking JPARepositories as Remote Rest repositories for TenantIsolationRunnable class | Fixing getMultipleOperationalEnvServiceModelStatus Marking JPARepositories as Remote Rest repositories for TenantIsolationRunnable class | Fixing Junits Marking JPARepositories as Remote Rest repositories for RequestsDBHelper Marking JPARepositories as Remote Rest repositories for TenantIsolationRunnable class | Moving RequestsDbClient to requestdb package Marking JPARepositories as Remote Rest repositories for TenantIsolationRunnable class | Fixing Junits Marking JPARepositories as Remote Rest repositories for TenantIsolationRunnable class | Initial Checkin Change-Id: I4053919e98afb8db962511be0a3318b1bf8af88a Issue-ID: SO-903 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-21fixed sonar issue in WebSecurityConfigImpl.javaSandeep J1-1/+1
fixed the sonar issue in the file at line 39 Issue-ID: SO-874 Change-Id: Ic187fa42e81a503e99ff71ab9ab971c21aa82cd3 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-21save csar file path add directory versionYulian Han2-2/+13
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa70000009 Issue-ID: SO-668 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-08-10Casablana bugfixesBenjamin, Max (mb388a)20-2474/+63
updated mock in unassignnetworkbbtest instead of base added mock to extract pojos method in unassignnetwork Return gBuildingBlockExecution from calls to VnfAdapter subprocess Correct JUnit data to expect modelInfoVfModule Enable Spring Security for logging of unauthorized/bad credentials errors Fix handling of a case of no VF Modules in a VNF resource. fix populating lookupKeyMap with resource ids removed unnecessary test resources Issue-ID: SO-848 Change-Id: Id89f075dcac4042bf8fb1e207e66d289d079171f Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-09GR-API flow, VF Module, SDNC GR API FixesBenjamin, Max (mb388a)5-36/+140
Fixes the new GR-API flow Various fixes in the create VF Module area Fixes issues parsing the SDNC GR API response Fixes new resource type in ASDC controller Fixes AppC mismatch in JSON marshaling Issue-ID: SO-821 Change-Id: I4ace0d348483ab1303fcfee26c5801674be51466 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-06Update SDC Client DependenciesSmokowski, Steve (ss835w)1-2/+2
Issue-ID: SO-799 Change-Id: Ia403872b2d81e7277f9329d6be08df6e04f7bd27 Change-Id: Ia403872b2d81e7277f9329d6be08df6e04f7bd27 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-07-31Containerization feature of SOBenjamin, Max (mb388a)149-8580/+12232
Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18 Issue-ID: SO-670 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-05-24Fix potential errors in ASDCControllerTomasz Switon1-11/+11
Change-Id: Ic9cdc62286cee9a62f3de325a3aa5b3a1008ec5f Issue-ID: SO-647 Signed-off-by: Switon Tomasz <tomasz.switon@nokia.com>
2018-05-18Fix subcategory population for vnf resourcesubhash kumar singh1-1/+1
Fix subcategory population for vnf resource. Change-Id: Ib9b03a19cc12ed66f552096a9b3a499ac6ef574f Issue-ID: SO-630 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-18Fix parsing for category and subcategorysubhash kumar singh1-0/+2
Fix parsing of VNF resource. Change-Id: Ib2adfaab1ae9bb5fa9cff195cdecbdea5aea18e1 Issue-ID: SO-630 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-17Fix resource population to DBsubhash kumar singh1-16/+27
Fix resource population to DB. Change-Id: Iae25ce2f15fa121a45a55559458fcbbd217f2c7d Issue-ID: SO-624 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-10Resolved License Issues for asdc-controllersanchitap4-0/+0
csar files: 1. resource_Extvl.csar 2. service-ServiceFdnt-csar-0904-2.csar 3. service-ServiceFdnt-with-allotted.csar 4. service_Rg516VmmscSrvc_csar.csar Change-Id: I8688a8a29508c9332eaa8a0130ff2f79db5308dd Issue-ID: SO-611 Signed-off-by: sanchitap <sanchita@techmahindra.com>
2018-04-23Sonar-Critical Bug FixingAS004650591-1/+5
File:RestfulUtil.java Line:L85 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:E2EServiceInstances.java Line:L263 L1059 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:OrchestrationRequests.java Line:L343 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:ASDCConfiguration.java Line:L286 L378 SonarLink: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:ResourceInput.java Line:L287 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:ResourceRecipeRequest.java Line:L136 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:ResourceRequestBuilder.java Line:L108 L214 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:CheckAaiForCorrelationIdDelegate.java Line:L70 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:AbstractSdncOperationTask.java Line:L359 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:DmaapClient.java Line:L62 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:HasAnnotationPropertyWithValueMatcher.java Line:L60 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL Change-Id: Ic168a118790c31850a9f32f98465be5d52b8c96f Issue-ID: SO-581 Signed-off-by: AS00465059 <AS00465059@techmahindra.com>
2018-04-18AAIRestClient support for Basic AuthRob Daugherty1-0/+10
Adding support for Basic Auth in the AAI Rest Clients because ONAP uses this (whereas ECOMP uses 2-way SSL). In general, each AAI client will allow the user to configure properties called "aai.auth" and "mso.msoKey". If these are set, then the client will add the Authorization header to every request. Change-Id: I7c81ec05d2ec4a7dca131f2e9e19d341ac89b09f Issue-ID: SO-576 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-04-16Change version of sdc-tosca dependencyArthur Martella1-16/+1
Rolling back version of sdc-tosca library to 1.3.0 to match sdc-distribution-client Removing the exclusion of jtosca and letting sdc-tosca pick the version it wants Change-Id: I5ac8775cce41a92c1964c7a2f24bf0a6b1e3e5df Issue-ID: SO-564 Signed-off-by: Arthur Martella <amartell@research.att.com>
2018-04-14SDC to SO Northbound (HPA) changeliboNet1-1/+1
Change-Id: I01f4f88d15f2152b7c951f4cc6f4f3682ee45e86 Issue-ID: SO-405 Signed-off-by: liboNet <libo.zhu@intel.com>
2018-04-12asdc controller package copyrght correctionSeshu-Kumar-M3-0/+0
Issue-ID: SO-570 Change-Id: Ie597c0f1f1e982f840223e22e60a174082fd71fb Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2018-03-29UT Coverage for asdc-controllerAnjali Walsatwar6-6/+6
UT Coverage for asdc-controller Issue-ID: SO-369 Change-Id: Id38747b83f41218024592eaf225eb52de91fd4c2 Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>
2018-03-29UT Coverage for asdc-controllerAnjali Walsatwar8-8/+8
UT Coverage for asdc-controller Issue-ID: SO-369 Change-Id: I950750db64f69ef50185785e2c215d3401462001 Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>
2018-03-28UT Coverage for asdc-controller emulatorsAnjali Walsatwar1-0/+46
UT Coverage for asdc-controller emulators Issue-ID: SO-369 Change-Id: If37ca5f4c8e7c0ace8430ae5a316d0287c66bb16 Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>
2018-03-28UT Coverage for asdc-controller emulatorsAnjali Walsatwar3-1/+120
UT Coverage for asdc-controller emulators Issue-ID: SO-369 Change-Id: Ic34fdabd98713745232b2ecbb612cc958f7677a8 Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>
2018-03-28UT Coverage for asdc-controller emulatorsAnjali Walsatwar1-0/+57
UT Coverage for asdc-controller emulators Issue-ID: SO-369 Change-Id: I5d59533fadfaa0e4b069d598d4495b8ef27ff37a Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>
2018-03-28UT Coverage for asdc-controller emulatorsAnjali Walsatwar1-0/+62
UT Coverage for asdc-controller emulators Issue-ID: SO-369 Change-Id: I9a63b488e79cbaa19b24f51ee77e0f5f825d5a90 Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>
2018-03-27sdc-tosca:1.3.3 depends on a SNAPSHOT artifactRob Daugherty1-0/+15
We have to exclude jtosca:1.3.4-SNAPSHOT and import jtosca:1.3.4. This is really a defect in SDC, but we have to work around it for M4. Change-Id: I4f204da9c5f3f601ae9a832203439bef7554079d Issue-ID: SO-536 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-03-27Dependency version updates for BeijingRob Daugherty26-169/+140
Update so/libs version to 1.2.1 Update aai-common version to 1.2.1 Update sdc-distribution-client version to 1.3.0 Update sdc-tosca version to 1.3.3 Change-Id: I6c8f1c5476efc4dc866bf765c265736ab70c12c7 Issue-ID: SO-536 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-03-23Remove forbidden dependencies to fix Jenkins jobArthur Martella1-1/+15
Change-Id: I5cdc138bb64d526d9b1baa8c2238cc9223004426 Issue-ID: SO-529 Signed-off-by: Arthur Martella <amartell@research.att.com>
2018-03-21added custom validators for use with openpojoBenjamin, Max (mb388a)1-6/+0
Change-Id: I7c9fdeb6bccddb1b7ec6bf845351731c3043aafa Issue-ID: SO-510 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-03-21SO License issue fix take 3Seshu-Kumar-M1-0/+0
Issue-ID: SO-505 Change-Id: Ie253b0d9d54b72b2716c0f9fe0ee8c47f340ec84 Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2018-03-21take 2 license issue fixSeshu-Kumar-M1-0/+0
Issue-ID: SO-505 Change-Id: I330137ddfd5a1909b76be375451800e71d61798d Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2018-03-21License scan issue fixSeshu-Kumar-M1-0/+0
Issue-ID: SO-505 Change-Id: I7f13115dd644749fd67663610be138666492cb2b Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2018-03-20NexusIQ security violation - httpclientRob Daugherty1-1/+0
Violation in: org.apache-httpcomponents : httpclient : 4.4.1, 4.3.1, 4.3.3, 4.5, 4.5.2 Fix: Upgrade httpclient to 4.5.5 and httpcore to 4.4.4 Change-Id: Ie31b853102eb2a4fc7fc16441a2a1c18a2b7fa35 Issue-ID: SO-507 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-03-19Merge "Fix the Jar vulnerability and licensing"Seshu Kumar M1-1/+1
2018-03-19Fix the Jar vulnerability and licensingByung-Woo Jun1-1/+1
Updated Jar versions in pom.xml files Change-Id: I507b9348d7eabba879979a3cfeeefe9d850ecf4a Issue-ID: SO-457 Signed-off-by: byungwoojun<byung-woo.jun@ericsson.com>
2018-03-19CII badging issue resolutionManamohan Satapathy2-2/+20
PASSWORD detected in this expression review this potentially hardcoded credential ASDCConfiguration.java:L63 L70 Sonar link:https://sonar.onap.org/project/issues?id=org.onap.so%3Aso&myIssues=true&open=AWHCr-rlEU5FCDfKtmaI&resolved=false&rules=squid%3AS2068&severities=CRITICAL Change-Id: I0def66fe4bf7db1b41b5930d42fcc601e37f61f0 Issue-ID: SO-478 Signed-off-by: Manamohan Satapathy <MS00534989@techmahindra.com>