aboutsummaryrefslogtreecommitdiffstats
path: root/mso-api-handlers
AgeCommit message (Collapse)AuthorFilesLines
2018-06-15Merge "add junit for CamundaTaskClient"Seshu Kumar M4-7/+143
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-06-01add junit for CamundaTaskClientLukasz Muszkieta4-7/+143
Change-Id: I3afd465b6b2536cd3a285865de9a8aa29c046bd8 Issue-ID: SO-665 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-05-28CorrelationId implementation correctionLukasz Muszkieta13-383/+411
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-24Revert correlationId implLukasz Muszkieta13-410/+384
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 M13-384/+410
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 Daugherty9-128/+160
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 Martella2-1/+5
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 Muszkieta13-384/+410
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-handlerc001491072-393/+23
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 Han2-24/+19
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-19getOperationStatusByServiceId db result is listYulian Han2-4/+9
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064302 Issue-ID: SO-578 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
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-04-06Restore SERVICE_NAME to OPERATION_STATUS tableRob Daugherty1-0/+1
This column was inadvertantly renoved during a recent merge. Change-Id: Iae31822b412ebb04f4a5b26c639c606fc4467675 Issue-ID: SO-560 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-04-03Added controllerType to requestParametersBrittany Plummer (bp896r)1-0/+1
Change-Id: Ib99642783e9d88558ff0875a246a9a1a628d3817 Issue-ID: SO-553 Signed-off-by: Brittany Plummer (bp896r) <bp896r@att.com>
2018-03-29Merge "Add additional junits"Rob Daugherty4-0/+13
2018-03-29Add additional junitsSmokowski, Steve (ss835w)4-0/+13
Change-Id: Ifd792d5739394c29555c9b2a3447d7088d865a07 Issue-ID: SO-549 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-03-29Merge "removed unused api-handler code"Rob Daugherty52-10634/+48
2018-03-28removed unused api-handler codeBenjamin, Max (mb388a)52-10634/+48
Change-Id: I4fc23794cc96092ca4144bd847de91cff4bdb02b Issue-ID: SO-548 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-03-28improve E2EServiceInstances coverageBenjamin, Max (mb388a)1-26/+623
Change-Id: I2c983c233ad71379e412de0b75356aec9f38492d Issue-ID: SO-547 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-03-28Merge "MSO API Handler Infra test repair"Seshu Kumar M2-14/+5
2018-03-28MSO API Handler Infra test repairArthur Martella2-14/+5
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-28UT Coverage for API HandlerAbhishek Shekhar1-925/+925
1. E2EServiceInstances Change-Id: I2516352a237a2b1dbec152d6886c9974a1b10054 Issue-ID: SO-369 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-03-28improved request-db test coverageBenjamin, Max (mb388a)14-717/+892
Change-Id: I790517aaa524189c09fcc59d23dd301758f0145c Issue-ID: SO-544 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-03-28Junit for apihandlerinfra.volumebeansSumapriya6-0/+266
Junit for: 1.ObjectFactory.java 2.RequestInfo.java 3.VolumeInputs.java 4.VolumeOutputs.java 5.VolumeRequests.java 6.VolumeRequest.java Sonar Link: https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so%3Amso-api-handler-infra%3Asrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fmso%2Fapihandlerinfra%2Fvolumebeans Change-Id: Id2eea3ba913651d30bd8d5535c48d09dbea0d892 Issue-ID: SO-539 Signed-off-by: Sumapriya <SS00493505@techmahindra.com>
2018-03-28UT Coverage for API HandlerAbhishek Shekhar5-44/+90
1. VnfMsoInfraRequest 2. MsoRequest 3. NetworkRequestHandler 4. OrchestrationRequests Change-Id: Id85e5bd157bb491287ffb229f7b87c501554ca0f Issue-ID: SO-369 Signed-off-by: Abhishek Shekhar <abhishek.shekhar1@amdocs.com>
2018-03-28Merge "Junit for mso.requestsdb"Rob Daugherty9-259/+614
2018-03-28Merge "support manual scale for NS"Chuanyu Chen7-1/+431
2018-03-28Merge "checkE2ESvcInstStatus using status_result"Chuanyu Chen2-1/+3
2018-03-28Junit for mso.requestsdbSP005016389-259/+614
Adding Junit for: 1.InfraRequests.java 2.OperationalEnvDistributionStatus.java 3.OperationalEnvServiceModelStatus.java 4.OperationStatus.java 5.ResourceOperationStatus.java 6.SiteStatus.java 7.WatchdogComponentDistributionStatus.java 8.WatchdogDistributionStatus.java 9.WatchdogServiceModVerIdLookup.java Sonar link: https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so%3Amso-requests-db%3Asrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fmso%2Frequestsdb Change-Id: I5059fd48b3f33b00a256eeadf00d6d181b78cb1f Issue-ID: SO-540 Signed-off-by: SP00501638 <SP00501638@techmahindra.com>
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 Han2-1/+3
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0641f8 Issue-ID: SO-419 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-03-28UT Coverage for API HandlerAbhishek Shekhar2-8/+206
1. NetworkRequestHandler 2. VolumeInfoHandler Change-Id: I2b04effcdc9cd8e5ff0af5a73c2fcbfba580f645 Issue-ID: SO-369 Signed-off-by: Abhishek Shekhar <abhishek.shekhar1@amdocs.com>
2018-03-27Remove forbidden dependenciesArthur Martella7-9/+9
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-27Merge "Remove dependencies with vulnerabilities"Rob Daugherty1-1/+1
2018-03-27Remove dependencies with vulnerabilitiesArthur Martella1-1/+1
Upgrade commons-fileupload : commons-fileupload to 1.3.3 Upgrade com.fasterxml.jackson.core : jackson-databind to 2.8.7 Change-Id: I6a9f074b07dea59327ca79f945473767d57d5aa8 Issue-ID: SO-537 Signed-off-by: Arthur Martella <amartell@research.att.com>
2018-03-27UT Coverage for API HandlerAbhishek Shekhar6-61/+615
Change-Id: I7bde5bf105ecda5404875edd8de953e3d1f9d1ff Issue-ID: SO-369 Signed-off-by: Abhishek Shekhar <abhishek.shekhar1@amdocs.com>
2018-03-27Dependency version updates for BeijingRob Daugherty1-4/+4
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-23UT coverage for mso api handler moduleSindhu A1-1/+1
UT coverage for pojo classes in api handler module. Change-Id: I73b0ef63b2758d45902c62c7362f54086b31b4fc Issue-ID: SO-369 Signed-off-by: Sindhu A <arcot.sindhuri@huawei.com>