summaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN/src/test
AgeCommit message (Collapse)AuthorFilesLines
2019-03-21Merge "Removed MsoUtils.log() calls from CatalogDbUtils"Steve Smokowski1-3/+3
2019-03-21Merge "removed unused test classes and methods"Steve Smokowski15-1698/+0
2019-03-21Removed MsoUtils.log() calls from CatalogDbUtilsWitold Ficio Kopel1-3/+3
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 unused test classes and methodsBenjamin, Max (mb388a)15-1698/+0
removed unused test classes and methods Change-Id: I9ae5f6f49e416f208e8879ed202aa8865bc9ef83 Issue-ID: SO-1687 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-19Add cloudOwner to VNF adapter callEric Multanen1-0/+1
The BPMN layer has the CloudRegion which includes the CloudOwner attribute, but this is not passed to the VNF adapter layer. Calls to the Multicloud infrastructure workload need the CloudOwner as well. This patch adds CloudOwner to the VNF adapter API. While the intended usage is primarily for the multicloud adapter, it touches a log of other files - though those do not make use of it at this point. Change-Id: I88028096fbd84fc3fe5d53786c70b3c8806bb711 Issue-ID: SO-1447 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
2019-03-14Added vnfc support to BB layerBenjamin, Max (mb388a)1-6/+12
added vnfc to gbb for execute bb and bb layer enhance workflow action layer to handle vnfcs Change-Id: I0d39c3aefe66180ed6f2b75a0c946e07ca603261 Issue-ID: SO-1658 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-12add instance group support to SOBenjamin, Max (mb388a)8-11/+674
add create support add delete support added naming service support Change-Id: Iaf4f2bdae8ea55aca71d6e9b818a76e90db0b012 Issue-ID: SO-1616 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-06improvements to audit inventory featureBenjamin, Max (mb388a)6-4/+49
Adjust test data to add tenant mapping Remove unused unit test already renamed Update logic, to pass hostname not pservername remove unused file that has been refactored Add project to ignore, remove class Address issues in comments on pull request Remove logging that is not needed, used UPdate BPMN to use Boolean Value, change timings Adjust BPMN to not hit deadlock scenario put error message in execution before checking rollback - removed extra code for vnf resource processing found in onap environment. Fix improper use of inclusive gateway causing deadlock Fix flakey unit tests from ONAP Remove qualifier on bean, as it breaks callbacks Adjust pom version of external camunda client Fix polling timers to be more reasonable Updated Junit test for delete vf module in onap. Changed auditInventoryNeeded variable to a boolean to prevent bpmn from erroring out in the event this variable is not found on the execution. Update logic to support writing of self link Change-Id: I2f784a0a58a09f303775282c9be6019031668570 Issue-ID: SO-1597 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-04Merge "flow validators can be skipped via an annotation"Steve Smokowski1-0/+44
2019-03-04Remove restriction on mapping String values onlyBenjamin, Max (mb388a)5-25/+171
Correct the JUnits to address userParams non-String values Remove restriction on mapping of String values only for userParams in BB RequestContext. Change-Id: I8a0d30e61618c275301d62bf04c064bea56c1b4d Issue-ID: SO-1593 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-04flow validators can be skipped via an annotationBenjamin, Max (mb388a)1-0/+44
flow validators can now be skipped via an annotation Change-Id: I7796d5829aacee466419d558dfc95a761125577a Issue-ID: SO-1589 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-01vnf spin up gr api vnf s base module failsBenjamin, Max (mb388a)1-1/+1
map object representations of json back to json strings marshal all objects to json strings before sending all input params converted to Map<String, Object> Updated userParams map from HashMap<String, String> to Map<String, Object> as HashMap<String, String> userParams was causing VNF spin up to fail. Input json in Userparams was not accepted as a valid json format. Updated other files that were affected by this change. Change-Id: I0c00fc00c4c11b54ace4df7be8d5bfc80d41d130 Issue-ID: SO-1582 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-27Removed MsoLogger from 'MSOCommonBPMN'r.bogacki9-126/+130
Removed MsoLogger from adapters ('MSOCommonBPMN') Replaced MsoLogger with plain slf4j. Refactored login output. Fixed imports. Change-Id: I5e1ed5e438c19be9a9cfd2decae06c706fd1a92a Issue-ID: LOG-631 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-02-22remove payload logging from metric/audit sideBenjamin, Max (mb388a)1-1/+1
fixed unit test after changing how entities are read remove payload logging from metric/audit side Change-Id: Ibfe7cf96c76920926e9ae9ce5041389324d09b46 Issue-ID: SO-1564 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-22Merge "assignvfmodulebb must send use-preload"Steve Smokowski2-0/+59
2019-02-21Merge "Updated as per review comments"Steve Smokowski2-16/+37
2019-02-20Updated as per review commentsPrema Bhatt2-16/+37
This git review replaces https://gerrit.onap.org/r/#/c/78430/. As I had some issues updating the existing git review, I'm creating a new one. Issue-ID: SO-1391 Change-Id: Ida3f94ad7e2249a30a99d67a071930323ba743b5 Signed-off-by: Prema Bhatt <pb6115@att.com>
2019-02-20assignvfmodulebb must send use-preloadBenjamin, Max (mb388a)2-0/+59
Corrections to JUnit data to account for usePreload usage. Resurrect usage of usePreload value and pass fromPreload to SDNC. Change-Id: I6fb52f6abf09ec501e90335a01e37db1c10ae2b3 Issue-ID: SO-1539 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-19flowvaldiator will allow more flexible filteringBenjamin, Max (mb388a)6-12/+12
fixed unit tests that reference forItems() forItems is now shouldRunFor allowing more flexibility Change-Id: I497f3a2899ae4df555e781c7c85a238e657fcba8 Issue-ID: SO-1533 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-13Merge "Fixed possible NPE in ResourceRequestBuilder"Steve Smokowski1-1/+29
2019-02-13Merge "use encrypted auth for dmaap"Steve Smokowski2-3/+22
2019-02-13Fixed possible NPE in ResourceRequestBuilderr.bogacki1-1/+29
According to Sonar current implementation could cause NullPointerException. Added JUnit test. Change-Id: I840c018bed346d85e2042c7308bdd27197f50b46 Issue-ID: SO-1498 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-02-11Merge "made max retries configurable via mso config"Steve Smokowski1-0/+1
2019-02-11made max retries configurable via mso configBenjamin, Max (mb388a)1-0/+1
fixed an error with the wrong variable being printed made max retries configurable via mso config Change-Id: Iec6d209ec2868200ec5956e269b6a048d7619307 Issue-ID: SO-1495 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-11restructured a&ai clientBenjamin, Max (mb388a)3-10/+10
made generics a bit safer and updated groovy tests Change-Id: I6d7a2567cd9bf795e0cfa4914a7674a4ed5f50c4 Issue-ID: SO-1493 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-08Increase long poll DMaaP timeout value to 60Benjamin, Max (mb388a)1-1/+1
Corrected a JUnit to include updated timeout value. Increase long poll DMaaP timeout value to 60 seconds Change-Id: I22a6f17bc694b17b14f25c7dccd6b57d89d0c2b7 Issue-ID: SO-1488 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-05populate modelinfovfmodule from catalog dbBenjamin, Max (mb388a)1-0/+10
add in a junit test to check if all vfModules model info get populated populate all vf modules for the vnf not just the orchestrated Change-Id: Icaed88f217f61861157313a0c7e09a28fff74fdb Issue-ID: SO-1467 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-01compare resources from openstack to aaiBenjamin, Max (mb388a)1-5/+5
Address Review comments on pull request Update Unit test to have proper variable for testing update logic inside bpmn to reflect proper variable Update unit test to check property for audit Add flag to turn on and off audit behavior Add license headers, remove un-used files Update Building Block Tests and Activity Names Fix additional unit tests in so-bpmn-tasks layer Fix broken Junit Test, and correct Bug in if statement Add annotation to ignore class under test profile Additional bug fixes and unit tests for classes Add Additional JUNITS, add more sample data Add Openstack Audit functionality to Adapter Change-Id: I0492063271e991eefc608b56336a5cdf1d5a7778 Issue-ID: SO-1456 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-31Add setting of serviceId to productFamilyIdBenjamin, Max (mb388a)1-18/+31
Add setting of serviceId to productFamilyId and provStatus to PREPROV on GenericVnf creation Change-Id: I6b09e8dff522af6c0b32a0bfe30dc6b0623fc900 Issue-ID: SO-1453 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-28Merge 'origin/casablanca' into masterBenjamin, Max (mb388a)7-13/+436
Issue-ID: SO-1435 Change-Id: If065ef5c91e769452fd6701fa6c28a23b4bdf2b2 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-01-24Removed deprecated Matcher importsBenjamin, Max (mb388a)7-11/+11
replaced org.mockito.Matchers with ArgumentMatchers Change-Id: I2feb4d4fb314cd14aca0719c4cc29b1a0510cbf7 Issue-ID: SO-1413 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-24use encrypted auth for dmaapBenjamin, Max (mb388a)2-3/+22
remove deobfuscate as crypto is already used. update based on the feedback to use crypto utils to decrypt Re-Factor DMAAP Credentials to use encrypted auth credential Change-Id: I2ac5be84594d84f0f24ae554d99cef274dbb6c16 Issue-ID: SO-1425 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-21Bug fixes from AT&T January 20thBenjamin, Max (mb388a)2-1/+2
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-17Merge "Fix url for catalog query" into casablancaSteve Smokowski1-8/+8
2019-01-16Fix url for catalog querysubhash kumar singh1-8/+8
Fix url for catalog query. Change-Id: I694284b9c3b354a5d0e4340b7f7e78744096c80f Issue-ID: SO-1398 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2019-01-15revert the changesseshukm3-20/+5
Issue-ID: SO-1391 Change-Id: I166d149b813aebb0511c1944a3bd3700080de201 Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2019-01-15eliminate the failing testsseshukm3-5/+25
Initial step to make the release build success for 1.3.6. Issue-ID: SO-1391 Change-Id: If7cadd5b5cd23cdbf6474bf94850a83ed7efed81 Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2019-01-14Add missing license headersBenjamin, Max (mb388a)1-0/+20
add headers to files which were missing them Issue-ID: SO-1390 Change-Id: I6c754f72c5d1ef6485d6343aae4b994120901d08 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-12Merge changes I49db843f,I6c6d7a50Steve Smokowski8-30/+35
* changes: descriptive messages now returned by validator refactored validator to be more generic
2019-01-12Merge "removed retired A&AI versions from codebase"Steve Smokowski1-1/+1
2019-01-12Merge "explicitly type defs and strings for templates"Steve Smokowski6-24/+24
2019-01-11descriptive messages now returned by validatorBenjamin, Max (mb388a)8-14/+20
descriptive messages now returned by validator Change-Id: I49db843fbdfe20979fba6991744c62aa1f745d5f Issue-ID: SO-1388 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-11explicitly type defs and strings for templatesBenjamin, Max (mb388a)6-24/+24
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-11removed retired A&AI versions from codebaseBenjamin, Max (mb388a)1-1/+1
removed retired A&AI versions from codebase Change-Id: I3e0a185ad1020c91be2fa3df7a509fde2a83c4cd Issue-ID: SO-1385 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-11refactored validator to be more genericBenjamin, Max (mb388a)8-18/+17
removed overloaded method from class for JUEL changed test back to DelegateExecution added methods to allow validations with DelegateExecution refactored validator to be more generic Change-Id: I6c6d7a50e8b5470ffa5619cc83966f5ad68e66fe Issue-ID: SO-1383 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-11validation for vnfs before WorkflowAction startsBenjamin, Max (mb388a)3-0/+178
Removed accidental merge markup from WorkflowActionBB Addition of prevalidation to WorkflowActionBB. Implement more JUnits for validation methods. Implement verification of deleteInstance workflow for VNR configuration dependencies. Added a validation mechanism on a workflow level to check for valid actions. Change-Id: Icb2859c3b8ece534d4e9831ca5f48a15dfaef58d Issue-ID: SO-1379 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-04Bugfixes for December 2018Benjamin, Max (mb388a)3-12/+66
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 Kabaj11-15/+43
-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-24Enable use of resource order and inputsubhash kumar singh1-7/+399
Enable use of resource order and input. Change-Id: I4d5b29997068447fc1bc657a6e5ae067d3b43496 Issue-ID: SO-1248 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-12-13Add junit tests for CatalogDBUtilsLukasz Muszkieta1-0/+145
Change-Id: I1ea3e92b6dcb3fbca837513e11451be47d8c488b Issue-ID: SO-784 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>