summaryrefslogtreecommitdiffstats
path: root/prh-app-server/src/main
AgeCommit message (Collapse)AuthorFilesLines
2019-10-16Fix El-alto staging jobJoanna Jeremicz3-5/+49
- Clean up scheduledTasksRunner after previous integration tests - Prevent race condition Change-Id: I2e112be27d736406b30ccfbfe0f762c164becb6c Issue-ID: DCAEGEN2-1853 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
2019-10-10Add baseUrl supportJoanna Jeremicz1-0/+1
Add support for baseUrl usage. It is needed for handling objects other than pnfs from the inventory. BaseUrl is necessary for fixing the existing bug, where pnf path is used to get service-instance from AAI. Change-Id: I6ab95f54316ae4d57867e1bc29fefcf6ff698ee3 Issue-ID: INT-1181 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
2019-07-02fix CbsConfiguration update buggrabinsk1-1/+2
'CbsConfiguration' bean is statefull. The singleton instance lifespan should match application lifespan. The problem was bootstrap context (and all it's beans) are destroyed during bootstrap context refresh. Change-Id: Ib02cd49c37935422d4ca861afee55f621015146e Issue-ID: DCAEGEN2-1647 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-06-28fix PRH dmaap content type configuration after breaking changes introduced ↵grabinsk8-71/+16
to SDK and mix of minor code cleanups Change-Id: I568f49b8b6635f23b2089a4355eb78451102c2b1 Issue-ID: DCAEGEN2-1647 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-06-25Merge "Adding logs in BBSActionTaskImpl"Piotr Wielebski1-2/+2
2019-06-25Adding logs in BBSActionTaskImplMarcin Migdal1-2/+2
Change-Id: I3a21021427eb75964c88542a68838ccb443c60e5 Issue-ID: DCAEGEN2-1636 Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
2019-06-21Skip putting non-primitive values from CBS config into PRH app environmentgrabinsk1-17/+15
Non-primitive properties are currently not used by app and cause serialization failure on 'actuator/env' endpoint. The serialization issue is caused by fact, that swagger enforces switch to jackson and there are no proper gson's JsonObject serializers registered. Change-Id: Id5cfb743282aeec7db88434f06815ae5cc9057a6 Issue-ID: DCAEGEN2-1544 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-06-17Merge "Do not start scheduling until application starts"Piotr Wielebski1-2/+7
2019-06-17Merge "cbs config refresh scheduler bugfix"Piotr Wielebski1-1/+1
2019-06-17Logical links creation bugJoanna Jeremicz1-1/+1
Added missing slash Change-Id: I63104d7d0919828ffb67dc437ee8c1d1299916b4 Issue-ID: DCAEGEN2-1611 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
2019-06-17cbs config refresh scheduler bugfixgrabinsk1-1/+1
(inappropriate transient usage where volatile expected) Change-Id: I5208ff889e55530276e4605e591ff6b681d1e096 Issue-ID: DCAEGEN2-1544 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-06-14Do not start scheduling until application startsgrabinsk1-2/+7
(moving task schedule starting logic from bean's post construct to ApplicationStartedEvent listener) Change-Id: Ia09ecbf5efda9b8f838053359bba2cfe80ce095b Issue-ID: DCAEGEN2-1544 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-06-14fetching configuration from CBS at application bootstrapgrabinsk18-141/+546
Change-Id: Ibaa56c38b87fc8b8cfa858f74b7bc201bd507b37 Issue-ID: DCAEGEN2-1544 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-06-13Logical links creation bugJoanna Jeremicz1-38/+105
Fixed issues: Second PNF registration with same attachment point doesn't send output to PNF_READ Second PNF registration with different attachmentPoint doesn't replace previous Logical Link Change-Id: I238a8aa6d3f360da3451c720dc5cb1fa2e1ebd75 Issue-ID: DCAEGEN2-1611 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
2019-06-12Align to new SDK versionJoanna Jeremicz2-4/+3
Change-Id: I06974c7f890bfa1cb875d776efa8b3a9f5b0a711 Issue-ID: DCAEGEN2-1613 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
2019-06-10Merge "exposing actuator/loggers endpoint for ad-hoc logging level management"Piotr Wielebski1-0/+3
2019-06-10handle 404 from aaigrabinsk1-4/+10
(parsing response body from aai should not be attempted if there is no 2xx response) Change-Id: Iedc9daa65895600d826ac808784b3c6803a6dab4 Issue-ID: DCAEGEN2-1601 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-06-10exposing actuator/loggers endpoint for ad-hoc logging level managementgrabinsk1-0/+3
Change-Id: Ia19388a1a6e9a46273a59d0d9930f054d271f6f9 Issue-ID: DCAEGEN2-1609 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-06-10Merge "fix logging"Piotr Wielebski1-12/+3
2019-06-05fix loggingmicdzied1-12/+3
Change-Id: Iebc973500f880f6b5c248b5e26740568ac993b0b Issue-ID: DCAEGEN2-1601 Signed-off-by: micdzied <michal.1.dziedzic@nokia.com>
2019-06-04Fix attachment-point issuepwielebs1-1/+1
Change-Id: Iba52e54e09774a54d23c410c0081aae0643e76c3 Issue-ID: DCAEGEN2-1596 Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
2019-06-03cleanups around CbsClientConfiguration resolvinggrabinsk7-103/+115
Change-Id: Id3c02de034fbf396e81dab39c4442880b346e70d Issue-ID: DCAEGEN2-1544 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-06-03Merge "Adjust PRH with SDK"Piotr Wielebski2-18/+19
2019-06-03Adjust PRH with SDKkurczews2-18/+19
Change-Id: If1f230047bf635d5288482b275d05c484a4ecaec Issue-ID: DCAEGEN2-1521 Signed-off-by: kurczews <krzysztof.kurczewski@nokia.com>
2019-05-31Add test for ScheduleController;grabinsk2-16/+7
moving web related logic out from ScheduleTasksRunner Change-Id: I57c0311509ca94b639e3dc9978fbe602aec1f0c4 Issue-ID: DCAEGEN2-1544 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-05-31Merge "replace local copy of 'MdcVariables' with one from SDK"Piotr Wielebski2-8/+10
2019-05-31Adding 'dev' profile with default spring's logback console appender to allow ↵grabinsk2-0/+19
starting app from IDE Change-Id: If59c8678f0fb323b3201eb4f52926e2f2baa3e67 Issue-ID: DCAEGEN2-1544 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-05-31replace local copy of 'MdcVariables' with one from SDKgrabinsk2-8/+10
Change-Id: I9d13941ca9c4d70b5c4d9c354fa0ba09c3e5e6fa Issue-ID: DCAEGEN2-1544 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-05-31Merge "Fix Sonar issues"Piotr Jaszczyk5-28/+27
2019-05-30Fix Sonar issuespwielebs5-28/+27
Change-Id: If7134bf3b5aabdba6d057562ae863b40412e2d6b Issue-ID: DCAEGEN2-1501 Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
2019-05-30Configs cleanupgrabinsk4-31/+22
Adding test for AppInfoController Change-Id: Ib793cf20a17bcca56f5fe2162048c1b95409da01 Issue-ID: DCAEGEN2-1544 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-05-29SSL key loading for Dmaap clientgrabinsk12-144/+93
Change-Id: I65b3d0bcd6735af655c9243f20f3596ce8f03aca Issue-ID: DCAEGEN2-1501 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-05-28Refactor due to AAI model changespwielebs2-17/+6
Change-Id: I1684cb798b40c5d58b531549f2596582f14bc901 Issue-ID: DCAEGEN2-1533 Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
2019-05-23Align PRH to SDKMarcin Migdal2-7/+4
Change-Id: Ia4fb83ea0ea9d85ed90a0c29872eb8aac42a2c22 Issue-ID: DCAEGEN2-1527 Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
2019-05-23Fix sending PNF_READY notification after update to El Alto SDK version usagegrabinsk1-5/+3
Change-Id: I06c1ae2b2a9831a4c31e09fafbe1500c10714caa Issue-ID: DCAEGEN2-1501 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-05-22Merge "Remove deprecated method from PRH"Piotr Jaszczyk4-80/+18
2019-05-22Remove deprecated method from PRHpwielebs4-80/+18
Change-Id: Ie59ca61840c5119cc1e2a745c4d54263f77fb27e Issue-ID: DCAEGEN2-1501 Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
2019-05-22replace generated model classes with immutablesgrabinsk2-4/+8
Change-Id: I5a1330e356522d2e315f7e243a2e65b90e4f6ddd Issue-ID: DCAEGEN2-1391 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-05-22Align PRH to El Alto SDKpwielebs14-229/+203
Change-Id: I65c445d76092e11084fb60c68740e1321b35708c Issue-ID: DCAEGEN2-1501 Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
2019-04-24Merge "Fix logging"1.2.2Piotr Wielebski1-9/+4
2019-04-24Fix loggingMarcin Migdal1-9/+4
Change-Id: I9dd88e87385f828ec4301578fe34fd45d50dab58 Issue-ID: DCAEGEN2-1361 Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
2019-04-12Merge "Fix consulHost"Piotr Wielebski1-1/+1
2019-04-12Fix consulHostMarcin Migdal1-1/+1
Change-Id: I7a94b672367a0deb92fbf88472ee2e8ee8505ca3 Issue-ID: DCAEGEN2-1361 Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
2019-04-11read topic_url via Data streamspwielebs5-75/+30
Change-Id: Ibabbeb3fa9b327dafbbb81e58980f8978a509d7e Issue-ID: DCAEGEN2-1360 Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
2019-04-10use CBS SDK in PRH (II)pwielebs12-434/+41
-remove unused classes -fix junit tests -use cbs -patch project version updated Change-Id: I5fb63408b33b07632eab579d028070eb3a025865 Issue-ID: DCAEGEN2-1360 Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
2019-04-08use CBS SDK in PRHmicdzied10-205/+145
-remove unused classes -fix junit tests -use cbs Change-Id: Ibc5841b713ad00522dd78a52b7cb7efa871cb8b4 Issue-ID: DCAEGEN2-1360 Signed-off-by: micdzied <michal.1.dziedzic@nokia.com>
2019-04-05Add pnfUrl fieldgrabinsk2-0/+5
Due to changes in the aai client configuration json old parameters aaiHost, aaiProtocol, aaiPort, aaiBasePath, aaiPnfPath will be replaced by pnfUrl Change-Id: Ifd8841f8a80d743a95e3b0ea7d868eda923febca Issue-ID: DCAEGEN2-1398 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
2019-04-03Align PRH to newest SDKMarcin Migdal1-4/+5
Change-Id: I961c83cd230b521ee13c7146d7f0e98d805e6d47 Issue-ID: DCAEGEN2-1361 Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
2019-03-29PNF re-registration is supportedandrzejszukuc17-257/+675
Change-Id: I3a70c610e075bcfbab8cee62ae229ce06cfc5e5d Signed-off-by: andrzejszukuc <andrzej.szukuc@nokia.com> Issue-ID: DCAEGEN2-1059
2019-03-28Configuration fix in BBS taskkurczews1-9/+17
Issue-ID: DCAEGEN2-1373 Change-Id: I739ffaef68917f420d9633e3ac68d6833a4db6d2 Signed-off-by: kurczews <krzysztof.kurczewski@nokia.com>