summaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN/src/main/groovy
AgeCommit message (Collapse)AuthorFilesLines
2019-04-11Merge "Support for SO to ExtAPI"Seshu Kumar M1-0/+4
2019-04-01replace all fixed wiremock portsBenjamin, Max (mb388a)5-3/+15
trying to get the tests that can be threaded to pass started to remove fixed port references Change-Id: I7bfe067a8f36c908039700646571681321e9a6f5 Issue-ID: SO-1676 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-29Refactored SDNCAdapterUtils (groovy)Witold Ficio Kopel2-142/+134
Standardized usage of MsoUtils class in all methods of SDNCAdapterUtils. Removed AbstractServiceTaskProcessor from constructor parameter. Change-Id: I45263aefc980163a927d8a6dce886e299691e025 Issue-ID: SO-1700 Signed-off-by: Witold Ficio Kopel <w.kopel@samsung.com>
2019-03-26Eliminated printStackTrace() callsWitold Ficio Kopel12-119/+110
Eliminated calls to printStackTrace() on Throwable as they go to stdout and are not handled by logger. Occurences has been replaced by calls to logger or modifications to nearby logger calls (Throwable passed as last parameter). Occurences in unit test classes left without modification. Change-Id: I6a771d60a3ea69ceecc29bb21358e565aa5ce101 Issue-ID: LOG-631 Signed-off-by: Witold Ficio Kopel <w.kopel@samsung.com>
2019-03-22Hid MsoUtils.log() methods from public useWitold Ficio Kopel2-133/+38
The MsoUtils class has utility methods for logging made publicly available (by default groovy scope). With changes to logging subsystem, other classes should not use them for logging - so they have been made private. This is last commit in a series to eliminate use of MsoUtils.log() from other classes and should prevent such usage in future. Change-Id: I8311df26e17b70043c5d8de6b13818f803319ab8 Signed-off-by: Witold Ficio Kopel <w.kopel@samsung.com> Issue-ID: LOG-631
2019-03-21Removed MsoUtils.log() calls from CatalogDbUtilsWitold Ficio Kopel2-10/+12
Refactored calls to MsoUtils.log() to use logger object already present in the CatalogDbUtils class. In addition the CatalogDbUtils class has been accepting MsoUtils object as parameter to constructor - which is not necessary and not aligned with style in rest of the groovy code. Change-Id: Ib80593294ead5b2779f667d8e58f128e958538f0 Issue-ID: LOG-631 Signed-off-by: Witold Ficio Kopel <w.kopel@samsung.com>
2019-03-20Removed BPMNLogger classWitold Ficio Kopel1-75/+71
The BPMNLogger class has overlapping use to preferred solution based on slf4j and logback - thus has been replaced by it. Change-Id: I9889d4b9ab06f28941f0d827df889e3c081155da Issue-ID: LOG-631 Signed-off-by: Witold Ficio Kopel <w.kopel@samsung.com>
2019-03-20Merge "Removed logXXX() methods from MsoUtils"Steve Smokowski4-29/+0
2019-03-20Support for SO to ExtAPIVodafone1-0/+4
Change-Id: I5789ceb1fd4bd22d3b5ca706e55efe1bf4a3f51a Issue-ID: SO-1421 Co-authored-by: gopal.sabhadiya@vodafone.com Signed-off-by: Vodafone <onap@vodafone.com>
2019-03-19Merge "Update Tasks API with additional fields"Steve Smokowski1-0/+4
2019-03-19Removed logXXX() methods from MsoUtilsWitold Ficio Kopel4-29/+0
Following methods has been removed from MsoUtils (.groovy) class: logContext(requestId, serviceInstanceId) logMetrics(elapsedTime, logtxt) logAudit(logtxt) as no longer required. Remaining uses of them in other groovy clases has been deleted/replaced by apropriate use of logback. Change-Id: I473f01b65c67e90667311cff3b2a671e719f7258 Issue-ID: LOG-631 Signed-off-by: Witold Ficio Kopel <w.kopel@samsung.com>
2019-03-18Removed MsoLogger classr.bogacki26-132/+134
Bye bye MsoLogger class. Extracted constants to separated classes. Fixed imports. Change-Id: I7c8e0527e7dbd097d3ea93b9dab279354652da47 Issue-ID: LOG-631 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-03-15Update Tasks API with additional fieldsElena Kuleshov1-0/+4
Update Tasks API with additional fields and new valid response Change-Id: I39d85ae599f9274373bbcf66dce4752ee75f16ed Issue-ID: SO-1594 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-03-14Cleaned up content of MsoLoggerr.bogacki24-198/+199
Cleaned java and groovy code from 'getServiceName' method in MsoLogger. Change-Id: I23c3fc8005db5f89e94b87271bb60b7bcce72064 Issue-ID: LOG-631 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-03-13Remove MsoLogger from MSOCommonBPMN scriptsWitold Ficio Kopel38-1050/+1308
Modifications of groovy scripts in MSOCommonBPMN removing following: Replaced MsoLogger with plain slf4j. Refactored loging output. Fixed imports. Replaced utils.log() with respective logger calls (except for AbstractServiceTaskProcessor class). Modifications to MsoUtils class. Change-Id: I6bdd8ab6f60dca9b765fcf7d56f5aaa707c028cc Issue-ID: LOG-631 Signed-off-by: Witold Ficio Kopel <w.kopel@samsung.com>
2019-01-28Merge 'origin/casablanca' into masterBenjamin, Max (mb388a)3-23/+79
Issue-ID: SO-1435 Change-Id: If065ef5c91e769452fd6701fa6c28a23b4bdf2b2 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-01-21Bug fixes from AT&T January 20thBenjamin, Max (mb388a)2-22/+20
sorted vfmodules by base last for negative action reqs store Response in execution as String on network delete added functionality to skip rollback based on flag # Conflicts: # bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflo w/tasks/WorkflowAction.java require XML in the header for delete network request Update APP-C LCM Client library version to 1.7.0. replaced wiremock style test with mockito test Handle AAIClient Exps in CreateCustomerV1 getServiceInstance() changed default status code to be configurable Replace vnfType by nfRole in the healthcheck request to SDNO. updated error messages in sdnc handler and flow status updated flow status message on completion of flow Send GenericVnf object for AAI VNF update for vnf-api updates Add a JUnit test file for SDNOValidatorImpl.java Set nodeType on the inner SDNO request as per update from SDNO. updated rollbackToAssigned logic to remove unassign flows updated sdnc handler error message for client error added exception handling for httpclienterror in sdnc out map workflow exception so error is reported throws sdnc error message on bad response from sdnc add catalog entries for TRANSPORT service delete flows change script number that was duplicate add find method to NorthBoundRequestRepository include serviceType in hash code use asterisk for all non-TRANSPORT flow db entries alacart true, rm not needed transport srvc model steps correct insert query syntax for orchestration_flow support serviceType (TRANSPORT) process flow fix SDNCAdapterException causing no callback to bpmn use JsonAlias for alternate case when deserializing GRM client will accept both "serviceEndPointList" and "ServiceEndPointList" root node in the JSON response. AAIRestClient now uses getSystemName in headers finishtime should not be returned in requeststatus Change-Id: I81a185252b057020f7f36f125c85c3357756da88 Issue-ID: SO-1403 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-12Merge "Miscellaneous fixes"Steve Smokowski1-5/+5
2019-01-11explicitly type defs and strings for templatesBenjamin, Max (mb388a)5-10/+10
explicitly type defs and strings for templates Change-Id: If4af5b0cdf086cd0d30277d1e835e2aa7c8e7f9c Issue-ID: SO-1386 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-11Miscellaneous fixesBenjamin, Max (mb388a)1-5/+5
updated common pom to use aai schema version 1.4.1 removed handle sync error from SDNCHandler bpmn flow added mso-request-id to in mapping of delete vnf flows moved temporary test file to temporary folder Removed obsolete genericVnfNode parameter from updateGenericVnfNode sorted vfmodules by base last for negative action reqs Change-Id: I7a5018d67292cfaac8d923ac3bd9b27ed037be57 Issue-ID: SO-1382 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-04Bugfixes for December 2018Benjamin, Max (mb388a)2-6/+5
Changed the way that the cidr is constructed in network utils. added in the if statement to check if selflink already exists removed execution line that was not needed in pull added service instance id to workflowResourceIds for virtualLinkKey network flows wrote test for updating request to complete in db workflow action directly updates db instead of using mso complete process Increase max timeout for SDNO Health Checks dmaap. Added execution variable and corrected type and way data is retrieved to fix defect fixed retry status message in request db for #/5 updated workflowActionBBTasks for flow status message updated flow status to failed on a workflowaction fail Removed slashes and fixed rollbackStatusMessage Updated requestStatus logic for adding status messages Added junit test to validate casue of a defect and cleaned up code and logging added end timestamp to request db on complete request fixed l3Network update of orchestation status in DoUpdateNetworkInstance groovy as well fixed update of l3network orchestration status Add explicit resetting of heatStackId in A&AI to DeleteVfModule and DeleteVolumeGroup BBs. Preserve heatStackId setting in the copiedVfModule when updating the VF Module in A&AI. added functionality to skip rollback based on flag Update snapshot version for logging, add headers fixed optional of error in retrieveErrorMessage method Set heatStackId to null if we want to remove it in A&AI. added in a warn logger statement to keep track of field map network technology from l3network instead of model info for network adapter object mapper Force heatStackId value to empty on an attempt to set it to null on update updated common pom to use aai schema version 1.4.1 removed handle sync error from SDNCHandler bpmn flow Change-Id: I1bd7aa55b06d4e439000b216165c9daafeacc9a4 Issue-ID: SO-1361 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-04HttpClientFactory to create HttpClient instancesMichal Kabaj9-14/+26
-Replace constructor calls with existing factory -Add create methods to factory for each required Media Type Change-Id: Ibd03c10230c87a0413c0ec529e0ea9ac800444f9 Issue-ID: SO-1344 Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>
2018-12-13Add junit tests for CatalogDBUtilsLukasz Muszkieta3-62/+58
Change-Id: I1ea3e92b6dcb3fbca837513e11451be47d8c488b Issue-ID: SO-784 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-12-12Merge "Fixed vlan xml and host routes"Steve Smokowski1-394/+25
2018-12-12Merge "fixed aai response code in updateAAIVfModule"Steve Smokowski2-1/+9
2018-12-12Merge "ConfirmVolumeGroupNameTest improvements"Steve Smokowski3-17/+58
2018-12-12ConfirmVolumeGroupNameTest improvementsJoanna Jeremicz3-17/+58
Change-Id: I3e611f2577e66932d8337d1768ba803c25d01b39 Issue-ID: SO-784 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
2018-12-11Fixed vlan xml and host routesKalkere Ramesh, Sharan (sk720x)1-394/+25
Fixed parse error in build vlan xml and host routes, removed dead code. Change-Id: Id3f4e6400434c77f9a942f7e64e03aed91e24c9f Issue-ID: SO-1322 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2018-12-11Changed sdncRequestId to SDNCA_requestIdKalkere Ramesh, Sharan (sk720x)1-3/+3
Updated junit groovy test for sdnc adapter Changed to set sdncRequestId to be set to SDNCA_requestId so correlation happens during callback. Change-Id: I6532a676caa4332a32c89ef0ff2e2739d7e8cb56 Issue-ID: SO-1320 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2018-12-10fixed aai response code in updateAAIVfModuleKalkere Ramesh, Sharan (sk720x)2-1/+9
Added PUAAIVfMod_updateVfModuleResponseCode to be set to execution Added responseCode verification in unit tests Set UAAIVfMod_updateVfModuleResponseCode Change-Id: I0d429388ff49ae78241ad1b0f33815a80f749061 Issue-ID: SO-1313 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2018-12-10requestid retrieval and validation in bpmnKalkere Ramesh, Sharan (sk720x)1-6/+10
Change-Id: I4d30a784eed5dd68f9ee7c2b6833d72cbf0eccfa Issue-ID: SO-1311 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2018-12-10Merge "remove unused methods"Rob Daugherty5-1229/+2
2018-12-10Merge "fixed headers for traceability"Rob Daugherty2-2/+10
2018-12-10Merge "remove multiline strings with A&AI client"Rob Daugherty1-12/+10
2018-12-10Merge "Add unit tests for ExternalAPIUtil"Rob Daugherty2-18/+48
2018-12-10remove unused methodsLukasz Muszkieta5-1229/+2
Change-Id: Ica2d63e4d64f778257deb970b72d3fe858729952 Issue-ID: SO-729 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-12-07remove multiline strings with A&AI clientKalkere Ramesh, Sharan (sk720x)1-12/+10
do not use multiline strings with A&AI client Change-Id: I6c88e198601479dda1c09edc7717289beae5dc60 Issue-ID: SO-1302 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2018-12-07fixed headers for traceabilityKalkere Ramesh, Sharan (sk720x)2-2/+10
Changed if condition and updated to get last element/instance in the list. Add block to handle when there is more than 1 process instance returned. Update headers for traceability in logging Change-Id: Ibb2cd0bf5ba7cd733371a204c0b61e418564df97 Issue-ID: SO-1301 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2018-11-30Fix cloudSite creation in homingMarcus G K Williams1-1/+1
This change fixes the use of optional in OofInfraUtils.java, so that cloudSites can be created if one is not found in catalogDB. Issue-ID: SO-1262 Change-Id: Ifec9083950758c650a369e9c5ebd386715ed9df8 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-11-30Fix alacarte homing flowsMarcus G K Williams2-29/+31
This fix adds homingInstance bean and stores homing info in the database. It then retreves that info when homing ala carte and populates homingSiteId and oofDirectives. SO-1254 Issue-ID: SO-1258 Change-Id: I6f8d5d3aff9ebeb669064a02926c779886dc59dd Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-11-22isBase value - bug fixingLukasz Muszkieta1-16/+1
isBase json value is boolean type, not an integer Change-Id: Ic6d148c65a910bace6940770ee01e6836ab47e0d Issue-ID: SO-1244 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-11-21Add unit tests for ExternalAPIUtilMichal Kabaj2-18/+48
-Add unit tests for ExternalAPIUtil -Add dependency injection via constructor -Add factory for creating ExternalAPIUtil and RESTClient Change-Id: Ied89afa3612de8d51424c95239341a57387ad94f Issue-ID: SO-1195 Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>
2018-11-14Add junit tests for CreateAAIVfModuleLukasz Muszkieta1-109/+13
Change-Id: If71c2472aefc7edd1387837bdbbb24a186c1316c Issue-ID: SO-784 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-11-12Fix OOF Directives processingMarcus G K Williams2-49/+68
- Various fixes to process OOF directives correctly - Add orchestrator userParam Processing to ala carte and vCPE path to ensure multicloud adapter can be called when homing - Fix JsonUtils to accept json object as well as strings - Adds JsonUtils unit tests to ensure json object code works correctly and didn't break previous func. - Fix OOF Homing codes processing of OOF response to match Casablanca response from OOF (including OOF directives) - Add CloudIdentity get and put to catalogDBClient, along with junit tests - to enable creation of cloudSites - Fix serviceResourceId check Issue-ID: SO-1203 Change-Id: Ice9a9d1da2ce0cd4bd11029e3669b30d658fe359 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-11-10Bug fixes November 10thBenjamin, Max (mb388a)1-1/+2
use network name on delete when heat id not present compare mod count index as Integers Change-Id: I76e567378fed83fb857d4d16b88f7a199d0df475 Issue-ID: SO-1204 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-11-0711/7: merge casablanca to masterRob Daugherty3-11/+29
Commit: dbb53cabbff772880134699eb81dee775d7df8df Subject: Send correct resourceModuleName Issue: SO-1178 Commit: d3759e15184562647ea83b92cf02140fc705cb0d by ss835w Subject: Update Regex Logic to take into account new scale out URI... Issue: SO-117 Commit: 5dadc2c5790c961a74085d3d10b6f5aec6b7ba30 Subject: Fix msb url in homing cloudsite Issue: SO-1180 Commit: 9a9b0fa23afe8d46171fe95f1090de5a7f701d3d Subject: Updated Reference data for AutoScaleOut Issue: SO-1174 Commit: 3178cad6c756140b18eb658277598e3e2d2d3dcf Subject: ConfigurationParameter is empty for scaleout Issue: SO-1083 Commit: 402bf528e9a796f6ce31ad36c16316c2b31acc48 Subject: Added Null check for gtConfigurationParameter Issue: SO-1179 Commit: fb6ab40a64e74876ba1f08c4d3bdb6a040c21b94 Subject: Bug fixes November 5th Issue: SO-1188 Commit: ce37ae979311ed4e55150426d477db262773beb0 Subject: Removed slashes and added catch block Issue: SO-1183 Commit: 16aa0b6cc42c7287fc080c81451e301c0acc14cf Subject: removed retry from rainy day table Issue: SO-1185 Commit: 2073a3b4c20965252c7f3a0c1aea8e4407e876fa Subject: Fixing scaleOut workflow looping issue Issue: SO-1182 Commit: 5ca364a5e975877244ee51796602043a4b078a23 Subject: Make homingBB optinal and fix homing process Issue: SO-1168 Commit: 1c554c3332ccf6be4e576e9159bbb0f901197379 Subject: bug fixing with reading dmaap message Issue: SO-1191 Change-Id: Id747bc05b791787f304316396bc5fcd20d350b6f Issue-ID: SO-1190 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-11-07Make homingBB optinal and fix homing processAlexis de Talhouët1-4/+1
Properly defined whether or not to call homing at AssignVnfBB where by default homing doesn't get called, but if a homing solution is provided, then we resolve the solutions. The goal is to change the BPMN definition to use serviceTask rather than a scriptTask, allowing to use the Srping component to inject logic. Also we create a new HomingV2 component that is agnostic of the homing implementation, which goal is to route the homing request to the proper bbackend implementation; e.g. oof vs homing. Finally, we remove the un-needed variables set in the execution context. Change-Id: Ic9fb2a599c6375617c92a6d3462b62921ee47a6f Issue-ID: SO-1168 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2018-11-06Merge "Bug fixes November 5th" into casablancaRob Daugherty1-1/+21
2018-11-06Merge "Fix msb url in homing cloudsite" into casablancaRob Daugherty2-5/+21
2018-11-05Bug fixes November 5thBenjamin, Max (mb388a)1-1/+21
building block validator test now passes added buildingblockvalidator process instance test Retrieve actual error from WorkflowExceptionErrorMessage when the error message is empty, not only when null. Propagate orchestrationStatusValidationResult values from BB to BB. corrected use of constructor for AaiUtil use AaiUtil method to create path for get call modified how allotted resource urls are constructed - Removed the findExistingVnfcInstanceGroup method. It is not required to check this because the vnfResourceCustomization is always a new object at this location. Enable multiStage VF Module Create processing only when aLaCarte flag is on. Change-Id: If8cf397a84abc290e67e287d5b2264dd226398bc Issue-ID: SO-1188 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>