summaryrefslogtreecommitdiffstats
path: root/src/test
AgeCommit message (Collapse)AuthorFilesLines
2024-04-17Add model-loader integration tests1.13.6Fiete Ostkamp17-319/+607
- add integration tests that assert the external communication towards other services using Wiremock - remove tests that are asserting getters and setters of objects Issue-ID: AAI-3826 Change-Id: I1f627801869f40cb0eaa61b10148b41bd3b1bdb8 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-11sdc-distribution-client is registered twice in model-loaderFiete Ostkamp2-17/+3
- registration of client was moved into separate config class in last change - however registration in ModelController was not removed Issue-ID: AAI-3824 Change-Id: Icad4211fb245d84fd369c75dd48de7f9a1ec1b20 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-08Model distribution fails with model-loader 1.13.5Fiete Ostkamp8-5/+130
- move sdc-distribution-client instantiation out of the ModelController into a separate class - add integration test with embedded kafka (not fully implemented) Issue-ID: AAI-3818 Change-Id: I0b5dd118d9145372ddf123319b58829d0ef9275a Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-05Make rest-client request timeout in model-loader configurableFiete Ostkamp2-6/+12
- this reduces the test execution time, when test cases run into timouts Issue-ID: AAI-3703 Change-Id: Ie683f55e5ce8d59b10d2788aea6933854dcb7e99 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-03-26Use more dependency injection in model-loaderFiete Ostkamp7-110/+111
- use more dependency injection - make class variables final if possible - simplify mock creation in some tests using @Mock Issue-ID: AAI-3811 Change-Id: I7a7ccba02df78e6fd3bf082c23aac0968137661b Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-03-26Refactor model controller in model-loaderFiete Ostkamp2-11/+6
- rename ModelLoaderService to ModelController since it's a @RestController - use dependency injection for depending classes - make class as immutable as possible Issue-ID: AAI-3806 Change-Id: I3b976f2c4ed3dba43e8696eb9f6e0d7575403963 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-02-28Update model-loader to spring-boot 2.4Fiete Ostkamp25-120/+126
- update spring boot from 2.3.12 to 2.4.13 release - migrate JUnit 4 to JUnit 5 - bump version to 1.13.5 Issue-ID: AAI-3788 Change-Id: I280dd09194dfb4c9810c01933fdd18ea7f3d03a9 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2022-11-16Replace deprecated methods in model-loaderFiete Ostkamp21-35/+62
- junit's assertThat was deprecated in favour of hamcrest - apache-commons now requires a Charset argument Issue-ID: AAI-3604 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I10bf46922e44b3a3adcc14eab6486401a5cf14e1
2022-11-08[SDC-DIST] Upgrade sdc-distro-client to v 2.0.0efiacor6-18/+1
Signed-off-by: efiacor <fiachra.corcoran@est.tech> Issue-ID: DMAAP-1800 Change-Id: Idcfa147dd07a18953972b85f38ec2d46ba3fc009
2022-10-14Fixed AAI ModelLoader fails to connect to aai-babelNiharika Sharma1-0/+15
Issue-ID: AAI-3533 Signed-off-by: Niharika Sharma <niharika.sharma@amdocs.com> Change-Id: I121263b0be39b13109782e0b5db02d3a36650d75
2021-07-20Fix sonar issuesSamuel Liard9-12/+30
Issue-ID: AAI-3362 Signed-off-by: sliard <samuel.liard@gmail.com> Change-Id: I46a41146fb69cf99e4bfaedc4a94807b025832af
2019-08-07Upversion Spring Boot to 2.1.6Lee, Tian (tl5884)4-61/+45
Change-Id: I0e8b3f738777ab106d13fa826f0b40e3392a0f6b Issue-ID: AAI-2539 Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
2019-03-18Refactor GizmoTranslator.translate()mark.j.leonard1-9/+12
Address Sonar violation for the translate() method throwing multiple types of checked Exception. Add a JUnit test case for this. Change-Id: If3c18460895f8193c7b759da4537aad0a2cbf485 Issue-ID: AAI-2264 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-14Handle unexpected HTTP return codesed852m1-0/+45
Issue-ID: AAI-2263 Change-Id: I2510b7a2630918ffe17efbbf813c3e43b0b44d34 Signed-off-by: ed852m <ed.dening@amdocs.com>
2018-12-11Handle non-obfuscated configDaniel Silverthorn1-0/+21
Change-Id: I5c57fcc16a93881af5cdf33947967e0d7ef2dd33 Issue-ID: AAI-1997 Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
2018-11-27Fix Sonar code smellsmark.j.leonard3-116/+75
Reformat to ONAP Java standards. Rename GizmoTranslatorTest.java to Test*.java to match the existing naming conventions. Remove duplicated test scaffolding from this file. Change-Id: Ie8d5f7ea113d3d60d6222f66cd6740df7f9afca0 Issue-ID: AAI-1957 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-11-27Configurable option to load models via Gizmosblimkie1-0/+116
Change-Id: I792e1a0db166ccab84f42a2d1beb92d7a630165b Issue-ID: AAI-1957 Signed-off-by: sblimkie <steven.blimkie@amdocs.com>
2018-09-18Remove unused system properties from unit testsLee, Tian (tl5884)2-4/+0
Change-Id: I5d56bf794c69381d03dda277afe4e110791b660a Issue-ID: AAI-1606 Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
2018-08-17Explicitly initialise the EventCallback classmark.j.leonard1-1/+2
Remove the @Autowired annotation on the Babel Service Client and pass this as a parameter so that Spring will inject the value. This ensures that the EventCallback is not initialised with a null value. Issue-ID: AAI-1501 Change-Id: Ic1a66bf61afec4f707162acf323b83a8a48e8f28 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-06-07Add support for loading VNF Catalog XML filesmark.j.leonard11-20/+863
Issue-ID: AAI-1214 Change-Id: I5d0eb3456916e6f3e5ba3a9b4e828feaff0cde4e Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-06-06Refactor for Sonar smells and code coveragemark.j.leonard37-476/+1025
Various code formatting and style fixes (to address Sonar code smells). Introduce a BabelServiceClientException to replace the use of the base Exception class. Make both the BabelServiceClient class and its Factory class use an interface, to allow for Spring injection (using annotations) and for simplified mocking. Refactor the Notification Publishing by making this the responsibility of the main Service classes and not the deployment manager. Issue-ID: AAI-1207 Change-Id: I6bf8a504fa7b98e9158c9976fd1d88c6c54027c1 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-04-26Convert project from AJSC to Spring Bootmark.j.leonard26-655/+1283
Remove all AJSC configuration and dependencies. Update the pom.xml to use oparent and to depend on Spring Boot. Refactor the main class to introduce a minimal set of Spring annotations. Note that the license text was corrected in this change. Issue-ID: AAI-1039 Change-Id: I16385db3216ec39bfd2881f2278e340ec3795199 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-04-18Remove dependency on org.powermock (PowerMockito)mark.j.leonard12-1274/+304
Replace use of PowerMockito packages with the standard Mockito. Create a BabelServiceClient Factory class to simplify mocking. Remove duplicated "no mock" test classes that were not in fact free of mocking. Add a dummy sample CSAR file for testing of artifact downloads. Change-Id: Ib86f560e514e1efab0e2f732e494a032d555c7c3 Issue-ID: AAI-1049 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-04-03Revisions made to the Model Loader to use BabelBlackwell, Ian (ib733q)30-1801/+2806
Change the Model Loader to use the Babel micro service. Responsibility for transformation of ASDC TOSCA models, the yaml files, has been moved from ASDC and placed into the Bable microservice. Model Loader will forward any CSAR received from ASDC and delegate transformation to Babel. Babel will return the transformed TOSCA models to Model Loader which will then ingest them into the A&AI Inventory. Issue-ID: AAI-987 Change-Id: I99594770b51b00cb7dcc0f30706060ae27cd94c5 Signed-off-by: Blackwell, Ian (ib733q) <IanB@amdocs.com>
2018-03-26Update license date and textSanchez, Gabriel (gs882h)13-130/+91
Update license data and disable license plugin Issue-ID: AAI-867 Change-Id: Ida91a4fc99b9d8ca65b15d6a7be1eaf097d0ae4f Signed-off-by: gabriel.sanchez <gabriel.sanchez@amdocs.com>
2017-12-08Add unit tests to increase the sonar coverageaditya5-136/+1314
Add unit tests to notification and service packages Issue-ID: AAI-501 Change-Id: Ia15090f2f5999d76e2c274d4dc3dca6408ead7db Signed-off-by: Aditya Gajulapalli <ag282f@att.com>
2017-09-13Renaming openecomp to onapArul.Nambi9-22/+40
Issue-ID: AAI-208 Change-Id: I559ba27fba96364c506730e8cbac05a9e6591694 Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
2017-08-21Remove OpenECOMP from license fileDaniel Silverthorn9-36/+45
Change-Id: I76110503a4f74f24bd8ba66c633e1a3cb13fef6a Issue-ID: AAI-86 Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
2017-06-27Allow handling of legact model artifactsBlimkie, Steven (sb787e)23-1635/+1303
Change-Id: I3d4c5e51140d4d05b3fd871d58c2590421c0e9db Signed-off-by: Blimkie, Steven (sb787e) <steven.blimkie@amdocs.com>
2017-05-16[AAI-3] Remove dependency on SDCBlimkie, Steven (sb787e)3-384/+394
Change-Id: Iacdf8fb0dabdfe396f508dec3755ef1a2ea0210e Signed-off-by: Blimkie, Steven (sb787e) <steven.blimkie@amdocs.com>
2017-05-03Implement support for v10 model entities.Fraboni, Gino (gf403a)26-1537/+2154
Change-Id: Id2b42b70d7fe0ada6695ac9632b314f21ace193f Signed-off-by: Fraboni, Gino (gf403a) <gino.fraboni@amdocs.com>
2017-02-10Update Poms and TestsSteve Smokowski6-2108/+21
Change-Id: If95a1f2188e4073725c50b7dbb1e03b1329b7e27 Signed-off-by: Steve Smokowski <ss835w@att.com>
2017-02-09Initial OpenECOMP A&AI Model Loader commitSteve Smokowski17-0/+3672
Change-Id: Iae343fa01ecc701919703fb7d61727555371321d Signed-off-by: Steve Smokowski <ss835w@att.com>