emaclee [Sun, 24 Mar 2024 19:05:34 +0000 (19:05 +0000)]
Uplift Spring boot 3.2.4
- uplifted spring boot from 3.1.2 to 3.2.4
- removed redundant dependencies
- upgraded relevant dependencies
- use of @Bean(some_name) is give a specific bean name
- using @Bean(some_name) with @Qualifier so on the injection point to specify which bean to actually inject, this is used as we deal with multiple beans of the same type.
Issue-ID: CPS-2101
Change-Id: I64d5bf567b9eb03fb39034a46528d0160b332715
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
Toine Siebelink [Tue, 26 Mar 2024 16:38:50 +0000 (16:38 +0000)]
Merge "Condense Liquibase steps"
david.mcweeney [Wed, 21 Feb 2024 09:51:29 +0000 (09:51 +0000)]
Condense Liquibase steps
Change-Id: I1493f49bb93c359df3ff7d4f928f9a94fb8b2604
Signed-off-by: david.mcweeney <david.mcweeney@est.tech>
Issue-ID: CPS-2061
Lee Anjella Macabuhay [Tue, 26 Mar 2024 10:42:15 +0000 (10:42 +0000)]
Merge "Code review cleanup for: Add kafka messaging support to integration test module"
halil.cakal [Fri, 22 Mar 2024 11:46:03 +0000 (11:46 +0000)]
Code review cleanup for: Add kafka messaging support to integration test module
- Address code review on commit which already merged
https://gerrit.onap.org/r/c/cps/+/137496
Issue-ID: CPS-2152
Change-Id: I7a46dd08c919227c37fdeacf4763d0ab364c88c1
Signed-off-by: halil.cakal <halil.cakal@est.tech>
Priyank Maheshwari [Mon, 25 Mar 2024 15:28:54 +0000 (15:28 +0000)]
Merge "Save new cm notification subscription"
emaclee [Tue, 19 Mar 2024 12:43:51 +0000 (12:43 +0000)]
Save new cm notification subscription
Issue-ID: CPS-2043
Change-Id: If1c066a7d1c1f7e1c154714fe06f2566b727634c
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
Toine Siebelink [Tue, 19 Mar 2024 17:02:00 +0000 (17:02 +0000)]
Merge "Add kafka messaging support to integration test module"
Toine Siebelink [Tue, 19 Mar 2024 16:13:04 +0000 (16:13 +0000)]
Merge "Update deployment docs for Postgres shared_buffers value"
halil.cakal [Mon, 11 Mar 2024 14:19:36 +0000 (14:19 +0000)]
Add kafka messaging support to integration test module
- add ncmp test using kafka to integration test suite
Issue-ID: CPS-2152
Change-Id: Ia486bbcf1590ecf3ec6cbc2f513b74d55e4d6a31
Signed-off-by: halil.cakal <halil.cakal@est.tech>
Priyank Maheshwari [Tue, 19 Mar 2024 15:42:26 +0000 (15:42 +0000)]
Merge "Fix SonarQube warnings"
danielhanrahan [Tue, 19 Mar 2024 15:28:32 +0000 (15:28 +0000)]
Update deployment docs for Postgres shared_buffers value
- update deployment.rst to include info on Postgres shared_buffers
Issue-ID: CPS-2156
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ia6e896e066227477a4824c03336de270800698d2
ToineSiebelink [Tue, 19 Mar 2024 10:42:07 +0000 (10:42 +0000)]
Fix SonarQube warnings
targetted:
- Introduced CmResourceAddress (name agreed with Daniel and Priyank)
- Extracted out private method in AltenateIdChecker to reduce complexity
side effects:
- use 'record' java feature as suggested by ItelliJ
- had to uprade spotbugs version to avoid incorrect warning on 'record' equeals method
- convention: added missing 'asserts' in affected testware
- my preference: removed a lot of unnecessary linebreaks in affected testware
- removed redunfant (variation) of a 'delegation' test
Issue-ID: CPS-475
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Change-Id: Ie0c9d5ebc33196ae14ed6c226843095a2a040d1d
danielhanrahan [Thu, 14 Mar 2024 18:02:09 +0000 (18:02 +0000)]
Set Postgres shared_buffers in docker-compose
By default, Postgres uses value of 128MB for shared_buffers,
regardless of available memory. It is recommended to use
between 25% and 40% of memory for shared_buffers in Postgres.
Current value can be checked in SQL using 'SHOW shared_buffers'.
Issue-ID: CPS-2156
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ib20502f159f005ba941f39758555551f447d2b67
danielhanrahan [Fri, 15 Mar 2024 12:42:15 +0000 (12:42 +0000)]
Configure Hazelcast to have 1 backup to reduce memory
Currently Hazelcast is configured to have 3 synchronous backups
and 3 asynchronous backups. These are separate, meaning there will
be 7 copies in the cluster (1 original + 3 sync + 3 async backups).
Even if only 1 instance of CPS/NCMP is running, it will have 7 copies
in memory.
Given that CPS/NCMP is typically only deployed using 1 or 2 instances,
the settings are changed to 1 synchronous backup (same as Hazelcast's
default configuration). This change has been tested and shown to reduce
heap usage by around 100MB during 20K CM-handle registration.
Issue-ID: CPS-2146
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I4a5f6d83bc35e2c13cfb32002e38dc365da34c8e
Sourabh Sourabh [Fri, 15 Mar 2024 10:13:55 +0000 (10:13 +0000)]
Merge "[Bug] Removing inner TaskExecutor to call DMI"
Toine Siebelink [Thu, 14 Mar 2024 15:17:57 +0000 (15:17 +0000)]
Merge "Performance tests of alternate-id/module-set-tag lookup"
mpriyank [Fri, 8 Mar 2024 12:50:53 +0000 (12:50 +0000)]
[Bug] Removing inner TaskExecutor to call DMI
- Removing TaskExecutor from cps-ncmp-service package as anyways the
call coming over from the cps-ncmp-rest layer is managed by a
different thread executor(CpsNcmpTaskExecutor)
- Provided 60secs timeout value.
- Spawning new thread from a different executor might not be needed
- Removing @Async from a non spring managed method as its of no use
Issue-ID: CPS-2150
Change-Id: Ic99632983aff2c40df81421d782cf98ec600fc41
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
JvD_Ericsson [Mon, 4 Mar 2024 16:23:25 +0000 (16:23 +0000)]
Modify lcm events to include dataProducerIdentifier and moduleSetTag (CPS-1964 3)
Issue-ID: CPS-2114
Change-Id: I52ae18fe849801706491742818b316df9f8cb554
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
JvD_Ericsson [Mon, 26 Feb 2024 13:45:47 +0000 (13:45 +0000)]
Modify the get cmHandle api to return dataProducerIdentifier, moduleSetTag, and alternateId (CPS-1964 2)
Issue-ID: CPS-2113
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
Change-Id: I672e5c8408e77a5fa15d6fc2f41438aca705484c
JvD_Ericsson [Fri, 16 Feb 2024 09:30:45 +0000 (09:30 +0000)]
Provide support for data producer identifier during registration (CPS-1964 1)
- Added support for the dataProducerIdentifier to be added,
and updated from blank to something once
- The dataProducerIdentifier is persisted in the DB
Issue-ID: CPS-2105
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
Change-Id: I1c230be8f9402154a761e8c2ba4d8a6331965b3c
danielhanrahan [Sun, 11 Feb 2024 16:30:44 +0000 (16:30 +0000)]
Performance tests of alternate-id/module-set-tag lookup
- Add some tests of CPS get/query operations comparing
look up of cm-handle id vs alternate-id
- Add test of querying all CM handles by module-set-tag
- Test accuracy is improved by performing warmup operations
(reported results are faster with more warmup iterations)
Issue-ID: CPS-2087
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I4214e157ccf93f751c69b8a17d55f4185749ca90
mpriyank [Wed, 6 Mar 2024 11:54:17 +0000 (11:54 +0000)]
Mapper to form CmNotificationSubscriptionNcmpOutEvent
- mapper to be used in the subsequent patches
- test case to support the mapping of
CmNotificationSubscriptionNcmpOutEvent
Issue-ID: CPS-2147
Change-Id: I7f0be81941b774a27ddc343ed304a68c23796a60
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
Priyank Maheshwari [Wed, 6 Mar 2024 15:23:44 +0000 (15:23 +0000)]
Merge "Advance DMI Stub to change module set (tags) used by cm handle"
Toine Siebelink [Wed, 6 Mar 2024 14:36:40 +0000 (14:36 +0000)]
Merge "Test of retry of failed module sync"
sourabh_sourabh [Mon, 19 Feb 2024 03:42:54 +0000 (03:42 +0000)]
Advance DMI Stub to change module set (tags) used by cm handle
- Renamed json response file name based on module set tag into Dmi plugin stub.
- Added in memory map to hold the information of cm handle per
module set tag int dmi plugin stub.
- Exposed a REST api to perform diff. operations on memory map to replicate dmi plugin stub.
Issue-ID: CPS-2079
Change-Id: I7818fa4c47be9a02068976fd116a1dbc36b134ef
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
Toine Siebelink [Wed, 6 Mar 2024 10:53:26 +0000 (10:53 +0000)]
Merge "Log all incoming HTTP requests to NCMP with Authorization Header"
Toine Siebelink [Wed, 6 Mar 2024 09:39:36 +0000 (09:39 +0000)]
Merge "Update postman collection to utilize newest yang files"
Toine Siebelink [Wed, 6 Mar 2024 09:33:19 +0000 (09:33 +0000)]
Merge "Error reporting when registering cm handle with alternate id 2 - update scenario"
halil.cakal [Tue, 5 Mar 2024 17:15:42 +0000 (17:15 +0000)]
Error reporting when registering cm handle with alternate id 2 - update scenario
- added error collection to cmhandle update
Issue-ID: CPS-2109
Change-Id: I751cad7c35ec53e914888760dd66eb52054da36e
Signed-off-by: halil.cakal <halil.cakal@est.tech>
danielhanrahan [Fri, 1 Mar 2024 10:56:19 +0000 (10:56 +0000)]
Integration test of Bearer Token pass-through (CPS-2126 #5)
This covers REST endpoints of GET, POST, PUT, PATCH, DELETE
of /ncmp/v1/ch/{cmHandleId}/data/ds/{datastoreName}
and the async REST endpoint of POST /ncmp/v1/data
It verifies that:
- bearer token is passed from NCMP to DMI
- basic auth header is not passed from NCMP to DMI
Issue-ID: CPS-2137
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ie4761a848904175a9d8cd5b917817e85f5b69813
mpriyank [Thu, 29 Feb 2024 17:47:47 +0000 (17:47 +0000)]
Bump CPS to 3.4.7-SNAPSHOT
- bump cps to 3.4.7-snapshot
- updated the relese notes
Issue-ID: CPS-2135
Change-Id: Ib166ebae2e3de9a727b3d0d4d21832c8858f4108
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
Sourabh Sourabh [Thu, 29 Feb 2024 17:39:44 +0000 (17:39 +0000)]
Merge "Add container yaml for release"
mpriyank [Thu, 29 Feb 2024 16:45:40 +0000 (16:45 +0000)]
Add container yaml for release
- add container yaml to relase CPS 3.4.6 version
Issue-ID: CPS-2135
Change-Id: Iabf6b3de1e29c894e95bb5659c0a357dd9876991
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
mpriyank [Thu, 29 Feb 2024 16:33:25 +0000 (16:33 +0000)]
Add maven stage yaml
- maven stage yaml to release 3.4.6 version of CPS
Issue-ID: CPS-2135
Change-Id: Icce73ceece62c889596bd757abe74844cd2f9531
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
Sourabh Sourabh [Thu, 29 Feb 2024 16:29:58 +0000 (16:29 +0000)]
Merge "Release notes added for 3.4.6"
danielhanrahan [Thu, 29 Feb 2024 15:52:46 +0000 (15:52 +0000)]
Add bearer token to NCMP async batch data passthrough (CPS-2126 #4)
Async processing was not passing bearer token.
Issue-ID: CPS-2128
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I75da35cce555c49cca638b68f106a9daba79c24a
mpriyank [Thu, 29 Feb 2024 14:39:00 +0000 (14:39 +0000)]
Release notes added for 3.4.6
- added the release notes and openapi documentation
Issue-ID: CPS-2135
Change-Id: Ib224353ca5a529b6788ecb67c6432b806acdf557
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
JvD_Ericsson [Wed, 28 Feb 2024 15:02:53 +0000 (15:02 +0000)]
Update postman collection to utilize newest yang files
Issue-ID: CPS-2054
Change-Id: Id7aec68922157b1e662418de880742114b6ccc9e
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
danielhanrahan [Wed, 28 Feb 2024 16:05:07 +0000 (16:05 +0000)]
Add bearer token to NCMP passthrough operations (CPS-2126 #2)
For NCMP resource data passthrough operations, accept an
authorization header and propagate it to outgoing DMI request
if it has a bearer token, otherwise use same behaviour as before
Issue-ID: CPS-2128
Change-Id: Ib3bf401abce4221a8b706989fb6f07618aa33fe2
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Sourabh Sourabh [Thu, 29 Feb 2024 11:54:45 +0000 (11:54 +0000)]
Merge "Remove Http Status 401 for cps core and NCMP(CPS-2126 #3)"
mpriyank [Thu, 29 Feb 2024 09:22:36 +0000 (09:22 +0000)]
Remove Http Status 401 for cps core and NCMP(CPS-2126 #3)
- Removing Unauthorized Http Status code 401 from the repo for CPS-Core
and NCMP
Issue-ID: CPS-2134
Change-Id: I535156fa30dd4292ad390177c217ddb3e8942d34
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
danielhanrahan [Wed, 28 Feb 2024 07:13:50 +0000 (07:13 +0000)]
Disable Spring Security and HTTP Basic Auth (CPS-2126 #1)
This allows any authorization header to be passed in.
Issue-ID: CPS-2127
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ib1c5bd7024eed39afd1ae6e19325ed4733c853d4
mpriyank [Wed, 28 Feb 2024 14:10:54 +0000 (14:10 +0000)]
Revert Spring Boot Uplift
- reverting back to spring 3.1.2
- manual changes to revert as other apps not fully ready for the
delivery
Issue-ID: CPS-2133
Change-Id: I670b67916fa4a5d4e5bced6548b7fcd5ee12e855
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
sourabh_sourabh [Wed, 28 Feb 2024 09:06:24 +0000 (09:06 +0000)]
Log all incoming HTTP requests to NCMP with Authorization Header
- Enabled configuration to log NCMP request header and payload.
- Enabled the DEBUG level log into application.yml.
Issue-ID: CPS-2131
Change-Id: I458b1148894b8f460b013f0fa93032231ac47938
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
mpriyank [Tue, 27 Feb 2024 14:04:38 +0000 (14:04 +0000)]
Bump CPS to 3.4.6-SNAPSHOT
- bumping CPS to 3.4.6-SNAPSHOT
- updated the release notes
Issue-ID: CPS-2124
Change-Id: Id28af9340da9c1ce118b2122e97b8717860c7932
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
mpriyank [Tue, 27 Feb 2024 13:39:14 +0000 (13:39 +0000)]
Add maven container yaml
- maven container yaml for the cps 3.4.5 release
Issue-ID: CPS-2124
Change-Id: I185562247b39b7eed0f489be2f1cabd432a53a9b
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
mpriyank [Tue, 27 Feb 2024 13:18:09 +0000 (13:18 +0000)]
Add maven stage yaml
- maven stage yaml for 3.4.5 version of CPS
Issue-ID: CPS-2124
Change-Id: I61aadcf6400ba47ee511b4da1e324909473d6860
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
danielhanrahan [Tue, 20 Feb 2024 14:50:14 +0000 (14:50 +0000)]
Test of retry of failed module sync
A new integration test verifies that LOCKED handles that failed
module sync will be retried after a few minutes.
Issue-ID: CPS-2033
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: If194daeb315090f2710a017270875b6301f7140a
mpriyank [Tue, 27 Feb 2024 12:21:53 +0000 (12:21 +0000)]
Release notes update
- Added the spring boot uplift ticket
Issue-ID: CPS-2124
Change-Id: I55b1e246d5bce92ed0a34deb19afe4903db4a7bc
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
thmsdt [Tue, 27 Feb 2024 09:47:03 +0000 (10:47 +0100)]
update link to upper-constraints.txt
Issue-ID: DOC-823
Change-Id: I797b8e1058e8afe511bb9b140c75c887728ba311
Signed-off-by: thmsdt <thomas.kulik@telekom.de>
Priyank Maheshwari [Mon, 26 Feb 2024 17:06:21 +0000 (17:06 +0000)]
Merge "Populate cmSubscription cache"
Sourabh Sourabh [Mon, 26 Feb 2024 16:58:22 +0000 (16:58 +0000)]
Merge "Create shared postman collections"
Lee Anjella Macabuhay [Mon, 26 Feb 2024 16:57:42 +0000 (16:57 +0000)]
Merge "Add passthrough read operation (synchronous) to DMI stub"
emaclee [Wed, 24 Jan 2024 15:22:58 +0000 (15:22 +0000)]
Populate cmSubscription cache
- Create subscription cache handler
- Add unit tests
Issue-ID: CPS-2025
Change-Id: I54d505369a8429d6f6a87a2af0b169f9530622c3
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
Priyank Maheshwari [Mon, 26 Feb 2024 16:10:23 +0000 (16:10 +0000)]
Merge "Get Subscription Delta"
Priyank Maheshwari [Mon, 26 Feb 2024 11:56:23 +0000 (11:56 +0000)]
Merge "Limit max connections in DMI stub"
Priyank Maheshwari [Mon, 26 Feb 2024 11:54:05 +0000 (11:54 +0000)]
Merge "Use default values for timers in docker-compose"
danielhanrahan [Wed, 29 Nov 2023 18:51:16 +0000 (18:51 +0000)]
Add passthrough read operation (synchronous) to DMI stub
- Implement DMI stub endpoint needed for for NCMP passthrough data
operation, returning a fixed JSON response and adding delay.
POST /dmi/v1/ch/{cmHandleId}/data/ds/{datastoreName}
- Add script to measure average overhead for many requests
Test results indicate the NCMP adds up to 150ms per request.
Issue-ID: CPS-2099
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I2aba8285f8a52f3570fc1699a8687caffa9d9c77
Lee Anjella Macabuhay [Mon, 26 Feb 2024 10:37:17 +0000 (10:37 +0000)]
Merge "Remove subscriptionModelLoader flag"
Priyank Maheshwari [Mon, 26 Feb 2024 10:32:19 +0000 (10:32 +0000)]
Merge "Uplift Spring Boot to 3.2.2"
Priyank Maheshwari [Mon, 26 Feb 2024 10:25:13 +0000 (10:25 +0000)]
Merge "Add health check endpoint to DMI stub"
mpriyank [Fri, 23 Feb 2024 10:35:37 +0000 (10:35 +0000)]
Remove subscriptionModelLoader flag
- removed the flag as the functionality around model loader is stable
now
- removed the config parameter from the application yaml file as well
Issue-ID: CPS-2112
Change-Id: Ie4e3317c0689615b900dcd9bbf1896bc3a5f37b3
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
danielhanrahan [Fri, 23 Feb 2024 15:27:17 +0000 (15:27 +0000)]
Bump CPS to 3.4.5-SNAPSHOT
- bump CPS to 3.4.5-SNAPSHOT and update the docs
Issue-ID: CPS-2120
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ia2ea81b40ec19b87d3b25359fbb25ffdcc3285dd
danielhanrahan [Fri, 23 Feb 2024 14:52:06 +0000 (14:52 +0000)]
Add container yaml for CPS 3.4.4
- added container yaml to release the docker images for CPS 3.4.4
Issue-ID: CPS-2120
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I9786dd5a3fc4d1597e24304236c427c0658c44b1
danielhanrahan [Fri, 23 Feb 2024 14:06:20 +0000 (14:06 +0000)]
Add maven stage yaml for CPS 3.4.4
- maven stage yaml to release 3.4.4
Issue-ID: CPS-2120
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Iad423641f9fb214d195a6376d5c0496dff52bc79
danielhanrahan [Fri, 23 Feb 2024 13:27:37 +0000 (13:27 +0000)]
Update release notes for CPS 3.4.4
- updated release notes for 3.4.4
- no openapi changes
Issue-ID: CPS-2120
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I1634ed15b058e50c205dcf15ad59c21cce0e4972
JvD_Ericsson [Thu, 15 Feb 2024 11:34:36 +0000 (11:34 +0000)]
Create shared postman collections
Issue-ID: CPS-2054
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
Change-Id: I0a7e941bc4accfe00edaf7157df5a8ebabadb187
danielhanrahan [Fri, 23 Feb 2024 10:19:23 +0000 (10:19 +0000)]
Limit max connections in DMI stub
DMI plugin in a real deployment could only handle a limited number
of parallel connections. From CPS-1968 of testing in a realistic
deployment, 25 max connections is chosen as a reasonable default.
This allows us to simulate rate limiting with DMI stub.
Functionality has been verified by changing the max connections and
registering 5000 CM-handles. It takes:
- 120 seconds with 8 max DMI connections
- 80 seconds with 16 max DMI connections
Issue-ID: CPS-2117
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I6aaf43f721d6f2e6dcff45929fc9699e26980cdb
seanbeirne [Tue, 6 Feb 2024 10:37:02 +0000 (10:37 +0000)]
Get Subscription Delta
-Added @AllArgsConstructor to improve readability
Issue-ID: CPS-1953
Change-Id: Id457561edb8ce8c00c9c93a1453ec37da5174b38
Signed-off-by: seanbeirne <sean.beirne@est.tech>
Lee Anjella Macabuhay [Fri, 23 Feb 2024 11:09:00 +0000 (11:09 +0000)]
Merge "CmNotificationSubscription event from Dmi Plugin"
danielhanrahan [Fri, 23 Feb 2024 10:27:00 +0000 (10:27 +0000)]
Use default values for timers in docker-compose
docker-compose.yml is overriding NCMP timers, e.g. module sync timer
is overridden from default of 5 seconds to 30 seconds, which
negatively affects performance testing.
Issue-ID: CPS-2119
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ic664169ddeed9cce59416dde50ec919cfcea522a
danielhanrahan [Fri, 23 Feb 2024 10:16:43 +0000 (10:16 +0000)]
Add health check endpoint to DMI stub
DMI stub health check endpoint /actuator/health is needed
for NCMP to set trust level. Can be verified using:
curl "http://localhost:8784/actuator/health"
which reports:
{"status":"UP"}
Issue-ID: CPS-2118
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I4477a389a585280d36028b72d280028705e0f8f2
halil.cakal [Mon, 19 Feb 2024 21:37:25 +0000 (21:37 +0000)]
Error reporting when registering cm handle with alternate id
- refactored registration code all use cases; 1 method for each action
- introduce new cps error code; 111
- TODO: error reporting registration, UPDATE
Issue-ID: CPS-2100
Change-Id: I5049777ee4e08fdc94aa1db09e668e952ed8e1c3
Signed-off-by: halil.cakal <halil.cakal@est.tech>
Lee Anjella Macabuhay [Fri, 23 Feb 2024 10:24:09 +0000 (10:24 +0000)]
Merge "NCMP to DMI CmSubscription Event"
waqas.ikram [Wed, 21 Feb 2024 11:31:00 +0000 (11:31 +0000)]
Uplift Spring Boot to 3.2.2
- Upgraded hypersistence-utils-hibernate-60 to hypersistence-utils-hibernate-63
- Introduced @Qualifier annotations where needed
Issue-ID: CPS-2101
Change-Id: I8303592ed91584deb6ca5cd4e49800210b6ea989
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
Lee Anjella Macabuhay [Thu, 22 Feb 2024 15:47:20 +0000 (15:47 +0000)]
Merge "NCMP to Client Cm Subscription Event"
danielhanrahan [Thu, 22 Feb 2024 10:20:17 +0000 (10:20 +0000)]
Introduce class for Module Delta during module sync
Removed ImmutableTriple<String, Map<String, String>, Collection<ModuleReference>>
and replaced it with a ModuleDelta class to hold results.
Split syncAndCreateOrUpgradeSchemaSetAndAnchor into methods
syncAndCreateSchemaSetAndAnchor and syncAndUpgradeSchemaSet
Issue-ID: CPS-2027
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I95462ab55dcae7d98b9e2671fc278c4ded45f3fc
danielhanrahan [Wed, 21 Feb 2024 16:37:19 +0000 (16:37 +0000)]
Improve performance of moduleSetTag lookup
- Using absolute cps-path /dmi-registry/cm-handles is faster
than descendant cps-path //cm-handles due to CPS-2087.
- Converting DataNodes to YangModelCmHandle allows checking if
the handles are READY without needing to send additional DB
queries via cmHandleQueries::cmHandleHasState.
Issue-ID: CPS-2027
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ied7e884b0f779f394854603a7f8b186d09eb5be8
Sourabh Sourabh [Thu, 22 Feb 2024 10:51:18 +0000 (10:51 +0000)]
Merge "Refactor YangDataConverter.convertCmHandleToYangModel"
danielhanrahan [Wed, 21 Feb 2024 19:50:32 +0000 (19:50 +0000)]
Refactor check for no new modules in Module Sync
This change moves the check for no new module references into
DmiModelOperations::getNewYangResourcesFromDmi
(The method is only used by ModuleSyncService)
Issue-ID: CPS-2027
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I3cc65e7a327148ebe01b98b61dc64b70872e2cf5
danielhanrahan [Wed, 21 Feb 2024 17:31:44 +0000 (17:31 +0000)]
Refactor YangDataConverter.convertCmHandleToYangModel
This method redundantly takes cmHandleId as a parameter, even though
the DataNode representing a CM-handle is guaranteed to have the ID
in a leaf called 'id'.
Issue-ID: CPS-245
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ib10097b6e13f7188fd933d6f6913110ec664273e
ToineSiebelink [Wed, 21 Feb 2024 15:42:45 +0000 (15:42 +0000)]
Improve unit test for regsitration, upgrade
- verify schema set is created
- add test case for upgarde to same tag
Issue-ID: CPS-2027
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Change-Id: Id853f477d2a90a86d13828a27b9269c62e1d9462
Priyank Maheshwari [Wed, 21 Feb 2024 15:10:02 +0000 (15:10 +0000)]
Merge "adding isUniqueSubscriptionId method"
danielhanrahan [Wed, 21 Feb 2024 12:38:05 +0000 (12:38 +0000)]
Upgrade yang modules using module set tag
- New algorithm is implemented as per the pseudo code -> https://wiki.onap.org/display/DW/CPS-1733%3A+Upgrade+YANG+Schema-Set+for+CM+Handle+Using+a+Module+Set+Tag
Issue-ID: CPS-2027
Change-Id: I78fc1c8f927de1a1b814c3c1c62351dda58f2139
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
mpriyank [Wed, 21 Feb 2024 12:21:18 +0000 (12:21 +0000)]
NCMP to Client Cm Subscription Event
- CmNotificationSubscriptionNcmpOut event to inform the client about the
subscription he requested
- Testware for the same
- Code to provide the data to this producer will be part of other
patches
Issue-ID: CPS-2108
Change-Id: Ic302e798a20da54dd3c56d2cb792b800446cc2d3
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
danielhanrahan [Wed, 21 Feb 2024 10:02:19 +0000 (10:02 +0000)]
Fix handling of blank moduleSetTag
Handling of blank moduleSetTag is very inconsistent.
Sometimes it will be returned as null, '' or 'not-specified'.
Specifically in the case of MODULE_UPGRADE_FAILED, on the retry,
a blank moduleSetTag will be returned as 'not-specified', leading
to incorrect upgrade.
Issue-ID: CPS-2027
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I3f4290dc5659c386c7b2b924325da2560d00d73b
danielhanrahan [Mon, 19 Feb 2024 18:39:37 +0000 (18:39 +0000)]
Add moduleSetTag when getting a CM handle
Test changes:
- Check moduleSetTag (and alternateId) in unit test of get CM handle.
- Verify moduleSetTag is updated in tests of CM handle upgrade.
Code changes:
- Set moduleSetTag when converting a YangModelCmHandle to
NcmpServiceCmHandle.
- Set moduleSetTag in YangModelCmHandle copy constructor.
- Minor refactor using StringUtils::isBlank.
Issue-ID: CPS-2027
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I6a9a92aa58d15c6ecf5a6bb21aa5c9d6ec8dc817
leventecsanyi [Tue, 20 Feb 2024 12:15:11 +0000 (13:15 +0100)]
Remove alternate ID caches
- removed alternate id cache related classes and updated deployment.rst
Issue-ID: CPS-2107
Change-Id: I567af7b2f44107fceffaef370205b00a5cf79522
Signed-off-by: leventecsanyi <levente.csanyi@est.tech>
mpriyank [Tue, 20 Feb 2024 13:32:23 +0000 (13:32 +0000)]
CmNotificationSubscription event from Dmi Plugin
- Added infrastructure related code to read event from the dmi plugin
- Just consuming and reading the message.
- Core logic to introduced to be part of subsequent patches
Issue-ID: CPS-2106
Change-Id: Ic58f4f80b3dded32df95daecac42315fa9212f58
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
Toine Siebelink [Mon, 19 Feb 2024 17:29:57 +0000 (17:29 +0000)]
Merge "Use DB for checking Alternate IDs"
emaclee [Mon, 19 Feb 2024 12:56:46 +0000 (12:56 +0000)]
adding isUniqueSubscriptionId method
Issue-ID: CPS-2044
Change-Id: I26b209ead80add7e60b4de9257a9f5c326ddea6f
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
mpriyank [Mon, 19 Feb 2024 11:30:01 +0000 (11:30 +0000)]
NCMP to DMI CmSubscription Event
- Ncmp to have a producer which converts
CmNotificationSubscriptionDmiInEvent to Cloud event and then publishes
it
- For now , using the old topic prefix as topic name. Once topic names
are finalized then they can be configured
- Testware for the publishing code
Issue-ID: CPS-2103
Change-Id: I83b6ce5b6647e92313839b25492cb076e528ce3e
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
danielhanrahan [Mon, 19 Feb 2024 09:55:37 +0000 (09:55 +0000)]
Tests of CM-handle module upgrade & moduleSetTag
Integration tests covering scenarios of the creation and upgrade of
CM-handles with:
- no moduleSetTag
- new moduleSetTag
- existing moduleSetTag
Failing tests are marked @Ignore.
Issue-ID: CPS-2102
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Id5567e08a13d8c26dc7b6458f0af8449bef6f082
halil.cakal [Mon, 12 Feb 2024 11:41:00 +0000 (11:41 +0000)]
Use DB for checking Alternate IDs
- do NOT use hazelcast cache
- introduced AlternateIcChecker
- use checks during Inital registration
- TODO: remvoe Hazalcast Cache (once perf test are OK)
- TODO: use checks during UPDATE registration
- TODO: error reporting during registration
Issue-Id: CPS-2049
Change-Id: I0adcac52a7a49e26301758eafc4684152ddfcaf5
Signed-off-by: halil.cakal <halil.cakal@est.tech>
danielhanrahan [Tue, 13 Feb 2024 11:12:29 +0000 (11:12 +0000)]
Add NCMP to integration-test module
- Add NCMP to integration test base class
- Use MockRestServiceServer to mock DMI responses in groovy tests
- Added tests for CM-handle registration to READY and LOCKED states
- Add test of CM-handle deregistration
Issue-ID: CPS-2033
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I89f9f8aab2bba9d4eb5b3136a2feb238e7cf1b06
Lee Anjella Macabuhay [Wed, 14 Feb 2024 14:26:52 +0000 (14:26 +0000)]
Merge "Mapper to form event for DMI Plugin"
Lee Anjella Macabuhay [Wed, 14 Feb 2024 11:48:45 +0000 (11:48 +0000)]
Merge "Clean up of integration-test base classes"
Lee Anjella Macabuhay [Wed, 14 Feb 2024 11:30:37 +0000 (11:30 +0000)]
Merge "Faster absolute xpath query using parent path lookup"
danielhanrahan [Tue, 13 Feb 2024 11:12:29 +0000 (11:12 +0000)]
Clean up of integration-test base classes
- Remove TestConfig and instead use auto-configuration
- Add needed application.yml config
- Refactor helper methods for creating JSON
Issue-ID: CPS-2090
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I4f618a1d4a83e9c75e468928c257b817d449c22f