summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2024-09-04Enable prometheus metrics in model-loader1.14.2Fiete Ostkamp4-26/+51
- add micrometer-registry-prometheus dependency - update vulnerable dependencies Issue-ID: AAI-3983 Change-Id: I9377ee4a1d1f77ca2811d3b954814374a2b2774e Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-05-27Release 1.14.1 container imageFiete Ostkamp1-0/+7
- add spring-boot actuator to allow liveness probes - close distribution-client upon application shutdown - use return values instead of updates to parameters that are passed into methods - update aai-parent from 2.1.0 to 3.3.3 - remove jersey, aai-rest-client, org.json, jetty-security and jline dependencies Issue-ID: AAI-3861 Change-Id: Ie41e642a8095ab5dc441bff77c6481dc71f52b93 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-05-21Add spring-boot actuator to model-loader1.14.1Fiete Ostkamp4-9/+53
- add actuator that enables liveness probes - allow passing in jvm args to the running process (for debugging or profiling) - bump version to 1.14.1 Issue-ID: AAI-3852 Change-Id: Id4b8c5d5402a8eeaf1630a3cdcdfc68471a26a94 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-05-16Stop sdc-distribution-client upon service shutdownFiete Ostkamp3-8/+80
- restore old behaviour by calling distributionClient.stop() - downgrade sdc-distribution-client version to 2.0.0 Issue-ID: AAI-3848 Change-Id: Id252f4d8e387a916dcbdebd5110b46432858ee6b Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-30Return List<Artifact> in ArtifactDownloadManagerFiete Ostkamp10-258/+137
- return processed artifacts as List<Artifact> instead of updating the parameters in ArtifactDownloadManager - use exceptions to signal exceptional behaviour instead of boolean success = false; Issue-ID: AAI-3841 Change-Id: Ie99c5da1f553bebd70665914fa6be9c460fa412c Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-29Refactor babel-related code to not update parameter valuesFiete Ostkamp14-163/+178
- return processed Artifact's as List<Artifact> in BabelArtifactService and ArtifactDownloadManager Issue-ID: AAI-3840 Change-Id: Ibc78517e87ebf1bfc9c6336555c96e6d1506cf5c Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-26Upgrade spring-boot to 2.7.X in model-loaderFiete Ostkamp2-8/+8
- upgrade spring-boot from 2.4.13 to 2.7.18 Issue-ID: AAI-3838 Change-Id: Ia43df48e049ae1e3d05aaa0ed85c245db7df004c Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-26Update oparent in model-loaderFiete Ostkamp3-19/+7
- update oparent from 2.1.0 to latest 3.3.3 - remove: - org.json - jetty-security - jline dependencies as they are not used anywhere Issue-ID: AAI-3837 Change-Id: Id39dac0dfbb3a56568f43816035f06c29148d15c Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-26Remove jersey and aai-rest-client dependencies from model-loaderFiete Ostkamp7-97/+33
- aai-rest-client has been fully replaced with RestTemplate - use spring provided imports in ModelController Issue-ID: AAI-3836 Change-Id: If2471c8a68c273823bef138626534df1894a91d7 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-26Create 1.14.0 container release of model-loaderFiete Ostkamp1-0/+7
- replace AaiRestClient with spring boot's RestTemplate for tracing support Issue-ID: AAI-3835 Change-Id: I22b95b045cb5fd20d1dd78f438758a8279c556c2 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-24Improve error logging1.14.0Fiete Ostkamp3-6/+18
- do not log csar payload to babel on info level - log exception when PUT to aai-resources fails Issue-ID: AAI-3834 Change-Id: I524315465c79165755fb9b8062f29f4f10d876ab Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-22Use RestTemplate in AaiRestClientFiete Ostkamp29-437/+836
- brings tracing support for the requests towards aai-resources - leverage automatic object mapping done by Jackson in the background - add model related entities Issue-ID: AAI-3833 Change-Id: I4f6ec65c80a6dcc1e1e3fa10786a119996c3bc79 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-18Update babel dependency in model-loaderFiete Ostkamp2-17/+3
Issue-ID: AAI-3832 Change-Id: I1cd1588dac16401c7f5064398ff7b8de71bffe30 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-18Refactor Babel related code in model-loaderFiete Ostkamp17-464/+350
- introduce BabelArtifactService - simplify babel http client by removing factory and https support Issue-ID: AAI-3827 Change-Id: I5c004d342687c8aaa8f26927342752d472f05da3 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-17Release model-loader 1.13.6Fiete Ostkamp1-0/+7
- release should fix model distribution Issue-ID: AAI-3825 Change-Id: I2a2daedeaa5c604a8175e6a673a723a25dd8ed1a Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-04-17Add model-loader integration tests1.13.6Fiete Ostkamp25-509/+696
- 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 Ostkamp3-80/+4
- 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 Ostkamp11-6/+242
- 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 Ostkamp5-19/+34
- 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 Ostkamp19-234/+182
- 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-26Publish 1.13.5 container releaseFiete Ostkamp3-2/+9
- add tracing - update spring boot from 2.1 to 2.4 - update docker base image Issue-ID: AAI-3809 Change-Id: If5e56ebded9592c74f67808ca3f059b0e16a20be Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-03-26Publish 1.13.5 maven releaseFiete Ostkamp1-0/+4
- add tracing - update spring boot from 2.1 to 2.4 - update docker base image Issue-ID: AAI-3808 Change-Id: I7a7f3314cd3900c98300fed71dda1399eb91bfa2 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-03-26Refactor model controller in model-loaderFiete Ostkamp4-52/+89
- 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-03-07Update sdc-distribution-client and vulnerable dependencies in model-loaderFiete Ostkamp1-2/+4
- update sdc-distribution-client from 2.0.0 to 2.1.1 - update gson from 2.8.9 to 2.10.1 - update json-sanitizer from 1.2.0 to 1.2.3 Issue-ID: AAI-3804 Change-Id: Id5666f38fac054f71fc003fe80867c928f9e0937 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-02-28Add tracing to model-loaderFiete Ostkamp2-0/+28
Issue-ID: AAI-3789 Change-Id: I7ded82e560e07da74883e6a5d7cc61835470d55c Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-02-28Update model-loader to spring-boot 2.4Fiete Ostkamp28-134/+148
- 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>
2024-02-22Update aai-common-alpine base image in model-loaderFiete Ostkamp3-1/+2
- update aai-common-alpine base image from 1.8.1 to 1.13.2 - rename README file Issue-ID: AAI-3785 Change-Id: I0343c5ffc4dc3b00fd95cdd1a18f4d9ca663f832 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-01-12[AAI] Promote Fiete Ostkamp and Nandkishor Patke to AAI Contributorswr148d1-0/+16
Issue-ID: AAI-3729 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I022964c0e538fe93686a43e0ed016bbf7399e832
2022-11-16Replace deprecated methods in model-loaderFiete Ostkamp23-37/+66
- 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-16Merge "Update model-loader dependencies"William Reehil1-8/+8
2022-11-16Merge "[AAI-MODEL] Release image 1.12.0"William Reehil1-0/+7
2022-11-15[AAI-MODEL] Release mvn 1.12.0efiacor1-0/+4
Signed-off-by: efiacor <fiachra.corcoran@est.tech> Change-Id: Ib445c1cf40b8e6ac66d661c4b9c4ca92f6c93509 Issue-ID: DMAAP-1800
2022-11-15Update model-loader dependenciesFiete Ostkamp1-8/+8
- update dependencies - use https urls for repositories Issue-ID: AAI-3601 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: If5e3de6595112e7337a3df732d444602fe64c2f5
2022-11-15[AAI-MODEL] Release image 1.12.0efiacor1-0/+7
Signed-off-by: efiacor <fiachra.corcoran@est.tech> Change-Id: I855cb9583aadc7ea178ccffd4f647558165bec9f Issue-ID: DMAAP-1800
2022-11-08[SDC-DIST] Upgrade sdc-distro-client to v 2.0.0efiacor12-65/+58
Signed-off-by: efiacor <fiachra.corcoran@est.tech> Issue-ID: DMAAP-1800 Change-Id: Idcfa147dd07a18953972b85f38ec2d46ba3fc009
2022-10-20[AAI] Release model-loader docker artifact 1.11.0 for Kohnkohnwr148d1-0/+7
Issue-ID: AAI-3537 Signed-off-by: wr148d <wr148d@att.com> Change-Id: Ib6d52728c9ff6dfa2ec995cf65c1a52abf3a2c9f
2022-10-20[AAI] Release model-loader maven artifact 1.11.0 for Kohnwr148d1-0/+4
Issue-ID: AAI-3537 Signed-off-by: wr148d <wr148d@att.com> Change-Id: Ic78a0c7f1592eaa592943bf5c1f22079d8a70f98
2022-10-20[AAI] Upversion model-loader to 1.11.0 for Kohnwr148d2-4/+4
Issue-ID: AAI-3537 Signed-off-by: wr148d <wr148d@att.com> Change-Id: Iea45b1475fd768e442ab802b44c17d6a0a5cb8a2
2022-10-14Fixed AAI ModelLoader fails to connect to aai-babelNiharika Sharma5-169/+205
Issue-ID: AAI-3533 Signed-off-by: Niharika Sharma <niharika.sharma@amdocs.com> Change-Id: I121263b0be39b13109782e0b5db02d3a36650d75
2022-08-29[AAI] Remove Robby Maharajh & Harish Kajur as committerswr148d1-10/+6
Issue-ID: AAI-3515 Signed-off-by: wr148d <wr148d@att.com> Change-Id: Ifee73f730a3010941d9c3728ad863814a19f8f5b
2022-03-21[AAI] Release model-loader 1.9.4 docker imagewr148d1-0/+7
Issue-ID: AAI-3435 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I8ddaee69f2bbf6e2476d06258d04c075ec5b0ef6
2022-03-21[AAI] Release model-loader 1.9.4 maven artifactwr148d1-0/+4
Issue-ID: AAI-3435 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I089fa00b4741ad04d701e9a21928a104114f6aad
2022-03-21[AAI] Upversion model-loader to 1.9.4 and make it to use latest babelwr148d2-3/+3
Issue-ID: AAI-3435 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I8c8a057984c01e814f94756bfd7fb79d785ce25d
2022-03-15[AAI] Release model-loader docker artifact 1.9.3wr148d1-0/+7
Issue-ID: AAI-3435 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I6290077c1a801112f45642ea99af4327461100d2
2022-03-15[AAI] Release model-loader maven artifact 1.9.3wr148d1-0/+4
Issue-ID: AAI-3435 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I144e36cacd22daf4d721decdd4d244025629ef6a
2022-03-15[AAI] Update model-loader to use newer packageswr148d2-4/+4
Issue-ID: AAI-3435 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I6395a38ce013b0573af92aa09a874be1a8b19675
2022-02-23[AAI] Release the 1.9.2 docker image for model loaderwr148d1-0/+7
Issue-ID: AAI-3435 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I2cf9acc212eab0651072eb93fe71c99dfa08a289
2022-02-22[AAI] Release 1.9.2 maven artifactwr148d1-0/+4
Issue-ID: AAI-3435 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I331527c686d5418af9ea3c0b2ea8d1e4a2ed2d40
2022-02-22[AAI] Upversion model-loader to 1.9.2 and to use later babelwr148d2-4/+4
Issue-ID: AAI-3435 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I3c84c57634963d4315e51e572e9dc4fcaecc197d
2021-09-20[AAI] Releasing model-loader 1.9.1 docker artifactistanbulwr148d1-0/+7
Issue-ID: AAI-3361 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I7065f263928a607cbea383eba0b636adcc94824a