policy/apex-pdp.git
3 years agoPoint to models 2.3.2 release 35/113635/1
Ram Krishna Verma [Wed, 7 Oct 2020 19:31:12 +0000 (15:31 -0400)]
Point to models 2.3.2 release

Issue-ID: POLICY-2839
Change-Id: Icb05b2c63cf760f8b8e02731e235041d7430a06e
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
3 years agoRemove legacy operational policy type from apex-pdp 50/113550/1
Ram Krishna Verma [Mon, 5 Oct 2020 21:10:08 +0000 (17:10 -0400)]
Remove legacy operational policy type from apex-pdp

The legacy operational policy type for apex has been removed in Guilin release.
Removing it fron supported policy type and other places in apex-pdp.

Issue-ID: POLICY-2857
Change-Id: I41d58bf7e82292e11ff752f61dbe9be96a8a7af4
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
3 years agoFixing APEX eventName handling to avoid duplicate requests 54/113254/6
a.sreekumar [Mon, 28 Sep 2020 11:45:22 +0000 (12:45 +0100)]
Fixing APEX eventName handling to avoid duplicate requests

Change-Id: I6ee50fb455424ae1f241b7a12d1cdbf0e6ee4011
Issue-ID: POLICY-2815
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
3 years agoupdate default keystores 27/113127/1
jhh [Thu, 24 Sep 2020 19:52:14 +0000 (14:52 -0500)]
update default keystores

Issue-ID: POLICY-2827
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I7cde8197621ccc3d366baab952243c7b7894a29b

3 years agoCleanup related to removal of legacy format support in APEX 17/112817/3
a.sreekumar [Thu, 17 Sep 2020 11:02:19 +0000 (12:02 +0100)]
Cleanup related to removal of legacy format support in APEX

This review basically just removes all "policyModelFileName" occurences
which are not used anymore.

Change-Id: Ibac8ec776dd989a5d677ff27a99eb7a36110773f
Issue-ID: POLICY-2835
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
3 years agoUse alpine base image 2.1.1 47/112647/1
Jim Hahn [Mon, 14 Sep 2020 22:09:01 +0000 (18:09 -0400)]
Use alpine base image 2.1.1

Issue-ID: POLICY-2819
Change-Id: I28b4c8acdef0302b6419a07c4445d60c398c4f73
Signed-off-by: Jim Hahn <jrh3@att.com>
3 years agoBump APEX version to 2.4.2-SNAPSHOT 01/112501/1
a.sreekumar [Thu, 10 Sep 2020 15:32:05 +0000 (16:32 +0100)]
Bump APEX version to 2.4.2-SNAPSHOT

Change-Id: Idde5050b425eb1bebe312e80e795c21513367a1b
Issue-ID: POLICY-2789
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
3 years agoRelease APEX docker 2.4.1 90/112490/1
a.sreekumar [Thu, 10 Sep 2020 13:43:50 +0000 (14:43 +0100)]
Release APEX docker 2.4.1

Change-Id: Ief1025869ee480fe0d43063c2590d74c6de2c77d
Issue-ID: POLICY-2789
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
3 years agoRelease APEX maven 2.4.1 83/112483/1
a.sreekumar [Thu, 10 Sep 2020 12:38:53 +0000 (13:38 +0100)]
Release APEX maven 2.4.1

Change-Id: I50a84d9abbb8563d1886f1ef199a79f1cc99b4ff
Issue-ID: POLICY-2789
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
3 years agoDelete apex-client from packaging 40/112440/2
Jim Hahn [Thu, 10 Sep 2020 01:01:11 +0000 (21:01 -0400)]
Delete apex-client from packaging

The "stage-release" failed due to:
  18:51:12 [ERROR] Failed to execute goal
  org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy
  (copy-fat-jars) on project apex-pdp-package-full: Unable to
  find/resolve artifact. Could not find artifact
  org.onap.policy.apex-pdp.client:apex-client-full:jar:full:2.4.1
  in release-mirror (https://nexus.onap.org/content/repositories/public/)
  -> [Help 1]

Removed it from the package, as it is no longer part of apex-pdp.

Issue-ID: POLICY-2789
Change-Id: I4089096ab9668af33e885c70e140ce8fc1f51939
Signed-off-by: Jim Hahn <jrh3@att.com>
3 years agoRemove deleted dependency from apex-pdp 27/112427/2
Jim Hahn [Wed, 9 Sep 2020 21:39:17 +0000 (17:39 -0400)]
Remove deleted dependency from apex-pdp

One of the poms refers to core-deployment, which has been deleted from
apex-pdp.  Deleted it from the pom.

Issue-ID: POLICY-2789
Change-Id: Ie9d9265ad61808ca0d5dbf8ea3e772ac7348edbb
Signed-off-by: Jim Hahn <jrh3@att.com>
3 years agoPointing to released common & models 99/112399/1
Ram Krishna Verma [Wed, 9 Sep 2020 17:20:18 +0000 (13:20 -0400)]
Pointing to released common & models

Issue-ID: POLICY-2789
Change-Id: Ibaaf533f79cf2bc98090b2933392945ef8bb06ef
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
3 years agoAPEX standalone support for ToscaPolicy format 53/112053/15
a.sreekumar [Wed, 2 Sep 2020 16:19:26 +0000 (17:19 +0100)]
APEX standalone support for ToscaPolicy format

Legacy format support is removed, and Tosca format support is added.

Change-Id: I3cfc181ccb5471a5d224c0162af18c1fa0fdbc70
Issue-ID: POLICY-2812
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
3 years agoMerge "Remove client code from apex-pdp"
Ram Krishna Verma [Tue, 8 Sep 2020 17:23:34 +0000 (17:23 +0000)]
Merge "Remove client code from apex-pdp"

3 years agopoint to 2.1.0 policy-alpine base - apex 68/112168/2
Taka Cho [Fri, 4 Sep 2020 12:52:15 +0000 (08:52 -0400)]
point to 2.1.0 policy-alpine base - apex

In G-rel, using 2.1.0 base.

Issue-ID: POLICY-2789
Change-Id: Ieff7433ab0c85abca218032a0a3c91bb42081a80
Signed-off-by: Taka Cho <takamune.cho@att.com>
3 years agoRemove client code from apex-pdp 64/112164/1
liamfallon [Fri, 4 Sep 2020 10:03:24 +0000 (11:03 +0100)]
Remove client code from apex-pdp

Removal of the deployment and monitoring client from the apex-pdp as
the functionality is replaced by the Policy Framework deployment using
PAP and the Policy Framework monitoring GUI.

Code in the engine proper that was used to administer apex-pdp over the
Web Socket port is also removed, as this code was only used by the
apex-pdp legacy GUIs.

Issue-ID: POLICY-2621
Change-Id: Ib9fc4a667a4bc79377bb7b82fae6a2bd520a3e3d
Signed-off-by: liamfallon <liam.fallon@est.tech>
3 years agoMerge "Sonar Bug fixes"
Pamela Dragosh [Thu, 3 Sep 2020 17:42:03 +0000 (17:42 +0000)]
Merge "Sonar Bug fixes"

3 years agoSonar Bug fixes 00/112100/3
waynedunican [Thu, 3 Sep 2020 11:56:54 +0000 (12:56 +0100)]
Sonar Bug fixes

Removal of remaining bugs in apex-pdp

Issue-ID: POLICY-2774
Change-Id: I370796e7c8a41c116155155c33176512e9e0cd91
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoClean up warnings and SONAR issues 01/112101/2
liamfallon [Thu, 3 Sep 2020 12:32:01 +0000 (13:32 +0100)]
Clean up warnings and SONAR issues

Issue-ID: POLICY-2654
Change-Id: Ifd391ea9141d37cfd3ca4110d66c667962230ae1
Signed-off-by: liamfallon <liam.fallon@est.tech>
3 years agoSonar Build Fix 38/112038/1
waynedunican [Wed, 2 Sep 2020 12:12:45 +0000 (13:12 +0100)]
Sonar Build Fix

Issue-ID: POLICY-2611
Change-Id: I125e2e4be8e8f3f5e8bb67b282c134a51f1cd255
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoJavaScript Sonar Coverage setup 82/111882/3
waynedunican [Mon, 31 Aug 2020 12:17:03 +0000 (13:17 +0100)]
JavaScript Sonar Coverage setup

Sonar properties added to apex-pdp in order to pick up JavaScript
coverage in SonarCloud

Issue-ID: POLICY-2611
Change-Id: Ia9c5837bc18a34722437b2b299e85c6a8a67088d
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoUpdate apex JRuby joni dependency for security 40/111740/1
liamfallon [Wed, 26 Aug 2020 11:48:45 +0000 (12:48 +0100)]
Update apex JRuby joni dependency for security

Issue-ID: POLICY-2799
Change-Id: Ifdc16e99093995665db61329f61455fc0f327386
Signed-off-by: liamfallon <liam.fallon@est.tech>
3 years agoCorrect directory permission check in apex 35/111535/2
liamfallon [Fri, 21 Aug 2020 11:58:04 +0000 (12:58 +0100)]
Correct directory permission check in apex

Apex checked if the current directory is writable when it starts, it is corrected
to just check that the directory is readable and executable.

Issue-ID: POLICY-2791
Change-Id: I794f836cabfde0f6f78392b3c9e1de364d76e5f6
Signed-off-by: liamfallon <liam.fallon@est.tech>
3 years agoMerge "SONAR fixes - assert dissimiliar types"
Ram Krishna Verma [Tue, 18 Aug 2020 19:59:41 +0000 (19:59 +0000)]
Merge "SONAR fixes - assert dissimiliar types"

3 years agoMerge "Changes to make APEX container crash with non zero exitCode"
Ram Krishna Verma [Tue, 18 Aug 2020 19:57:14 +0000 (19:57 +0000)]
Merge "Changes to make APEX container crash with non zero exitCode"

3 years agoMerge "Remove apex policy editor gui"
Liam Fallon [Tue, 18 Aug 2020 10:18:13 +0000 (10:18 +0000)]
Merge "Remove apex policy editor gui"

3 years agoChanges to make APEX container crash with non zero exitCode 14/111314/3
a.sreekumar [Mon, 17 Aug 2020 10:29:16 +0000 (11:29 +0100)]
Changes to make APEX container crash with non zero exitCode

Change-Id: I1d36c28cfb07881ebede1cf918140397b076512c
Issue-ID: POLICY-2753
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
3 years agoSONAR fixes - assert dissimiliar types 72/111272/3
waynedunican [Fri, 14 Aug 2020 10:24:14 +0000 (11:24 +0100)]
SONAR fixes - assert dissimiliar types

Fix for assertions comparing dissimiliar types.

Issue-ID: POLICY-2761
Change-Id: I1b2b8afa3e6308cda887d73a4ee079709847d054
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoRemove apex policy editor gui 20/111320/1
liamfallon [Mon, 17 Aug 2020 12:49:06 +0000 (13:49 +0100)]
Remove apex policy editor gui

The apex policy editor has been moved to policy-gui. This review removes
the code from the apex-pdp repo.

Issue-ID: POLICY-2621
Change-Id: Ib5b90386d0da8af6eec8870fbcaf01b94975d5c6
Signed-off-by: liamfallon <liam.fallon@est.tech>
3 years agoSONAR fixes - log formatting 31/111231/2
waynedunican [Thu, 13 Aug 2020 11:23:39 +0000 (12:23 +0100)]
SONAR fixes - log formatting

Fixed the sonar issues relating to Printf format being used for logging
instead of String concatenation

Issue-ID: POLICY-2773
Change-Id: I38db8d1df077fd7102f6c4f9b33685f2914bd624
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoSONAR cleanup 91/111091/3
waynedunican [Mon, 10 Aug 2020 13:59:21 +0000 (14:59 +0100)]
SONAR cleanup

Removed the "result != null" checks

Issue-ID: POLICY-2768
Change-Id: Ibf174fbbb99512b1847b319931bc17a984fb8cc0
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoMerge "Handling apex-pdp multi policy deployment failure:"
Pamela Dragosh [Mon, 10 Aug 2020 14:47:31 +0000 (14:47 +0000)]
Merge "Handling apex-pdp multi policy deployment failure:"

3 years agoMerge "Sonar Fixes"
Pamela Dragosh [Mon, 10 Aug 2020 14:47:08 +0000 (14:47 +0000)]
Merge "Sonar Fixes"

3 years agoSONAR assertion cleanup 23/111023/2
waynedunican [Fri, 7 Aug 2020 08:51:52 +0000 (09:51 +0100)]
SONAR assertion cleanup

Replaced assertions to not have the same actual and expected expression
in apex-pdp

Issue-ID: POLICY-2761
Change-Id: I2bf45a3cc4411bd39f93f9d0b8c8e56dd318281e
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoHandling apex-pdp multi policy deployment failure: 85/110985/6
puthuparambil.aditya [Thu, 6 Aug 2020 12:03:38 +0000 (13:03 +0100)]
Handling apex-pdp multi policy deployment failure:

1.Include the list of duplicate parameters in the logs for easier troubleshooting
2.Also fix 4 Sonar blockers in ApexMainTest.java

Issue-ID: POLICY-2712
Signed-off-by: puthuparambil.aditya <aditya.puthuparambil@bell.ca>
Change-Id: I145a7e03f76f880f8e3cbde97284748468b354a5

3 years agoSonar Fixes 76/110976/7
JvD_Ericsson [Thu, 6 Aug 2020 09:00:32 +0000 (10:00 +0100)]
Sonar Fixes

Replace the type specification in this constructor call with the diamond operator
and other small fixes

Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
Issue-ID: POLICY-2760
Change-Id: I83821859a4a1dbbffbaeae15281abac2de3b5712

3 years agochange shebang bash line 26/110926/1
jhh [Wed, 5 Aug 2020 18:26:25 +0000 (13:26 -0500)]
change shebang bash line

The shebang line does not take flags causing container
intialization problems.

Issue-ID: POLICY-2615
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Iac66922873ded0684232c23e3fa2ac6747a959ae

3 years agoenvironment variables to support cert. store paths 01/110901/1
jhh [Wed, 5 Aug 2020 02:36:47 +0000 (21:36 -0500)]
environment variables to support cert. store paths

Issue-ID: POLICY-2615
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I746f1be50f7a85c0febddc9a92576bb2dbcd9a06

3 years agoUpdate info yaml in policy/apex-pdp 87/110787/1
Ram Krishna Verma [Thu, 30 Jul 2020 19:50:42 +0000 (15:50 -0400)]
Update info yaml in policy/apex-pdp

Issue-ID: POLICY-2738
Change-Id: I36b0180ce0eeab793b62af857d55f27c50b3d012
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
3 years agoFixing intermittent test failures in APEX 84/110684/2
a.sreekumar [Wed, 29 Jul 2020 09:42:43 +0000 (10:42 +0100)]
Fixing intermittent test failures in APEX

Here the intermittent test failures are fixed by providing a latch to
wait until the DeploymentClient is started. This may need improvement,
but all these deployment classes will be removed soon, hence not worth
the effort.

Change-Id: I1090e991c0448b42af1d9cbd16d96ae1cb5774fd
Issue-ID: POLICY-2654
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
3 years agoMerge "APEX changes to support policy disable/enable and some improvements"
Pamela Dragosh [Tue, 28 Jul 2020 20:05:38 +0000 (20:05 +0000)]
Merge "APEX changes to support policy disable/enable and some improvements"

3 years agoMerge "SONAR assertions apex-pdp"
Jim Hahn [Tue, 28 Jul 2020 17:58:22 +0000 (17:58 +0000)]
Merge "SONAR assertions apex-pdp"

3 years agoSONAR assertions apex-pdp 49/110549/3
waynedunican [Fri, 24 Jul 2020 08:46:36 +0000 (09:46 +0100)]
SONAR assertions apex-pdp

Ensure assertions are present in test cases

Issue-ID: POLICY-2706
Change-Id: I3673a7668564401d2136450b0bdd7a013605dd7c
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoAPEX changes to support policy disable/enable and some improvements 83/110483/6
a.sreekumar [Thu, 23 Jul 2020 09:36:32 +0000 (10:36 +0100)]
APEX changes to support policy disable/enable and some improvements

1) Do not stop all the marshallers/unmarshallers while updating the
engine. Stop and remove only those that are part of the policies that
are undeployed.
2) Do not reinitilaize any marshaller/unmarshaller that is already
initilaized as part of the policies which were already deployed.
Initialize only the ones as part of any newly deployed policy.
3) EngineParameters could be different in different policies. Aggregate
these parameters and make it available in the engine for any running policy.
4) Enable support for running policies with same model and different
configurations.

Change-Id: If74807a0515a741ef4e53bd0a93e43b05872f6b5
Issue-ID: POLICY-2536
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
3 years agoMerge "Fix replaceAll SONAR issues in apex-pdp"
Ram Krishna Verma [Fri, 24 Jul 2020 14:17:50 +0000 (14:17 +0000)]
Merge "Fix replaceAll SONAR issues in apex-pdp"

3 years agoFix replaceAll SONAR issues in apex-pdp 45/110545/2
JvD_Ericsson [Fri, 24 Jul 2020 09:07:18 +0000 (10:07 +0100)]
Fix replaceAll SONAR issues in apex-pdp

Change replaceAll() with repalce() in apex-pdp

Issue-ID: POLICY-2722
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
Change-Id: I8a15b99f02399addfc8f0e25349e3022d8b8c9f1

3 years agoAdd Ajith to apex-pdp info 00/110500/4
Jim Hahn [Thu, 23 Jul 2020 17:05:24 +0000 (13:05 -0400)]
Add Ajith to apex-pdp info

Also made changes required by changes to rules that process the yaml file.

Issue-ID: POLICY-2738
Change-Id: I1976f711b7f278c4e5a5b1d7338f451e81c42075
Signed-off-by: Jim Hahn <jrh3@att.com>
3 years agoMerge "Fix assertTrue in apex-pdp/model"
Jim Hahn [Thu, 23 Jul 2020 15:46:31 +0000 (15:46 +0000)]
Merge "Fix assertTrue in apex-pdp/model"

3 years agoMerge "Fix replaceAll SONAR issues in apex-pdp"
Ram Krishna Verma [Thu, 23 Jul 2020 14:42:39 +0000 (14:42 +0000)]
Merge "Fix replaceAll SONAR issues in apex-pdp"

3 years agoFix assertTrue in apex-pdp/model 91/110491/2
JvD_Ericsson [Thu, 23 Jul 2020 11:59:30 +0000 (12:59 +0100)]
Fix assertTrue in apex-pdp/model

Replace assertTrue with assertEquals and assertFalse with
assertNotEquals in apex-pdp/model

Issue-ID: POLICY-2690
Change-Id: Ifd435a4ea69d8f682407c2a70d5e8119f017ae9f
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
3 years agoMerge "Remove try/catch blocks with assertj - apex-pdp"
Jim Hahn [Thu, 23 Jul 2020 13:40:28 +0000 (13:40 +0000)]
Merge "Remove try/catch blocks with assertj - apex-pdp"

3 years agoRemove try/catch blocks with assertj - apex-pdp 58/110058/13
waynedunican [Thu, 9 Jul 2020 12:03:28 +0000 (13:03 +0100)]
Remove try/catch blocks with assertj - apex-pdp

Removed try/catch blocks in apex-pdp and replaced with assertj
assertions Part III

Issue-ID: POLICY-2451
Change-Id: I1e6ede1c256c5bcf7899e1af130add71fdf1381c
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoFix replaceAll SONAR issues in apex-pdp 38/110438/4
JvD_Ericsson [Tue, 21 Jul 2020 11:33:11 +0000 (12:33 +0100)]
Fix replaceAll SONAR issues in apex-pdp

Change replaceAll() with repalce() in apex-pdp/plugins and
apex-pdp/testsuites

Issue-ID: POLICY-2722
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
Change-Id: Ib9d5256c050197b06f9df9c4cbb7562be081283c

3 years agoMerge "Fix assertTrue in apex-pdp/model apex-pdp/plugins, apex-pdp/services and apex...
Jorge Hernandez [Wed, 22 Jul 2020 14:26:19 +0000 (14:26 +0000)]
Merge "Fix assertTrue in apex-pdp/model apex-pdp/plugins, apex-pdp/services and apex-pdp/testsuites"

3 years agoFix assertTrue in apex-pdp/model apex-pdp/plugins, apex-pdp/services and apex-pdp... 65/110165/7
JvD_Ericsson [Fri, 17 Jul 2020 13:08:52 +0000 (14:08 +0100)]
Fix assertTrue in apex-pdp/model apex-pdp/plugins, apex-pdp/services and apex-pdp/testsuites

Replace assertTrue with assertEquals and assertFalse with
assertNotEquals in apex-pdp/model, apex-pdp/plugins, apex-pdp/services
and apex-pdp/testsuites

Issue-ID: POLICY-2690
Change-Id: If088371cf012d5648e04ade2aa4d49b38945f6d2
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
3 years agoReplace try/catch with assertj - apex-pdp 75/109975/5
waynedunican [Wed, 8 Jul 2020 13:33:48 +0000 (14:33 +0100)]
Replace try/catch with assertj - apex-pdp

Replaced try/catch blocks apex-pdp with assertj assertions. Part III of
changes.

Issue-ID: POLICY-2451
Change-Id: I77ee4140cdfc2066f463459f92163677c3e34ef2
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoMerge "Refer to snapshot versions"
Pamela Dragosh [Fri, 17 Jul 2020 20:18:01 +0000 (20:18 +0000)]
Merge "Refer to snapshot versions"

3 years agoMerge "Replace try/catch with assertj - apex-pdp"
Ram Krishna Verma [Fri, 17 Jul 2020 18:30:21 +0000 (18:30 +0000)]
Merge "Replace try/catch with assertj - apex-pdp"

3 years agoMerge "Fix assertTrue SONAR issues in apex-pdp/model"
Ram Krishna Verma [Fri, 17 Jul 2020 18:27:09 +0000 (18:27 +0000)]
Merge "Fix assertTrue SONAR issues in apex-pdp/model"

3 years agoRefer to snapshot versions 52/110352/1
Ram Krishna Verma [Fri, 17 Jul 2020 17:56:41 +0000 (13:56 -0400)]
Refer to snapshot versions

Issue-ID: POLICY-2695
Change-Id: I97ab109ee7a3a80cb44890f2586407d9a32c8bd7
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
3 years agoMerge "Fix double initiation error on EngineServiceFacade"
Jim Hahn [Fri, 17 Jul 2020 16:16:01 +0000 (16:16 +0000)]
Merge "Fix double initiation error on EngineServiceFacade"

3 years agoFix assertTrue SONAR issues in apex-pdp/model 27/110127/6
JvD_Ericsson [Fri, 17 Jul 2020 12:18:37 +0000 (13:18 +0100)]
Fix assertTrue SONAR issues in apex-pdp/model

Replace assertTrue with assertEquals and assertFalse with
assertNotEquals in apex-pdp/model

Issue-ID: POLICY-2690
Change-Id: Id37989ea8a6ad7b3156e13851cc072ce6c53c03e
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
3 years agoReplace try/catch with assertj - apex-pdp 23/109923/3
waynedunican [Tue, 7 Jul 2020 16:51:42 +0000 (17:51 +0100)]
Replace try/catch with assertj - apex-pdp

Replaced try/catch blocks in apex-pdp with assertj assertions. Part II
of changes

Issue-ID: POLICY-2451
Change-Id: I29823054fbeb6d1a287d1234859aaf2d4609ef6d
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoFix double initiation error on EngineServiceFacade 54/110254/3
liamfallon [Thu, 16 Jul 2020 13:15:56 +0000 (14:15 +0100)]
Fix double initiation error on EngineServiceFacade

The engineServiceFacade allows it's init() method to be called twice,
the second call should return that the facade is already initialized.

Issue-ID: POLICY-2720
Change-Id: Id241e232163a8812a72f92841ce7b11f59358d45
Signed-off-by: liamfallon <liam.fallon@est.tech>
3 years agoMerge "Renaming password variables to match with oom"
Liam Fallon [Thu, 16 Jul 2020 15:03:28 +0000 (15:03 +0000)]
Merge "Renaming password variables to match with oom"

3 years agoMerge "Replaced try/catch blocks with assertj - apex-pdp"
Pamela Dragosh [Thu, 16 Jul 2020 13:51:38 +0000 (13:51 +0000)]
Merge "Replaced try/catch blocks with assertj - apex-pdp"

3 years agoMerge "Replace try/catch with assertj"
Pamela Dragosh [Thu, 16 Jul 2020 13:51:22 +0000 (13:51 +0000)]
Merge "Replace try/catch with assertj"

3 years agoRenaming password variables to match with oom 99/110199/1
RossC [Wed, 15 Jul 2020 15:19:24 +0000 (16:19 +0100)]
Renaming password variables to match with oom

Issue-ID: POLICY-2633
Change-Id: If5df0e82ab4154f5e32cdc3a5080cb13264830aa
Signed-off-by: RossC <ross.carter@est.tech>
3 years agoReplace try/catch with assertj 53/110153/2
waynedunican [Mon, 13 Jul 2020 10:13:53 +0000 (11:13 +0100)]
Replace try/catch with assertj

Replaced try/catch blocks with assertj assertions in apex-pdp. Last
batch of changes

Issue-ID: POLICY-2451
Change-Id: I39bd02fdbd8389818dcf1b786189c1e344ddcea5
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoReplaced try/catch blocks with assertj - apex-pdp 56/110056/2
waynedunican [Fri, 10 Jul 2020 07:25:22 +0000 (08:25 +0100)]
Replaced try/catch blocks with assertj - apex-pdp

Removed try/catch blocks in apex-pdp with assertj assertions Part IV

Issue-ID: POLICY-2451
Change-Id: I4b6accb9f944195db9ccf8a5de165b169301ac7f
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoMerge "Fix assertTrue SONAR issues in apex-pdp/examples and apex-pdp/model"
Ram Krishna Verma [Tue, 14 Jul 2020 15:17:25 +0000 (15:17 +0000)]
Merge "Fix assertTrue SONAR issues in apex-pdp/examples and apex-pdp/model"

3 years agoMerge "Remove old documentation from build"
Jim Hahn [Mon, 13 Jul 2020 14:20:21 +0000 (14:20 +0000)]
Merge "Remove old documentation from build"

3 years agoMerge "Fix assertTrue SONAR issues in apex-pdp/contex and apex-pdp/core"
Pamela Dragosh [Mon, 13 Jul 2020 12:55:42 +0000 (12:55 +0000)]
Merge "Fix assertTrue SONAR issues in apex-pdp/contex and apex-pdp/core"

3 years agoMerge "Allowing configuration of truststore password"
Liam Fallon [Mon, 13 Jul 2020 11:37:37 +0000 (11:37 +0000)]
Merge "Allowing configuration of truststore password"

3 years agoMerge "Fix assertTrue SONAR issues in apex-pdp"
Liam Fallon [Mon, 13 Jul 2020 11:36:59 +0000 (11:36 +0000)]
Merge "Fix assertTrue SONAR issues in apex-pdp"

3 years agoRemove old documentation from build 19/110119/2
liamfallon [Mon, 13 Jul 2020 08:41:28 +0000 (09:41 +0100)]
Remove old documentation from build

apex-pdp had an in-line docuemntation build system built on asciidoc. It
has proven to be very difficult to maintain and keep up to date and it
is incompatible with the ONAP official RST/ReadTheDocs docuementation
system.

In the Dublin release, we converted the asciidoc documentation to RST
format, and hae been updating the RST documentation since. The asciidoc
docuemntation system is now so out of date that it is being removed.

In this change, the "site" directory is removed from all modules in
apex-pdp and a profile called "apexSite" is removed from the pom.xml
file in all modules.

Issue-ID: POLICY-2686
Change-Id: I645f3ed101159d356cd90e619cef791067ad5eb5
Signed-off-by: liamfallon <liam.fallon@est.tech>
3 years agoFix assertTrue SONAR issues in apex-pdp/examples and apex-pdp/model 03/109903/5
JvD_Ericsson [Wed, 8 Jul 2020 12:21:57 +0000 (13:21 +0100)]
Fix assertTrue SONAR issues in apex-pdp/examples and apex-pdp/model

Replace assertTrue with assertEquals and assertFalse with
assertNotEquals in apex-pdp/examples and apex-pdp/model

Issue-ID: POLICY-2690
Change-Id: Ie863dd95ccead62268689a4a8388f9b6e8821649
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
3 years agoBump apex-pdp to 2.4.1-SNAPSHOT 02/110102/1
Ram Krishna Verma [Fri, 10 Jul 2020 21:25:54 +0000 (17:25 -0400)]
Bump apex-pdp to 2.4.1-SNAPSHOT

Issue-ID: POLICY-2695
Change-Id: I15b489de9ca2614e3a6c94b450a3d6397d17d4ff
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
3 years agoRelease apex-pdp 2.4.0 docker artifacts 97/110097/1
Ram Krishna Verma [Fri, 10 Jul 2020 19:22:20 +0000 (15:22 -0400)]
Release apex-pdp 2.4.0 docker artifacts

Issue-ID: POLICY-2695
Change-Id: Ie87b3328b86c471d97e8b69167122978bf42ed2a
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
3 years agoRelease apex-pdp 2.4.0 maven artifacts 92/110092/2
Ram Krishna Verma [Fri, 10 Jul 2020 18:19:12 +0000 (14:19 -0400)]
Release apex-pdp 2.4.0 maven artifacts

Issue-ID: POLICY-2695
Change-Id: Ib0fb0753deda32d9162a24b1c470a30ff20ade35
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
3 years agoPointing apex towards latest artifacts 75/110075/1
RossC [Fri, 10 Jul 2020 14:28:29 +0000 (15:28 +0100)]
Pointing apex towards latest artifacts

Issue-ID: POLICY-2695
Change-Id: I28fd0e7e12a8f3e7ee192e40b99aaa2339aea24f
Signed-off-by: RossC <ross.carter@est.tech>
3 years agoFix assertTrue SONAR issues in apex-pdp/contex and apex-pdp/core 99/109999/2
JvD_Ericsson [Tue, 7 Jul 2020 12:18:20 +0000 (13:18 +0100)]
Fix assertTrue SONAR issues in apex-pdp/contex and apex-pdp/core

Replace assertTrue with assertEquals and assertFalse with
assertNotEquals in apex-pdp/client apex-pdp/context and apex-pdp/core

Issue-ID: POLICY-2690
Change-Id: Ic1e69c75e5f8f887cac135b6728b007faf4b19a6
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
3 years agoAllowing configuration of truststore password 02/110002/1
RossC [Thu, 9 Jul 2020 10:00:29 +0000 (11:00 +0100)]
Allowing configuration of truststore password

Issue-ID: POLICY-2633
Change-Id: Ic891ab55ded843e44b7998097949c1156c070657
Signed-off-by: RossC <ross.carter@est.tech>
3 years agoFix assertTrue SONAR issues in apex-pdp 52/109852/2
JvD_Ericsson [Mon, 6 Jul 2020 09:37:04 +0000 (10:37 +0100)]
Fix assertTrue SONAR issues in apex-pdp

Replaced assertTrue with assertEquals and assertFalse with
assertNotEquals in apex-pdp auth

Issue-ID: POLICY-2690
Change-Id: Ica84f57f5a9048c33a2b641945a4376e60cf97c1
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
3 years agoMerge "Replace try/catch blocks with assertj - apex-pdp"
Ram Krishna Verma [Mon, 6 Jul 2020 20:51:01 +0000 (20:51 +0000)]
Merge "Replace try/catch blocks with assertj - apex-pdp"

3 years agoMerge "Fix URL checking on REST plugins"
Jorge Hernandez [Mon, 6 Jul 2020 18:40:12 +0000 (18:40 +0000)]
Merge "Fix URL checking on REST plugins"

3 years agoFix URL checking on REST plugins 46/109846/3
liamfallon [Mon, 6 Jul 2020 08:31:18 +0000 (09:31 +0100)]
Fix URL checking on REST plugins

The URL parameter must always be provided on the REST client carrier plugin

The URL parameter must always be provided on the REST requestor consumer

The URL parameter is not required on the REST requestor producer

This patch fixes the implementation to always checks the URL for existence on
the REST Client plugin. The current checks on the REST Requestor are correct
for the REST requestor plugin consumer and producer classes, so the checks
are not required in the REST Requestor parameters.

Issue-ID: POLICY-2692
Change-Id: I4e1534202002cf4a03bd159ac97b2a4f5b1746ab
Signed-off-by: liamfallon <liam.fallon@est.tech>
3 years agoReplace try/catch blocks with assertj - apex-pdp 47/109847/3
waynedunican [Mon, 6 Jul 2020 08:31:10 +0000 (09:31 +0100)]
Replace try/catch blocks with assertj - apex-pdp

Replaced try/catch blocks in apex-pdp with assertj assertions

Issue-ID: POLICY-2451
Change-Id: I83375b9e0f38d399b84bb68ce5d441e1cec73ef5
Signed-off-by: waynedunican <wayne.dunican@est.tech>
3 years agoFixing issue with policy chaining after CDS request failure in APEX 18/109818/2
a.sreekumar [Fri, 3 Jul 2020 10:08:04 +0000 (11:08 +0100)]
Fixing issue with policy chaining after CDS request failure in APEX

Change-Id: Id27343c21caaf69e30ee13076a2963c256fab55d
Issue-ID: POLICY-2687
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
3 years agoFixing ConcurrentModificationException during multiple policy deployment in APEX 00/109700/5
a.sreekumar [Tue, 30 Jun 2020 16:50:04 +0000 (17:50 +0100)]
Fixing ConcurrentModificationException during multiple policy deployment in APEX

Change-Id: Ib39e798d733727bdc676755b66adf2c499e618af
Issue-ID: POLICY-2655
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
3 years agoAdd tests for XPathReader 95/109695/2
ToineSiebelink [Tue, 30 Jun 2020 15:27:05 +0000 (16:27 +0100)]
Add tests for XPathReader

XPathReader had some SQ vulnerabilities whihch have been udpated in previous commit
This is just making sure same code is now covred by testware

Issue-ID: POLICY-2654

Change-Id: Ie40ee015b517b0cc3c5986a67513543653f53a61
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
3 years agoMerge "Removed CDS simulator from apex-pdp"
Jim Hahn [Tue, 30 Jun 2020 12:41:31 +0000 (12:41 +0000)]
Merge "Removed CDS simulator from apex-pdp"

3 years agoRemoved CDS simulator from apex-pdp 57/109657/1
Jim Hahn [Mon, 29 Jun 2020 16:34:58 +0000 (12:34 -0400)]
Removed CDS simulator from apex-pdp

As the simulator now resides in policy-models, the code for it is
no longer needed in apex-pdp.  Deleted it.

Issue-ID: POLICY-2676
Change-Id: I8ae6c8d860a47e5e7ba0509c99e4e2676109de25
Signed-off-by: Jim Hahn <jrh3@att.com>
3 years agoFix SonarQube vulnerabilities 49/109649/2
ToineSiebelink [Mon, 29 Jun 2020 11:24:38 +0000 (12:24 +0100)]
Fix SonarQube vulnerabilities

Added logging to handle file io boolean returns
Added security related settings to xml factories and builders

Issue-ID: POLICY-2654
Change-Id: Ibc0a01f978bfc446e1dc1f8ad952d1305a7b7178
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
3 years agoFixing error with Main class name usage in APEX 79/109579/2
a.sreekumar [Thu, 25 Jun 2020 15:48:15 +0000 (16:48 +0100)]
Fixing error with Main class name usage in APEX

Change-Id: I0da222e592e6e29f0afca4a1515d8f126fe91cbb
Issue-ID: POLICY-2623
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
3 years agoMerge "Remove thread in JavascriptExecutor"
Liam Fallon [Thu, 25 Jun 2020 09:20:24 +0000 (09:20 +0000)]
Merge "Remove thread in JavascriptExecutor"

3 years agoRemove thread in JavascriptExecutor 42/109242/5
huaxing [Wed, 17 Jun 2020 05:34:10 +0000 (13:34 +0800)]
Remove thread in JavascriptExecutor

This change is basically a rollback of https://gerrit.onap.org/r/c/policy/apex-pdp/+/104230, with minor refactoring.
The problem that 104230 tried to address was supposed to be caused by https://jira.onap.org/browse/POLICY-2463.
With this rollback, apex-pdp increases performance and reduces memory usage.

Issue-ID: POLICY-2572
Signed-off-by: huaxing <huaxing.jin@est.tech>
Change-Id: I3a52d0ead0c1e530d218f9e3aba8b3eb5558abaf

3 years agoremove build warning with json dependency 37/109437/3
Henry.Sun [Tue, 23 Jun 2020 05:58:44 +0000 (13:58 +0800)]
remove build warning with json dependency

Signed-off-by: Henry.Sun <henry.a.sun@est.tech>
Change-Id: Ieceb3e129620ced23552027e71fd09a2bd91acbe
Issue-ID: POLICY-2649

3 years agoMerge "Updating all Apex dependencies"
Ram Krishna Verma [Tue, 23 Jun 2020 13:17:20 +0000 (13:17 +0000)]
Merge "Updating all Apex dependencies"

3 years agoRemove apex-pdp Jackson security issue 91/109391/2
liamfallon [Sun, 21 Jun 2020 20:52:55 +0000 (21:52 +0100)]
Remove apex-pdp Jackson security issue

We should use the managed version of jackson from policy-parent rather
than a specific apex-pdp version.

Also upgrade the version of Avro, avro 1.9.2 uses a newer somewhat more
secure version of Jackson.

Issue-ID: POLICY-1508
Change-Id: If32218816ae76cf3cf6ddc8980e3a37e7e2ffd19
Signed-off-by: liamfallon <liam.fallon@est.tech>