sebdet [Thu, 18 Jun 2020 10:42:41 +0000 (12:42 +0200)]
Fix sonar issues
Fix sonar/checkstyle issues in sdc code
Issue-ID: SDC-3116
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I87802bb9edb378bdbe456c3ca4f10d8c6dae9437
Francis Toth [Thu, 18 Jun 2020 19:23:12 +0000 (15:23 -0400)]
Decouple TXT Report file writing and formatting logic (2/6)
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
ChrisC [Fri, 19 Jun 2020 16:05:20 +0000 (18:05 +0200)]
Fix Assert usage
Sonar Fix, fix assert usage in this file
Issue-ID: SDC-3116
Signed-off-by: ChrisC <christophe.closset@intl.att.com>
Change-Id: I292649e84e589a35eb69139de53b3ee95223be26
JulienBe [Thu, 18 Jun 2020 11:33:05 +0000 (13:33 +0200)]
fix sonar issues related to MessageContainer.java
Issue-ID: SDC-3127
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
Change-Id: I02357fa3cbf7afd7845737ba01c72dc202401882
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
xuegao [Fri, 19 Jun 2020 07:23:42 +0000 (09:23 +0200)]
Remove duplicate code
Removing duplicate code.
Issue-ID: SDC-3132
Signed-off-by: xuegao <xg353y@intl.att.com>
Change-Id: I595a791ebd7cb160d7149ea92a6434d52cfc9f48
xuegao [Thu, 18 Jun 2020 10:00:35 +0000 (12:00 +0200)]
Remove unused method
Removing unused method in Constraint and use lombok annotations instead.
Issue-ID: SDC-3130
Signed-off-by: xuegao <xg353y@intl.att.com>
Change-Id: Ia718d184c55d40503f42830966bb11675b7c3f85
Signed-off-by: xuegao <xg353y@intl.att.com>
xuegao [Fri, 12 Jun 2020 11:01:57 +0000 (13:01 +0200)]
Fix Vulnerabilities
Fix the vulnerabilities reported by Sonar.
Issue-ID: SDC-3114
Signed-off-by: xuegao <xg353y@intl.att.com>
Change-Id: Icf97e427ef0c192b2f279380d7ee9eb570949d1f
Signed-off-by: xuegao <xg353y@intl.att.com>
ChrisC [Fri, 19 Jun 2020 08:26:12 +0000 (10:26 +0200)]
Fix Sonar issues
Assert params updated to be in correct order
Issue-ID: SDC-3116
Signed-off-by: ChrisC <christophe.closset@intl.att.com>
Change-Id: I8be2dec4a1d5ec9ab59ea8fddab540958fe25511
ChrisC [Fri, 19 Jun 2020 09:15:07 +0000 (11:15 +0200)]
Fix Sonar issues
Assert params updated to be in correct order
Issue-ID: SDC-3116
Signed-off-by: ChrisC <christophe.closset@intl.att.com>
Change-Id: I10168defa289e45102f7f8aa436db8ca7176fe6a
ChrisC [Fri, 19 Jun 2020 10:08:04 +0000 (12:08 +0200)]
Fix Sonar issues
Fix assertThat usage and tests
Issue-ID: SDC-3116
Signed-off-by: ChrisC <christophe.closset@intl.att.com>
Change-Id: Ife533a479096047c4ccb7ae46dfaaa6e2ece974d
JulienBe [Tue, 16 Jun 2020 17:18:16 +0000 (19:18 +0200)]
improve test coverage
Issue-ID: SDC-3120
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
Change-Id: I8e02fcb3f495d70c14e6e9cf0304085d77918805
Francis Toth [Thu, 18 Jun 2020 11:37:20 +0000 (07:37 -0400)]
Decouple TXT Report file writing and formatting logic (1/6)
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
ChrisC [Thu, 18 Jun 2020 14:50:39 +0000 (16:50 +0200)]
Fix more doc warnings
Fix couple of doc warnings
Issue-ID: SDC-1357
Signed-off-by: ChrisC <christophe.closset@intl.att.com>
Change-Id: I3c195ab8d9caacce7dde5d8e9631a0fb7c2ea25a
JulienBe [Wed, 17 Jun 2020 20:27:45 +0000 (22:27 +0200)]
datatypes.Constants:
- adhere to naming conventions
- remove unused
Issue-ID: SDC-3126
Change-Id: I4ea23a8c69aaaf8fcc404868d3c59c47d09ba442
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
MichaelMorris [Wed, 27 May 2020 17:09:40 +0000 (18:09 +0100)]
Importing VSP with node_type in separate file
Import fails when a node_type referenced in the main template is defined in a separate yaml file in the csar even when that separate file is correctly imported in the main template
Change-Id: I6abe074585c2ce592fe9bed7abe76f0856bcfe93
Issue-ID: SDC-2850
Signed-off-by: MichaelMorris <michael.morris@est.tech>
JulienBe [Wed, 17 Jun 2020 12:22:53 +0000 (14:22 +0200)]
create tests for ScalarUnitValidator.java
Issue-ID: SDC-3123
Change-Id: Iaa60ce2df46ee7a4d9138a56cf4d4c115a059240
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
JulienBe [Wed, 17 Jun 2020 14:53:55 +0000 (16:53 +0200)]
create tests for PropertyTypeExt.java and remove unsused method
Issue-ID: SDC-3124
Change-Id: I5d3baeeff23c0003952eabc39a5f9dd296dd7c39
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
Francis Toth [Mon, 20 Apr 2020 23:16:47 +0000 (19:16 -0400)]
Decouple CSV Report file writing and formatting logic
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I6168b71bb54192a806ff6aa437788bedad933c76
Issue-ID: SDC-2499
xuegao [Wed, 17 Jun 2020 07:58:36 +0000 (09:58 +0200)]
Fix Java Code Conventions non-compliance issues
Update locations of the constructor and private variable to comply with the Java Code Conventions.
Issue-ID: SDC-3121
Signed-off-by: xuegao <xg353y@intl.att.com>
Change-Id: I0114c880e389f0ed167262c9cd513583be35ba56
Signed-off-by: xuegao <xg353y@intl.att.com>
xuegao [Tue, 16 Jun 2020 11:15:39 +0000 (13:15 +0200)]
Reduce nest statement levels
Reduce the if/for/switch/try nest statement levels to less than 3.
Issue-ID: SDC-3119
Signed-off-by: xuegao <xg353y@intl.att.com>
Change-Id: I60f0c0203db4495c6e10127114acdb8586867b14
Signed-off-by: xuegao <xg353y@intl.att.com>
Francis Toth [Sun, 31 May 2020 12:42:14 +0000 (08:42 -0400)]
Refactor ArtifactsBusinessLogic::getUpdatedGroupInstances
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I6d62c1f916aa820f84328d25d2afbc7470397b0d
Issue-ID: SDC-2961
xuegao [Tue, 16 Jun 2020 09:38:34 +0000 (11:38 +0200)]
Reduce nest statement levels
Reduce the if/for/switch/try nest statement levels to less than 3.
Issue-ID: SDC-3118
Signed-off-by: xuegao <xg353y@intl.att.com>
Change-Id: I490e66a807a0a8508b7e3c1da332546f2ced3005
Francis Toth [Fri, 29 May 2020 14:12:10 +0000 (10:12 -0400)]
Extract ComponentCache from CsarUtils
This commit aims to decouple the component caching logic from CsarUtils to its own class.
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: Ia7e9284639ec8cd87ca5107e12f295e2eb599768
Issue-ID: SDC-2812
MichaelMorris [Mon, 25 May 2020 16:08:23 +0000 (17:08 +0100)]
Support the substitution_mappings in the VNFD
Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-2957
Change-Id: I8a385b02568b3bf3d83a250cbe36a7e7f61e710c
ChrisC [Mon, 15 Jun 2020 09:28:14 +0000 (11:28 +0200)]
Fix Sonar issues
Hide implicit public constructor in utility class
Issue-ID: SDC-3116
Signed-off-by: ChrisC <christophe.closset@intl.att.com>
Change-Id: I4edd2ac37aab2fd587b5d46391dd669181385748
JulienBe [Thu, 11 Jun 2020 10:06:09 +0000 (12:06 +0200)]
add information on the containers based on what is available in the wiki
Issue-ID: SDC-2449
Change-Id: I740a14623161e051399f03d1788ae8a2605c1076
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
MichaelMorris [Tue, 12 May 2020 10:19:47 +0000 (11:19 +0100)]
Manifest is optional in ETSI SOL004 manifest
SOL004MetaDirectoryValidtor enforces all files contained in an ETSI SOL004 CSAR are included in the manifest file, however the manifest itself is not mandatory to include in the manifest
Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-3057
Change-Id: I460071ecbd21578edb0603f600da0ac1ea877539
Satoshi Fujii [Wed, 8 Apr 2020 09:11:41 +0000 (18:11 +0900)]
Add some unit tests
This change added some unit tests for ComponentInstanceBusinessLogic
to increase test coverage and removed unused variables for better
readability.
Also the test class was rewritten to use JUnit 5.
Change-Id: I519976d00d8eccc194f8f1168d45f95392808652
Signed-off-by: Satoshi Fujii <fujii-satoshi@jp.fujitsu.com>
Issue-ID: SDC-2885
andre.schmid [Wed, 5 Feb 2020 12:13:57 +0000 (12:13 +0000)]
Onboard TOSCA data_types defined in package
Onboard TOSCA data_types defined in a CSAR package
that does not exists in the SDC default data_types
library. Those data_types were being lost.
All data_types declared in the package will be
included in the "GlobalSubstitutionServiceTemplate".
This includes the data_types declared in the main
topology template and in its imported definition
files.
Defines a maven profile to compile the catalog-be
in the main SDC pom.
Change-Id: I39445b0f42e924dc1015945b7e605e804c1d505b
Issue-ID: SDC-2763
Signed-off-by: André Schmid <andre.schmid@est.tech>
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
vasraz [Thu, 11 Jun 2020 11:57:25 +0000 (12:57 +0100)]
Fix 'not running Junit5 tests'-issue
Change-Id: Iee67a4af7262e554a86252b411264f55ff1baa88
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3109
vasraz [Thu, 11 Jun 2020 16:05:29 +0000 (17:05 +0100)]
Fix Critical security vulnerability
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
xuegao [Fri, 12 Jun 2020 08:39:07 +0000 (10:39 +0200)]
Fix bug in UpdateIsVnfMenu
Fix the unboxing bug reported by Sonar.
Issue-ID: SDC-3112
Signed-off-by: xuegao <xg353y@intl.att.com>
Change-Id: I4ed3f9a48ad21af2f9f67872791df2796c4e4ad1
Ofir Sonsino [Sun, 14 Jun 2020 15:18:14 +0000 (18:18 +0300)]
Use dummy info for distribution-engine
Change-Id: I7679e0ed8ce4c4217cf6c5f4a646fe06cf32372d
Issue-ID: SDC-3115
Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
ChrisC [Sat, 13 Jun 2020 07:26:13 +0000 (09:26 +0200)]
Fix Doc warnings
Fix some RST warnings and rendering issues
Issue-ID: SDC-1357
Signed-off-by: ChrisC <christophe.closset@intl.att.com>
Change-Id: I142085dcdbbaf8f1a3de27680548e2c37d0a099e
aribeiro [Wed, 13 May 2020 12:49:31 +0000 (13:49 +0100)]
Add support for directives on VFC
This change also updates the directives values according to Tosca 1.3 spec
Issue-ID: SDC-3074
Change-Id: Ia6a68c9a23a71a2c17ba2c006990342811aa7b4e
Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
Chris André [Wed, 3 Jun 2020 17:23:40 +0000 (13:23 -0400)]
Rewrite of `updateArtifactOnInterfaceOperationByResourceUUID` to remove NPE
Issue-ID: SDC-2978
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I60942ab1767bf65c806ce796ca62365396b20d93
Neil Derraugh [Mon, 8 Jun 2020 19:45:58 +0000 (15:45 -0400)]
Set properties on XML parsers to prevent XXE attack
- 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
Neil Derraugh [Mon, 8 Jun 2020 14:40:10 +0000 (10:40 -0400)]
Fix security issue in SecurityUtil
- Specified mode and padding to address risky algorithm
- Corrected unit test for different exception message
- Moved tests to package
Issue-ID: SDC-3105
Signed-off-by: Neil Derraugh <neil.derraugh@yoppworks.com>
Change-Id: I5773ab555a5468362c775cf99795df4eb8c52136
Rodrigo Lima [Fri, 5 Jun 2020 18:02:15 +0000 (14:02 -0400)]
Java 11 migration - 'test-apis-ci'
- Removed references to protected packages (sun.net.*)
Issue-ID: SDC-3037
Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com>
Change-Id: Ibbf25af390e624e15fb2bc8ea17777056fe5f3b5
sebdet [Fri, 5 Jun 2020 14:04:28 +0000 (16:04 +0200)]
Fix sonar bugs
Fix all sonar bugs reported in SwitchoverDetector class + fix all checkstyle issues
Issue-ID: SDC-2931
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ic86a3526fc7030e10a61b150058c04a391c40c7b
JulienBe [Thu, 4 Jun 2020 17:06:51 +0000 (19:06 +0200)]
class passed to MdcLogger() is compared by name
Issue-ID: SDC-3098
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
Change-Id: I8b61218d1164a0ebff7f290ac82f1cdd67a5152a
vasraz [Thu, 28 May 2020 10:44:09 +0000 (11:44 +0100)]
Support setting SDC-BE configuration at deployment time
Change-Id: I4b384bc911630d6041a0c5c235d3aaf3ac148090
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3076
sebdet [Fri, 5 Jun 2020 10:55:28 +0000 (12:55 +0200)]
Add build config in README
Add a required step to build the project, the oparent settings.xml must be installed first in .m2
Issue-ID: SDC-2871
Change-Id: Id69582582849a8937f4e76d24d6a6bfdc8f0a957
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
aribeiro [Wed, 20 May 2020 09:05:48 +0000 (10:05 +0100)]
Make Directive values Tosca compliant
Issue-ID: SDC-3079
Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
Change-Id: Ie711c61244a4e2d68a96e2814ba2db52e067c6e4
Chris André [Tue, 2 Jun 2020 18:18:43 +0000 (14:18 -0400)]
Rewrite of `certifyToscaElement` to remove NPE
- Modularized `certifyToscaElement` in smaller, less complex methods (`handleRelationsBeforeCertifyingAndProcessClone`, `cloneToscaElementAndHandleRelations`, `handleRelationsOfNewestCertifiedToscaElementAndReturn` & `logDebugMessageAndReturnStorageOperationStatus`)
- Removed potential NPE flagged by Sonar in `certifyToscaElement`
Issue-ID: SDC-2966
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: Id65871cbfd611abdcc878e61c1541f01ff972828
Chris André [Mon, 25 May 2020 16:51:38 +0000 (12:51 -0400)]
Refactor method 'undoCheckout' to simplify it and remove potential NPE
- Extracted methods 'retrieveAndUpdatePreviousVersion' and 'updateEdgeToCatalogRootAndReturnPreVersionElement' from 'undoCheckout'
Issue-ID: SDC-2965
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I52faffdaf2e99a9de8c2e566da26a5be6e7fd667
Chris André [Tue, 2 Jun 2020 15:37:03 +0000 (11:37 -0400)]
ArtifactsBusinessLogic refactor to remove NullPointerException
- Reformatted `downloadResourceInstanceArtifactByUUIDs`
- Fixed Sonar-related warning regarding a NPE in `validateInput`
Issue-ID: SDC-2979
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I5a62daabcc436f28fba1f09317c5723281df15bf
andre.schmid [Mon, 25 May 2020 13:54:30 +0000 (14:54 +0100)]
Add constraints structure to ToscaProperty
Add constraints structure to ToscaProperty and implements
the valid_values property.
Change-Id: Id69581582839a8937f0c76c24d6a6bfcc7f0a957
Issue-ID: SDC-3084
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Francis Toth [Wed, 20 May 2020 16:19:26 +0000 (12:19 -0400)]
Refactor CsarUtils::writeComponentInterface
This commit aims to decouple the zip file writing logic from the CsarUtils::writeComponentInterface function. This should provide a higher level of testability and maintenance thanks to inversion of control. An extra helper has also been added to help the migration from the FJ library to VAVR.
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I4f2df4749cae3082906a80acc39045ac8887ec39
Issue-ID: SDC-2812
MichaelMorris [Mon, 6 Apr 2020 13:00:13 +0000 (14:00 +0100)]
Remove boolean entries in TOSCA Metadata
Change-Id: I0101bbe35656b4c7d7405429d95939b892e85402
Issue-ID: SDC-2876
Signed-off-by: MichaelMorris <michael.morris@est.tech>
vasraz [Wed, 20 May 2020 16:27:25 +0000 (17:27 +0100)]
Add interface inputs handling
Enables interface inputs specified in a node_type to be imported and included in the generated csar
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Ia3acaad50b4091831d0c0471b07ba2b2e9bd380d
Issue-ID: SDC-3077
andre.schmid [Wed, 13 May 2020 18:11:38 +0000 (19:11 +0100)]
Plugin to customize prop. during Service creation
Creates an entry point to customize properties of a Service
Component before its creation.
Change-Id: I102a70b37eec498dd9c6df009c38da57d0e5b17f
Issue-ID: SDC-3062
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Ofir Sonsino [Wed, 27 May 2020 12:08:59 +0000 (15:08 +0300)]
Finalize Documentation R6
Change-Id: I66837d0b314c1a529bd6ca2e29c9527899286c6f
Issue-ID: SDC-2949
Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
andre.schmid [Wed, 20 May 2020 13:24:40 +0000 (14:24 +0100)]
Fix interface types creation
Interface types creation logic was not interpreting some allowed TOSCA
entries, that, when declared, were breaking the interface type
creation. Every entry under the interface type was being considered
as an interface operation, but it is possible to have "derived_from",
"version", "metadata" and "description". Also it is not considering
the Interface Type entries "inputs", "operations" and "notifications".
Another thing is that TOSCA 1.3 changes the way operations should be
declared, deprecating the previous way. Now there should be an entry
"operations" with the operations entries under it, instead of having
the operations entries direct under the interface type. The change
allows both types, following the TOSCA rule: if operations entry is
not present, then the deprecated way is considered.
Change-Id: I13218bda60b29d19b9c5565cbfd63ae3250a78bf
Issue-ID: SDC-3075
Signed-off-by: andre.schmid <andre.schmid@est.tech>
andre.schmid [Mon, 25 May 2020 16:47:47 +0000 (17:47 +0100)]
Entry points in ToscaExportHandler for plugin use
Open the access for two methods in ToscaExportHandler so they
can be called in a CsarEntryGenerator plugin.
Change-Id: I0ee1daab348c0fc85db56428369a5ec190cb0101
Issue-ID: SDC-3083
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Francis Toth [Mon, 20 Apr 2020 22:43:20 +0000 (18:43 -0400)]
Encapsulate ReportManager's failedVerticesPerTask and resultsPerVertex in Report
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
Francis Toth [Mon, 4 May 2020 22:42:58 +0000 (18:42 -0400)]
Extract artifact component belonging logic
This commit extracts checkArtifactInComponent and checkArtifactInResourceInstance from ArtifactsBusinessLogic. Tests have been added along with a some utility functions designed to generate randomized test data. The former tests were deleted as they were not doing any assertions.
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I1b27c55d064cf4e9a40cd7b152e7ea6032a09276
Issue-ID: SDC-2961
aribeiro [Tue, 5 May 2020 13:36:38 +0000 (14:36 +0100)]
Allow global types generation
This change allows to configure which global type file will be added to the generated CSAR
Issue-ID: SDC-3021
Change-Id: I83c0c3f317c4a4e5e8dbf22cb3dbd47e63562d3a
Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
aribeiro [Wed, 27 May 2020 10:37:44 +0000 (11:37 +0100)]
Revert "Java 11 migration: fixing problems on 'catalog-fe'"
This reverts commit
50906f4dcd00b0162298d1f86d72dcfc4d3caee9.
Issue-ID: SDC-3088
Change-Id: I13c48243b3a137c7e66da1ef217a0ecbbd55f216
Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
Francis Toth [Sat, 2 May 2020 14:16:17 +0000 (10:16 -0400)]
Refactor CsarUtils::WriteArtifactDefinition
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I167a05d8fbc2085a3e25eeb5bfd6b30f0e80462e
Issue-ID: SDC-2812
Francis Toth [Fri, 8 May 2020 22:45:14 +0000 (18:45 -0400)]
Add ArtifactsBusinessLogic::fetchLatestComponentMetadata
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: Ibb8621a91551a2e4ffcac1145f85ed7983063d02
Issue-ID: SDC-2812
Chris André [Fri, 15 May 2020 12:29:29 +0000 (08:29 -0400)]
Work on unchecked Optional access
- extract code to static methods
- throw an explicit exception now if element not found
Issue-ID: SDC-2987
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I693bb53059b056235b567ac1f9f752a33512505a
aribeiro [Wed, 20 May 2020 08:31:52 +0000 (09:31 +0100)]
Fix for locked component
After add, update or remove node_filter the component was left locked on SDC
Issue-ID: SDC-3072
Change-Id: I27058760704bd6261619946becda3612a6386432
Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
vasraz [Wed, 20 May 2020 09:04:51 +0000 (10:04 +0100)]
Fix wrong tests directory structure
Change-Id: I0538e5ad56c9a77a0e9cb40d629739e979b67495
Issue-ID: SDC-3073
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Chris André [Tue, 26 May 2020 00:24:26 +0000 (20:24 -0400)]
Java 11 migration: fixing problem on 'openecomp-tosca-converter-core'
- Explicitely indicate the type associated with 'Collection'
Issue-ID: SDC-3030
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I557eb205598c337b75b06a2c7d705276aeb543a1
Chris André [Fri, 22 May 2020 18:29:25 +0000 (14:29 -0400)]
Java 11 migration: fixing problems on 'catalog-fe'
- Upgrade `jersey-bom` version variable to the most recent stable one
- Removed `jersey-common` version variable and replaced its references with `jersey-bom`
Issue-ID: SDC-3036
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I414e3814d6d4fc1d927b302efb5dd08659676dc2
Francis Toth [Tue, 19 May 2020 14:36:58 +0000 (10:36 -0400)]
Refactor CsarUtil::addInnerComponentsToCSAR
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I7f32d729a96f696c217631cd019105c17cb36a8c
Issue-ID: SDC-2812
vasraz [Thu, 14 May 2020 15:09:22 +0000 (16:09 +0100)]
Support setting SDC-BE configuration at deployment time
Change-Id: Id1ebcb01d81b8e0cd681dcb304aa77bb3248d69c
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3076
andre.schmid [Tue, 19 May 2020 15:31:28 +0000 (16:31 +0100)]
Fix potential NullPointer in SchemaFileImport
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>
Ben David, Elad (eb7504) [Thu, 21 May 2020 10:53:36 +0000 (13:53 +0300)]
500 error at WFD artifact-deliveries api
Change-Id: I9227387c26b6ee4c68c635b78c4980a9c07b3d35
Issue-ID: SDC-3052
Signed-off-by: Ben David, Elad (eb7504) <eb7504@intl.att.com>
Chris André [Fri, 24 Apr 2020 02:24:36 +0000 (22:24 -0400)]
Work around potential NullPointerExceptions in ToscaElementLifecycleOperation
- Rewrite of `checkinToscaELement`
- Extracted methods from `checkinToscaELement`
Issue-ID: SDC-2964
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I99d2c5aaa73b955ef5aa60eeb7644bb47ac12bd6
Francis Toth [Fri, 8 May 2020 20:31:04 +0000 (16:31 -0400)]
Refactor ArtifactsBusinessLogic::getRelatedComponentInstance
This commit aims to refactor the ArtifactsBusinessLogic::getRelatedComponentInstance, and getRelatedComponentComponentInstance. It improves how Either is used, fixes a potential NullPointerException, reduces some duplication along with cyclomatic complexity.
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I2503f5e2a697f793e4dcf32d7793f83c4a25ff46
Issue-ID: SDC-2812
Francis Toth [Wed, 6 May 2020 21:54:27 +0000 (17:54 -0400)]
Remove wildcard pattern when retrieving components
This commit aims to remove a redundant cast while preparing the field for some Either refactoring in ArtifactsBusinessLogic. The reasons for removing the wildcard pattern are explained in SDC-3040 (a sub-task of SDC-2812).
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I573c01eca56f096ccb54e564d0144291121bde22
Issue-ID: SDC-2812
Francis Toth [Fri, 8 May 2020 16:22:41 +0000 (12:22 -0400)]
Refactor ArtifactsBusinessLogic::handleDeleteInternal
This commit is a first step towards the ArtifactsBusinessLogic::handleDeleteInternal function refactoring. It aims to improve how Either is used, and to reduce its cyclomatic complexity along with some duplications.
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I1b476ccc0e0341975b80c10dc79c5dc1592267f4
Issue-ID: SDC-2812
Rodrigo Lima [Tue, 19 May 2020 16:10:17 +0000 (12:10 -0400)]
remove powermock dependency from pom xmls
- 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
Chris André [Tue, 5 May 2020 18:09:02 +0000 (14:09 -0400)]
Add null test to ComponentInstanceBusinessLogic
- Added test in `changeInstanceVersion` for null value
Issue-ID: SDC-2908
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I42a428c4b245a55b7229e2ec9b781e9af4403662
Francis Toth [Mon, 11 May 2020 20:15:18 +0000 (16:15 -0400)]
Refactor ArtifactsBusinessLogic::generateAndSaveToscaArtifact
This commit aims to make some minor refactoring related to the either used in ArtifactsBusinessLogic::generateAndSaveToscaArtifact.
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I4923e014146a17f1cd035db3513359a2ab8f38f2
Issue-ID: SDC-2812
Francis Toth [Fri, 1 May 2020 16:42:58 +0000 (12:42 -0400)]
Refactor CsarUtil::extractVfcArtifact
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: Ica8d17d4f3c763920f406ccb89fb3e464d05eab4
Issue-ID: SDC-2812
Francis Toth [Tue, 5 May 2020 16:44:59 +0000 (12:44 -0400)]
Refactor tosca representation retrieval in CsarUtils::populateZip
This commit aims to simplify CsarUtils::populateZip by extracting how a tosca representation is fetched to another function. this enables to reduce the overall cyclomatic complexity of the function. Some additional work still needs to be done especially regarding the ToscaRepresentation and MainYamlWithDependencies classes (These happen to be really similar). This will be done in another change in the near future.
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I93600d0752565de523cf2285b1fa2ba43a96334f
Issue-ID: SDC-2812
Chris André [Mon, 4 May 2020 20:12:17 +0000 (16:12 -0400)]
OrchestrationTemplateDaoZusammenImpl - Add tests for the presence of Optional values
Issue-ID: SDC-3015
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: Iae0ce3d1b4bb5a72f04f0cd8a890c84eb15b214c
Rodrigo Lima [Thu, 14 May 2020 14:14:34 +0000 (10:14 -0400)]
Remove powermock from ContextTracker
- Remove powermock from ContextTrackerTest
- Add package level constructor to ContextTracker to pass clear and put functions
Issue-ID: SDC-3058
Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com>
Change-Id: I82519538b763b00f2768801f06929773bfb58013
Rodrigo Lima [Fri, 15 May 2020 01:06:05 +0000 (21:06 -0400)]
Remove powermock from ValidationConfigManagerTest
- Remove powermock reference from ValidationConfigManagerTest
Issue-ID: SDC-3064
Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com>
Change-Id: Ib330b0fcaf132e5d67f65b482a80b5b75f8c336b
Rodrigo Lima [Fri, 15 May 2020 14:06:29 +0000 (10:06 -0400)]
Remove powermock from ArtifactValidationUtilsTest
- 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
Rodrigo Lima [Fri, 15 May 2020 13:37:26 +0000 (09:37 -0400)]
Remove powermock from ReportManagerTest
- 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
Rodrigo Lima [Fri, 15 May 2020 19:50:10 +0000 (15:50 -0400)]
Remove powermock from HostAddressCacheTest
- Remove powermock and easymock from HostAddressCacheTest
- Add package level constructor to HostAddressCache and pass read address function to verified in unit test
Issue-ID: SDC-3068
Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com>
Change-Id: I749211393d9e0ecb3ff3b587dc0f811b58bb967c
Fuss, Areli (af732p) [Thu, 14 May 2020 12:27:12 +0000 (15:27 +0300)]
sdc-backend-init does not restart on healthcheck failure
Issue-ID: SDC-3063
Change-Id: I6c4a796f42060832ee8a37a708dedda7e7e98c70
Signed-off-by: Fuss, Areli (af732p) <areli.fuss@intl.att.com>
Tufman, Shay (st198j) [Thu, 14 May 2020 07:43:28 +0000 (10:43 +0300)]
Fix edit deployment artifact icon, and download
Change-Id: I9e66870b03fcc5edcea30a18809cf8a2c539e674
Issue-ID: SDC-3053
Signed-off-by: Tufman, Shay (st198j) <st198j@att.com>
Chris André [Fri, 24 Apr 2020 23:43:18 +0000 (19:43 -0400)]
Work around potential NullPointerExceptions in ComponentInstanceOperation
- Rewrite of `updateAttributeValueInResourceInstance`
Issue-ID: SDC-2923
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I1becdec8c10515976835e7d8fb0208b9cbad10bb
Chris André [Tue, 5 May 2020 11:54:27 +0000 (07:54 -0400)]
Add tests for the presence of Optional values
Issue-ID: SDC-3014
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I041c0109c41bb1a716792074c004fd8f54857038
vasraz [Fri, 1 May 2020 17:27:11 +0000 (18:27 +0100)]
Increase test coverage - openecomp-sdc-vendor-software-product-core
Change-Id: I1af31c1f14d72fbc30a026f7ae787ae9d4b03b36
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3001
Rodrigo Lima [Mon, 11 May 2020 19:54:37 +0000 (15:54 -0400)]
Remove powermock from SecurityManagerTest
- Add new package level constructor to SecurityManager
- Remove powermock from SecurityManagerTest
Issue-ID: SDC-3054
Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com>
Change-Id: I04c53601f31d2aad84de8f8801f6889f8b9d4260
Francis Toth [Mon, 11 May 2020 20:09:38 +0000 (16:09 -0400)]
Remove unused ArtifactsBusinessLogic::updateArtifactsFlowForInterfaceOperations
This commit deletes the ArtifactsBusinessLogic::updateArtifactsFlowForInterfaceOperations function as it is no longer used anywhere.
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I1dd950930485fc83bb02c889dafc5461192accbc
Issue-ID: SDC-2812
Francis Toth [Mon, 20 Apr 2020 00:55:37 +0000 (20:55 -0400)]
Remove outputFullFilePath from ValidationConfigManager
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
Neil Derraugh [Wed, 6 May 2020 15:28:39 +0000 (11:28 -0400)]
Fix security issues in SecurityUtil
- Removed hard coded key
- Specified mode and padding to address risky algorithm
Issue-ID: SDC-3017
Signed-off-by: Neil Derraugh <neil.derraugh@yoppworks.com>
Change-Id: I6c21174003fcb5669de49158d8dd6bf9907f50c6
Francis Toth [Fri, 1 May 2020 14:23:18 +0000 (10:23 -0400)]
Refactor CsarUtil::writeComponentInterface
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I6a40119540c18469db44e218984b4d4b92d3f4af
Issue-ID: SDC-2812
Francis Toth [Mon, 4 May 2020 12:14:51 +0000 (08:14 -0400)]
Refactor ArtifactsBusinessLogic::generateToscaArtifact
This commit aims to refactor how Either is used in ArtifactsBusinessLogic::generateToscaArtifact. In order to keep the refactoring relatively small, we evalute its result at the call site.
Change-Id: I669b30b44e9c69d1b3968fd719c5340b2dff83f5
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Issue-ID: SDC-2812
Chris André [Thu, 30 Apr 2020 19:41:41 +0000 (15:41 -0400)]
Refactor to remove false positives from Sonar
- change `updateResourceInstancesNames` to account for case where `preparedResource` is null
- change `findInputByName` to return an Either<InputDefinition, RuntimeException> in order to make exceptions explicit
- create `rollbackWithEither` (+ tests) to make exceptions more explicit
Issue-ID: SDC-2992
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I487994a3f9e88b0a2b14d2679c3587d85d8aa12d
Francis Toth [Fri, 8 May 2020 12:17:33 +0000 (08:17 -0400)]
Refactor ArtifactsBusinessLogic::handleDelete and ArtifactsBusinessLogic::deleteArtifactByInterface
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I89f12c70f388375ed13554edf62bf6a442c9036a
Issue-ID: SDC-2812
andre.schmid [Tue, 5 May 2020 11:45:33 +0000 (12:45 +0100)]
Allow any extension to WORKFLOW artifact type
Allow any extension to WORKFLOW artifact as it was before
the artifact type configuration change SDC-2754.
Change-Id: I6c497cd83e36fe4df0cc800b9301010c22aa79f7
Issue-ID: SDC-3019
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Rodrigo Lima [Thu, 7 May 2020 17:50:44 +0000 (13:50 -0400)]
Remove powermock from ComponentProcessesImplTest
- Remove powermock from ComponentProcessesImplTest and add new constructor to ComponentProcessesImpl
Issue-ID: SDC-3042
Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com>
Change-Id: I1766371a42a65d6b11c9b7b6783a312db2ed723e