summaryrefslogtreecommitdiffstats
path: root/asdctool
AgeCommit message (Collapse)AuthorFilesLines
2020-07-07Add test contracts for ValidatorExecutor and TopologyTemplateValidatorExecutorFrancis Toth7-103/+76
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I10f0de565588e0bc7cd0f47ba7f714eab3f1f7f7 Issue-ID: SDC-2499
2020-07-05Fix sonar issuessebdet1-43/+25
Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3158 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ib6ee78fd5756d615c2a103ac0d7d26070fd24206
2020-07-05Fix sonar issuessebdet3-63/+45
Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3158 Change-Id: Ic29f9233838e25c195d2b349bfac8e6d56888609 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2020-07-05Fix sonar issuessebdet1-22/+16
Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3158 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I0ae188c5f0e2d96fd94de66fe0dcd0c47bcd9af5
2020-07-05Clean CsarUtils::MainYamlWithDependenciesFrancis Toth3-8/+4
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I593dd7bb6a20445899a14da793e8c550e1e14e09 Issue-ID: SDC-2812
2020-06-30Fix typo in package name and classesFrancis Toth24-66/+66
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I55a6efeb4a0c2b4734dc3a091afbc6295599c74b Issue-ID: SDC-2499
2020-06-30Fix test coverage drop introduced by #109510vasraz1-8/+6
Change-Id: Ic74f11f60ff7673330a8c3521da49a92f70ae0fb Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3149
2020-06-25Rationalize maven dependenciesJulienBe1-21/+0
Issue-ID: SDC-3149 Signed-off-by: JulienBe <julien.bertozzi@intl.att.com> Change-Id: I1ee42494a4cc5b185b6dfcbee44399d2960cf880
2020-06-25Cleaned up ArtifactValidatorExecuter and IArtifactValidatorExecutorFrancis Toth19-286/+189
This commit intends to clean the tests related to ArtifactValidatorExecuter and IArtifactValidatorExecutor by introducing the concept of test contract. Some renaming have to be done to fix the typo in Executer (it should be named Executor), hence the number of changes. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I5cd4512c425ae01f4f1118c9d61e6fce3df94f1d Issue-ID: SDC-2499
2020-06-25add a new profil for fast buildJulienBe1-0/+1
Issue-ID: SDC-3148 Signed-off-by: JulienBe <julien.bertozzi@intl.att.com> Change-Id: Ie98194fe6d136f57491a0590ab2afc9db59fbfbd
2020-06-23Decouple TXT Report file writing and formatting logic (6/6)Francis Toth20-222/+136
This commit moves the writeReportLineToFile from ReportManager to ReportFile, deletes ReportManager (as it's not longer used), and finalizes the decoupling between the writing and the formatting logic of the TXT Report file. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Ia5cce71535ea808e6e24807ed62ae9b262eab6ad Issue-ID: SDC-2499
2020-06-23Decouple TXT Report file writing and formatting logic (5/6)Francis Toth6-36/+60
This commit aims to move the reportEndOfToolRun function from ReportManager (deprecated) to ReportFile. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I17731864c34ed9a70b1b1e91b89bad835dc72449 Issue-ID: SDC-2499
2020-06-22Decouple TXT Report file writing and formatting logic (4/6)Francis Toth4-23/+26
This commit aims to move the reportValidatorTypeSummary function from ReportManager (deprecated) to ReportFile. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I30898d69bbcdb129a2dac917c4dee3c276556e91 Issue-ID: SDC-2499
2020-06-21Decouple TXT Report file writing and formatting logic (3/6)Francis Toth4-20/+23
This commit aims to move the printValidationTaskStatus function's logic from ReportManager (deprecated) to ReportFile. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Ic33a519f4c70276d404a83bf7de8a27f0007b285 Issue-ID: SDC-2499
2020-06-21Toggletalio1-1/+1
Add toggling mechanism to catalog side. The first toggleable feature is healing - this was added to healing flow, in healJanusGraphDao Issue-ID: SDC-2874 Signed-off-by: talio <talio@amdocs.com> Change-Id: If386651cab8304ebaf13497ded3a7a50bd60e477 Signed-off-by: talio <talio@amdocs.com>
2020-06-21Fix sonar issuessebdet4-33/+24
Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3116 Change-Id: I87802cc9edb378bdbe456c3ca4f10d8c6ebe9425 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2020-06-21Decouple TXT Report file writing and formatting logic (2/6)Francis Toth4-14/+15
This commit aims to move the reportStartValidatorRun function's logic from ReportManager (deprecated) to ReportFile. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I93c2e8f98cdef598094647d734d0deec0f1941db Issue-ID: SDC-2499
2020-06-19Decouple TXT Report file writing and formatting logic (1/6)Francis Toth15-49/+138
This commit is the first of a series aiming to decouple the writing and formatting logic of text report files in the asdc tool. Unfortunately because of a significant amount of technical debt, a small hack had to be done so that the header of the file is not written twice. This will be removed in a future change. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I8d2a7c1353d59562d8026088824c26ae0daa36e9 Issue-ID: SDC-2499
2020-06-18Decouple CSV Report file writing and formatting logicFrancis Toth11-62/+303
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I6168b71bb54192a806ff6aa437788bedad933c76 Issue-ID: SDC-2499
2020-06-15Fix 'not running Junit5 tests'-issuevasraz1-0/+6
Change-Id: Iee67a4af7262e554a86252b411264f55ff1baa88 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3109
2020-06-15Fix Critical security vulnerabilityvasraz1-5/+39
com.fasterxml.jackson.core : jackson-databind : 2.9.9 Change-Id: I81af7879cb1fbcd158177a3dc220b704ff2f3388 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3111
2020-06-15Fix bug in UpdateIsVnfMenuxuegao1-2/+2
Fix the unboxing bug reported by Sonar. Issue-ID: SDC-3112 Signed-off-by: xuegao <xg353y@intl.att.com> Change-Id: I4ed3f9a48ad21af2f9f67872791df2796c4e4ad1
2020-06-10Set properties on XML parsers to prevent XXE attackNeil Derraugh1-0/+4
- Set ACCESS_EXTERNAL_DTD and ACCESS_EXTERNAL_SCHEMA properties on XML parsers to prevent XXE attacks Issue-ID: SDC-3106 Signed-off-by: Neil Derraugh <neil.derraugh@yoppworks.com> Change-Id: If4e835858dd3d718d37b3ee41fb2fd0c94574c24
2020-05-28Encapsulate ReportManager's failedVerticesPerTask and resultsPerVertex in ReportFrancis Toth22-113/+197
This commit aims to encapsulate the static fields failedVerticesPerTask and resultsPerVertex in their own class (called Report). In the short terms, any state needing to be passed around will be stored there. Unfortunately, this commit required many minor changes in functions signature (to pass the Report instance). Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I3756d9a939cbd0f2856be72aa2bd24a3980dde49 Issue-ID: SDC-2499
2020-05-24Fix potential NullPointer in SchemaFileImportandre.schmid1-10/+17
While reading the YAML to import, if the content was missing the entry node_types it was causing a NullPointerException. Also the exception was being suppressed, making very difficult to understand what happened. Change-Id: I44badbee1c739ddf6db08b4e518adb33c430fa84 Issue-ID: SDC-3070 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-05-19remove powermock dependency from pom xmlsRodrigo Lima1-6/+0
- Remove powermock from pom xml files - Remove powermock from ActivityLogManagerFactoryImplTest Issue-ID: SDC-3071 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I4c4b8b0751f4ce8895617a951429111fc08d8e2e
2020-05-17Remove powermock from ValidationConfigManagerTestRodrigo Lima1-8/+2
- Remove powermock reference from ValidationConfigManagerTest Issue-ID: SDC-3064 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: Ib330b0fcaf132e5d67f65b482a80b5b75f8c336b
2020-05-17Remove powermock from ArtifactValidationUtilsTestRodrigo Lima1-24/+17
- Remove powermock reference from ArtifactValidationUtilsTest - Use junit 5 imports instead of junit 4 Issue-ID: SDC-3067 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I6388e133024ed1e7604e90fc24ba3e84a33da4f7
2020-05-17Remove powermock from ReportManagerTestRodrigo Lima1-19/+9
- Remove powermock reference from ReportManagerTest - Use Junit 5 imports instead of junit 4 Issue-ID: SDC-3066 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: Iece6e5741d5f2f5bc5db2ec7c85c63948776d601
2020-05-12Remove outputFullFilePath from ValidationConfigManagerFrancis Toth35-673/+629
This commit aims to extract the outputFullFilePath field from ValidationConfigManager in order to improve testability. This commit contains multiple minor modifications resulting from bubbling up the outputFullFilePath static field to where it is actually set. Most of the modifications result from changing the signature of the functions which formerly relied on ValidationConfigManager.getOutputFullFilePath. Change-Id: I0a28e527cabe606de8af62b8dcbc4b4e70db98ed Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Issue-ID: SDC-2499
2020-05-07Reduce scope from 'compile' to 'test' for 'junit-vintage-engine'vasraz1-0/+1
Change-Id: I39b0be6ba6650c9a7215acf359f3d74e0a24e553 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2844 Issue-ID: SDC-2983
2020-05-06Prepare for Junit5vasraz1-8/+14
Remove unused/duplicated dependencies Change-Id: Iee0d9510ffbe3e2e14574e22ba965d6829fd568b Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2844 Issue-ID: SDC-2983
2020-05-05Remove all thrift's dependenciesvasraz1-5/+0
Remove unused/duplicated dependencies Change-Id: Ic2239acc5ddde1d0874b5139c228934ec1e61cd0 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2985
2020-04-28Remove csvReportFilePath from ValidationConfigManagerFrancis Toth9-106/+109
This commit aims to extract the csvReportFilePath field from ValidationConfigManager in order to improve testability. This commit contains multiple minor modifications resulting from bubbling up the csvReportFilePath static field to where it is actually set. Put differently, most of the modifications result from changing the signature of the functions which formerly relied on ValidationConfigManager.getCSVReportFilePath. Change-Id: I82c3b0fca8a0f407319e40ecfff45e89ec1d4323 Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Issue-ID: SDC-2499
2020-04-23Added early check for null value for `containerV`Chris André1-33/+48
- Formatting code following project's code style - Added early check for null value for `containerV` Issue-ID: SDC-2905 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I648e9a4a04be3f2e7cd3e30a70c04de2257a99d3
2020-04-20Remove props from ValidationConfigManagerFrancis Toth2-47/+1
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I1c3a845c44722010e8933876e59752cef00937f0 Issue-ID: SDC-2499
2020-04-20Fix cs-init SchemaFileImport error file creationandre.schmid1-1/+1
Fix issue in SdcSchemaFileImport "STDERR: Error in file creation : data, /tmp/sdctool/tosca/data-types/data.yml (No such file or directory)", during the cassandra init. Introduced by SDC-2898. Change-Id: Ifd2018fac456f15d03fc39ea766a6ae0c3eda081 Issue-ID: SDC-2939 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-20Added a try-with-resource to properly close a FileInputStreamChris André1-221/+234
Issue-ID: SDC-2898 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I0a0163937ee2e760f3074d858dfc68a7b262ecd9
2020-04-20Added early check for null value for `containerV`Chris André1-33/+48
- Formatting code following project's code style - Added early check for null value for `containerV` Issue-ID: SDC-2904 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: Ib8d7c1bf36608855c73d8a0df637e86aefce9377
2020-04-19Configure a new Artifact Typeandre.schmid4-671/+7
Centralizes artifact configuration in one yaml entry. Allow the configuration of a new artifact type without the need of code changes. The configuration file now is used as a source of artifacts types instead the artifact type enum. The enum will be used as a source of base artifact types and also in hard coded business rules. Change-Id: Id0383d9fca9bce0519a4d52a4ecb3a68c8713f0f Issue-ID: SDC-2754 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-19Unable to update VSP (heat template) version in VFSebastien Premont-Tendland1-5/+0
This seems to fix the issue, we can still onboard CBA at VF level and the CBA get included in the distributed CSAR under the directory Artifacts/*/Deployment/CONTROLLER_BLUEPRINT_ARCHIVE/ as expected Issue-ID: SDC-2892 Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca> Change-Id: Ie9f9cd7b8d2cf5eb3ff3c41a4b04eedd788265a6
2020-04-19Removed explicit references to exceptions in log messagesChris André1-2/+1
Issue-ID: SDC-2884 Change-Id: I6f3e9503922cc3a4f4049fced8d23cede7b0455a Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
2020-04-16Upgrade Junit to version 5.6Baumel, Dvir (db384r)3-8/+24
Issue-ID: SDC-2844 Change-Id: I4716bf7920f9bb79c450ebfd48e9d4fba54fdfdd Signed-off-by: Baumel, Dvir (db384r) <dvir.baumel@intl.att.com>
2020-04-05Fix data type properties declarationaribeiro1-3/+3
According to TOSCA Network properties definition the keyname 'ip_version:' should have Integer as valid_values rather than String Where the keyname 'count:' is declared as a String type the default value should be String rather than Integer Fix misspelled ONAP types 'onap.datatypes.monitoring.measurementType' and 'onap.datatypes.monitoring.managedObjectDNsBasic' Fix the keynames 'upstream:' and 'downstream:' as both are declared as a String type the valid_values should be String rather than Integer Issue-ID: SDC-2864 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I56afdf2818b5f2463fb6088cd8b468fd38ef5086
2020-04-05Fix keyname 'constraints:' according to TOSCA property definitionaribeiro1-1/+1
Issue-ID: SDC-2863 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I955af393b4f10ca56a01bfcb2f62c37496c484d6
2020-04-01Increase test coveragevasraz5-215/+28
Change-Id: I290371a025ba3376a013ba464e4dfb601d74aa8b Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833
2020-03-24Improve log textsLasse Kaihlavirta1-1/+1
Issue-ID: SDC-2852 Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> Change-Id: I7a1ebfc625e297f943794046f37b15cc48d8cacb
2020-03-22Add support for simple yaml profile 1.2vasraz1-3/+3
Change-Id: I735d25c6b6c3344c4b742f09b3aeaf4d03c2d17c Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2738
2020-03-19Use new base dockersOfir Sonsino1-1/+1
Issue-ID: SDC-2798 Change-Id: I7a6e66c3a983d1490722c3ce36711f0b700dc756 Signed-off-by: Ofir Sonsino <os0695@intl.att.com> (cherry picked from commit 68fe4496694a286a441e23ef9686b04feeb0f5fd)
2020-03-19Added new unit testsk.kedron5-215/+152
Added new unit tests to GraphMLConverter class. Fixed the Sonar issue. Issue-ID: SDC-2327 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I985a860012c0c2b0b6524c0a2346415cb113d83c