cps.git
8 months agomaven stage yaml for 3.5.1 83/138483/1
mpriyank [Mon, 15 Jul 2024 10:21:57 +0000 (11:21 +0100)]
maven stage yaml for 3.5.1

- adding maven stage yaml for CPS 3.5.1 release

Issue-ID: CPS-2318
Change-Id: I14f4f8a890fbab80497696907fde4fd22601a562
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
8 months agoMerge "Release notes CPS 3.5.1"
Daniel Hanrahan [Mon, 15 Jul 2024 10:05:06 +0000 (10:05 +0000)]
Merge "Release notes CPS 3.5.1"

8 months agoRelease notes CPS 3.5.1 82/138482/1
mpriyank [Mon, 15 Jul 2024 09:48:49 +0000 (10:48 +0100)]
Release notes CPS 3.5.1

- Added release notes and syncd the openapi files.

Issue-ID: CPS-2318
Change-Id: I1982e31f3bcb9337ed9814cb55a4db885b157158
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
8 months agoPrint DMI stub logs in CSITs 61/138461/1
danielhanrahan [Fri, 12 Jul 2024 14:05:15 +0000 (15:05 +0100)]
Print DMI stub logs in CSITs

Issue-ID: CPS-2313
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I4ecb5ce1713666b5e90b90eba3c98b737fd91896

8 months agoPrint docker logs in CSITs for 2 cps-and-ncmp instances 37/138437/1
danielhanrahan [Fri, 12 Jul 2024 10:58:40 +0000 (11:58 +0100)]
Print docker logs in CSITs for 2 cps-and-ncmp instances

Following introduction of 2 instances of cps-and-ncmp,
CSIT logs show an error "No such container: cps-and-ncmp".
This commit prints docker logs for each cps-and-ncmp container.

Issue-ID: CPS-2038
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: If3ed4590cef0f5b59d74e62c84f6c6e72edfd411

8 months agoMerge "Policy Executor Feature Toggle"
Sourabh Sourabh [Thu, 11 Jul 2024 16:11:34 +0000 (16:11 +0000)]
Merge "Policy Executor Feature Toggle"

8 months agoPolicy Executor Feature Toggle 22/138422/3
ToineSiebelink [Wed, 10 Jul 2024 16:34:13 +0000 (17:34 +0100)]
Policy Executor Feature Toggle

- defined config parameters for feature toggle and server details
- log request details when feature enabled
- improved JavaDoc in Controller
- improved configuration properties checks in HttpClientConfigurationSpec

Issue-ID: CPS-2311
Change-Id: I1ff4bd3592ce2570ac74f9ec6e62b75001cb611a
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
8 months agoMerge "Fix timing issue in CmHandleCreateSpec"
Priyank Maheshwari [Thu, 11 Jul 2024 13:29:59 +0000 (13:29 +0000)]
Merge "Fix timing issue in CmHandleCreateSpec"

8 months agoFix timing issue in CmHandleCreateSpec 20/138420/2
danielhanrahan [Thu, 11 Jul 2024 11:16:43 +0000 (12:16 +0100)]
Fix timing issue in CmHandleCreateSpec

The test for module sync retry on LOCKED handles has a timing issue,
due the ordering of the steps. After a LOCKED handle gets reset to
ADVISED state (but DMI is not yet set to available), the Module Sync
Watchdog may wake up and put it back into LOCKED state again.

This fix is to first make the DMI available before waiting for the
LOCKED handle to reset.

Issue-ID: CPS-2304
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I9d33b0eeea1e0a2e163489130c928b4d03182774

8 months agoDocumentation updated in docs/ncmp-inventory-querying.rst 18/138418/3
sourabh_sourabh [Thu, 11 Jul 2024 09:45:45 +0000 (10:45 +0100)]
Documentation updated in docs/ncmp-inventory-querying.rst

- Existing API docs in docs/ncmp-cmhandle-querying.rst is updated where
  CPS Path is now supported as ancestor axis.

Issue-ID: CPS-2289
Change-Id: I065179fe7c294588580448a8467765e9d116d33a
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
8 months agoMerge "NCMP inventory cm handle search should support cps path query"
Toine Siebelink [Wed, 10 Jul 2024 16:43:03 +0000 (16:43 +0000)]
Merge "NCMP inventory cm handle search should support cps path query"

8 months agoRemove nginx logs that not being used anywhere 13/138413/1
halil.cakal [Wed, 10 Jul 2024 13:58:26 +0000 (14:58 +0100)]
Remove nginx logs that not being used anywhere

Issue-ID: CPS-2038

Change-Id: Iba8950db4f3fcfc13f32bf915189f5fcb2ccee90
Signed-off-by: halil.cakal <halil.cakal@est.tech>
8 months agoNCMP inventory cm handle search should support cps path query 11/138411/2
sourabh_sourabh [Wed, 10 Jul 2024 11:51:31 +0000 (12:51 +0100)]
NCMP inventory cm handle search should support cps path query

- Added cps path query conditions for inventory search api

Issue-ID: CPS-2289
Change-Id: I0bcc9a45af65ad9d41c4d4cf79b35bfb95f50cff
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
8 months agoSplit integration tests into cps and ncmp packages 04/138404/3
danielhanrahan [Tue, 9 Jul 2024 11:06:20 +0000 (12:06 +0100)]
Split integration tests into cps and ncmp packages

Issue-ID: CPS-2309
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ie97c1430d1121c4c68b3fc6dacbc2466d48e1017

8 months agoPolicy Executor API, make Authorization header optional 10/138410/2
ToineSiebelink [Wed, 10 Jul 2024 08:24:22 +0000 (09:24 +0100)]
Policy Executor API, make Authorization header optional

Issue-ID: CPS-22291
Change-Id: I2b8f9b97c92dfc640c8b40b7053c609bbdcb2f6e
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
8 months agoNCMP: NCMP search API fixed to handle cps path that is ancestor axis as 02/138402/6
sourabh_sourabh [Mon, 8 Jul 2024 16:40:38 +0000 (17:40 +0100)]
NCMP: NCMP search API fixed to handle cps path that is ancestor axis as
well

- Cps path builder is fixed to handle ancestor axis that is target as well while quering.

Issue-ID: CPS-2308
Change-Id: Iaf215851ada17d21516ae83fa142ac77ff1c6c19
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
8 months agoRefactor remaining classes package structure 05/138405/3
ToineSiebelink [Tue, 9 Jul 2024 11:41:59 +0000 (12:41 +0100)]
Refactor remaining classes package structure

-Introduced org.onap.cps.ncmp.config for all config type classes like http, kafka etc.
-Introduced org.onap.cps.ncmp.impl.dmi for dmi specif classes like DmiRestClient etc.
-Moved most exception classes to org.onap.cps.ncmp.api.exceptions
(only two were 'internal' i.e. NOT used in REST so left in org.onap.cps.ncmp.exceptions)
-Deleted unused DateNodeHelper class (and related testware)
-Moved some classes to org.onap.cps.ncmp.impl.utils
-Moved messaging test base classes to org.onap.cps.ncmp.impl.utils.events
-All imports were reorganised automatically by IntelliJ
-did NOT update any copyright dates (seems incorrect to me anyway)

Issue-ID: CPS-2257
Change-Id: Ie28b1777ea278064b46c6a1c3a28f4d0696565e2
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
8 months agoIncrease module sync wait time in tests to 10 seconds 08/138408/1
danielhanrahan [Tue, 9 Jul 2024 14:21:25 +0000 (15:21 +0100)]
Increase module sync wait time in tests to 10 seconds

Too small timeout is causing intermittant test failures.

Issue-ID: CPS-2304
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ib6a25cb2f44e9a65b8f7d2d98e8d5e7dfe1f9ceb

8 months agoMerge "Create PolicyExecutor Stub"
Sourabh Sourabh [Tue, 9 Jul 2024 13:30:26 +0000 (13:30 +0000)]
Merge "Create PolicyExecutor Stub"

8 months agoMerge "Setup automated tests with two replicas of cps-and-ncmp"
Daniel Hanrahan [Tue, 9 Jul 2024 12:31:10 +0000 (12:31 +0000)]
Merge "Setup automated tests with two replicas of cps-and-ncmp"

8 months agoMerge "[k6] Measure CM-handle (de)registration in CM-handles/sec"
Sourabh Sourabh [Tue, 9 Jul 2024 09:38:47 +0000 (09:38 +0000)]
Merge "[k6] Measure CM-handle (de)registration in CM-handles/sec"

8 months agoMerge "Remove forced module sync from NCMP integration tests"
Lee Anjella Macabuhay [Tue, 9 Jul 2024 09:24:08 +0000 (09:24 +0000)]
Merge "Remove forced module sync from NCMP integration tests"

8 months agoMerge "Refactor integration tests so only one DmiDispatcher is used"
Lee Anjella Macabuhay [Tue, 9 Jul 2024 09:23:51 +0000 (09:23 +0000)]
Merge "Refactor integration tests so only one DmiDispatcher is used"

8 months agoCreate PolicyExecutor Stub 01/138401/3
ToineSiebelink [Thu, 4 Jul 2024 14:15:36 +0000 (15:15 +0100)]
Create PolicyExecutor Stub

- Generate interface from OpenApi in RTD docs
- Fixed Content Type in OpenAPI
- Fixed Paths in OpenAPI
- Made Authorization header compulsory in OpenAPI
- All 'enum' values in OpenAPI lowercase (in linr with CPS/NCMP conventions)
- Added impl with some basic functionality
- Added testware
- Pom includes docker image creation
- Docker compose updated to deploy stub

Issue-ID: CPS-2301
Change-Id: I462ad5c70474b2813fc04005c0d20a1b15b574ec
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
8 months agoMerge "Remove Mappers and Events Facade"
Lee Anjella Macabuhay [Mon, 8 Jul 2024 14:06:48 +0000 (14:06 +0000)]
Merge "Remove Mappers and Events Facade"

9 months ago[BUG] Fix handling of special characters in moduleSetTag 98/138398/2
danielhanrahan [Fri, 5 Jul 2024 12:20:31 +0000 (13:20 +0100)]
[BUG] Fix handling of special characters in moduleSetTag

During CM-handle registration, moduleSetTag is sent as part of the
JSON request body when getting modules from DMI. However, it
incorrectly parses the moduleSetTag as JSON, instead of encoding to
JSON. This results in parsing errors when moduleSetTag includes
characters such as ':'

Issue-ID: CPS-2302
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ie38008e0effac2423a4d069a91587e47d8747d66

9 months agoRemove Mappers and Events Facade 97/138397/1
mpriyank [Fri, 5 Jul 2024 11:33:06 +0000 (12:33 +0100)]
Remove Mappers and Events Facade

- Removing Mappers and Events Facade and introducing the normal classes
  that this facade was wrapping
- Corresponding changes in the testware

Issue-ID: CPS-2298
Change-Id: I380d73ff3a9b3bf79633cd91580d6a4dee00a662
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
9 months ago[k6] Measure CM-handle (de)registration in CM-handles/sec 43/138343/5
danielhanrahan [Fri, 28 Jun 2024 12:43:35 +0000 (13:43 +0100)]
[k6] Measure CM-handle (de)registration in CM-handles/sec

As per characteristics requirements document:
- measure registration in CM-handles/second
- measure deregistration in CM-handles/second
- summary table includes test case number, description,
  units of measurement, actual value and limit.

Issue-ID: CPS-2269
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I838004da1c230ab722f49c2adacf34e730d7ac79

9 months agoMerge "refactor cmsubscription code"
Daniel Hanrahan [Fri, 5 Jul 2024 10:23:48 +0000 (10:23 +0000)]
Merge "refactor cmsubscription code"

9 months agoRemove forced module sync from NCMP integration tests 93/138393/1
danielhanrahan [Thu, 4 Jul 2024 17:01:28 +0000 (18:01 +0100)]
Remove forced module sync from NCMP integration tests

- remove forced module sync in tests
- set module sync timers to 1 second in test application.yml
- have tests wait up to 2 seconds for module sync to run

Issue-ID: CPS-2304
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I727894dc1b4b9cee1ab82d05a9c31d1e3e067cf3

9 months agoRefactor integration tests so only one DmiDispatcher is used 91/138391/1
danielhanrahan [Thu, 4 Jul 2024 16:03:44 +0000 (17:03 +0100)]
Refactor integration tests so only one DmiDispatcher is used

Issue-ID: CPS-2303
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I4d04fb9b7693a769e9059d3b2b7257a714da0532

9 months agorefactor cmsubscription code 55/138355/7
mpriyank [Mon, 1 Jul 2024 11:32:27 +0000 (12:32 +0100)]
refactor cmsubscription code

- Moved cmsubscription to the impl package instead of api.
- Below packages are renamed or newly created for code and tests
  - moved ..api.cmsubsription to ..impl.cmsubscription
  - renamed ..api.cmsubscription.mappers to ..impl.cmsubscription.ncmp
    or dmi as per the functionality
  - renamed ..api.cmsubscription.model to ..impl.cmsubscription.models
  - removed ..api.cmsubscription.producer/consumer and classes moved to  ..impl.cmsubscription.ncmp/dmi
  - new package ..impl.cmsubscription.cache to hold cache config and
    cache operations
  - new package ..impl.cmsubscription.avc to hold the CmAvcEventConsumer
    for the notifications emitted as a result of the subscriptions
  - Removed the prefix CmNotificationSubscription for majority of the classes , not removed for Config and model classes
  - Renamed the schemas and package structure as per the code refactoring

Note: *EventsFacade and *MappersFacade to be removed in the next
patchset

Issue-ID: CPS-2298
Change-Id: I1d788ab745d65965570e28beaefa511cbe4a8547
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
9 months agoRelease notes for Web Client prometheus metrics 82/138382/1
sourabh_sourabh [Thu, 4 Jul 2024 08:46:24 +0000 (09:46 +0100)]
Release notes for Web Client prometheus metrics

- Release notes updated as we enabled http client prometheus metrics.

Issue-ID: CPS-2121
Change-Id: I6918da7cd4e4523c1ec0ab6060bdc1686c141a9d
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
9 months agoMerge "Add Policy Executor Open API Interface definition"
Sourabh Sourabh [Thu, 4 Jul 2024 08:34:42 +0000 (08:34 +0000)]
Merge "Add Policy Executor Open API Interface definition"

9 months agoMerge " CPS NCMP: Resolved high cardinality of prometheus metrics for dmi service...
Toine Siebelink [Wed, 3 Jul 2024 16:57:48 +0000 (16:57 +0000)]
Merge " CPS NCMP: Resolved high cardinality of prometheus metrics for dmi service url"

9 months ago CPS NCMP: Resolved high cardinality of prometheus metrics for dmi service url 18/138318/13
sourabh_sourabh [Thu, 20 Jun 2024 16:48:47 +0000 (17:48 +0100)]
 CPS NCMP: Resolved high cardinality of prometheus metrics for dmi service url

 - Used autoconfigured web client builder for http_client_requests_* prometheus metrics.
 - Refactored dmi service url builder to create url template and its
   variables.
 - Web client is modified to use uri(urlTemplate, urlvars) version.
 - Deleted InvalidDmiResourceUrlException that no longer needed.
 - Used DmiServiceUrlBuilder to build dmi health check service url.
 - Created a new pkg url.builder into utils to have all related classes
   and record.

Issue-ID: CPS-2121
Change-Id: Id67e0f0d4e640bb8f9eea0b6c2db1dba3468e1d7
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
9 months agoAdd Policy Executor Open API Interface definition 66/138366/3
ToineSiebelink [Mon, 1 Jul 2024 16:50:54 +0000 (17:50 +0100)]
Add Policy Executor Open API Interface definition

- OPenApi in RTD only (for now)
- Bear authentication included in OpenApi
- Placeholder RTD page (to be completed upon feature delivery)
- For consistency (and color coding in editors) I put all Description and Example strings inside double qoutes "..."

Issue-ID: CPS-2291
Change-Id: I7f16cdce2a06cb011997005fa8b86b54c044304a
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
9 months agoFix sonar issue in performance test ResourceMeter 78/138378/2
danielhanrahan [Wed, 3 Jul 2024 14:41:40 +0000 (15:41 +0100)]
Fix sonar issue in performance test ResourceMeter

Replace busy loop with await().until as suggested by sonar

Issue-ID: CPS-89
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ic6c870c419a67708082ceb05ef3ccba884ae375e

9 months agoSetup automated tests with two replicas of cps-and-ncmp 38/138238/16
halil.cakal [Mon, 17 Jun 2024 08:24:59 +0000 (09:24 +0100)]
Setup automated tests with two replicas of cps-and-ncmp

- this change for two test suits: CSIT and K6
- increase cps-and-ncmp replicas to 2
- introduce nginx as load-balancer
- set proxies inside nginx for the cps-and-ncmp URI paths
- upgrade hazelcast-spring to 5.3.7

Issue-ID: CPS-2038

Change-Id: If1b6c1e1218af16b24cc061507ea9b25d277d143
Signed-off-by: halil.cakal <halil.cakal@est.tech>
9 months agoMerge "Improve handling of Invalid Operation exception"
Sourabh Sourabh [Mon, 1 Jul 2024 14:08:27 +0000 (14:08 +0000)]
Merge "Improve handling of Invalid Operation exception"

9 months agoMerge "Fix incorrect use of getAnchors(dataspace, schemasets)"
Daniel Hanrahan [Mon, 1 Jul 2024 13:52:29 +0000 (13:52 +0000)]
Merge "Fix incorrect use of getAnchors(dataspace, schemasets)"

9 months agoImprove handling of Invalid Operation exception 50/138350/1
ToineSiebelink [Mon, 1 Jul 2024 10:24:49 +0000 (11:24 +0100)]
Improve handling of Invalid Operation exception

- MOve to API package
- Handle in REST Controller to return BAD REQUEST

Issue-ID: CPS-2256
Change-Id: I4f96519aaf2e7f781729c8b8671ea02630a2e0a8
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
9 months agorepackage 'data' feature 37/138337/2
ToineSiebelink [Thu, 27 Jun 2024 11:49:27 +0000 (12:49 +0100)]
repackage 'data' feature

- moved relevant classes into these (new) packages:
api.data.exceptions
api.data.models
impl.data
impl.data.async
impl.data.exceptions
impl.data.models
impl.data.utils
utils.events
- removed old unused event class
- moves some missed inventory related class to the right place

Issue-ID: CPS-2256
Change-Id: I75563e063acc0054769d8f2b13146e6c1d1c6054
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
9 months agomove lcm/common events classes 39/138339/1
ToineSiebelink [Thu, 27 Jun 2024 14:35:37 +0000 (15:35 +0100)]
move lcm/common events classes

-moved api.impl.events.lcm to impl.inventory.sync.lcm
-moved most api.impl.events class to utils.events
(remaining classes in api.impl.events belong to cmsubscrption and Priyank wil take care of those)

Issue-ID: CPS-2258
Change-Id: I1818194e708aa0d9c713b470e878997c2f26fb13
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
9 months agoMerge "Simplify package structure cps-ncmp-rest"
Priyank Maheshwari [Thu, 27 Jun 2024 11:02:43 +0000 (11:02 +0000)]
Merge "Simplify package structure cps-ncmp-rest"

9 months agoSimplify package structure cps-ncmp-rest 34/138334/1
ToineSiebelink [Thu, 27 Jun 2024 08:06:31 +0000 (09:06 +0100)]
Simplify package structure cps-ncmp-rest

Issue-ID: CPS-2294
Change-Id: Idc3605c1b877be13a8d344875612da6bef791fc7
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
9 months agoMerge "Move TrustLevel Feature"
Priyank Maheshwari [Wed, 26 Jun 2024 14:33:36 +0000 (14:33 +0000)]
Merge "Move TrustLevel Feature"

9 months agoMove TrustLevel Feature 25/138325/4
ToineSiebelink [Tue, 25 Jun 2024 13:40:40 +0000 (14:40 +0100)]
Move TrustLevel Feature

-Moved TrustLevel impl from Controller to Inventory Facade
-Applied new package name convention using impl\inventory\trustlevel for this (sub)feature
-Renamed some trustlevel related classes to better describe their role
-Disabled failing architecture test (agreed this is tech. debt and created CPS-2293)
-Refactored YangDataConverter method names and signatures (moved Spec to correct place)
-Cleaned up names and javadoc of class now called DeviceTrustLevelMessageConsumer
-Applied conventions to modified test methods

Issue-ID: CPS-2255
Change-Id: Iccd20541488e6b61444bb2c7406c90e61a34124d
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
9 months agoMerge "Disable the java debug port permanently"
Sourabh Sourabh [Wed, 26 Jun 2024 11:36:00 +0000 (11:36 +0000)]
Merge "Disable the java debug port permanently"

9 months agoDisable the java debug port permanently 28/138328/1
halil.cakal [Wed, 26 Jun 2024 11:03:38 +0000 (12:03 +0100)]
Disable the java debug port permanently

Issue-ID: CPS-1864

Change-Id: I0366b126920cf0bc706545bc5b4e469d3faa2486
Signed-off-by: halil.cakal <halil.cakal@est.tech>
9 months agoMerge "Clean up the k6 test suite"
Daniel Hanrahan [Wed, 26 Jun 2024 08:09:46 +0000 (08:09 +0000)]
Merge "Clean up the k6 test suite"

9 months agoFix incorrect use of getAnchors(dataspace, schemasets) 05/138305/3
danielhanrahan [Fri, 21 Jun 2024 10:12:45 +0000 (11:12 +0100)]
Fix incorrect use of getAnchors(dataspace, schemasets)

There is an issue in a method deleteDataNodes(dataspace, anchors)
where it doesn't send data update events. This is because it fetches
anchors using a method getAnchors(dataspace, schemaSetNames), when it
needs to fetch anchors by name: getAnchors(dataspace, anchorNames)

Changes:
- Rename getAnchors method using schemasets to getAnchorsBySchemaSetNames
- Add a method getAnchors(dataspace, anchorNames)
- Update test of deleteDataNodes method using getAnchors so it checks
  that data update events are sent

Issue-ID: CPS-2254
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I55fe853f0a9278a66a5724bf4cf2723b0e2fbc8b

9 months agoRepackage Inventory Feature 54/138154/3
ToineSiebelink [Mon, 24 Jun 2024 12:24:57 +0000 (13:24 +0100)]
Repackage Inventory Feature

- decided that cm handle queries is part of 'inventory' feature
- a lot of files (~100 total) have changes because of some files have been moved.
- The reviewers should probably just focus on the MOVED/renamed (~30) files
- New packages (top level only):
-- org.onap.cps.ncmp.api.inventory
-- org.onap.cps.ncmp.impl.inventory
-- org.onap.cps.ncmp.impl.models  (common models NOT used in API, this was unforeseen)
-- org.onap.cps.ncmp.impl.utils
- I am NOT updating copyright years as part of this commit since there are no real code changes and it is simply NOT worth the effort
TODO:
- extend scope to 'TrustLevel' as an 'internal feature' (TBD)

Issue-ID: CPS-2255
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Change-Id: I40b4efc8326068ab9ae1f31b77f46b2fe8579431

9 months agoClean up the k6 test suite 06/138306/2
halil.cakal [Fri, 21 Jun 2024 14:22:57 +0000 (15:22 +0100)]
Clean up the k6 test suite

- Remove the tests that are not in the Characteristics
- Set .625 seconds/operation for cm handle id search with module filter
- Set 13 seconds/operation for cm handle search with module filter

Issue-ID: CPS-2286

Change-Id: I88d5773abadb29ce46914029332384ae8e55e032
Signed-off-by: halil.cakal <halil.cakal@est.tech>
9 months agoFix compile issue after facade introduction 04/138304/1
danielhanrahan [Fri, 21 Jun 2024 10:49:48 +0000 (11:49 +0100)]
Fix compile issue after facade introduction

Due to automatic rebase, a method got renamed in one commit but not
the other.

Issue-ID: CPS-2263
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Id0fa8eba79cb98bb24419bfddc0c9b9e8c9a42d3

9 months agoMerge "Introducing NCMP Facades"
Sourabh Sourabh [Fri, 21 Jun 2024 09:28:37 +0000 (09:28 +0000)]
Merge "Introducing NCMP Facades"

9 months agoMerge "Spliting a data-job into sub-jobs for DMI Plugin"
Sourabh Sourabh [Fri, 21 Jun 2024 08:50:46 +0000 (08:50 +0000)]
Merge "Spliting a data-job into sub-jobs for DMI Plugin"

9 months agoIntroducing NCMP Facades 28/138228/5
ToineSiebelink [Thu, 13 Jun 2024 15:52:45 +0000 (16:52 +0100)]
Introducing NCMP Facades

- NetworkCmProxyDataService was polluted with many non-data operations
- it is now split into:
1) NetworkCmProxyFacade, a single thin facade for the (main) controler to redirect calls to the correct services
2) CmHandleRegistrationService(Impl), methods related to registration only
- introduced NetworkCmProxyInventoryFacade for the invenoty controller
- renamed some services for consitency and clarification
- Use facade to acces ncmp data request handlers (instead of direct from controller)
- remove unnecesarry wrappings between request handlers and facade
- split facades according to names: data & inventory
(the REST controllers are not split properly so I think one rest controller will end up needing both facades)

Issue-ID: CPS-2263
Change-Id: I250732aa16ec28b43ff642d2adf10ba36f67290e
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
9 months agoBump CPS version to 3.5.1-SNAPSHOT 96/138296/2
mpriyank [Thu, 20 Jun 2024 14:22:14 +0000 (15:22 +0100)]
Bump CPS version to 3.5.1-SNAPSHOT

- bump cps version to 3.5.1-SNAPSHOT
- updated release notes to make it ready for the next release

Issue-ID: CPS-2283
Change-Id: I242cae7c95a87c1a9e225cce3eb7b36097f1e5ba
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
9 months agoMaven container yaml for release 95/138295/1
mpriyank [Thu, 20 Jun 2024 13:32:31 +0000 (14:32 +0100)]
Maven container yaml for release

- added maven container yaml to release cps 3.5.0 version

Issue-ID: CPS-2283
Change-Id: I45ce5b440d8ca2f6ff3999971202f9fc3bd4a8fa
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
9 months agoSpliting a data-job into sub-jobs for DMI Plugin 40/138240/7
leventecsanyi [Mon, 17 Jun 2024 09:11:24 +0000 (11:11 +0200)]
Spliting a data-job into sub-jobs for DMI Plugin

    - algorithm for create sub-job requests
    - added new method to DmiServiceUrlBuilder to get the write job url
    - created WriteOperationExaminer, DmiSubJobClient & testware

Issue-ID: CPS-2142
Change-Id: I258d334ef346cd388341a1deb4078d24d8bdb7cc
Signed-off-by: leventecsanyi <levente.csanyi@est.tech>
9 months agoMaven yaml for release 93/138293/1
mpriyank [Thu, 20 Jun 2024 13:00:56 +0000 (14:00 +0100)]
Maven yaml for release

- added maven yaml file to release cps 3.5.0

Issue-ID: CPS-2283
Change-Id: Ifc9cc9f33381d64bf573593949cf59303ff8d0fc
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
9 months agoRelease notes and OpenApi sync 91/138291/1
mpriyank [Thu, 20 Jun 2024 11:59:02 +0000 (12:59 +0100)]
Release notes and OpenApi sync

- Release notes updated and openapi syncd for CPS-Core and NCMP

Issue-ID: CPS-2283
Change-Id: Iafdebc65cbcec01bf0d6e6963bd9601fea5f5081
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
9 months agoAddressed an adaptability issue 86/138286/2
sourabh_sourabh [Wed, 19 Jun 2024 13:35:30 +0000 (14:35 +0100)]
Addressed an adaptability issue

- Defined a constant instead of duplicating literal "No data nodes 4 times.

Issue-ID: CPS-478
Change-Id: I2b980a228217e85424342d4c2b9e97c5cfa618d1
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
9 months agoHandle high frequency (faster then DMI) of passthrough request in NCMP 74/138274/4
sourabh_sourabh [Mon, 17 Jun 2024 18:45:00 +0000 (19:45 +0100)]
Handle high frequency (faster then DMI) of passthrough request in NCMP

- Added pendingAcquireMaxCount property into appliaction.yml.
- Added findbugs google annotations dependency.
- Supressed "BC_UNCONFIRMED_CAST_OF_RETURN_VALUE" spotbugs low error for
  reactor.netty.resources.ConnectionProvider.

Issue-ID: CPS-2262
Change-Id: Ie755e40282473933f2052fbe7654e7090bb9b337
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
9 months agoMerge "[k6] Add JVM warmup phase (#2)"
Priyank Maheshwari [Mon, 17 Jun 2024 16:01:24 +0000 (16:01 +0000)]
Merge "[k6] Add JVM warmup phase (#2)"

9 months agoMerge "[k6] Refactoring k6 tests (#1)"
Priyank Maheshwari [Mon, 17 Jun 2024 13:13:24 +0000 (13:13 +0000)]
Merge "[k6] Refactoring k6 tests (#1)"

9 months agoRefactor and Move NCMP Data Request Handlers 25/138225/5
ToineSiebelink [Fri, 14 Jun 2024 09:01:56 +0000 (10:01 +0100)]
Refactor and Move NCMP Data Request Handlers

- Simplified NCMP Rest Request Handlers
- Moved responsEntity wrapping to Controller so most handler methods can have clear return types
- Moved NCMP Rest Request Handlers  to Service Layer
- Moved related exceptions and utils to Service Layer
- Used Lombok for constructors
- Improved related testware

Issue-ID: CPS-2266
Change-Id: I0025fab1c92e0d613825093b6e4b43dae044c01a
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
9 months ago[k6] Add JVM warmup phase (#2) 12/138212/6
danielhanrahan [Wed, 12 Jun 2024 15:50:07 +0000 (16:50 +0100)]
[k6] Add JVM warmup phase (#2)

To account for JVM warmup effect, the k6 test suite is run twice:
initially, the whole test suite is run without recording results.

- Added environment variables to allow setting total CM-handles and
  batch size for registration. By reducing total CM-handles during
  warm-up, many more operations will be run.

Issue-ID: CPS-2264
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ib1d1e76d31719d788a3e026797faa0a425b320a2

9 months ago[k6] Refactoring k6 tests (#1) 64/138164/5
danielhanrahan [Mon, 10 Jun 2024 20:32:12 +0000 (21:32 +0100)]
[k6] Refactoring k6 tests (#1)

This commit moves all common request logic into a common folder.
It is needed to avoid duplication before adding JVM warmup phase.

- move registration-related code into common folder
- move passthrough operations into common folder

Issue-ID: CPS-2208
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ia9ebf61d21044b43063bde153f9c526e67d607c8

9 months agoUpdate ONAP DMI version in NCMP 24/138224/1
mpriyank [Fri, 14 Jun 2024 14:02:53 +0000 (15:02 +0100)]
Update ONAP DMI version in NCMP

- update the docker compose file to point to latest version on
  onap-dmi-plugin. Same to be used to run the CSITs during build.

Issue-ID: CPS-2271
Change-Id: Ifbb2ee9c9548d54979a04595e19062d9192bfd1d
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
9 months ago #2: Used async version of web client for single cm handle read operation 57/138157/7
sourabh_sourabh [Tue, 11 Jun 2024 07:56:54 +0000 (08:56 +0100)]
 #2: Used async version of web client for single cm handle read operation

 - Code change is done to use async web client for single cm handle
   read data operation.
 - CpsNcmpTaskExecutor class and groovy test code is removed.
 - Use of supplier code is removed from cm handle Query service.

Issue-ID:CPS-2259
Change-Id: I2b7a36e8a151a9224937afd876fceb30be6a24ce
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
9 months ago #1: Used async version of web client for batch read operation 52/138152/7
sourabh_sourabh [Fri, 7 Jun 2024 18:10:45 +0000 (19:10 +0100)]
 #1: Used async version of web client for batch read operation

  - Exposed async version of post method into dmi rest client.
  - Code change is done to use async web client for batch data
   operation.
  - Use of CpsNcmpTaskExecutor code is removed.

Issue-ID: CPS-2174
Change-Id: I7840fd8c6d9debe42e50c860f9cf39d64274df72
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
9 months agoMerge "[k6] Refactor k6 tests for CM handle searches"
Lee Anjella Macabuhay [Mon, 10 Jun 2024 08:31:59 +0000 (08:31 +0000)]
Merge "[k6] Refactor k6 tests for CM handle searches"

10 months agoMerge "Cm Subscription: Predicates optional now"
Lee Anjella Macabuhay [Thu, 6 Jun 2024 20:01:42 +0000 (20:01 +0000)]
Merge "Cm Subscription: Predicates optional now"

10 months ago[k6] Refactor k6 tests for CM handle searches 51/138151/1
danielhanrahan [Thu, 6 Jun 2024 19:43:21 +0000 (20:43 +0100)]
[k6] Refactor k6 tests for CM handle searches

A cleanup of the k6 tests to avoid code duplication

Issue-ID: CPS-2208
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: If1e58ee87300cd28ed72b365d9a86e2709dc6c13

10 months ago#1: Dedicated web client instance is assigned for data, model and health services 86/138086/14
sourabh_sourabh [Mon, 27 May 2024 17:28:10 +0000 (18:28 +0100)]
#1: Dedicated web client instance is assigned for data, model and health services

 - Switched web client instance based on dmi service type (like data or model)
 - 3 diff. beans are configured for data, model and health dmi service.
 - Added configurable properties for data and model.
 - Hard coded properties are assigned for health service.

Issue-ID: CPS-2231
Change-Id: I39fb739c07c41430dae43509fe29ece5306b7d71
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
10 months agoCm Subscription: Predicates optional now 42/138142/1
mpriyank [Thu, 6 Jun 2024 10:47:46 +0000 (11:47 +0100)]
Cm Subscription: Predicates optional now

- making the predicates sectional OPTIONAL as the schemas are common for
  both create and delete use case and we dont have the need to send in
  the predicates information for DELETE use case.
- Delete is done based on the incoming subscriptionId only

Issue-ID: CPS-2252
Change-Id: I43ec480821a6088c5fa161480ce2b29b660a2ba5
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
10 months agoCPS Delta API 2: Delta between anchor and payload 59/135859/53
Arpit Singh [Thu, 7 Sep 2023 11:35:37 +0000 (17:05 +0530)]
CPS Delta API 2: Delta between anchor and payload

  - Second API to get Delta between an anchor and JSON payload
  - added new API getDeltaByDataspaceAnchorAndPayload
  - added controller and service layer methods
    getDeltaByDataspaceAnchorAndPayload
  - Core Delta algorithm remains same as the first API.
    getDeltaByDataspaceAnchorAndPayload will call getDeltaBetweenDataNodes

Issue-ID: CPS-1836
Signed-off-by: Arpit Singh <as00745003@techmahindra.com>
Change-Id: Id74cd930ce48e5cb414aa62c5381b79675788a37

10 months agoMerge "Change ApplicationEvent for ModelLoading"
Toine Siebelink [Thu, 6 Jun 2024 08:16:39 +0000 (08:16 +0000)]
Merge "Change ApplicationEvent for ModelLoading"

10 months agoXML content support on update node leaves 63/137163/27
Rudrangi Anupriya [Wed, 5 Jun 2024 18:25:14 +0000 (23:55 +0530)]
XML content support on update node leaves

Issue-ID: CPS-2071
Change-Id: Ibe7f59fbfcbb03703626132c6d5c2afde0e7ab4b
Signed-off-by: Rudrangi Anupriya <ra00745022@techmahindra.com>
10 months agoChange ApplicationEvent for ModelLoading 50/137850/4
mpriyank [Tue, 7 May 2024 12:57:48 +0000 (13:57 +0100)]
Change ApplicationEvent for ModelLoading

- Application to use ApplicationStartedEvent as the trigger to start the
  ModelLoading process instead of ApplicationReadyEvent
- Modified the testware to reflect the same

Issue-ID: CPS-2211
Change-Id: I3176b6373f585ec1915c3d43c553e233660225f5
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
10 months agoMerge "CM SUBSCRIPTION: Add delete use case #2 (DMI-NCMP)"
Priyank Maheshwari [Wed, 5 Jun 2024 08:20:20 +0000 (08:20 +0000)]
Merge "CM SUBSCRIPTION: Add delete use case #2 (DMI-NCMP)"

10 months agoMerge "Added OpenTelemetry to CPS"
Toine Siebelink [Wed, 5 Jun 2024 07:11:05 +0000 (07:11 +0000)]
Merge "Added OpenTelemetry to CPS"

10 months agoMerge "CM SUBSCRIPTION: Add delete use case #1 (Client-NCMP)"
Priyank Maheshwari [Tue, 4 Jun 2024 15:10:48 +0000 (15:10 +0000)]
Merge "CM SUBSCRIPTION: Add delete use case #1 (Client-NCMP)"

10 months agoAdded OpenTelemetry to CPS 67/137767/11
david.mcweeney [Thu, 25 Apr 2024 13:37:33 +0000 (14:37 +0100)]
Added OpenTelemetry to CPS

Change-Id: I192fa53e293ea43cdff92ebd44d0382eb290bb76
Signed-off-by: david.mcweeney <david.mcweeney@est.tech>
Issue-ID: CPS-2172

10 months agoCM SUBSCRIPTION: Add delete use case #2 (DMI-NCMP) 03/138103/2
emaclee [Thu, 30 May 2024 05:48:23 +0000 (06:48 +0100)]
CM SUBSCRIPTION: Add delete use case #2 (DMI-NCMP)

Issue-ID: CPS-2241
Change-Id: I218c46e9c16cc78025450494f5019bde1f351a40
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
10 months agoCM SUBSCRIPTION: Add delete use case #1 (Client-NCMP) 02/138102/2
emaclee [Thu, 30 May 2024 05:33:51 +0000 (06:33 +0100)]
CM SUBSCRIPTION: Add delete use case #1 (Client-NCMP)

Issue-ID: CPS-2241
Change-Id: Idd074ff4d29cf11f45f1c69200788b2f39b49e74
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
10 months agoCM SUBSCRIPTION: Update schemas 10/138110/1
mpriyank [Fri, 31 May 2024 08:46:11 +0000 (09:46 +0100)]
CM SUBSCRIPTION: Update schemas

- updated the cm subscription schemas with proper case as agreed before
  for the events
- fixed the tests to reflect the camelCase change

Issue-ID: CPS-2245
Change-Id: I64fb8b27a5f64280dfa19d86ae310e6b5309de39
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
10 months agoSimplify Code around building DMI URLs 94/138094/4
ToineSiebelink [Mon, 27 May 2024 14:02:35 +0000 (15:02 +0100)]
Simplify Code around building DMI URLs

- Bug analysis showed some unclear and complicated code for building URLs
- This patch is to clean up the related code and show more clearly what is encoded and what is not
- Use SPringBoot provided builder to apply correct encoding of all URI parts
- DmiOperations base class no longer need as no common code model and data operations anymore
- Converted builder to POJO (client needs to provide the only dmi properties upon build)
- Added some missing test (in affected code) to increase coverage percntage
(as the production code has significantly reduced in size the overal coverage was inadvertently reduced below the treshold)
- Added more unit test. Now impl.operations' package has 100%
- removed the test fro Dmi Exception that was incorrectly callign the handleException methdod directly instead of mocking an exception
it was really a dupclicate of a test I added but I was able to re-use the event checkign in my test

Issue-ID: CPS-2246
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Change-Id: I1ff196cd03bbb95f5877ee590c321febeb672800

10 months agoMerge "CPS-2187 - Move Module Set Tag into request body for dmi data access passthrou...
Sourabh Sourabh [Wed, 29 May 2024 14:14:37 +0000 (14:14 +0000)]
Merge "CPS-2187 - Move Module Set Tag into request body for dmi data access passthrough calls"

10 months agoCPS-2187 - Move Module Set Tag into request body for dmi data access passthrough... 89/138089/6
david.mcweeney [Tue, 28 May 2024 11:48:38 +0000 (12:48 +0100)]
CPS-2187 - Move Module Set Tag into request body for dmi data access passthrough calls

Change-Id: I9c807d2ef5b3712bf3f8ee5db7663d9628eef3bb
Signed-off-by: david.mcweeney <david.mcweeney@est.tech>
Issue-ID: CPS-2187

10 months agoAdjust K6 thresholds 95/138095/2
danielhanrahan [Tue, 28 May 2024 17:28:32 +0000 (18:28 +0100)]
Adjust K6 thresholds

- Adjust timings based on previous runs.
- Reduce from 5 to 4 parallel clients for CM handle searches
  to avoid OutOfMemoryErrors.

Issue-ID: CPS-2208
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I339cc3df84b2295bb11371ab73b4948f43615c15

10 months agoRestructure(package) DataJobs feature in NCMP Service 73/138073/6
leventecsanyi [Thu, 23 May 2024 14:40:13 +0000 (16:40 +0200)]
Restructure(package) DataJobs feature in NCMP Service

   - restructured already existing classes
   - added testware for AlternateIdMatcher

Issue-ID: CPS 2240
Change-Id: I5691ed99627353903689cd2929163f77ed8c4eca
Signed-off-by: leventecsanyi <levente.csanyi@est.tech>
10 months agoMerge "CmDataSubscription status code update"
Lee Anjella Macabuhay [Tue, 28 May 2024 11:30:04 +0000 (11:30 +0000)]
Merge "CmDataSubscription status code update"

10 months agoMerge "Print summary report for K6 tests"
Daniel Hanrahan [Tue, 28 May 2024 10:16:20 +0000 (10:16 +0000)]
Merge "Print summary report for K6 tests"

10 months agoPrint summary report for K6 tests 82/138082/3
halil.cakal [Mon, 27 May 2024 15:06:59 +0000 (16:06 +0100)]
Print summary report for K6 tests

- add a generic template to print summary of k6 test results
- remove container logs since its around 50 mb

Issue-ID: CPS-2215
Change-Id: I8971fc30b9dc8be2ed16eda6755d17a91f608b48
Signed-off-by: halil.cakal <halil.cakal@est.tech>
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Signed-off-by: halil.cakal <halil.cakal@est.tech>
10 months agoCmDataSubscription status code update 84/138084/1
mpriyank [Mon, 27 May 2024 12:33:36 +0000 (13:33 +0100)]
CmDataSubscription status code update

- Removing the unused NcmpRespnseStatus internal codes and messages
- Introducing statusCode 1 for ACCEPTED and 104 for REJECTED of
  CmSubscription
- Added check for status code and message both in the flow

Issue-ID: CPS-2238
Change-Id: Id99f099a398392dbef1504f9d7c658665d163902
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
10 months agoCmSubscription overlapping case 75/138075/4
mpriyank [Fri, 24 May 2024 10:38:06 +0000 (11:38 +0100)]
CmSubscription overlapping case

- Directly ACCEPT the CmSubscription request in case of overlapping
  scenario
- The confirmation will be sent out when the DMI timeout has happened
- No request sent out to DMI plugin in this scenario

Issue-ID: CPS-2237
Change-Id: Ic799801058e9c8e1c2db8780a42ab85ea306f45e
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
10 months agoMerge "CM SUBSCRIPTION: add new subscription for non existing xpath"
Priyank Maheshwari [Thu, 23 May 2024 15:29:37 +0000 (15:29 +0000)]
Merge "CM SUBSCRIPTION: add new subscription for non existing xpath"