aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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>
2018-05-25Make babel run as rootDaniel Silverthorn1-8/+1
Change-Id: I14a0e96ab0b1c4b4c04b8050ea853e74d31e94ce Issue-ID: AAI-1179 Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
2018-05-23Merge "Upversion for Casablanca"Steven Blimkie2-3/+3
2018-05-23Upversion for CasablancaJimmy Forsyth2-3/+3
Issue-ID: AAI-1169 Change-Id: Iddc4a76f40b9ab60f698a0f1b5cb9ec13581c10e Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2018-05-08Fix Babel authorisation mechanismv1.2.02.0.0-ONAPbeijing2.0.0-ONAPLee, Tian (tl5884)5-50/+29
Change-Id: Iae3139b33e315fae0c205fd7e0df67554d91cd5b Issue-ID: AAI-1126 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-05-01Remove license violationsLee, Tian (tl5884)1-6/+0
Remove un-needed javaee-api dependency. Change-Id: I86967388afa404267a1ef7f7eb9110d134050946 Issue-ID: AAI-1108 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-05-01Merge "Upversion logback classic and core dependencies"James Forsyth1-0/+12
2018-05-01Upversion logback classic and core dependenciesLee, Tian (tl5884)1-0/+12
To remove Nexus-IQ security vulnerability Change-Id: Ia9ff4aaf36f525c427e30664f143803c9d08a6da Issue-ID: AAI-1107 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-04-30Merge "Convert Babel from AJSC2 to Spring Boot 1.5.12"James Forsyth135-1847/+378
2018-04-30Convert Babel from AJSC2 to Spring Boot 1.5.12Lee, Tian (tl5884)135-1847/+378
Change-Id: I2ea10250c3881827b6b274afadf1a8c89683f568 Issue-ID: AAI-1045 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-04-20Remove test data containing proprietary markingmark.j.leonard2-0/+0
Update the test CSAR (compressed artifacts) to delete unnecessary text files containing wording that indicates proprietary content. The test files were based on genuine CSAR content from a test system and the informational files were overlooked. These can be safely removed without breaking the unit tests. Change-Id: I4b20f7c9a5484bf181b687dbdd821fbc4662e5aa Issue-ID: AAI-1086 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-04-18Update groupid to match ONAP conventionLee, Tian (tl5884)1-1/+1
groupid must contain the repository name Change-Id: I33c40339fc24320968ada7355239c3100f6503d7 Issue-ID: AAI-1077 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2018-04-17Re-add maven license pluginLee, Tian (tl5884)2-18/+65
The plugin is now configured to enforce the presence of license headers without overwriting any existing headers. Change-Id: I11c2fc6fed0d893153f1bb8c02d5b9a70e56cdae Issue-ID: AAI-920 Signed-off-by: Lee, Tian (tl5884) <tl5884@att.com>
2018-04-16Add .gitreview file for projectMohammed Naser1-0/+4
Change-Id: I281686783b6aa455c8964c519192b2adcd2c7cb0 Issue-ID: AAI-1038 Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
2018-04-16Drop registry prefix from pom.xmlMohammed Naser1-1/+1
The registry prefix is not needed as when things get published the maven plugin automatically prefixes them when you supply it as part of the maven arguments. Change-Id: I18aa3f62446b3a16924e2d3733e294bb98dd33b4 Issue-ID: CIMAN-154 Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>