Age | Commit message (Collapse) | Author | Files | Lines |
|
Change the filter-types.properties file: re-implement to use JSON
content. Remove the System Property that defines the location of the
file and add this to the Spring application properties.
Initialise the type-to-model mappings using the key=value pairs from
this JSON content.
Refactor existing Junit tests to remove duplicated resource loading
code.
Change-Id: Idb2e962fe5cae39b70cc8cf16053d0a253f4fac0
Issue-ID: AAI-2121
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
|
|
The keystore password does not need to be decrypted if in clear text
Change-Id: Ia0d8591e1d5ca6890fcb77295de9573921f6652f
Issue-ID: AAI-2072
Signed-off-by: Serban Popescu <serban.popescu@amdocs.com>
|
|
Issue-ID: AAI-2032
Change-Id: I224d1b03f7187f7caac8220154fce3ee1eaffa1a
Signed-off-by: jimmy <jf2512@att.com>
|
|
Change-Id: I69d083b8e1cf574b15dc20b26f2925004e22620a
Issue-ID: AAI-2012
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
|
|
Protect against a Null Pointer Exception when any member of an Instance
Group cannot be mapped to an output XML Resource or Widget.
Change-Id: Icf099686681b8dffb86e9f003bd92ace6e8679b1
Issue-ID: AAI-1991
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
|
|
Fix a bug that masked differences between expected and actual XML files.
This affects JUnit tests only.
Change-Id: I72c779c008baa9fba52c09a0751cdd25bdc0e5cc
Issue-ID: AAI-1991
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
|
|
Simplify the JUnit testing for the YAML file extractor and compare the
actual and expected files using Strings (with line endings normalized).
Change-Id: Ie78d3506511b4a1d5333c1b0b95a676bbc2ab5e2
Issue-ID: AAI-1991
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
|
|
Change-Id: I186683ff734747e64a561391ec4314bc716a0cd3
Issue-ID: AAI-1983
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
|
|
Create an InstanceGroup XML model for groups of the Service topology
template in the case where there is no Resource model generated.
Add a test CSAR file for a Service Proxy (an unsupported type).
Assert that the Service is associated with the instance-group Models.
Change-Id: If76bf7a1cfb960bc8692f1e136ee85176725915e
Issue-ID: AAI-1963
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
|
|
Remedy some Java formatting issues and also simplify Providing Service
processing code.
Change-Id: Ifddc045e6a1fd1280f63065d4f3b6df83251800c
Issue-ID: AAI-1884
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
|
|
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>
|
|
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>
|
|
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>
|
|
Non-functional changes addressing whitespace inconsistencies.
Change-Id: Ife84f6b04bf8ce0204409d2f3708ab85b3a3caff
Issue-ID: AAI-1884
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
|
|
To fix NexusIQ vunerabilities
Change-Id: I2ce3dd403292297e1a86c6a8df853d72ad42ec7d
Issue-ID: AAI-1897
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
|
|
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>
|
|
Change-Id: I53863aabd02050606605f2e905186b01232a77c9
Issue-ID: AAI-1771
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
|
|
Change-Id: I14455a57732ad27f3934628587f8b26c7ababa4c
Issue-ID: AAI-1848
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
|
|
Change-Id: Id1036eed42908e80bcf145d5864b5bd530eb84ad
Issue-ID: AAI-1814
Signed-off-by: sblimkie <steven.blimkie@amdocs.com>
|
|
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>
|
|
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>
|
|
Change-Id: I90ed0b13bb83ab9b03d873ba03fe5521eae823d4
Issue-ID: AAI-1734
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
|
|
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>
|
|
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>
|
|
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>
|
|
Change-Id: I1d7daf205735ebb810fdb3e2cda92c982c464f49
Issue-ID: AAI-1686
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
|
|
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>
|
|
- 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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
New tests for extracting software versions.
Change-Id: I26a9d654d03154a1d026741e623c8f953946a5f4
Issue-ID: AAI-1250
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
|
|
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>
|
|
|
|
|
|
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>
|
|
|
|
Issue-ID: AAI-1449
Change-Id: I862fd89a4f9aa9525c5475997ca8c360c6cb39a7
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
|
|
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>
|
|
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>
|
|
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>
|
|
Issue-ID: AAI-1449
Change-Id: I5cda30518c34d52e49bb61055e29aaf839e090c6
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
|
|
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>
|
|
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>
|
|
Change-Id: I4138d1d60fe234949264f3c2d2e2156681e9075c
Issue-ID: AAI-1448
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
|
|
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>
|
|
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>
|
|
Issue-ID: AAI-1444
Change-Id: If25a2ea001fe7b43dbd14eed008a14e5dd8b3579
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
|
|
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>
|