summaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN/src/main
AgeCommit message (Collapse)AuthorFilesLines
2019-03-26Merge "PNF ingestion in SO catalogdb"Steve Smokowski1-1/+1
2019-03-26Eliminated printStackTrace() callsWitold Ficio Kopel13-120/+111
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-25PNF ingestion in SO catalogdbeeginux1-1/+1
Support PNF csar ingestion in SO catalogdb Add integation test for TOSCA installer Fix the VNF resource/resource customization insert https://jira.onap.org/browse/SO-1604 subtask so-1607 and SO-1608 are included The catalogdb table contents are attached in the jira Issue-ID: SO-1604 Change-Id: Ie08c4a1219a6cce96ba081b0dd9d3e5fd997da8f Signed-off-by: eeginux <henry.xie@est.tech>
2019-03-22Merge "Hid MsoUtils.log() methods from public use"Steve Smokowski2-133/+38
2019-03-22Merge "Config Assign"Steve Smokowski12-0/+889
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-21Merge "removed extra argument from extractByKey method"Steve Smokowski1-10/+13
2019-03-21Merge "Corrected hibernate for cfvc customization table"Steve Smokowski1-1/+1
2019-03-21Corrected hibernate for cfvc customization tableBenjamin, Max (mb388a)1-1/+1
fix two tests that did not ignore some properties fix schema sql file that was missing fields Properly wire hibernate entities, clean up db tables Update schema.sql files to be consistent add junit for customization linked to same cvnfc Change-Id: I4bc0a83cb3908f5b34224416e75446b6cd166b9e Issue-ID: SO-1689 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-21removed extra argument from extractByKey methodBenjamin, Max (mb388a)1-10/+13
removed extra argument from extractByKey method Change-Id: I9835672eef5d6ab0c7b0c2b21e5a84be8aa305a7 Issue-ID: SO-1678 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
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-20Config AssignSunilB12-0/+889
Generic Bulding block for assign shall trigger controller for config assign action Change-Id: I2da91cccdbff9eacbb225b7f3a7bdbb253be607a Issue-ID: SO-1481 Change-Id: I2da91cccdbff9eacbb225b7f3a7bdbb253be607a Signed-off-by: sunilb <sb00577584@techmahindra.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.bogacki29-141/+141
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-14vfModule id should be retrieved from resourceIdBenjamin, Max (mb388a)3-2/+20
fix unit test that was broken because of mapping correctly connect the configuration to vfModule added in mapping of configuration to aai object fix compilation error with mapper layer Fix unit test compare to contain vfnc name Update vnfc to have proper generated serialVersionID Change-Id: I161c73b3ace1e9c5385c028ae65fe5258b4decd5 Issue-ID: SO-1663 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-14Added vnfc support to BB layerBenjamin, Max (mb388a)7-7/+188
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-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-14Reduced content of MsoLoggerr.bogacki2-5/+5
Cleaned java code dependencies for 'setLogContext' and 'getServiceName' methods from MsoLogger. Fixed imports. Change-Id: I33251c837088ce580ffa1c44e69766c77283004b Issue-ID: LOG-631 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-03-13Openstack adapter can't resolve HEAT parameterBenjamin, Max (mb388a)3-6/+51
only cast to Element if value is of that type added XmlAccessorType annotations to classes map of string, object now correctly maps with jaxb Null comma delimited lists can convert to null as well Handle null values all types in input parameters map. Change-Id: Ic46ed31c05b8f8551d39b2267ae731829abfc1f0 Issue-ID: SO-1617 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-13Merge "Remove MsoLogger from MSOCommonBPMN scripts"Steve Smokowski38-1050/+1308
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-03-12add instance group support to SOBenjamin, Max (mb388a)9-16/+264
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-07Merge "Add support for CDS basic-auth"Steve Smokowski1-0/+6
2019-03-06Add support for CDS basic-authAlexis de Talhouët1-0/+6
Change-Id: I22834f989afb748917aa2099b1da78c5f794bbe5 Issue-ID: CCSDK-1055 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-03-06improvements to audit inventory featureBenjamin, Max (mb388a)5-2/+100
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 "put error message in execution"Steve Smokowski1-7/+10
2019-03-04Merge "flow validators can be skipped via an annotation"Steve Smokowski2-1/+10
2019-03-04Remove restriction on mapping String values onlyBenjamin, Max (mb388a)1-2/+2
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-04put error message in executionBenjamin, Max (mb388a)1-7/+10
put error message in execution before checking rollback Change-Id: I41bc89f589a260aece0c837d83218794ec1ec72e Issue-ID: SO-1591 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-04flow validators can be skipped via an annotationBenjamin, Max (mb388a)2-1/+10
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)2-5/+5
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.bogacki16-133/+177
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-26Add CDS clientAlexis de Talhouët3-9/+82
Change-Id: I3f77a2c9e8341239b97675f5897cecf28c7dfb6f Issue-ID: SO-1483 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-02-20assignvfmodulebb must send use-preloadBenjamin, Max (mb388a)2-0/+17
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-19Create Pre Building Block validatorBenjamin, Max (mb388a)1-0/+8
Use Flowvalidator shouldRunFor method to check if flow needs to be validated. Create Pre Building Block validator to check if cloud-region orchestration-disabled is true Change-Id: I2f1dca16c97505292d9b99f7e206713e4963261f Issue-ID: SO-1534 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-19flowvaldiator will allow more flexible filteringBenjamin, Max (mb388a)2-3/+3
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-13fixed CandidateType json serializationBenjamin, Max (mb388a)1-4/+3
fixed CandidateType json serialization Change-Id: Icafa5884db5424167c7fac08ad6aae5781bdafa5 Issue-ID: SO-1503 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-13Merge "Fixed possible NPE in ResourceRequestBuilder"Steve Smokowski1-1/+3
2019-02-13Merge "use encrypted auth for dmaap"Steve Smokowski1-5/+4
2019-02-13Fixed possible NPE in ResourceRequestBuilderr.bogacki1-1/+3
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-11made max retries configurable via mso configBenjamin, Max (mb388a)1-1/+9
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-05populate modelinfovfmodule from catalog dbBenjamin, Max (mb388a)1-5/+4
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-04Updated fields on sniro requestBenjamin, Max (mb388a)1-12/+12
Updated setter methods in avpn bonding classes. Updated fields on sniro request to be idenitier instead of candidate Change-Id: I67a98f742b28a93912c4b6fb05618449b629c883 Issue-ID: SO-1463 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-01compare resources from openstack to aaiBenjamin, Max (mb388a)2-33/+60
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-6/+14
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)5-177/+282
Issue-ID: SO-1435 Change-Id: If065ef5c91e769452fd6701fa6c28a23b4bdf2b2 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>