summaryrefslogtreecommitdiffstats
path: root/cps-ncmp-service/src
AgeCommit message (Collapse)AuthorFilesLines
2022-08-29Performance Improvement: Use hazelcast blocking queueToineSiebelink13-292/+515
- Introducing hazelcast for queue and progress map - process batch of 100 at the time - decreased module sync watchdog sleeptime to 5 seconds - separate module sync tasks in new class and some other async preparations and easier testing - tests for batching in module sync watchdog - remove qualifiers annotation (support) where no longer needed Issue-ID: CPS-1210 Issue-ID: CPS-1126 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: I0a7d3755bf774e27c5688741bddb01f427d4a8a7
2022-08-25Merge "Performance Improvement: Batch Update DataNodes"Sourabh Sourabh2-3/+35
2022-08-25Performance Improvement: Batch Update DataNodeslukegleeson2-3/+35
Implemented methods to perform a batch operation on updating datanodes Refactored replace data node(s) tree methods to update data node(s) and descendants Issue-ID: CPS-1203 Signed-off-by: lukegleeson <luke.gleeson@est.tech> Change-Id: I365d657422b19c9ce384110c9a23d041eaed06f4
2022-08-23Performance Improvement: LCM Eventsmpriyank2-8/+21
- Changed scope of method responsible for creating and publishing the LCM events. - Use a dedicated thread pool for publishing the LCM events. Issue-ID: CPS-1223 Change-Id: Ib46e3c1ff8d80f724ad9db30fca6e8125ca0775a Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2022-08-23Move Advised CM Handles Log to debug levellukegleeson1-1/+1
Issue-ID: CPS-1218 Signed-off-by: lukegleeson <luke.gleeson@est.tech> Change-Id: I77a799cfb86fe98e526519c7555bbbd85d289f04
2022-08-22Merge "Distributed datastore solution for Data Sync Watchdog"Toine Siebelink11-133/+156
2022-08-22Distributed datastore solution for Data Sync Watchdogkissand11-133/+156
- update lombok config to handle Qualifier annotation - update Semaphore config to use ConcurrentMap - update SyncUtils to return a list of cm handles - update DataSyncWatchdog and ModuleSyncWatchdog with Qualifier - update DataSyncWatchdog to handle a list of cm handles - Use get with xpath to check cm handle state Issue-ID: CPS-1015 Change-Id: Icb39bd29f89e0020d49a1f8960476ffe81b12362 Signed-off-by: kissand <andras.zoltan.kiss@est.tech>
2022-08-22Merge "Fix: CM Handles for only hasAllModules Query"Sourabh Sourabh2-2/+2
2022-08-22Fix: CM Handles for only hasAllModules Querylukegleeson2-2/+2
hasAllModules was returning no CMHandles when queried by itself, only when paired with another query condition e.g. hasAllProperties This fix means endpoint works as expected. Reverted null check Issue-ID: CPS-977 Signed-off-by: lukegleeson <luke.gleeson@est.tech> Change-Id: Idafad4c9877941d121f5cbb98617c56a35a1cc94
2022-08-19Merge "Ensure Additional Properties for CM Handles are included"Joseph Keenan2-2/+13
2022-08-18Performance Improvement: Tune Resttemplatempriyank1-1/+6
- Increase connection and read timeout for Resttemplate to a higer value Issue-ID: CPS-1201 Change-Id: Ia159b022698ff60dbd02a5877899f520b91bf883 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2022-08-18Ensure Additional Properties for CM Handles are includedToineSiebelink2-2/+13
- seems like bug is not present on master - modified test to ensure the behavior is tested now - (intelliJ) cleaned up so unused stuff Issue-ID: CPS-1212 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: I6882df4277e50ef869c6a1e9b093ee83dbcdf78e
2022-08-10CmHandleState transition using state handlermpriyank8-102/+111
- Raise LCM Event when state transition happens. - Raised events for ADVISED to READY, ADVISED to LOCKED, LOCKED to ADVISED. - Refactor existing code to raise the events correctly. - Refactored existing test scenarios to comply with the code change. Issue-ID: CPS-1034 Change-Id: Ie548e644f6133304d7fa36c892ca2bec7393c074 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2022-08-04LcmEvent state handler refactoringmpriyank9-38/+475
- State handler will now handle new structure of LcmEvent. - We have 3 types of events i.e create, update and delete. - Introduced the LcmEventCreatorHelper to delegate some of the responsibility of event creation based on event type and the state. - New tests and existing refactoring - Code rebased - Refactored name as per group code review - Code rebase with other commits - Used copy constructor for deep copy operation of NcmpServiceCmhandle and CompositeState - UPCOMING : Related user stories to trigger the event publishing using state handler. Issue-ID: CPS-1128 Change-Id: I94b5a87d37d6a174c017ee0aa37cd0f0f74ba084 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2022-08-02Merge "Enable/Disable Data Sync for Cm Handle"Joseph Keenan13-52/+158
2022-08-02Merge "Incorrect response to {} for cmhandle id-searches"Joseph Keenan2-3/+3
2022-08-02Merge "Query CmHandles using CPS path"Joseph Keenan9-304/+522
2022-08-02Incorrect response to {} for cmhandle id-searcheslukegleeson2-3/+3
An empty body for the CmHandles id-searches api returns an anchor instead of all cm-handles Now returns all childnode ids for the dmi-registry Issue-ID: CPS-1175 Signed-off-by: lukegleeson <luke.gleeson@est.tech> Change-Id: I358970170a4eb7905e9646605f0f373fbcd78945
2022-07-29Query CmHandles using CPS pathlukegleeson9-304/+522
Added withCpsPath condition parameter Validated to prevent misuse and blocking of querying using private properties Updated OpenAPI with examples and links to documentation Moved methods related to cmHandle querying using cps path from InventoryPersistence to CmHandleQueries Renamed private method deleteSchemaSetAndListElementByCmHandleId to deleteCmHandleByCmHandleId Issue-ID: CPS-977 Change-Id: I83827215b7e58de74f8f62cd0140516d217d93f1 Signed-off-by: lukegleeson <luke.gleeson@est.tech>
2022-07-28Enable/Disable Data Sync for Cm HandleDylanB95EST13-52/+158
-Create API Which will enable/disable data sync enabled flag -Default functionality of module sync watchdog is to set to false -Remove global config param -Will set initial sync state based on data sync enabled flag -Throws an Exception if the same data sync enabled flag tries to be set -Throws Exception if state is not in READY -Data Sync enabled must be true to complete data sync process - Delete all resource data within fragment table related to synced cm handle when data sync is set to false Issue-ID: CPS-1133 Change-Id: Ib47bbd8293f083c1d705d91bd0def74e6a105c72 Signed-off-by: DylanB95EST <dylan.byrne@est.tech>
2022-07-27Distributed datastore solution for Module Sync Watchdogkissand3-23/+55
- use semaphore map in ModuleSyncWatchdog - increase test timeout, because it needs more time for hazelcast initialization Issue-ID: CPS-1015 Change-Id: I71feed8fbbd047af9fabba29a5f762a1f17a1c78 Signed-off-by: kissand <andras.zoltan.kiss@est.tech>
2022-07-25CmHandle creation performance degradationsourabh_sourabh7-35/+147
- Created a dedicated threadpool for scheduler. - Tuned async threadpool of notification executor from setting RejectedExecutionHandler and application.yml. Issue-ID: CPS-1126 Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech> Change-Id: I2afe3c76c1aec78751777df0d2f08ddb8dcee102
2022-07-25De-registration: send event(s) using central statesourabh_sourabh5-34/+102
- refactored method "parseAndRemoveCmHandlesInDmiRegistration" - added method to send events for DELETING and DELETED - introduced private method in state handler - updated unit tests for registration spec - added unit test to cover new private method in state handler Issue-ID: CPS-1003 Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech> Change-Id: Ifc1d1e94b7103d85b6352b196edf7075257c211a Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
2022-07-20Refractor code to use the new LcmEvent schemabmiklos10-104/+124
-Old schema deleted and comments from tests are removed -EventDateTimeFormatter utility added -From LcmEventsCreator.populateLcmEvent the NcmpServiceCmHandle param removed and tests are fixed accordingly -Changes made in test of the LcmEventsCreator for payload testing to make it more clear Issue-ID: CPS-1147 Change-Id: Id87c81f2755a6617a0fc68ba92a3d0e3170fd20f Signed-off-by: bmiklos <miklos.baranyak@est.tech>
2022-07-14Code Refactoring Ncmp* to Lcm* as per new scopempriyank14-94/+102
- Refactored code to reflect the LcmEvents scope now. - Test cases updated and dependencies reviewed. - You can find few occurences of NcmpEvent for now but that will be cleaned up once we implement CPS-1104 which is for LcmEvent schema - UPCOMING: LcmEvent schema and then the code to publish the events on cmHandleStates - LATER : LcmEvents based on public properties update. Issue-ID: CPS-1137 Change-Id: I9f395ed733b4028e706205894c36a38412e3452e Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2022-07-08CmHandleState Handlermpriyank6-40/+367
- State handler taking care of ADVISED, READY and LOCKED state transition at the moment. - For now I have not removed the actual code but eventually state handler will take care of persisting the state and publishing of the events - Rebased code to add the global parameter related to dataSyncCache - UPCOMING : The classes will be prefixed/renamed with LCM once we have the LcmEvent created with new schema Issue-ID: CPS-1118 Change-Id: Ic45d95169eb0c06cfb35c907d34380dbcbf2da11 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2022-07-07Merge "Define Initial Data Sync Enabled Flag and state"Joseph Keenan2-7/+24
2022-07-07Define Initial Data Sync Enabled Flag and stateDylanB95EST2-7/+24
- Define the initial Data Sync Cache enabled through configuration parameter - Set the data sync enabled flag based on this - And in turn define the initial sync state of the Data Sync Issue-ID: CPS-1119 Change-Id: I43bf03c79481291bf47c9b672f7bf408d789df61 Signed-off-by: DylanB95EST <dylan.byrne@est.tech>
2022-07-07Merge "Improve test coverage on CompositeStateBuilder"Toine Siebelink1-0/+22
2022-07-07Improve test coverage on CompositeStateBuilderbmiklos1-0/+22
Issue-ID: CPS-475 Change-Id: Id24f2b0c6fe95ca9c7559a8dbd160c4566ddc32f Signed-off-by: bmiklos <miklos.baranyak@est.tech>
2022-07-06Merge "Move persistence methods from NCMPproperty handler"Joseph Keenan6-71/+92
2022-07-06Merge "Distributed map setup for Module and Data Sync"Toine Siebelink2-0/+117
2022-07-06Distributed map setup for Module and Data Syncmpriyank2-0/+117
- Introduce the hazelcast dependency and check how the builds react to it. - Data Sync and Module Sync Map config. - Added basic test scenarios. - Updating the artifact-id from hazelcast-all to hazelcast-spring and version is 4.2.5. (5.1.2 is latest but has known vulnerabilities) - Refactored the code as per the onsite review session - Upcoming : Actual sub-task which will use the distributed maps in respective use cases. Issue-ID: CPS-1050 Change-Id: I60314c4ff95c267b186b20862aef93a5c389a971 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2022-07-05Move persistence methods from NCMPproperty handleremaclee6-71/+92
Issue-ID: CPS-1117 Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech> Change-Id: If6a0c620970a2a34a601267c6610f85e4bc07f60
2022-07-04Move persistence related methodsemaclee8-117/+247
-created new method in inventory persistence service for getting module references Issue-ID: CPS-1117 Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech> Change-Id: Ic1f3c180a62a7211e19982d8f3570829db58370e
2022-07-04Merge "Simplified 'External' lock reason Mapping"Joseph Keenan10-39/+39
2022-07-04Simplified 'External' lock reason Mappinglukegleeson10-39/+39
Refactored LOCKED_MISBEHAVING -> LOCKED_MODULE_SYNC_FAILED CompositeStateMapper will change internal reason LOCKED_MODULE_SYNC_FAILED to external reason LOCKED_MISBEHAVING for client payloads Changed openapi description of lock-reason to reflect only enum currently available LOCKED_MISBEHAVING Issue-ID: CPS-1099 Signed-off-by: lukegleeson <luke.gleeson@est.tech> Change-Id: I9cda45f6c30b94684ee1c8ad0c49e35a3a824d52
2022-07-01Add Logging to specify next retryDylanB95EST1-3/+7
Adding logging to specify the next time in minutes until the retry mechanism will attempt to unlock the cm handle if it is not yet ready to be unlocked Issue-ID: CPS-1076 Change-Id: Ic2b011966c779f13ad8380ebfd7d4b4354e6b3e1 Signed-off-by: DylanB95EST <dylan.byrne@est.tech>
2022-07-01Merge "use separated get methods for every cmHandle instead of one "get all" ↵Toine Siebelink2-15/+20
query"
2022-07-01use separated get methods for every cmHandle instead of one "get all"kissand2-15/+20
query Issue-ID: CPS-1085 Change-Id: Ifac152f606b25b7a7d143315dba6d73698ef914e Signed-off-by: kissand <andras.zoltan.kiss@est.tech>
2022-07-01Merge "Allow Module Re-Sync"Toine Siebelink4-2/+66
2022-06-30Allow Module Re-Synclukegleeson4-2/+66
Allows the Resync of an already synced CmHandle Currently: Advised -(create schemaset)-> Ready -(manual write)-> Advised -> Locked as schemaset for cmhandle already exists With this: Advised -(create schemaset)-> Ready -(manual write)-> Advised -(delete schemaset, create schemaset)-> Ready Included some logging Renamed ModuleSyncSpec -> ModuleSyncWatchdogSpec to match class Issue-ID: CPS-1045 Signed-off-by: lukegleeson <luke.gleeson@est.tech> Change-Id: I408fbea698b7926dbf5d0cddc74acf1b00235b1f
2022-06-30Composite state transition code changesourabh_sourabh3-23/+51
- Code cannge to set datastore to Unsynchronized when state moves from advice to ready - if resource data is not available or there is any issue while reading data from simulator then state will be set to synchronized else remain unsynchronized. - Handle serialization failure on empty bean. Issue-ID: CPS-1000 Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech> Change-Id: Ie51a787770da649e00aaefc00341756f92f9fa83
2022-06-30Add method to get YANG module sources for CM handleemaclee16-29/+82
- part of this commit includes renaming the enum SyncState to DataStoreSyncState Issue-ID: CPS-1064 Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech> Change-Id: I6bf419141a1b33f09871946445cdfff422c8c354
2022-06-30Merge "Fix performance degradation bug"Joseph Keenan6-153/+216
2022-06-30Merge "Retry Module-Sync based on from last failure"Toine Siebelink5-12/+72
2022-06-30Merge "Kafka consumer can not be turned off"Toine Siebelink3-13/+28
2022-06-30Kafka consumer can not be turned offJosephKeenan3-13/+28
-NOTE: Build will fail until docker-compose version issues on build server are fixed --Ticket raised https://jira.linuxfoundation.org/plugins/servlet/theme/portal/2/IT-24219 -added flag for async -added response if async is triggered without being enabled & associated test -modified to use one global flag for notifications Issue-ID: CPS-1088 Signed-off-by: JosephKeenan <joseph.keenan@est.tech> Change-Id: If9d988b4dcb71bf37c1b1bf9464090782708ffc2
2022-06-30Fix performance degradation bugkissand6-153/+216
- do NOT use cpsPath query for gettign individual CM Handles - change order of queries for more efficency (property query first) Issue-ID: CPS-1085 Change-Id: Ia3bdf4f0d245a2b128557352685d2aa17c1f939c Signed-off-by: kissand <andras.zoltan.kiss@est.tech> Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
2022-06-29Get cm-handle state endpointlukegleeson4-4/+85
Added new get cm-handle state endpoint Refactored RestOutputCmHandleState to CmHandleCompositeState Created new RestOutputCmHandleCompositeState OpenApi object ^This is done so that we get '"state: {" at the start of JSON response Refactored RestOutputCmHandleStateMapper to CmHandleStateMapper Added more detailed composite state to get cmHandleDetails endpoint tests Rebased code Code rebased on top of 129658: Unable to change state from LOCKED to ADVISED | https://gerrit.onap.org/r/c/cps/+/129658 which fixes output error Issue-ID: CPS-1019 Signed-off-by: mpriyank <priyank.maheshwari@est.tech> Signed-off-by: lukegleeson <luke.gleeson@est.tech> Change-Id: I361117c98c256a4aa578c13d21926bc6d7876a15