summaryrefslogtreecommitdiffstats
path: root/mso-api-handlers/mso-api-handler-infra/src/main
AgeCommit message (Collapse)AuthorFilesLines
2018-07-27Inlined local variables, used diamond operatorbiniek1-113/+58
Change-Id: Ib7b528b6e560fedb9fc23bc6ae5457c913faeeb1 Issue-ID: SO-506 Signed-off-by: biniek <lukasz.biniek@nokia.com>
2018-07-26Merge "Use defined constant END_OF_THE_TRANSACTION"Marcus Williams1-13/+13
2018-07-26Use defined constant END_OF_THE_TRANSACTIONEthan Hampton1-13/+13
Replace literal 'End of the transaction, the final response is: ' with already-defined constant END_OF_THE_TRANSACTION. Issue-ID: SO-666 Change-Id: I96e097df2042eeace55c8692c4dfd95df2594d13 Signed-off-by: Ethan Hampton <ethanx.hampton@intel.com>
2018-07-25Merge "Replace printStackTrace with usage of logger"Seshu Kumar M2-9/+5
2018-06-14Merge "Removed commented-out code block"Marcus Williams1-2/+0
2018-06-12Removed commented-out code blockMariah Jacobs1-2/+0
Removed two lines of commented-out code for readability. Issue-ID: SO-666 Change-Id: If897ba1f7b4eaeab2bb41c2c7e7b8e6a8e34b245 Signed-off-by: Mariah Jacobs <mariah.jacobs@intel.com>
2018-06-11Return expression instead of variable 'returnResp'Mariah Jacobs1-4/+1
Immediately return expression instead of assigning it to variable "returnResp". Issue-ID: SO-666 Change-Id: I7a9de4ebfb59776d9225f3bd29ef57d184b2679a Signed-off-by: Mariah Jacobs <mariah.jacobs@intel.com>
2018-05-28CorrelationId implementation correctionLukasz Muszkieta3-111/+64
service instance id is now correctly passed in case of delete instance operation Change-Id: Ifb5c27194d6a588852051df0aa391b559b484ac0 Issue-ID: SO-640 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-05-24Replace printStackTrace with usage of loggerMichal Korman2-9/+5
Change-Id: I648e5a25337beca1f8c483ba6e5359d245e237d3 Issue-ID: SO-642 Signed-off-by: mkorman <michal.korman@nokia.com>
2018-05-24Revert correlationId implLukasz Muszkieta3-63/+111
This reverts commit c40b51651eff7997eb1bc823644a059b5406868c. Change-Id: I99e03cf9be05110ca7b4609a35ce7106f3c30b3b Issue-ID: SO-640 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-05-22Merge "Add correlationId to ServiceInstancesRequest"Seshu Kumar M3-111/+63
2018-05-16Only set recipe when null in getServiceURIArthur Martella1-7/+7
Change-Id: I526d79d602d27c7c734bd1e38a4733176bd55f15 Issue-ID: SO-619 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-15WorkflowResponse json issuesRob Daugherty3-6/+6
This commit adds some robustness to the interface between the API-H and BPMN, specifically, in how the response is handled. I don't have proof, but there appears to be some randomness to the json provider behavior when used with the jax-rs. Sometimes, the serializer is adding the root element, and sometimes it is not. Maybe there's something wrong with the configuration. Maybe we have competing json providers. I couldn't pin this down. I'm almost certain it is the presence of the root element in the content that causes the API-H code to fail parsing of the BPMN response. This doesn't kill the request, as you might expect, but rather, the API-H passes the BPMN response through to the client (VID, or policy, or whatever). The original problem (SO-586) was "fixed" by "removing the wrapper". This "wrapper" is a needed feature of the interface between BPMN and the API-H. We shouldn't have removed it. The fact that the "fix" appeared to work is due to the behavior I described in the previous paragraph. The API-H chokes on the message, and it passes it through unchanged. Not really what we want. So, I don't know why the jackson/json behavior is flaky and different now, but I can (and did) modify the API-H so it can parse a json message whether or not it has a root element. Note that WorkflowResponse.java (in BPMN) and CamundaResponse.java (in the API-H) are basically the same bean representing the message format. Seems less than ideal to have two different classes. Also note that I changed the name of the "response" attribute of the WorkflowResponse and CamundaResponse classes to "content". Got tired of seeing this nonsense everywhere in the code: response.getResponse() Change-Id: Icaf70f8457de99e493cf882170fe778c620308c9 Issue-ID: SO-586 Issue-ID: SO-618 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-05-14Unwrap root value of request bodyArthur Martella1-1/+3
Change-Id: I04144bbd22773dfda08d7b13f16080930b7edb3a Issue-ID: SO-621 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-10Fix bugs reported by sonarEthan Lynn1-2/+3
Use new variable in convertJsonToCloudOrchestrationRequest, fix bug reported by sonar. Change-Id: I3f95bd410d950d4661584c1510a66ce90d6785d5 Issue-ID: SO-580 Signed-off-by: Ethan Lynn <ethanlynnl@vmware.com>
2018-05-08Add correlationId to ServiceInstancesRequestLukasz Muszkieta3-111/+63
Change-Id: Ia38fa1234f7b89c0574c74efe62d7b270c8ff987 Issue-ID: SO-596 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-04-27Add correlationId to ServiceInstancesRequestLukasz Muszkieta1-7/+4
Change-Id: Idc5ee56660da31f08fd8ed3a67b7cd28f9844f43 Issue-ID: SO-596 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-04-26Remove operation status set in api-handlerc001491071-261/+14
Remove operation status set in api-handler Change-Id: I579d25044130b0701231c0a2d42534e8c63e3ebd Issue-ID: SO-587 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-04-24Sonar Major Bug FixingSumapriya1-1/+1
File:E2EServiceInstances.java Line:L706 Sonar Link:https://sonar.onap.org/project/issues?assigned=false&id=org.onap.so%3Aso&open=AWJskpquRGy6eclHE4zt&resolved=false&rules=squid%3AS1132&severities=MAJOR Change-Id: Iba618d98de4153deefa3822240b3ec29226bef68 Issue-ID: SO-592 Signed-off-by: Sumapriya <SS00493505@techmahindra.com>
2018-04-23Sonar Major Bug FixingSumapriya2-3/+2
File: MsoVnfAdapterImpl.java Sonar Link: https://sonar.onap.org/project/issues?assigned=false&id=org.onap.so%3Aso&open=AWHCr-UwEU5FCDfKtmD4&resolved=false&rules=squid%3AS1481&severities=MAJOR Location: src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java Line No:L1888 File: E2EServiceInstances.java Sonar Link: https://sonar.onap.org/project/issues?assigned=false&id=org.onap.so%3Aso&open=AWHCr-iMEU5FCDfKtmO-&resolved=false&rules=squid%3AS1481&severities=MAJOR Location: src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java Line No:L1326 File: MsoRequest.java Sonar Link: https://sonar.onap.org/project/issues?assigned=false&id=org.onap.so%3Aso&open=AWHCr-jXEU5FCDfKtmSQ&resolved=false&rules=squid%3AS1481&severities=MAJOR Location: src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java Line No:L916 File: SdncUnderlayVpnOperationClient.java Sonar Link: https://sonar.onap.org/project/issues?assigned=false&id=org.onap.so%3Aso&open=AWIP10X8RGy6eclHDJ5J&resolved=false&rules=squid%3AS1481&severities=MAJOR Location: src/main/java/org/opencomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnOperationClient.java Line No:L70 Change-Id: Id2548cb7e9ef2a916d5adbd93fa5ded4fba6d7ab Issue-ID: SO-582 Signed-off-by: Sumapriya <SS00493505@techmahindra.com>
2018-04-23Sonar-Critical Bug FixingAS004650592-1456/+1456
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-20updateE2EServiceInstance error staus conflictYulian Han1-23/+18
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064305 Issue-ID: SO-578 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-04-19Merge "AAIRestClient support for Basic Auth"Seshu Kumar M1-0/+10
2018-04-19E2EServiceInstance Update API bugs fixYulian Han1-5/+5
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064300 Issue-ID: SO-578 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.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-10CompareModel API use POST to instead GETYulian Han1-1/+1
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064601 Issue-ID: SO-565 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-03-29Merge "Add additional junits"Rob Daugherty3-0/+12
2018-03-29Add additional junitsSmokowski, Steve (ss835w)3-0/+12
Change-Id: Ifd792d5739394c29555c9b2a3447d7088d865a07 Issue-ID: SO-549 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-03-28removed unused api-handler codeBenjamin, Max (mb388a)34-8848/+48
Change-Id: I4fc23794cc96092ca4144bd847de91cff4bdb02b Issue-ID: SO-548 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-03-28MSO API Handler Infra test repairArthur Martella1-1/+1
Repairing a number of tests in ServiceInstancesTest. Change-Id: Ic74015fb092433a0aa26d22ea726321d1c98efe3 Issue-ID: SO-489 Signed-off-by: Arthur Martella <amartell@research.att.com>
2018-03-28Merge "support manual scale for NS"Chuanyu Chen7-1/+431
2018-03-28support manual scale for NSguanwenyao7-1/+431
Issue-ID: SO-423 Change-Id: I752e096806ec513250a8fb1bf51a2ed57fb05f6e Signed-off-by: guanwenyao <guanwenyao@chinamobile.com>
2018-03-28checkE2ESvcInstStatus using status_resultYulian Han1-1/+1
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0641f8 Issue-ID: SO-419 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-03-27Remove forbidden dependenciesArthur Martella5-5/+5
Upgrade org.codehaus.jackson : jackson-mapper-asl : 1.9.13 to com.fasterxml.jackson.core : jackson-databind : 2.8.7 Change Jackson error message in test to new error message. Change-Id: I719166bcf71d171c2e2ba721790eb87fcda8f305 Issue-ID: SO-537 Signed-off-by: Arthur Martella <amartell@research.att.com>
2018-03-23add compareModelofE2EServiceInstance processYulian Han2-3/+124
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0641e6 Issue-ID: SO-419 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-03-22Added openpojo validationsSmokowski, Steve (ss835w)3-0/+20
Issue-ID: SO-522 Change-Id: Id984d3834a822d8b6de8ee4771009dad3eee4689 Change-Id: Id984d3834a822d8b6de8ee4771009dad3eee4689 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-03-22add CompareModelsRequest.javaYulian Han1-0/+68
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0641e5 Issue-ID: SO-419 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-03-15Merge "Sonar Critical"Seshu Kumar M1-0/+3
2018-03-15Sonar CriticalSP005016381-0/+3
Either log or rethrow this exception ServiceInstances.java:512,522,727 Sonar Link: https://sonar.onap.org/project/issues?assignees=swapnalipode&id=org.onap.so%3Aso&open=AWIklWkKRGy6eclHDh4e&resolved=false Location: /mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java Change-Id: I4697022be8de7a746d2b7d868badc919545a353b Issue-ID: SO-486 Signed-off-by: SP00501638 <SP00501638@techmahindra.com>
2018-03-15Merge "Sonar Critical"Seshu Kumar M1-0/+1
2018-03-15Sonar CriticalSP005016381-0/+1
Either log or rethrow this exception E2EServiceInstances.java:513 Sonar Link: https://sonar.onap.org/issues?myIssues=true&open=AWIA0508RGy6eclHC5SJ&resolved=false Location: mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java Change-Id: Ie38f89f41ea58ab5911c5213e7c39da68ded9209 Issue-ID: SO-483 Signed-off-by: SP00501638 <SP00501638@techmahindra.com>
2018-03-15Merge "Update e2e models"Chuanyu Chen6-148/+118
2018-03-14Update e2e modelssubhash kumar singh6-148/+118
Update e2e models. Change-Id: Ifc64a394670a7edcd01d2e4ec78f96a113913bbc Issue-ID: SO-368 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-03-14AT&T 1712 and 1802 release codeRob Daugherty90-2212/+6015
This is code from AT&T's 1712 and 1802 releases. Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04 Issue-ID: SO-425 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-03-07Swap if statement with switchMunir Ahmad9-270/+291
Change-Id: Ifc4011741849569b04160d6a009b8149102f6c33 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-03-07Merge "add update action for e2e svcinst"Chuanyu Chen1-939/+1154
2018-03-06Replace explicit type with dimond typeMunir Ahmad13-15/+15
Change-Id: I1dedb9ef1ca7b734e3cfc0a3a594d733dbd298d4 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-03-06Merge "Simplify if statements where it makes sense"Seshu Kumar M1-9/+6
2018-03-06add update action for e2e svcinstYulian Han1-939/+1154
Issue-ID: SO-419 Change-Id: Ibef5e8e617dcfb1d4f9b4087f20d6058a47bd741 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-02-27Add recipe params for bpmn callc001491073-4/+30
Add recipe params for bpmn call, to improve recipe enhancement. Change-Id: If9f2bff3f27ced62e814afcb918c863a527363e6 Issue-ID: SO-449 Signed-off-by: c00149107 <chenchuanyu@huawei.com>