aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn
AgeCommit message (Collapse)AuthorFilesLines
2018-05-31Update ConfigScaleOut payload formatElena Kuleshov1-1/+1
Change-Id: Ib05c30783b1c719c84b91be81cf052422da8fb9a Issue-ID: SO-602 Signed-off-by: Elena Kuleshov <ek1439@att.com>
2018-05-31Fix OOF serviceResourceId bugMarcus G K Williams5-14/+23
- Works around a bug in OOF where OOF does not return a serviceResourceId with homing solutions. SO uses serviceResourceId to match a homing deman to a homing request. This patch addes resourceModuleName as another way to match a demand to a request, as currently OOF needs this to be unique. - Changes SO homing processing of key cloudRegionId to key locationId as this is now the key used for cloudRegionId in solutions sent back from OOF Issue-ID: OPTFRA-249 Change-Id: I8e5d9244a227ea4d3d061a758f202144bac270ce Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-31Merge "Throw exception if resource receipe is not avail"Seshu Kumar M1-4/+13
2018-05-31Throw exception if resource receipe is not availsubhash kumar singh1-4/+13
Throw exception if resource receipe is not available for the resource in service. Change-Id: Ic6110a1f03d9a0f22d963812eab99e571191140d Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-31Miscellaneous fixes for SO-SDNC integrationArthur Martella3-4/+5
changing capitalization of SDNC in LCM property adding payload to createVfModule bpmn Change-Id: Ib4d8e172a929a8138cf4e3fbf446170467b44a42 Issue-ID: INT-475 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-30Add ConfigScaleOut to ApplicationControllerActionArthur Martella1-0/+1
Change-Id: Ia9aaf05cd2a255491b0f73351653f1b622140e62 Issue-ID: SO-602 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-30Merge "Set CreateVfModuleInfra health check to false"Marcus Williams1-1/+1
2018-05-30Set CreateVfModuleInfra health check to falseBancala, Ben (bb3476)1-1/+1
Issue-ID: SO-659 Change-Id: I4f7d9ce861db6d997ebc1108cdf1bd0995a7aa19 Signed-off-by: Bancala, Ben (bb3476) <bb3476@att.com>
2018-05-30Merge "Change topics setup for LCM"Marcus Williams2-11/+6
2018-05-30Change topics setup for LCMElena Kuleshov2-11/+6
- Fix general topic properties. - Fix junit for getLcmProperties Change-Id: I424129c18a017908280c6bdc831a6a72ba1192ca Issue-ID: SO-602 Signed-off-by: Elena Kuleshov <ek1439@att.com>
2018-05-30Merge "Correct controllerType property name"Marcus Williams1-1/+1
2018-05-30Merge "Add space to 'Tunnel XConn'"Marcus Williams8-23/+23
2018-05-30Correct controllerType property nameElena Kuleshov1-1/+1
Change-Id: I71003381548d1d221854f78e0d0734994dd16d5f Issue-ID: SO-602 Signed-off-by: Elena Kuleshov <ek1439@att.com>
2018-05-30Add space to 'Tunnel XConn'Arthur Martella8-23/+23
Adding space to change TunnelXConn to Tunnel XConn so that SO will match SDNC. Change-Id: I2a752fd1c6b3ed115c8a2dafbd47e3ce24f49a57 Issue-ID: SO-650 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-30Merge "Fix OOF Homing Interface"Seshu Kumar M6-86/+186
2018-05-29Fix OOF Homing InterfaceMarcus G K Williams6-86/+186
- Update homing request build to send correct request to OOF - Use nfFunction field as resourceModuleName requires updating nfFunction fields during vcpeRestCust service creation in SDC - Fix No Solution Error from OOF - Made subscriber info and cloud info optional as OOF Homing does not require it - Update Homing Requests for AR to provide vgMuxInfra modelInfo instead of vgmuxAR modelInfo as required by OOF Issue-ID: SO-573 Change-Id: If1c41c81f387bb614be954d158d6cc4d9c48e2c8 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-29Merge "Use actual vfModuleId in APP-C payload."Seshu Kumar M1-2/+2
2018-05-29Merge "Pass parameters from SDNC response to APP-C."Seshu Kumar M2-19/+97
2018-05-29Use actual vfModuleId in APP-C payload.Elena Kuleshov1-2/+2
Change-Id: I6d0d30b10615fd7b411ab723cf27fbeea2fec21e Issue-ID: SO-602 Signed-off-by: Elena Kuleshov <ek1439@att.com>
2018-05-29Pass parameters from SDNC response to APP-C.Elena Kuleshov2-19/+97
Change-Id: I7d83ee933361ca16d9b05639bfb84b9c1466887c Issue-ID: SO-602 Signed-off-by: Elena Kuleshov <ek1439@att.com>
2018-05-29fix query ns scale endless loopguanwenyao1-5/+4
Issue-ID: SO-634 Change-Id: I79ac70be79345c966642dc5b99c25b4a39dc575d Signed-off-by: guanwenyao <guanwenyao@chinamobile.com>
2018-05-24Merge "Fix serviceInstanceName in Homing"Seshu Kumar M4-13/+28
2018-05-24Fix serviceInstanceName in HomingMarcus G K Williams4-13/+28
serviceInstanceName was not set in CreateVcpeResCustService and not made available in Homing Flow. Issue-ID: SO-573 Change-Id: I9d3098aa252ceba139c75a24c71950bab70b14b6 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-24Merge "Removing license from OOF Homing Demand"Seshu Kumar M2-12/+4
2018-05-23Removing license from OOF Homing DemandMarcus G K Williams2-12/+4
OOF does not support License deman in Beijing Issue-ID: SO-573 Change-Id: Ia7e013949773595b520ed4cbd0bbe8cb0f18922c Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-23APPC client changes topic for controllerTypeArthur Martella1-2/+7
... again. Back to just changing topic.read and topic.write based on controllerType (but still setting controllerType too, just in case). Change-Id: I175d20b998c6d141ca7587504535bd7bb494563c Issue-ID: INT-475 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-23Change LCM property for SDNC topicArthur Martella1-0/+2
Followup to https://gerrit.onap.org/r/#/c/48571/ Adding property sdnc-topic.read and sdnc-topic.write to match topic.sdnc.read and topic.sdnc.write on advice of SDNC LCM dev. Change-Id: I3c856f126ecb2f6b1c45df818ea7d294e0440e5c Issue-ID: INT-475 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-23Fix cloudOwner, cloudRegionId in HomingMarcus G K Williams2-0/+15
Issue-ID: SO-637 Change-Id: I0c95e5d5c7a9ea60525d103823bd22495f6ac6a6 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-23Merge "Fix resource looping if AAI response empty"Chuanyu Chen1-10/+14
2018-05-23Merge "fix endless loop"Chuanyu Chen1-1/+1
2018-05-23Merge "Fix customerLocation var in VcpeCusRes Flow"Seshu Kumar M1-1/+2
2018-05-22Fix customerLocation var in VcpeCusRes FlowMarcus G K Williams1-1/+2
Issue-ID: SO-636 Change-Id: Ieb6c3da2c0485585d009bfca1d689f4c485a2879 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-22APPC client changes topic for controllerTypeArthur Martella1-2/+7
When controllerType is sdnc, it's still using the appc topic names. Trying this to switch topic based on controllerType. Patch 2 changed to match APPCClient in ATT code base. Change-Id: I72e7e84720f73ac30d3d28e3387af2d537d301ad Issue-ID: INT-475 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-22Fix resource looping if AAI response emptysubhash kumar singh1-10/+14
Fix ressource looping if AAI response is empty for resource list. Change-Id: I244d3836beb98ec2689c71df5c61f24f40619d96 Issue-ID: SO-632 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.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-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 "Added checking input variables in pnf-pnp"Rob Daugherty7-104/+271
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-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-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-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-15WorkflowResponse json issuesRob Daugherty34-177/+191
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-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-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-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>