summaryrefslogtreecommitdiffstats
path: root/bpmn/MSOInfrastructureBPMN/src/main
AgeCommit message (Collapse)AuthorFilesLines
2018-03-09Merge "Update resource recipe parameter prepare logic"Rob Daugherty1-47/+97
2018-03-09Merge "Fix some Sonar Blockers in workflow/serviceTask"Rob Daugherty4-128/+70
2018-03-09Update resource recipe parameter prepare logicc001491071-47/+97
Update resource recipe parameter prepare logic Change-Id: Iefb4964f059a92e3df4000627b8b404174bfb804 Issue-ID: SO-452 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-03-08Fix some Sonar Blockers in workflow/serviceTaskShashank Kumar Shankar4-128/+70
Some files in which the sonar code fixes are done: https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so%3AMSOInfrastructureBPMN%3Asrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fmso%2Fbpmn%2Finfrastructure%2Fworkflow%2FserviceTask Change-Id: I6c25c6553008c8cea53b11a71dbe89c28b3bb441 Issue-ID: SO-455 Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>
2018-03-07Merge "Store NB Create req. userParam - Customer_Location"Rob Daugherty1-752/+834
2018-03-07Remove unnecessary String constructor callMunir Ahmad1-2/+2
Change-Id: Ibb0dcc412ae6243ee370b8e272455269303130eb Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-03-06Store NB Create req. userParam - Customer_LocationMarcus G K Williams1-752/+834
1. Additional user param Customer_Location needs to be passed and stored for use later in communication to OOF for homing/placement. 2. Added request.json fields to unit test Customer_Location and enabled testing of Customer_Location in CreateVcpeResCustServiceTest.groovy 3. Cleanup of CreateVcpeRestCustService.groovy to match code conventions Issue-ID: SO-402 Change-Id: Id23161c1d63e2f0e7871bf9310468c1b64cbd04e Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-03-06Replace explicit type with dimond typeMunir Ahmad1-2/+2
Change-Id: I1dedb9ef1ca7b734e3cfc0a3a594d733dbd298d4 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-03-05Merge "Update generic create service workflow"Chuanyu Chen2-251/+410
2018-03-05Update generic create service workflowc001491072-251/+410
Update generic create service workflow Change-Id: Ia13b7acd107ca9df96f05f239e8ca156c554eb40 Issue-ID: SO-370 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-02-27Removed System.out.println from catch clauseMunir Ahmad1-3/+0
Change-Id: I957a2f8026ccfb88305461b9524ae861f958b27e Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-02-23Support more Generic workflow for voLTEc001491074-353/+475
Support more Generic workflow for voLTE Change-Id: I44509eaa6a5db7e9fb02df8edaa0a4a50e5d1d49 Issue-ID: SO-438 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-02-23Merge "Support more Generic workflow for voLTE"Seshu Kumar M4-12/+168
2018-02-22Support more Generic workflow for voLTEc001491074-12/+168
Support more Generic workflow for voLTE Change-Id: I0005fffdb420709b597739173fa894981ac9c74e Issue-ID: SO-438 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-02-21Remove redundant toStringMunir Ahmad2-2/+2
Change-Id: If039248f233e3aa53733aa1a888b571836ca9406 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-02-07Merge "Sonar blocker issue - closeableHttpClient"Seshu Kumar M1-100/+18
2018-02-08Sonar blocker issue - closeableHttpClientliboNet1-100/+18
user the try-with-resource method to fix issue https://sonar.onap.org/issues/search#issues=AV-B6Uh2-08if2a6r-Va and https://sonar.onap.org/issues/search#issues=AV-B6Uh2-08if2a6r-Vb Change-Id: I70a6424307e88c28a7290ed23d13888ef55c3aa3 Issue-ID: SO-165 Signed-off-by: Zhu Libo <libo.zhu@intel.com>
2018-01-29Refactor of DecomposeJsonUtils class.biniek1-2/+1
Change-Id: I72b779eb17ffb901266de605eb2eda49f13bd03e Issue-ID: SO-374 Signed-off-by: biniek <lukasz.biniek@nokia.com>
2018-01-16Add Generic Workflow for E2E ServiceInstancec001491074-0/+4276
Add Generic Workflow for E2E ServiceInstance Change-Id: I078d7b74b16c670927ca4aebba2fbe4aa1c0d542 Issue-ID: SO-379 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2017-12-15Fix Unexpected service create issuec001491071-1/+5
Fix Unexpected service create issue.Reset the variable before update it. Change-Id: I4e21cecc51ee441727600315f059f7c341c2cc11 Issue-ID: SO-358 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2017-12-14Fix Json Serialize failed issuec001491071-1/+1
Fix Json Serialize failed issue for delete service, Get json String value of the object. Change-Id: Id2375beede73581029fc5c048a26a6c7f17eb606 Issue-ID: SO-357 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2017-12-05Correct Service Type valuec001491071-2/+2
Correct Service Type value for E2E service Issue-ID: SO-354 Change-Id: I4265dfac3793117dc83a6ae97a0dddb1d532d58c Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2017-11-15Modified create-vcpe to filter out "bad" VNFsJim Hahn1-0/+21
Modified create-vcpe to delete the BRG and TXC items from the service VNF list contained within the service decomposition structure. Change-Id: I7624a93b422fa172a2079f70d66a2604ee2229b0 Issue-Id: SO-344 Signed-off-by: Jim Hahn <jrh3@att.com>
2017-11-15fix updateProgressv1.1.0Zhuoyao Huang4-12/+22
Change-Id: I91d63cacc0d1a55c3b07703890adecd95ba9410d Issue-ID:SO-181 Signed-off-by: Zhuoyao Huang <10112215@zte.com.cn>
2017-11-14Merge "Added global customer id to sdnc delete request"Rob Daugherty3-6/+20
2017-11-14Merge "Fix SDNC flow Exception"Seshu Kumar M1-2/+3
2017-11-14Merge "Fix Update Create Resource Status Error"Seshu Kumar M1-1/+2
2017-11-14Fix SDNC flow Exceptionc001491071-2/+3
Fix SDNC flow Exception Change-Id: I11478377105bfe0f5c02bb214e2748766d96c651 Issue-ID:SO-338 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2017-11-14Fix Update Create Resource Status Errorc001491071-1/+2
Fix Update Create Resource Status Error Change-Id: I230c7986b72e27e4c59fbeb129c1b39bb500a86b Issue-ID:SO-337 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2017-11-13Added global customer id to sdnc delete requestJim Hahn3-6/+20
Modified delete-BRG & delete-TXC to add global customer id and several other fields to the SDNC request. Change-Id: I4b85ba634b56a218037f95e1772fe0fcdde1cd91 Issue-Id: SO-336 Signed-off-by: Jim Hahn <jrh3@att.com>
2017-11-11Query AAI for ARs on deleteJim Hahn1-60/+76
Delete-vcpe code expected allotted-resources to be included within the SI response from AAI. That turns out not to be the case. As a result, the code for delete-vcpe was modified to query each AR found in the SI to get it's full info. Change-Id: I893fb2fcf50a32335bbd68d1aaa84c8d747b14f0 Issue-Id: SO-325 Signed-off-by: Jim Hahn <jrh3@att.com>
2017-11-11Changed parsing code in DoDeleteVfModuleFromVnfJim Hahn1-41/+24
Modified code to use MsoUtils to parse the xml rather than walking the nodes generated by documentBuilder. Added check for missing vfModuleOutputs. Added MsoUtils.getMultNodeObjects() to return real Node objects instead of lazy nodes. Change-Id: I0266502f1e0353c778dce982fa55cf7ce944d91e Issue-Id: SO-333 Signed-off-by: Jim Hahn <jrh3@att.com>
2017-11-10Merge "Fix AAI Service Delete failed issue."Seshu Kumar M3-14/+9
2017-11-10Fix AAI Service Delete failed issue.c001491073-14/+9
Fix AAI Service Delete failed issue. Change-Id: Ief3eae52d119fcf488a562916d1322641078983f Issue-ID:SO-329 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2017-11-10Merge changes I4e542ffd,Ibb86da2dSeshu Kumar M3-25/+37
* changes: Fix Null Point Exception Fix Delete workflow sent msg to vfc adatper failed
2017-11-10Merge "Now passing cloudConfig to subflows"Seshu Kumar M2-2/+6
2017-11-10Fix Delete workflow sent msg to vfc adatper failedc001491073-25/+37
Fix Delete workflow sent msg to vfc adatper failed Change-Id: Ibb86da2d9e03e0004854035b21daaae09d3f19e6 Issue-ID:SO-327 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2017-11-09Now passing cloudConfig to subflowsJim Hahn2-2/+6
Modified DeleteVcpeResCustService to pass cloudConfiguration to the delete-vnf-and-modules subflow, in addition to passing the cloud id and tenant id. Change-Id: Icf7824ed36eef95b8ab943005c5f4495706b5d70 Issue-Id: SO-324 Signed-off-by: Jim Hahn <jrh3@att.com>
2017-11-09Added authentication info to DoDeleteVnfAndModulesJim Hahn1-11/+2
Modified code to use AaiUtil.executeAAIGetCall() to make the the call to AAI, thus shortening the code while gaining the benefits of the common module (e.g., setting authentication info). Change-Id: Ic0e671c0301c78b14a2234efec3cc7064162d4ad Issue-Id: SO-326 Signed-off-by: Jim Hahn <jrh3@att.com>
2017-11-08Clean up Process Engine selection logicRob Daugherty3-54/+4
Several failed attempts to split the BPMN application into multiple applications with separate camunda process engines have left a mess of confusing classes and process engine definitions. In the Amsterdam release, there should be only one BPMN application war. This is MSOInfrastructureBPMN. MSOCommonBPMN should not be deployed as a separate application. Its classes are compiled into a jar and this is included inside MSOInfrastructureBPMN. The MSOInfrastructureBPMN application should use the "default" process engine. WorkflowAsyncInfrastructureResource and MSOCommonApplication classes are not needed. Issue: SO-322 Change-Id: Ifdb3b33541346b561a16361d1aa791e8342a34fa Signed-off-by: Rob Daugherty <rd472p@att.com>
2017-11-08Added input params to service-information sectionShailendra Borale3-6/+18
Added input params to service-information section to facilitate sdnc assign query subscriptionServiceType and globalCustomerId were added to groovy, bpmn parentServiceInstanceId shd not be part of service-information, serviceInstanceId - corrected Updated junit tests with new service-info fields. Change-Id: I9fbfdf8a97b4e42881e187bec198c977241c0c13 Issue-Id: SO-318 Signed-off-by: Jim Hahn <jrh3@att.com>
2017-11-08Merge changes I47e5be10,Ieb31f208Seshu Kumar M5-167/+166
* changes: Fix issue of Class name wrong Fix AAI Relationship read failed in delete flow
2017-11-07Fix issue of Class name wrongc001491075-6/+8
Fix issue of Class name wrong Change-Id: I47e5be10aed7f991088c99ec7baf3135783c40e2 Issue-ID:SO-312 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2017-11-07Fix AAI Relationship read failed in delete flowc001491075-161/+158
Fix AAI Relationship read failed in delete flow Change-Id: Ieb31f2088aba3d4bb2d4ad5c72aec061cf833069 Issue-ID:SO-311 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2017-11-06Updated xml tags and moved sleep to bpmnJim Hahn6-76/+118
Per issue, changed "_" to "-". Also related to a comment to SO-303, made "sleep" time a property and moved the sleep calls from groovy scripts to bpmn. Fixed a few test resources that still had "_" instead of "-". Changed variable name from sdnReplDelay to sdncReplDelay. Change-Id: I893254c0ab735508732fcf2c3e82934f26c2a05a Issue-Id: SO-308 Signed-off-by: Jim Hahn <jrh3@att.com>
2017-11-06Merge "Add Relationship between e2eservice and ns"Seshu Kumar M1-3/+2
2017-11-06Add Relationship between e2eservice and nsc001491071-3/+2
Add Relationship between e2eservice and ns Change-Id: Ib79fe952560789b2a1113e93eea1179b6c5088e7 Issue-ID:SO-307 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2017-11-06Merge "Changed debug variable name to be consistent"Seshu Kumar M1-40/+40
2017-11-05Moved sleep to macro flowJim Hahn3-55/+82
Added new method to "Await AAI Distribution" to macro flow and moved sleep there. Added junit test for new method and updated existing tests. Change-Id: I91c8a787669a0fc8cf2038a4cfb6f6229d3949e2 Issue-Id: SO-303 Signed-off-by: Jim Hahn <jrh3@att.com>
2017-11-05Changed debug variable name to be consistentJim Hahn1-40/+40
The debug variable name was inconsistent which resulted in null being passed to the debug logger. Change-Id: Ia431b12a950113d27cb84c54eb54579995ae17de Issue-Id: SO-306 Signed-off-by: Jim Hahn <jrh3@att.com>