aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-05-23add scale function in VfcAdapterRest.javaguochong1-0/+27
Issue-ID: SO-634 Change-Id: I57cc8f3e54de0fa02a437112aaa478b742c1ab9f Signed-off-by: guochong <guochong@chinamobile.com>
2018-05-22fix endless loopguochong1-1/+1
Issue-ID: SO-634 Change-Id: Id39f2487d111099abf09330f3f2f089605cbe945 Signed-off-by: guochong <guochong@chinamobile.com>
2018-05-22Merge "Added setting pnf name in pnf-pnp"Seshu Kumar M4-4/+54
2018-05-22Merge "Add correlationId to ServiceInstancesRequest"Seshu Kumar M13-384/+410
2018-05-21Move pnfDefaultTimeout to dmaap.propertiesArthur Martella3-7/+4
Re: https://gerrit.onap.org/r/#/c/48031/1 SO is failing health check because pnfCheckInputs is not found in dmaap.properties, and pnf.properties is not being read, since applicationContext.xml has two PropertyPlaceholderConfigurer attributes, but it's only using one. Moved defaultTimeout to dmaap.properties, where applicationContext.xml will be able to read it, and renamed it to pnfDefaultTimeout to make it clearer what it is. Change-Id: I6490de472fbf4875e53204f4248c6325787c8af5 Issue-ID: SO-506 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-21Merge "Adjust INFO.yaml"Rob Daugherty1-1/+17
2018-05-21Merge "Added checking input variables in pnf-pnp"Rob Daugherty7-104/+271
2018-05-18Adjust INFO.yamlJessica Wagantall1-1/+17
Addition: - Marcus Williams - Sanchita Pathak Removal: - Tal Liron - Heliu Zhong - Yuanwei Yang Change-Id: I4d5ed58584c387fe180dc2e8d91c9d9fc35ca8ea Issue-ID: CIMAN-134 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2018-05-18Merge "Fallback for cloud region calls to AAI"Rob Daugherty1-3/+11
2018-05-18Fallback for cloud region calls to AAIArthur Martella1-3/+11
In the integration environment, there's no cloud region named att-aic. Therefore, try without att-aic first (CLOUD-REGION) and if that fails, try att-aic (DEFAULT-CLOUD-REGION) Change-Id: Ie4a4a3924eb6fe1120519e124a7967a62c96428f Issue-ID: INT-475 Signed-off-by: Arthur Martella <am153x@att.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-18Merge "Fix parsing for category and subcategory"Seshu Kumar M1-0/+2
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-18Merge "Fix resource building logic"Seshu Kumar M1-1/+5
2018-05-17Fix resource building logicsubhash kumar singh1-1/+5
Fix resource building logic. Change-Id: I95064d945a6ff026a0ea10336a550d9bb8af401a Issue-ID: SO-624 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-17Added checking input variables in pnf-pnpbiniek7-104/+271
Change-Id: I1a4f4b9704385a17995e76d4b87484c2f588b889 Issue-ID: SO-506 Signed-off-by: biniek <lukasz.biniek@nokia.com>
2018-05-17Merge "Fix resource population to DB"Seshu Kumar M2-16/+43
2018-05-17Fix resource population to DBsubhash kumar singh2-16/+43
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-17Revert placementInfo to placement in SniroHomingMarcus G K Williams4-5/+5
Issue-ID: SO-628 Change-Id: I6e9e44d453a72b4e9ec1a0abe99eb8028aa5ba1a Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-16Revert placementInfo to placement in SNIROUtilsMarcus G K Williams2-4/+4
Issue-ID: SO-628 Change-Id: I3bd802fc966f466b12556d19e347a130e152a51d Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-17Update release notessubhash kumar singh1-0/+53
Update release notes. Change-Id: Ie353abb910c752557a99944528a9157c45ce8073 Issue-ID: SO-627 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-16Merge "Add guard time to keystone expiry"Rob Daugherty1-1/+2
2018-05-16Add homingService variable to homing bbArthur Martella2-2/+4
Change-Id: I41bf2c4d12345d46d8bf008f79d6610592e3b645 Issue-ID: SO-625 Signed-off-by: Arthur Martella <am153x@att.com>
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-16Add guard time to keystone expiryBrian Freeman1-1/+2
Issue-ID: SO-622 Change-Id: If8260ee70d3c632325939affcbd80258b2602c99 Signed-off-by: Brian Freeman <bf1936@att.com>
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-09Added setting pnf name in pnf-pnpbiniek4-4/+54
Change-Id: I2f35d1a8cc01f349f791b1bc192f91f5f020f689 Issue-ID: SO-506 Signed-off-by: biniek <lukasz.biniek@nokia.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-08Add correlationId to ServiceInstancesRequestLukasz Muszkieta13-384/+410
Change-Id: Ia38fa1234f7b89c0574c74efe62d7b270c8ff987 Issue-ID: SO-596 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.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>