aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-12-20Exclude tomcat from jersey starter3.0.1-ONAP1.3.3casablancajimmy1-0/+6
Issue-ID: AAI-2032 Change-Id: I224d1b03f7187f7caac8220154fce3ee1eaffa1a Signed-off-by: jimmy <jf2512@att.com>
2018-12-17Update to springboot 1.5.18jimmy2-3/+3
Issue-ID: AAI-2012 Change-Id: I536924dacad0f630f7511d9f277ac6aeda21eeff Signed-off-by: jimmy <jf2512@att.com>
2018-11-09Upversion to Spring Boot 1.15.173.0.0-ONAP1.3.2Lee, Tian (tl5884)1-1/+1
To fix NexusIQ vunerabilities Change-Id: I2ce3dd403292297e1a86c6a8df853d72ad42ec7d Issue-ID: AAI-1897 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com> (cherry picked from commit ec6ba0078e3ab017745402e50ac338e0f596e99d)
2018-11-01upversion to 1.3.2sblimkie2-2/+2
Change-Id: Id1036eed42908e80bcf145d5864b5bd530eb84ad Issue-ID: AAI-1814 Signed-off-by: sblimkie <steven.blimkie@amdocs.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-10-10Upversion to 1.3.1Lee, Tian (tl5884)2-2/+2
Change-Id: I90ed0b13bb83ab9b03d873ba03fe5521eae823d4 Issue-ID: AAI-1734 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-10-09Downgrade to sdc-tosca 1.4.41.3.0mark.j.leonard2-2/+2
Release 1.4.5 has a dependency on a SNAPSHOT jar and therefore must not be used. Change-Id: Ibc7a3d8f7f60eb06c01daaacb451fbc9748c4048 Issue-ID: AAI-1445 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-10-09Update to sdc-tosca 1.4.5mark.j.leonard2-4/+3
Update to use a newer release of the SDC TOSCA parser. Change-Id: I8bd3288e000c27c2fbcb5b4b24c3a31cf12bfab8 Issue-ID: AAI-1445 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-10-08Generate models for child resourcesmark.j.leonard3-94/+151
Babel now generates models for immediate children of Resources, non-recursively. Existing functionality is unchanged. Some large methods are refactored to avoid a Cognitive Complexity Sonar code smell. Change-Id: I7ab173a5693f25d0b303dfa97a25106e7e29b5f2 Issue-ID: AAI-1704 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-09-27Remove SNAPSHOT from aai-common dependencyLee, Tian (tl5884)1-1/+1
Change-Id: I1d7daf205735ebb810fdb3e2cda92c982c464f49 Issue-ID: AAI-1686 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-09-12Fix spring-boot plugin missing system parameterLee, Tian (tl5884)1-0/+1
Fix issue where if Babel was started using the Spring Boot maven plugin, it would not function correctly as a required system parameter is not set. Change-Id: I7778786fc03880aba5815d2d04cd7f91f3b641b2 Issue-ID: AAI-1579 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-09-12Fix NexusIQ security vulnerabilitiesLee, Tian (tl5884)1-11/+2
- Update oparent version to 1.2.0 - Remove explicit Guava dependency (not used) - Update commons-compress version to latest (1.18) Change-Id: Ic76e7ee7634fa8f410583a9019c59b86f1f180b4 Issue-ID: AAI-1291 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-09-12[Babel] Use Spring Boot 1.5.15mark.j.leonard1-1/+1
Upgrade from 1.5.14 to avoid known vulnerabilities. Change-Id: I83e1b4a62da8312e1785bd6954f9b2644f65bdaa Issue-ID: AAI-1508 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-09-11Improved logging for VNF image extractionmark.j.leonard5-70/+142
Changes to logging messages to help with debugging issues. Improved Javadoc comments. Issue-ID: AAI-1242 Change-Id: I255eeb774b791a9653fdd0274367801245be6bbd Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-09-10Add support for InstanceGroup resource modelsmark.j.leonard16-69/+323
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-10Simplify input CSAR test datamark.j.leonard4-1/+1
Remove unnecessary data from the test input files. Only the TOSCA YAML content is needed for testing Babel functionality. Change-Id: I25a459f70a0ea6adb64aa87965044b63e2eeb273 Issue-ID: AAI-1250 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-09-06Additional tests for VNF image extractionmark.j.leonard6-8/+201
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.leonard9-126/+185
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 Lee9-215/+212
2018-09-06Merge "Additional VNF Configuration test scenarios"Tian Lee4-8/+44
2018-09-06Replace test UUIDs with dummy stringsmark.j.leonard9-215/+212
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-17Merge "Fixing the achtype variable name"Tian Lee1-1/+1
2018-08-17Fixing the achtype variable nameArul.Nambi1-1/+1
Issue-ID: AAI-1449 Change-Id: I862fd89a4f9aa9525c5475997ca8c360c6cb39a7 Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
2018-08-16Additional VNF Configuration test scenariosmark.j.leonard4-8/+44
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.leonard12-13/+4680
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-14Fix Babel build issueLee, Tian (tl5884)2-7/+33
Caused by a change in the structure of the aai-schema jar that Babel depends on. Change-Id: I68575ba0c727826de9a930a5e85c4f077d1127d1 Issue-ID: AAI-1449 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-08-13Fixing the docker jenkins jobArul.Nambi2-8/+1
Issue-ID: AAI-1449 Change-Id: I5cda30518c34d52e49bb61055e29aaf839e090c6 Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
2018-08-08Refactor method processServiceTosca for Sonarmark.j.leonard1-25/+40
Fix for a new Sonar issue detected when a method was moved within an existing Java class file. See https://sonar.onap.org/project/issues?id=org.onap.aai%3Ababel&open=AWUZW80uwGn37JfbxewF Change-Id: I3ac7ecf74c261d39a8762fd39123f7f8048894e3 Issue-ID: AAI-1242 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-08-07Add VF Module Groups to the SD-WAN Service testmark.j.leonard5-4/+216
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.leonard2-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.leonard4-77/+146
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-06Use sdc-tosca version 1.4.1mark.j.leonard1-1/+1
Update the sdc-tosca dependency to version 1.4.1 Change-Id: Idad51e28a8ebb9f345f705329cbf05e62510e38f Issue-ID: AAI-1445 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-08-06Add support for the CR Widgetmark.j.leonard10-9/+73
Issue-ID: AAI-1444 Change-Id: If25a2ea001fe7b43dbd14eed008a14e5dd8b3579 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-08-06Minor text fixesmark.j.leonard6-7/+19
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-08-06Remove Byte Order Mark from License textmark.j.leonard66-66/+66
Change-Id: I331d3832828aa825c710d7fb058786dd1448c0c3 Issue-ID: AAI-1443 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-07-24Update expected results to v14 namespacemark.j.leonard4-7/+7
The aai-schema version has changed from v13 to v14. Unit tests which compare actual results with expected results are updated not to fail. Change-Id: I464eec917d5062e21a5f9c41155fe86ca1e073b9 Issue-ID: AAI-1400 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-07-06Refactor Widget class to reduce complexitymark.j.leonard2-62/+51
Remove a large switch statement to reduce Cyclomatic Complexity and thus remove an oustanding Sonar code smell. Replace the switch with a Map so that a look-up can be implemented. Issue-ID: AAI-1242 Change-Id: I5b396216a28b77dcb3953eb4897a5397c98d119d 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 Lee2-5/+83
2018-07-05Test coverage and refactor for GeneratorUtilAdam Wudzinski2-5/+83
Added tests and made GeneratorUtil final class Change-Id: I3e9b3fa22dff5c50fa37ad10ba0ddd8b9bbef2d9 Issue-ID: AAI-1334 Signed-off-by: awudzins <adam.wudzinski@nokia.com>
2018-07-05Resolve Nexus-IQ security vulnerabilitiesLee, Tian (tl5884)1-1/+8
Threat level 4+ Change-Id: Iedd7b44f7d8d07d81825b2c7cc076e82aba81b91 Issue-ID: AAI-1291 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-07-03Refactor Model methods to reduce complexitymark.j.leonard2-138/+232
Change-Id: Ie67b85df855670974aa7939caf0f9afc3effe077 Issue-ID: AAI-1242 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-07-02Revert "Drop registry prefix from pom.xml"mark.j.leonard1-1/+1
This reverts commit 1227efa25a23815c7c943c5d50da561bf369cd5d. Issue-ID: AAI-1352 Change-Id: I8ae4f512f832567c93da8599baf23a70d9d44d48 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-06-28Support Port Mirroring Configuration modelLee, Tian (tl5884)9-1/+168
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.leonard9-11/+402
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.leonard10-215/+86
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.leonard20-240/+287
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-06-25Extracted repeating strings; added annotationsWiktor Garbarek3-3/+6
Change-Id: Ibe92169b6819f032f5609849f785c22d76ffc237 Issue-ID: AAI-1239 Signed-off-by: Wiktor Garbarek <wiktor.garbarek@nokia.com>
2018-05-29Re-add arm64 support changesLee, Tian (tl5884)2-2/+9
Re-adding some of the changes made to support arm64 that were lost in a previous commit. Commits that were lost: b50d09cce12ac78b3f518a5e52ffa45cde259e70 04e6b061e130c40e92e3e45c8fd1355f3c99ac29 1227efa25a23815c7c943c5d50da561bf369cd5d Change-Id: Iff90e4d0fde55a283c47b687254ea4b9da2814c3 Issue-ID: CIMAN-154 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>