summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-05-15WorkflowResponse json issuesRob Daugherty46-305/+551
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-11Add junit for project mso-catalog-db-adapterLukasz Muszkieta6-161/+366
Change-Id: I7b28cc713929400b03b7e567bf9823d82631a1e9 Issue-ID: SO-617 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-05-10Add onap/so alias to docker buildArthur Martella1-0/+2
Change-Id: I57525e367ddf5bdbbc13f9efa9e93fda4fb6748e Issue-ID: SO-372 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-10Merge "Resolved License Issues for packages"Seshu Kumar M4-0/+0
2018-05-10Merge "Close db connections in finally block"Seshu Kumar M1-14/+19
2018-05-10Resolved License Issues for packagessanchitap4-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: I9e56bf3beaeeb858d91c4e9928789458ed9ba75f Issue-ID: SO-611 Signed-off-by: sanchitap <sanchita@techmahindra.com>
2018-05-10Merge "Resolved License Issues for asdc-controller"Seshu Kumar M4-0/+0
2018-05-10Close db connections in finally blockEthan Lynn1-14/+19
Fix bugs reported by sonar Change-Id: I0d3445856eb45533d904443b60d75c8aa03e5881 Issue-ID: SO-580 Signed-off-by: Ethan Lynn <ethanlynnl@vmware.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-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-10SO API doc updatesanchitap1-2/+34
Invenroty and MultiVIM APIs updated Change-Id: Ia72eaae208f94f2dff59a833661b181b6df1768b Issue-ID: SO-413 Signed-off-by: sanchitap <sanchita@techmahindra.com>
2018-05-08Merge "Remove wrapper from WorkflowResponse"Rob Daugherty4-3/+17
2018-05-08Remove wrapper from WorkflowResponseArthur Martella4-3/+17
When the workflow response succeeds, the requestReferences object is being wrapped by "WorkflowResponse": {"response": {... and all the other fields from the WorkflowResponse object are being included as well. Adding a WorkflowResponseSerializer didn't seem to work since the root node was still included and there was no ObjectMapper in which to set WrapRootValue to false. So this is the next best thing. Patch 2 fixes most of the broken unit tests. Change-Id: Ifa5bd02e70b23f41c9042ac207848c8ade77313a Issue-ID: SO-586 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-08SO API doc updatesanchitap1-44/+32
UUI APIs, SDC APIs updated Change-Id: I77a245217197b95b1735e75c8ff0bb09c2772d70 Issue-ID: SO-413 Signed-off-by: sanchitap <sanchita@techmahindra.com>
2018-05-07vnf-adapter failed to deployRob Daugherty1-4/+2
This is related to recent CloudConfig fixes. One change was apparently not submitted in the last batch. Change-Id: I8dcc49f7d808e0d842af3f568f5815fb48870acc Issue-ID: SO-584 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-05-07Merge "Fix for FileNotFoundException in MsoLoggerTest"Seshu Kumar M1-1/+1
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-07Merge "SO API document"Seshu Kumar M1-1/+1
2018-05-04Fix for FileNotFoundException in MsoLoggerTestMichal Kabaj1-1/+1
Remove over 100 whitespaces from logger filename which causes the unit tests to fail in some development environments. Change-Id: I068f4d4562b635b19889c3537282949665348c21 Issue-ID: SO-604 Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>
2018-05-04SO API documentsanchitap1-1/+1
VFC APIs, Policy APIs updated Change-Id: I492cc817f57d6f6410ba5ae3cdef6c9f3db1786d Issue-ID: SO-413 Signed-off-by: sanchitap <sanchita@techmahindra.com>
2018-05-04Use tosca parser without resolving GetInputsubhash kumar singh1-1/+1
Use tosca parser without resolving GetInput. Change-Id: I964464dd76c0bdd096e67ce78ab4cc7c2e76a167 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-04Fix progress update for VFC resourcessubhash kumar singh1-0/+8
Fix progress update for VFC resources. Change-Id: Ibd7d8fb3a399ae2b40ca82e459a7e47c05cbac6a Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
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-04Fix CloudConfig junitsRob Daugherty18-84/+150
...for some definition of the word "fix". There is still a lot that's less than ideal about how CloudConfig is handled, and with how the unit tests are written. Change-Id: Ic8c66c64d336f22c141687cf41a4828810bf1aec Issue-ID: SO-584 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-05-04Add enforcer.skip to pom.xmlArthur Martella3-4/+5
To prevent appc snapshot problem Also change appc version to SNAPSHOT Change-Id: Ifce05b7f44ccc70a2d654526d67da873dd325dcd Issue-ID: SO-605 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-03ecomp-model-information to onap-model-informationArthur Martella13-75/+86
Change-Id: I05f4648ff898a54e7a00d899d97129746172cdb4 Issue-ID: SO-603 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-01SDNC Adapter not loading propertiesRob Daugherty1-5/+3
Somebody changed some variables from static to non-static, and this broke the CloudConfig loading logic. I changed them back. Change-Id: Id7dca76a4f0af0209ebd6cef8f3e0209c3f7a022 Issue-ID: SO-584 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-04-28Merge "Fix null attribute for aai relationship"Seshu Kumar M0-0/+0
2018-04-28Merge "createvfcns serviceInstanceid is null bug fix"Seshu Kumar M3-11/+11
2018-04-28Merge "Add correlationId to ServiceInstancesRequest"Seshu Kumar M2-15/+25
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-27Add correlationId to ServiceInstancesRequestLukasz Muszkieta2-15/+25
Change-Id: Idc5ee56660da31f08fd8ed3a67b7cd28f9844f43 Issue-ID: SO-596 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-04-27Fix null attribute for aai relationshipsubhash kumar singh1-1/+1
Fix null attribute for aai relationship. Change-Id: Ifa3a7ec7101c1564be68d97a70d0cafd40d581fe Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@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-27Merge "SDNC Adapter not loading properties"Seshu Kumar M2-0/+127
2018-04-26Merge "Remove operation status set in api-handler"Rob Daugherty5-404/+31
2018-04-26Merge "Add NS relationship delete for E2E service"Rob Daugherty2-13/+100
2018-04-26Merge "Fix value for VFC sync response"Rob Daugherty2-0/+3
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-26SO North Bound APIs docsanchitap1-78/+302
SO North Bound APIs document Change-Id: I26789d249926e192ae6a0b59804dfeb3aef740a2 Issue-ID: SO-595 Signed-off-by: sanchitap <sanchita@techmahindra.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-handlerc001491075-404/+31
Remove operation status set in api-handler Change-Id: I579d25044130b0701231c0a2d42534e8c63e3ebd Issue-ID: SO-587 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-04-26SDNC Adapter not loading propertiesRob Daugherty2-0/+127
We are missing 2 source files in SO which were part of MSO 1802: CloudConfigInitializer.java CloudConfigIdentityMapper.java The missing initializer means that cloud-config.json is never loaded. Change-Id: Id1186edda01d345de072b5288382dbdc56679294 Issue-ID: SO-584 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-04-26Fix library CVEs in SOchenying832-1/+19
Fix additional CVEs: commons-fileupload 1.3.3 For CVE-2016-1000031 logback 1.1.11 For CVE-2017-5929 springframework 4.3.14.RELEASE For CVE-2014-0225 CVE-2015-5211 Issue-ID: SO-579 Change-Id: I94f8332d420d2586262260a0a59a645f0de66b73 Signed-off-by: chenying83 <chenying83@huawei.com>
2018-04-26Merge "Fix VFCNS termination invocation"Chuanyu Chen2-0/+20