summaryrefslogtreecommitdiffstats
path: root/asdctool/src/main
AgeCommit message (Collapse)AuthorFilesLines
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 issuessebdet2-61/+37
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 Toth2-3/+3
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 Toth13-36/+36
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I55a6efeb4a0c2b4734dc3a091afbc6295599c74b Issue-ID: SDC-2499
2020-06-25Cleaned up ArtifactValidatorExecuter and IArtifactValidatorExecutorFrancis Toth10-91/+56
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-23Decouple TXT Report file writing and formatting logic (6/6)Francis Toth13-137/+74
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 Toth3-13/+16
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 Toth3-11/+17
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 Toth3-12/+15
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-21Fix sonar issuessebdet2-31/+22
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 Toth3-8/+8
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 Toth9-33/+65
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 Toth6-30/+170
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I6168b71bb54192a806ff6aa437788bedad933c76 Issue-ID: SDC-2499
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 Toth14-95/+159
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-12Remove outputFullFilePath from ValidationConfigManagerFrancis Toth20-328/+323
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-04-28Remove csvReportFilePath from ValidationConfigManagerFrancis Toth5-56/+55
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 Toth1-30/+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.schmid2-322/+6
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-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-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 coveragevasraz4-116/+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-19Added new unit testsk.kedron2-66/+28
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
2020-03-19Increase default janusgraph timeouts for CSITLasse Kaihlavirta1-1/+4
- increase relevant timeouts to fix random (but frequent) SDC CSIT failures in sdc-cassandra-init Issue-ID: SDC-2759 Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> Change-Id: I302b0f5676a51b362e7c3c5387803947cf93473a
2020-03-16Remove hardcoded timeoutk.kedron2-1/+1
Added configuration for wait seconds for Cassandra connector. Also, increase the timeout value to prevent tests failed. Issue-ID: SDC-2759 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I1008ecce98efdd8627ac3232b35fecd2a41a9c79
2020-03-15Remove duplicated data typearibeiro1-16/+0
Issue-ID: SDC-2826 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I6cb4ecd9b6e479363158c6bcb1b0f1f1f52528e1
2020-03-10Added new unit testsk.kedron1-6/+11
Added new unit tests to GraphMLDataAnalyzer class. Fixed the Sonar issue. Issue-ID: SDC-2327 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I9a61dff2e9b0be1733de00b06c255abb8a3d5a8f
2020-02-18Configuration file runtime reloadandre.schmid1-2/+0
Reloads the backend configuration file when the file listener catches a change. Forces validations errors when the configuration file could not be parsed. Remove not used configurations. Change-Id: Ic6fcb2b557d52ec53074c38ab8e0fcfa96e9be67 Issue-ID: SDC-2758 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-01-30Upgrade to Cassandra 3shrek20002-14/+14
Creating base dockers suitable for Cassandra 3 remove cqlsh version Change-Id: I996bad2341410cdf45c49f191e998acf4781fc5d Issue-ID: SDC-2596 Signed-off-by: shrek2000 <oren.kleks@amdocs.com>
2020-01-22Catalog alignmentys9693100-3293/+2170
Issue-ID: SDC-2724 Signed-off-by: ys9693 <ys9693@att.com> Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe
2019-11-25Fix Sonar issuevasraz1-1/+1
Major SmellCode: Replace StringBuffer with StringBuilder Change-Id: I0283e5160e5c1f23423c66110015f18c8163411e Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2670
2019-11-03Create new non-mano Artifact Type entry for pnf software informationaribeiro1-0/+7
Issue-ID: SDC-2615 Change-Id: I4dd879d50b1dec58aceeaf0c265901c62d038071 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2019-10-29Fix for status properties value.aribeiro2-104/+104
These changes were made to align the normative types to the TOSCA property definition requirements. Issue-ID: SDC-322 Change-Id: I32e815dd26990dd6c82c859ad051b271db3c8029 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2019-10-03Fix for error message.aribeiro1-4/+4
Fixing error message for invalid values across SDC backend API. Issue-ID: SDC-2324 Change-Id: If01307138baf7692e398abf20eb75bbe9a8aa394 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2019-09-03Onboard Package Handlingaribeiro1-0/+1
Retain the original onboarded package when it comes in zip/csar format. Issue-ID: SDC-2510 Change-Id: Ie293db25eca8872be26ffc8475b25ccace1aab6f Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2019-09-03General Sonar fixesArindam Mondal3-7/+5
+)Organize imports ++) log formatter Issue-ID: SDC-2542 Change-Id: Ibb4b568b19ee40a68f783bfa820bd7c73aae5c1f Signed-off-by: arindamm <arind.mondal@samsung.com>
2019-08-27General Sonar fixesArindam Mondal2-647/+491
+) Replace System.out with logger ++) Use try-with-resources to close the resource +++) Format to delete tab charachter ++++) flip equals to avoid potential NPE Issue-ID: SDC-2542 Change-Id: If57f36072ec67e9622d4fe51bce8336094dc10c8 Signed-off-by: arindamm <arind.mondal@samsung.com>
2019-08-22unit tests - asdctoolTomasz Golabek3-123/+163
Additional junit tests Change-Id: I889772efaccbc6f1555d50cd47a02d868348d310 Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
2019-07-24Autowired annotation for catalog-beTomasz Golabek5-61/+25
Injection of the properties moved to the constructors/setters replacing field annotations. Change-Id: I766ff67e466bec5a91db1035f29e7f919d32e0ea Issue-ID: SDC-2400 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
2019-07-22Improved test for ReportManger, ArtifactValidationUtils and Sonar fixes.k.kedron1-26/+23
Add new ReportManagerHelper to read files with reports. Fixed log.info to print the types of exception in the messages. Removed redundant new lines in the report files. Issue-ID: SDC-2327 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: If0135f01a05b0936dad681d16e846a6c6560cc80