aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOInfrastructureBPMN
AgeCommit message (Collapse)AuthorFilesLines
2018-05-15WorkflowResponse json issuesRob Daugherty17-46/+46
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-07Merge "updated createvfmoduleinfra flow version number"Seshu Kumar M1-15/+15
2018-05-07Merge "fixed bug in createvnfinfra bpmn"Seshu Kumar M5-37/+104
2018-05-04Set operation type valuesubhash kumar singh1-0/+1
Set operation type value, to reflect in DB entries. Change-Id: I2f56bf5f33912645d17bbed2fc759f9354a0ba7b Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-04Fix warning in DoDeleteE2E bpmn filesubhash kumar singh1-7/+7
Fix warning in DoDeleteE2E bpmn file. Change-Id: I50b1ad5502fc08692775d2f5d9050c3796dd32b1 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-04updated createvfmoduleinfra flow version numberBancala, Ben (bb3476)1-15/+15
Change-Id: I0a166b867dcacad4133c8fc679606c381cb5389a Issue-ID: SO-602 Signed-off-by: Bancala, Ben (bb3476) <bb3476@att.com>
2018-05-04fixed bug in createvnfinfra bpmnBancala, Ben (bb3476)5-37/+104
Change-Id: I3e27ec0d1487eb68e8c54d27508b58233bf49808 Issue-ID: SO-602 Signed-off-by: Bancala, Ben (bb3476) <bb3476@att.com>
2018-05-03ecomp-model-information to onap-model-informationArthur Martella12-58/+58
Change-Id: I05f4648ff898a54e7a00d899d97129746172cdb4 Issue-ID: SO-603 Signed-off-by: Arthur Martella <am153x@att.com>
2018-04-28Merge "createvfcns serviceInstanceid is null bug fix"Seshu Kumar M3-11/+11
2018-04-28createvfcns serviceInstanceid is null bug fixYulian Han3-11/+11
deleteResource bugs fix Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f06430a Issue-ID: SO-578 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-04-27Change to sdncadapter for service callc001491072-50/+165
Change to sdncadapter for service call Change-Id: I9011e69fba20d4d0f83705455791b7357e2f5bb0 Issue-ID: SO-587 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-04-26Merge "Remove operation status set in api-handler"Rob Daugherty2-9/+8
2018-04-26Add NS relationship delete for E2E servicesubhash kumar singh2-13/+100
Add NS relationship delete for E2E service Change-Id: Ia58308dae0fef38b32098d1e92c0871617a86ed2 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-26Fix value for VFC sync responsesubhash kumar singh2-0/+3
Fix value for VFC sync response. Change-Id: Ie663f9080c051b9302dd4729aea5640c5289e14c Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-26Remove operation status set in api-handlerc001491072-9/+8
Remove operation status set in api-handler Change-Id: I579d25044130b0701231c0a2d42534e8c63e3ebd Issue-ID: SO-587 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-04-26Merge "Fix VFCNS termination invocation"Chuanyu Chen2-0/+20
2018-04-26Merge "Add service operation initialtion in request db"Chuanyu Chen2-16/+115
2018-04-25Fix VFCNS termination invocationsubhash kumar singh2-0/+20
Fix VFCNS termination invocation Change-Id: Ib30f0a3e4365e215f6da0a693f78825d5a2d32c9 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-25Add service operation initialtion in request dbsubhash kumar singh2-16/+115
Add service operation initialtion in request db Change-Id: I2aed78e5cda753b5424b8a8c39e9997a7a7dd61c Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-25Merge "PnfReadyEventConsumer implementation"Seshu Kumar M3-42/+45
2018-04-25Merge "Add sync response for VFCNS delete"Seshu Kumar M2-16/+55
2018-04-25Merge "Fix service topology deletion"Seshu Kumar M2-8/+45
2018-04-25Merge "Set Resource Recipe Time Out Val"Seshu Kumar M5-23/+98
2018-04-25Add sync response for VFCNS deletesubhash kumar singh2-16/+55
Add sync response for VFCNS delete Change-Id: I4917f0a83fc0c33d51b9b90d91f10dbdc023e690 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-25PnfReadyEventConsumer implementationLukasz Muszkieta3-42/+45
Change-Id: Ic8d5814c555bad436bfcbe1b4e212637a6800947 Issue-ID: SO-466 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-04-25Fix service topology deletionsubhash kumar singh2-8/+45
Fix request body for service topology deletion. Issue-ID: SO-422 Change-Id: Ic2e7cc74dd45dbc4b4a190a159f3ebb852e02b84 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-25Set Resource Recipe Time Out Valc001491075-23/+98
Set Resource Recipe Time Out Val Change-Id: I7f304465c71837ee37e5fa99a48ca14d97d8f91f Issue-ID: SO-587 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-04-25add serviceDecomposition input para for deleteE2EYulian Han3-18/+34
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064309 Issue-ID: SO-578 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-04-25Merge "Update Delete Resource Flow"Seshu Kumar M8-349/+584
2018-04-25Update Delete Resource Flowc001491078-349/+584
Update Delete Resource Flow Change-Id: Ie6270d954fc1c703de4bdd0c8f1e543a155060d1 Issue-ID: SO-587 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-04-24Create VF Module ErrorRob Daugherty2-86/+145
There are multiple issues here. 1) The LCM healthcheck and config-scale-out should be made conditional upon the VNF orchestration status being Active or Activated. I'm not going to do that with this commit, since the logic will probably need to be moved to the DoCreateVfModule flow. What I will do is bypass the LCM operations to unblock testing. Another ticket will need to address the real solution. 2) APP-C gave us an API where the controller type is configured in their client object, which is NOT what we wanted. As a result, we have to keep a client object for each controller type. Our implementation did not do this. 3) Need to support the APP-C client configuration properties for specifying the SDN-C topic names. I'm refactoring the APP-C client urn mapping names to make it clear that they are for configuring the APP-C *client* and not necessarily for APP-C itself. Change-Id: I588f3b98b4ee44ba53b4931f9f1a7938ee70bebf Issue-ID: SO-577 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-04-24Fix to get the resource from ordered listsubhash kumar singh1-2/+2
Fix to get the resource from ordered list Change-Id: I43a7a33a7d2464d7580f175807a1b42d2dce94f2 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-24Fix SDNC resource deletion for E2E servicesubhash kumar singh4-19/+47
Fix SDNC resource deletion for E2E service. Change-Id: I954c39044b4e4384a7941b6b6c5a0cccc57cf9b3 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-24Fix the variables in delete E2E workflowsubhash kumar singh3-22/+28
Fix the variables in delete E2E workflow. Change-Id: I23973d475ebc634f30bbb913d51b581c1222be7a Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-24Merge "Update resource instance id for Decomposed service"Seshu Kumar M3-6/+23
2018-04-24Merge "Fix request header for SDNC resource request"Chuanyu Chen1-2/+2
2018-04-24Merge "Add generic workflow for delete NS"Chuanyu Chen2-0/+193
2018-04-23Fix request header for SDNC resource requestsubhash kumar singh1-2/+2
Fix request header for SDNC resource request. Change-Id: I254d7139fcbeec00a98f44c8db3661da0425f8c7 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-23Add generic workflow for delete NSsubhash kumar singh2-0/+193
Add generic workflow for delete NS. Change-Id: I2bc1fe01aec3066e7ec6d8627c8bdcb79ce262fc Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-23Update resource instance id for Decomposed servicec001491073-6/+23
Update resourceinstanceid for Decomposed service Change-Id: Iaadd8b6d3fb861058eed56cbf33b3a0dc6a060d0 Issue-ID: SO-587 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-04-23Merge "Sonar Major Bug Fixing"Seshu Kumar M1-1/+1
2018-04-23Merge "Add 'not found in AAI' for updateE2E syncresponse"maopeng zhang2-1/+2
2018-04-23Sonar Major Bug FixingSumapriya1-1/+1
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-23Add 'not found in AAI' for updateE2E syncresponseYulian Han2-1/+2
add 'operaterID' input para to call deleteE2Em Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064308 Issue-ID: SO-578 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-04-23Merge "Update resource UUids for resource status"maopeng zhang1-27/+16
2018-04-23Merge "Added canceling subsription to pnf-pnp workflow"Seshu Kumar M9-100/+230
2018-04-23Merge "Sonar-Critical Bug Fixing"Seshu Kumar M2-2/+4
2018-04-23Update resource UUids for resource statusc001491071-27/+16
Update resource UUids for resource status Change-Id: I37bd5f9c6a2b30695b39e78dc64ab219831a3828 Issue-ID: SO-587 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-04-23Sonar-Critical Bug FixingAS004650592-2/+4
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-23Update response for delete e2e servicec001491072-10/+16
Update response for delete e2e service Change-Id: I8cd96981e085111e55211e8a24cb3b2cebe7ef9a Issue-ID: SO-587 Signed-off-by: c00149107 <chenchuanyu@huawei.com>