summaryrefslogtreecommitdiffstats
path: root/asdctool
AgeCommit message (Collapse)AuthorFilesLines
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
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.kedron3-1/+2
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-16Run pods as non-root userMichaelMorris2-8/+8
Summary of changes: sdc-cassandra-init Added user sdc (in base image base_sdc-cqlsh - https://gerrit.onap.org/r/103436) Run entrypoint as user sdc Moved relevant files from /root/ to /home/sdc/ sdc-backend-init Added user sdc (in base image base_sdc-python - https://gerrit.onap.org/r/103436) Run entrypoint as user sdc Moved relevant files from /root/ to /home/sdc/ sdc-backend Run entrypoint as user jetty Moved relevant files from /root/ to /var/lib/jetty/ Moved cadi & cert files from /opt/app/jetty to /var/lib/jetty/ Moved ready_probe from /var/lib/read-probe.sh to /var/lib/jetty/read-probe.sh sdc-frontend Run entrypoint as user jetty Moved relevant files from /root/ to /var/lib/jetty/ Moved ready_probe from /var/lib/read-probe.sh to /var/lib/jetty/read-probe.sh sdc-onboard-backend-docker Run entrypoint as user jetty Moved relevant files from /root/ to /var/lib/jetty/ Moved ready_probe from /var/lib/read-probe.sh to /var/lib/jetty/read-probe.sh sdc-onboard-db-init-docker Run entrypoint as user sdc Added user sdc (in base image base_sdc-cqlsh - https://gerrit.onap.org/r/103436) Moved relevant files from /root/ to /home/sdc/ Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-2798 Change-Id: I85be320a4a5e1cc5aeebbb98c4484d5d6fd06dfc
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-12Disable SecurityFilterOfir Sonsino1-1/+1
Bumping version to 1.7.0 Change-Id: I041bb5ce967b687e10be97dbbaa3ba1d119d13ff Issue-ID: SDC-2825 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2020-03-10Added new unit testsk.kedron3-20/+1627
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.schmid2-4/+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-02-05Remove ES & Kibanavasraz1-7/+0
Change-Id: I983a0fe570b1a2cbf641f4285ef030be686bed32 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2724
2020-02-02Move to version 1.6.1shrek20001-1/+1
Move SDC to version 1.6.1 Issue-ID: SDC-2755 Signed-off-by: shrek2000 <oren.kleks@amdocs.com> Change-Id: If5c55fdebb5bc2591190ee4389487f6dbb0e1831 Signed-off-by: shrek2000 <oren.kleks@amdocs.com>
2020-01-30Upgrade to Cassandra 3shrek20007-36/+32
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-26Increase junit TCsvasraz1-118/+126
1. Re-enable disabled TCs (enable = true) 2. Enable @Ignored TCs 3. Add some Assert when missing 4. Remove old unused TCs (covered in UI) Change-Id: I900e52f4860b1fdc5bd1e529a1fe7f5c3491465b Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2672
2020-01-22Fix version.rb after Catalog alignmentandre.schmid3-4/+3
Change-Id: Ibd4401a13d39ecbb6e7ba079e7e66d59c70c9e4b Issue-ID: SDC-2724, SDC-2729 Signed-off-by: Ofir Sonsino <os0695@intl.att.com> Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-01-22Catalog alignmentys9693155-5353/+3554
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-21Fix to stabilize sanity ui test suiteandre.schmid1-1/+1
Fix the selection of the Resource Composition screen. Fix the search for a Resource in the home screen. Refactor some related classes, mainly removing exceptions not thrown, correcting typos, removing unused/commented code, fixing SonarQube issues. Improve the logs and report logs. Change-Id: I89b5a0d89652367520cededa6744831492bbbaba Issue-ID: SDC-2648 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2019-11-03Create new non-mano Artifact Type entry for pnf software informationaribeiro2-0/+14
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-29Bump SDC version 1.6.0Ofir Sonsino1-1/+1
Change-Id: Ibacb46d19d49023a62caa8f5217086cea6c91ac4 Issue-ID: SDC-2560 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
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-10Bump SDC version 1.5.2Ofir Sonsino1-1/+1
Change-Id: Ib672dc8d60a0b6f4b37fd94afe84bc27dfba4c44 Issue-ID: SDC-2560 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2019-09-03Onboard Package Handlingaribeiro2-0/+2
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>