aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/java/org
AgeCommit message (Collapse)AuthorFilesLines
2018-11-27Refactor model generation algorithmmark.j.leonard1-12/+35
Reorganize the Service and Resource Model generation code for readability. Resort methods to put public before private. Rename generateService() to generateAllArtifacts() Reimplement this method such that the NodeTemplate list is iterated once only. This is intended to simplify future changes to the code. Change-Id: Ie0c6003eab99f42945747c6d79827881e05afc87 Issue-ID: AAI-1884 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-11-22Refactor Instance Group processingmark.j.leonard2-267/+266
Minor refactoring and reformatting of Java code using Eclipse. Add private method mergeProperties() to replace duplicated code logic for populating the Group model. Change-Id: I1360bbbf5b065149028a94392dd530af9c9153e8 Issue-ID: AAI-1884 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-11-09Add support for ResourceInstanceGroupmark.j.leonard1-3/+90
Refactor existing code and add a Junit test for the relevant method. Change-Id: I66703f1d2e93173df4676070faf66e289360609a Issue-ID: AAI-1884 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-11-09Minor formatting fixesmark.j.leonard2-2/+0
Non-functional changes addressing whitespace inconsistencies. Change-Id: Ife84f6b04bf8ce0204409d2f3708ab85b3a3caff Issue-ID: AAI-1884 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-11-08Add a CSAR test file containing an InstanceGroupmark.j.leonard2-6/+24
Add a test CSAR file to ensure that the ArtifactGeneratorToscaParser method processInstanceGroup() is covered, prior to refactoring. Change-Id: I277b6721c8a406631d54716aa68b313b1937e5cf Issue-ID: AAI-1884 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-10-26Do not apply timezone offsets to the test Clock1.3.1mark.j.leonard1-1/+1
Use UTC for the Clock value that is passed to the Info Service as a test, to avoid any Daylight Savings adjustments. Change-Id: Id9cafdae6e63bd5908ffe8f61ca21c617e86b08b Issue-ID: AAI-1766 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-10-24Fix JUnit test for the Info status reportmark.j.leonard1-7/+7
The ZoneOffset was being applied twice, causing the number of hours added to a test Clock to be calculated incorrectly only when Daylight Savings changes were applied during the interval. For example, the status report was showing 4 days 23 hrs instead of 5 days when the clocks had been put back an hour. Change-Id: If6380a8901b2723018dd3a45fcd7df3ffa0168d4 Issue-ID: AAI-1766 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-09-10Add support for InstanceGroup resource modelsmark.j.leonard4-12/+54
Generate models for Instance Groups (for specific supported types). Process groups with a metadata type of CR or Configuration. Add InstanceGroup Widget to the supported Widgets. Add support for a group filter properties resource/file (with the single property key "AAI.instance-group-types" which provides a comma-separated list of supported types). Add the System Propery groupfilter.config to define the file path. Change-Id: I6153e6284965c57ae43291b1dc3ee4a1d11e6583 Issue-ID: AAI-1579 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-09-06Additional tests for VNF image extractionmark.j.leonard5-6/+200
New tests for extracting software versions. Change-Id: I26a9d654d03154a1d026741e623c8f953946a5f4 Issue-ID: AAI-1250 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-09-06Refactor Junit test code to remove duplicationmark.j.leonard6-121/+184
Simplify the code by introducing an Enum to store each of the test input CSAR files. Add common functionality to this Enum class. Change-Id: I3c44d7ec3b7808a193b8918c43cf0a9eb5369533 Issue-ID: AAI-1250 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-09-06Merge "Replace test UUIDs with dummy strings"Tian Lee1-1/+1
2018-09-06Replace test UUIDs with dummy stringsmark.j.leonard1-1/+1
To simplify debugging and manual inspection of XML output files, use meaningful strings in place of UUIDs in the Junit test properties. Change-Id: If6721685d36c3959c946bd57a0872cbb1ce188ec Issue-ID: AAI-1250 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-08-16Additional VNF Configuration test scenariosmark.j.leonard2-8/+43
Add test cases for both 0 and 2 VNF Configurations in the input CSAR file Issue-ID: AAI-1250 Change-Id: I0cae09f876d7bbb08cbe48019220e1836e4b7fca Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-08-16Update SdWanServiceTest CSAR to make it validmark.j.leonard1-0/+6
The SD-WAN test CSAR file is parseable using the sdc-tosca dependency version 1.4.1 but it cannot be parsed using version 1.4.2 and above, as there are missing data types leading to inheritance errors. Correct the test CSAR file by adding the missing types. This has a beneficial side-effect of increasing code coverage. Issue-ID: AAI-1250 Change-Id: I41682b49d9d0a260a6feff05fda135949b46ec05 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-08-07Add VF Module Groups to the SD-WAN Service testmark.j.leonard1-2/+11
Create additional TOSCA YAML content for the existing SD-WAN Service CSAR input file, so that the VF Module processing code is invoked. Issue-ID: AAI-1250 Change-Id: I24a842223154d52e1a4a19e5b9cd739b0ceee4f4 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-08-07Add test CSAR file for missing Service metadatamark.j.leonard1-1/+12
Change-Id: I4138d1d60fe234949264f3c2d2e2156681e9075c Issue-ID: AAI-1448 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-08-07Check getMetaData() return value for nullmark.j.leonard1-0/+56
Added code to check for null metadata. Decomposed existing methods to avoid Sonar complexity warnings. Renamed some variables for readability. Change-Id: Id68be06bb5c105f45870a08f60a4ddc4dfbe5b09 Issue-ID: AAI-1448 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-08-06Minor text fixesmark.j.leonard4-6/+17
Updated some Javadoc text for compatibility with Checkstyle settings. Issue-ID: AAI-1444 Change-Id: I9d7541aa24d07e42d7d127f76b8576a7fa7184d4 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-07-06Create new tests for adding Widgets to VfModulemark.j.leonard6-81/+345
Also correct formatting for Checkstyle and add Javadoc comments where missing. Issue-ID: AAI-1250 Change-Id: I614fd748fb288e6fc8f763f073e99a5067cbaac4 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-07-06Merge "Test coverage and refactor for GeneratorUtil"Tian Lee1-0/+80
2018-07-05Test coverage and refactor for GeneratorUtilAdam Wudzinski1-0/+80
Added tests and made GeneratorUtil final class Change-Id: I3e9b3fa22dff5c50fa37ad10ba0ddd8b9bbef2d9 Issue-ID: AAI-1334 Signed-off-by: awudzins <adam.wudzinski@nokia.com>
2018-07-03Refactor Model methods to reduce complexitymark.j.leonard1-13/+65
Change-Id: Ie67b85df855670974aa7939caf0f9afc3effe077 Issue-ID: AAI-1242 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-06-28Support Port Mirroring Configuration modelLee, Tian (tl5884)1-0/+17
Add support for Port Mirroring Configuration XML model generation from SDC TOSCA Change-Id: I44718d20a53e343ee34ae47ef2bc35d49c862ddf Issue-ID: AAI-1345 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-06-27Additional junit tests for artifact generationmark.j.leonard6-10/+398
New tests to improve code coverage. Remove underscores from existing Junit test method names. Issue-ID: AAI-1250 Change-Id: I8d0d9c41d7a124cbedea69d64c4cd78ac6e4bcfa Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-06-27Remove the Generator Constants classmark.j.leonard4-18/+15
Move the String constants out of a common class and into the individual classes where they are used. This eliminates a set of Sonar code smells relating to non-standard ordering of declarations. It simplifies the code by removing the need for an empty private constructor in the static class (i.e. containing static methods only). Additionally, simplify the AaiModelGenerator interface by removing the static factory method (which is not currently required). If multiple implementations are needed we can use Spring annotations in the future. Issue-ID: AAI-1242 Change-Id: Ica03b66ae2fd899977093d11d3e23dc3f3c8f194 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-06-26Fix remaining Sonar code smellsmark.j.leonard14-183/+222
Code reformatting to address Sonar code smells, excluding the cyclomatic complexity errors which will require some heavier refactoring. Issue-ID: AAI-1242 Change-Id: I0f2502c8038b1e70f53f3b82b9d4d0761d9137cc Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-05-08Fix Babel authorisation mechanismv1.2.02.0.0-ONAPbeijing2.0.0-ONAPLee, Tian (tl5884)1-11/+10
Change-Id: Iae3139b33e315fae0c205fd7e0df67554d91cd5b Issue-ID: AAI-1126 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-04-30Convert Babel from AJSC2 to Spring Boot 1.5.12Lee, Tian (tl5884)14-30/+31
Change-Id: I2ea10250c3881827b6b274afadf1a8c89683f568 Issue-ID: AAI-1045 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-03-28Incorporate the ECOMP SDC Artefact Generator codeLeonard, Mark (ml401d)14-221/+933
Remove the Maven dependency on openecomp-sdc-artifact-generator-core, because this is not maintained in the ONAP source code repositories. The functionality provided by the SDC Artifact Generator is replaced with equivalent code that depends on the SDC-TOSCA parsing library, without introducing any backwards-compatibility breaks. The intention is to make this Maven project more maintainable by depending only the common ONAP libraries. Change-Id: I01d78575d3b7c70a11e4c7989a021de3c0913a06 Issue-ID: AAI-943 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2017-10-05Initial code submit for BabelEdwin Lawrance8-0/+1018
Change-Id: I3738ebe15eadbbd6d16e24e374c6e40c535b425d Issue-ID: AAI-46 Signed-off-by: Edwin Lawrance <Edwin.Lawrance@amdocs.com>