aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/resources
AgeCommit message (Collapse)AuthorFilesLines
2024-05-24[AAI] Update aai-schema version to 1.12.4 in babelFiete Ostkamp35-35/+35
- AAI schema addition for 3GPP RAN Network Slice Subnet - and Slice-Profile Attributes & FeasibilityCheckJob - Bump aai-schema pom version to 1.12.4 - Update aai-schema default version to v29 Issue-ID: AAI-3843 Change-Id: I848d2b0ebf914fba6f9c37fbd77d11c7606029ab Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-18Add tracing to babelFiete Ostkamp1-0/+1
- add cloud-sleuth tracing dependency Issue-ID: AAI-3829 Change-Id: I0eee4b79359e0cea679e4a044863c4f4b91e3425 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2023-10-30[AAI] Upversion to 1.12.2 to include v28nandkishorpatke36-38/+40
Issue-ID: AAI-3663 Change-Id: Icf98140444866dce9ca0dc0cffb50e87a0a736b0 Signed-off-by: nandkishorpatke <nandkishor-laxman.patke@t-systems.com>
2022-08-16[AAI] Upversion to 1.9.6 to include v27wr148d34-34/+34
Issue-ID: AAI-3489 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I5ee90a52e6d3e8752b9ca254084686d146ade420
2022-02-22[AAI] Update babel to use the new v26 schema and upversion to 1.9.3wr148d34-34/+34
Issue-ID: AAI-3435 Change-Id: I280aa7e646329999d066a88a33fa19c8e714d599 Signed-off-by: wr148d <wr148d@att.com>
2021-08-23[AAI] Updates for v24 upgrade on Babelwr148d36-36/+36
Issue-ID: AAI-3361 Signed-off-by: wr148d <wr148d@att.com> Change-Id: Id4891b769d07daa4102b696c9ecc80192ce2359f
2021-03-12Resolve files with licensing issues in BabelPolavarapu, Chaitanya (cp8128)4-1/+0
Issue-ID: AAI-3301 Change-Id: Ia376802e449b0bf013dfd3a3e9843448234afef1 Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
2021-02-23Updated pom to remove distribution-management section and corrected aai base ↵Polavarapu, Chaitanya (cp8128)63-66/+6326
image version Issue-ID: AAI-2996 Change-Id: I28da9ccf5618e180e04e3f29b0440bab5e3ffc3f Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
2020-08-28[aai-babel] Add support for sndc props parsingefiacor2-4/+16
Signed-off-by: efiacor <fiachra.corcoran@est.tech> Issue-ID: AAI-3121 Change-Id: I9ed925e7e95d73b30942df895d19fba0c36500f0
2020-08-06Add 'category' of service model to Babel artifactdhebeha18-20/+22
Issue-ID: AAI-3017 Signed-off-by: dhebeha <dhebeha.mj71@wipro.com> Change-Id: I079d3a1ea8c681a1c6d854adf80776ce934c49e2
2020-06-23Extend service modelwsliwka3-3/+5
extend service model by adding orchestrationType Issue-ID: AAI-2594 Signed-off-by: wsliwka <wojciech.sliwka@nokia.com> Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> Change-Id: I34de40005b6ddad0cd71ccb20fae94f7f45c6257
2019-11-21Update schema-service dep to 1.6.0sblimkie18-18/+18
Change-Id: Idfabac878db11ccde4859ee04bdf45b560460a88 Signed-off-by: sblimkie <steven.blimkie@amdocs.com> Issue-ID: AAI-2607
2019-04-11Updated to use dublin schema versionPolavarapu, Chaitanya (cp8128)1-0/+1
Using 1.0.2 schema-service version Fixed the junit test failure for default service version Issue-ID: AAI-2338 Change-Id: Ie0ddda41f6895ff0ce8e97ad065fb935462e643a Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
2019-04-10This enhancement will enable Babel to process artifacts of version n.nPolavarapu, Chaitanya (cp8128)17-17/+17
Issue-ID: AAI-2338 Change-Id: I829ba56aa09ac1d98a8c9d27fabb85d95d571534 Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
2019-03-28Change generic-vnf delete flag to truemark.j.leonard1-1/+1
Alter the test values for the generic-vnf Widget Type to match the actual configured values used in historic deployments of the Babel Service. The test values will then be aligned to the actual run-time values thus avoiding any confusion caused by the disparity. Issue-ID: AAI-2292 Change-Id: Ia8bef2e31d62027c4edb636a78c8cde93da6638b Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-28Remove all references to artifactgenerator configmark.j.leonard1-0/+0
Delete the artifact-generator.properties file. Remove all related functionality from the code. Change-Id: I652d99b6424bb60af5820f5afb97ef139e3f9511 Issue-ID: AAI-2284 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-26Allow UUID definitions in the mappings JSONmark.j.leonard2-288/+54
Add support for reading the Widget invariant and version UUIDs from the TOSCA mappings JSON. In this commit the artifact-generator.properties is also read and used to provide default values. This step prevents any existing deployments (e.g. automated test integration) from failing. The redundant properties file will be deprecated in a future commit, only when the JSON configuration has been updated. Also remove two unused Java files to help with coverage stats. Change-Id: Idc82e28092a2b028214225c7974db411c9f8a173 Issue-ID: AAI-2284 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-11Refactor auth classes and add testsmark.j.leonard1-0/+12
Add new tests to give better coverage of the authorization classes. Refactor the core class for readability. Change-Id: I2be467d8f4492249a0c29be8b108bb2bce2818dd Issue-ID: AAI-2229 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-11Additional JUnit tests for code coveragemark.j.leonard1-0/+0
Improve code coverage to address Sonar code smells. Include a dummy keystore file to allow the Spring Boot Application to start up without error. Change-Id: Ifab33a67e5d051baacfad91d3f317a8fb8b0a669 Issue-ID: AAI-2212 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-05Move Widget attribute data to the mappings JSONmark.j.leonard3-0/+93
Extend the TOSCA mappings JSON content by adding a set of of Widget types defining the type name and data-delete flag. In this change the set of supported types (defined by an enum) remains. However the intention is to replace this in a future commit. The hierarchy of annotated Widget types is replaced by this new configuration, which is accessed from the Widget class. Refactoring has been kept to a minimum to simplify the code review process but further improvements can now be made. Ideally the set of supported Widgets can be extended through configuration changes only. Change-Id: I005cfe6976778b14f14c3ad06d8acf3745c8dd8f Issue-ID: AAI-2212 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-02-05Replace Resource sub-classes with configurationmark.j.leonard1-19/+51
Delete the sub-classes of the Resource (internal Model class) and replace the annotated properties of these classes with TOSCA-to-Model mappping data loaded from the JSON configuration. Change-Id: I56d5d9d4893be45eb42ae65099ea9abe5f4409b9 Issue-ID: AAI-2121 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-01-30Load type mappings from a group configuration filemark.j.leonard2-1/+21
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>
2018-11-27Process Service-level Instance Groupsmark.j.leonard4-0/+133
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>
2018-11-09Add support for ResourceInstanceGroupmark.j.leonard1-1/+1
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.leonard1-0/+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.leonard5-0/+184
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-09-10Add support for InstanceGroup resource modelsmark.j.leonard2-1/+5
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-06Refactor Junit test code to remove duplicationmark.j.leonard3-5/+1
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 Lee8-214/+211
2018-09-06Replace test UUIDs with dummy stringsmark.j.leonard8-214/+211
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-0/+1
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.leonard11-13/+4674
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.leonard4-2/+205
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-0/+0
Change-Id: I4138d1d60fe234949264f3c2d2e2156681e9075c Issue-ID: AAI-1448 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-08-06Add support for the CR Widgetmark.j.leonard6-8/+11
Issue-ID: AAI-1444 Change-Id: If25a2ea001fe7b43dbd14eed008a14e5dd8b3579 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-06-28Support Port Mirroring Configuration modelLee, Tian (tl5884)4-0/+86
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.leonard2-0/+4
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-26Fix remaining Sonar code smellsmark.j.leonard1-1/+1
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-04-30Merge "Convert Babel from AJSC2 to Spring Boot 1.5.12"James Forsyth2-1/+1
2018-04-30Convert Babel from AJSC2 to Spring Boot 1.5.12Lee, Tian (tl5884)2-1/+1
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-03-28Incorporate the ECOMP SDC Artefact Generator codeLeonard, Mark (ml401d)20-53/+2729
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 Lawrance18-0/+1313
Change-Id: I3738ebe15eadbbd6d16e24e374c6e40c535b425d Issue-ID: AAI-46 Signed-off-by: Edwin Lawrance <Edwin.Lawrance@amdocs.com>