Liam Fallon [Wed, 6 Mar 2019 13:54:57 +0000 (13:54 +0000)]
Merge "Replace PropertyConfiguration"
Jim Hahn [Tue, 5 Mar 2019 00:19:44 +0000 (19:19 -0500)]
Replace PropertyConfiguration
Modified code to use BeanConfigurator instead of PropertyConfiguration.
Change-Id: I296d9047262fbc87f04c3db92f23181f588bfeda
Issue-ID: POLICY-1444
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Mon, 4 Mar 2019 16:15:45 +0000 (16:15 +0000)]
Merge "Add Controller Logging Feature"
Pamela Dragosh [Mon, 4 Mar 2019 16:11:12 +0000 (16:11 +0000)]
Merge "move all hard install config to environment vars"
Daniel Cruz [Fri, 22 Feb 2019 17:31:17 +0000 (11:31 -0600)]
Add Controller Logging Feature
This features provides a mechanism to extend the logback.xml
properties to add controller specific loggers. The controller's
logger will log messages from topics that the controller listens
to in a controller specific network log. The original network
log is preserved and still logs every message from every controller.
Note that the way a logger is associated with a controller is by
having the logger name match the controller's name. Any configuration
file that has "logback-include-" prepended and a ".xml" extension
will be added to the logback.xml and logback-eelf.xml files as
extensions to the base configuration.
Issue-ID: POLICY-1427
Change-Id: Iaeb823421eadb7ee413b6b03ae3dfe862f230612
Signed-off-by: Daniel Cruz <dc443y@att.com>
Jorge Hernandez [Thu, 28 Feb 2019 16:10:49 +0000 (10:10 -0600)]
move all hard install config to environment vars
+ support multiple system properties files with variable interpolation
loaded at initialization
+ support of configurable JVM options (-X, etc ..).
+ rearrange aaf configuration to avoid {{}} installation variables
and use dynamic enviroment variables.
+ miscellaneous clean up in areas touched and checkstyle.
Change-Id: I71ad839778e17eb57c098a2c5cc2bf96e468669a
Issue-ID: POLICY-1524
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Pamela Dragosh [Thu, 28 Feb 2019 16:06:05 +0000 (11:06 -0500)]
Update INFO.yaml Liam's email
est.tech
Issue-ID: POLICY-1556
Change-Id: I810dcac34ec078a07dfb2374067ecc06018fa7fb
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Jorge Hernandez [Wed, 27 Feb 2019 16:13:59 +0000 (10:13 -0600)]
Base POLICY-PDP-PAP channel configuration
With these changes the PDP should come up listening in
the new PAP-PDP topic for messages, and configured to
send.
Change-Id: I395f87a7401aeb6385d640e51f75d71c0def36b0
Issue-ID: POLICY-1548
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Jim Hahn [Fri, 22 Feb 2019 18:58:09 +0000 (13:58 -0500)]
Add getEffectiveTopic method to pooling test
A new method, getEffectiveTopic(), was added to the Topic interface.
A test class in the pooling feature uses that interface, thus the
method had to be added to the implementation within that test class.
Note: until this is merged, drools-pdp will not build.
Change-Id: Ib82e7a0d23f5b8e8eda08e8fc570e96543497da2
Issue-ID: POLICY-1534
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Fri, 22 Feb 2019 13:25:42 +0000 (13:25 +0000)]
Merge "Add Nested JSON Filtering"
Daniel Cruz [Thu, 14 Feb 2019 06:42:45 +0000 (00:42 -0600)]
Add Nested JSON Filtering
The refactoring of the JsonProtocolFilter allows for complex filter
queries for JSON events coming in on network topics. The underlying
library used is json-path, which supports path based searching and
ruby regex filtering at any level of the JSON document.
The JsonProtocolFilter no longer requires a FilterRule class as one
json-path filter can contain multiple constraints using "&&" or "||".
This eliminates the need to identify the field name as a key with a
regex associated with it in the controller properties file (see the
original FilterRule implementation). It also simplifies the parsing
needed in the DroolsControllerFactory when extracting the filter
property and creating the JsonProtocolFilter.
JUnit coverage is 100% and all sonar flags were addressed related to
the JsonProtocolFilter class. Tested and verified working with the
telemetry API in a locally deployed PDP-D.
Change-Id: I8bd63db4e497c1ba0b5044b5449ccb7a9e4dbdbc
Issue-ID: POLICY-1489
Signed-off-by: Daniel Cruz <dc443y@att.com>
Jorge Hernandez [Wed, 20 Feb 2019 03:17:15 +0000 (21:17 -0600)]
Moving hard install config to environment vars
Change-Id: I01e0cf2e2399ec81337961e0a2b3a349c34f55c4
Issue-ID: POLICY-1517
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Jorge Hernandez [Tue, 19 Feb 2019 18:28:17 +0000 (18:28 +0000)]
Merge "Remove unneeded "throws""
Jim Hahn [Mon, 18 Feb 2019 22:03:29 +0000 (17:03 -0500)]
Remove unneeded "throws"
Fixed sonar issue:
- remove the declaration of thrown exception
'com.google.gson.JsonParseException' which is a runtime exception
Change-Id: Ice29a875891a06a55932fcf80107d4dec2b10d1f
Issue-ID: POLICY-1533
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Mon, 18 Feb 2019 16:59:42 +0000 (11:59 -0500)]
Removed jackson from top-level pom
Change-Id: Ic9cc018e918527d610676b34f05da718f09d97b9
Issue-ID: POLICY-1529
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 15 Feb 2019 22:33:49 +0000 (17:33 -0500)]
Change properties to use gson
Modified property files to use gson instead of jackson for REST calls,
for both clients and servers.
Change-Id: Ib836886df33cd585b4c2d227e9cc496cc165fc2c
Issue-ID: POLICY-1431
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 15 Feb 2019 17:24:14 +0000 (12:24 -0500)]
Test gson in policy-management
Added jackson-like Gson annotations to policy-management classes.
Also added tests to verify that the classes serialize the same
with gson as with jackson.
Removed some trailing spaces.
Replaced tabs and adjusted spacing in json files.
Removed trailing newlines.
Updated license data per review comment.
Fixed merge conflict.
Added files that were inadvertently deleted.
Change-Id: Ib546e70f9d9d83187a6a93ff5c634000c4d53da5
Issue-ID: POLICY-1431
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Fri, 15 Feb 2019 16:48:36 +0000 (16:48 +0000)]
Merge "Decouple nexus reconfiguration from installation"
Jim Hahn [Wed, 13 Feb 2019 18:55:31 +0000 (13:55 -0500)]
Remove jackson from policy coders
Coders came in pairs, one for GSON and one for Jackson. Replaced the
pairs with a single coder for GSON.
Simplified list copy.
Removed multipleToolsetRetries flag.
Removed additional jackson code. It had been removed, but the changes
were somehow lost.
Simplified another list copy.
Updated license dates.
Note: the date in PolicyEngineTest will be updated via a
different review (mgmt-gson).
Change-Id: Id3c7688c2389d194f66afcefa14303cf403ada16
Issue-ID: POLICY-1431
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Wed, 13 Feb 2019 19:12:37 +0000 (13:12 -0600)]
Decouple nexus reconfiguration from installation
This allows for nexus to be reconfigured dynamically.
Change-Id: I103707ab7525ddb29663d7785739a34dff538605
Issue-ID: POLICY-1518
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Liam Fallon [Wed, 13 Feb 2019 13:46:55 +0000 (13:46 +0000)]
Merge "Support of environment variables in properties"
Jorge Hernandez [Tue, 12 Feb 2019 13:28:18 +0000 (07:28 -0600)]
Support of environment variables in properties
Change-Id: I5028ad3b4fb63a96607915e8b424dd2e57696bf0
Issue-ID: POLICY-1514
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Jim Hahn [Fri, 8 Feb 2019 18:22:06 +0000 (13:22 -0500)]
Replace PolicyAssert with assertj
PolicyAssert has a sonar issue and is no longer needed, as the
same functionality (and more) is provided by assertj. Modified
drools-pdp test code to replace PolicyAssert with assertj.
Updated license dates.
Removed trailing spaces.
Remove assertj version from poms, as it's now included in parent pom.
Change-Id: Ica82a959613e082dc6ed6fc9e103a198c2f17537
Issue-ID: POLICY-1393
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Mon, 4 Feb 2019 14:54:50 +0000 (08:54 -0600)]
Report KieBase names in rules artifacts.
The rule writer at design time can embed the domain base model(s) supported
at design time.
This information can be extracted at runtime to match a controller with the
domain/model functionality that it can support.
Change-Id: I7f7f1320d7d601d50949d0cd09bc48982c222333
Issue-ID: POLICY-1500
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Jim Hahn [Wed, 16 Jan 2019 16:06:28 +0000 (11:06 -0500)]
Remove jackson from feature-pooling-dmaap
Modified code to use gson instead of jackson.
Change-Id: I5a1b2dacdc1801b1110154ed7c3c81e0713ef369
Issue-ID: POLICY-1431
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Tue, 15 Jan 2019 14:29:47 +0000 (08:29 -0600)]
Change Junit to check for error code 406
This is to support some clean up changes done in
policy/common under commit
55f5c4dc9e130e48a25b048e1f3091b10c17e365.
Change-Id: I2961d7ba719d22f144af972dc3964c3ac402e75c
Issue-ID: POLICY-1397
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Jim Hahn [Tue, 8 Jan 2019 22:48:31 +0000 (17:48 -0500)]
Replace expectException with AssertJ
Change-Id: I5c9c5e962a7e2a5617405d534c0719f4bdb6ff1c
Issue-ID: POLICY-1393
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Fri, 4 Jan 2019 20:43:44 +0000 (14:43 -0600)]
Add tooling for drools policy developers
This commit adds tooling to better support development activities
for drools developers.
1. deploy artifacts to nexus or to local file repository on demand.
It also allows to test on a single drools instance without the
dependency on a nexus repo.
2. make installation configuration files conform to same
convention (all upper case).
Change-Id: Ia0a2fc25db2ef21b774a9eee4ed51d4b876a1993
Issue-ID: POLICY-1367
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Jorge Hernandez [Mon, 17 Dec 2018 14:57:25 +0000 (14:57 +0000)]
Merge "Environment variable pointing to logback.xml"
Jorge Hernandez [Fri, 14 Dec 2018 00:24:06 +0000 (18:24 -0600)]
Environment variable pointing to logback.xml
Per current logging spec, the location is recommended to be
under /etc/onap/<component>/subcomponent but is acceptable
to have an enviroment variable pointing to it instead.
Environment variable is preferred over fixed location so
the config files are not all over the place, and is not
placed under directories owned by root.
Change-Id: Id5679f49a726fa43147ffb3e141acec30ebfdaaf
Issue-ID: POLICY-1294
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Jorge Hernandez [Thu, 13 Dec 2018 20:43:39 +0000 (14:43 -0600)]
Update to latest keystore from AAF tooling
It is generic with extended expiration, and support for
policy-distribution and policy-apex-pdp components.
Change-Id: I02157b063159ed6f8fc71f00cf0f890059b20c7b
Issue-ID: POLICY-1377
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Jorge Hernandez [Mon, 3 Dec 2018 19:40:19 +0000 (19:40 +0000)]
Merge "Fix sonar issue in droolspdf"
Krishnakumar Jinka [Mon, 3 Dec 2018 00:38:51 +0000 (09:38 +0900)]
Fix sonar issue in droolspdf
Modify protocol coder to fix sonar issue about method
params too many. Using existing builder. Address review
comments, replace modified with modification
Issue-ID: POLICY-1251
Change-Id: I67bd753f346108865404b733e7cf6008c2012766
Signed-off-by: krisjinka <kris.jinka@samsung.com>
Jim Hahn [Fri, 30 Nov 2018 15:07:10 +0000 (10:07 -0500)]
Update eclipselink version in drools-pdp
Use eclipselink from policy parent.
Re-insert scope=provided.
Change-Id: I325d13b7249747469d93bf451f5753cfbc728568
Issue-ID: POLICY-1361
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Thu, 29 Nov 2018 16:27:36 +0000 (16:27 +0000)]
Merge "Remove Factory from various drools-pdp classes"
Jorge Hernandez [Thu, 29 Nov 2018 15:52:49 +0000 (15:52 +0000)]
Merge "Fix sonar issue in event protocol coder"
krishnajinka [Sun, 25 Nov 2018 01:57:13 +0000 (10:57 +0900)]
Fix sonar issue in event protocol coder
Add method in Eventprotocolcoder uses more params than
allowed causing sonar issue, use builder object instead
Modify javadoc and tostring methods based on review comments
Issue-ID: POLICY-1251
Change-Id: I6f283135560bfa61ca9d9512f5c971d118d7e071
Signed-off-by: kris.jinka <kris.jinka@samsung.com>
Jim Hahn [Thu, 29 Nov 2018 14:33:02 +0000 (09:33 -0500)]
Remove Factory from various drools-pdp classes
Also merged changes from 'Rename test classes in drools-pdp'.
Change-Id: I4d0a3a1b0b5523eadf38d1edb5aa86c404b69d19
Issue-ID: POLICY-1288
Signed-off-by: Jim Hahn <jrh3@att.com>
Parshad Patel [Fri, 23 Nov 2018 06:21:20 +0000 (15:21 +0900)]
Rename test classes in drools-pdp
Make test classes name consistence
Issue-ID: POLICY-1281
Change-Id: I9632831dd36b1d362aeadfb53fda600762c835ca
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
kris.jinka [Fri, 16 Nov 2018 11:16:14 +0000 (20:16 +0900)]
Modify decoder to use param obj
Modify decoder to use param object for sonar issue fix
Issue-ID: POLICY-1251
Change-Id: Iae68ba276f02be51058037b56d901a131b25838e
Signed-off-by: kris.jinka <kris.jinka@samsung.com>
kris.jinka [Thu, 15 Nov 2018 00:51:02 +0000 (09:51 +0900)]
Modify event (en)coder to use param objs
Use builder object to send params to event protocol
coder and encoder methods to fix sonar issue
Issue-ID: POLICY-1251
Change-Id: I6ca5823e1aa35d9aa3a05eb23ac159947efdde23
Signed-off-by: kris.jinka <kris.jinka@samsung.com>
Parshad Patel [Wed, 7 Nov 2018 07:36:25 +0000 (16:36 +0900)]
Fix for Test failure issue in drools-pdp
Replace JAVA_HOME with PATH env variable in assert statement
Issue-ID: POLICY-1241
Change-Id: I2441d7be44a9578a3137a7a0b5747ec0799f0869
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
liamfallon [Wed, 31 Oct 2018 16:00:08 +0000 (16:00 +0000)]
Set new master version for Dublin
Issue-ID: POLICY-1232
Change-Id: I768c9f4e0e1411854fe6aadb52abbc616654127d
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Jim Hahn [Tue, 30 Oct 2018 14:00:16 +0000 (10:00 -0400)]
Remove openecomp repo from drools-pdp pom
Change-Id: I44437c34f79fe7f169f38715bfd88d5ebfab93e4
Issue-ID: POLICY-1231
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Fri, 26 Oct 2018 14:27:05 +0000 (09:27 -0500)]
Enable Authorization AAF Filter programmatically
The intent is to reduce configuration options and
automatically set up the authorization filter
(that will complement the authentication filter
that the policy-endpoints common framework automatically
provides).
Previously to enable the AAF authorization filter,
it will need the configuration had to kept track of
AAF flag, and the "filterClasses" property configuration,
make a bit more difficult to keep them sync, and easily
turn on/off AAF.
Change-Id: I3d59de6fa83986c5dcb6b3d38077278b8e75689a
Issue-ID: POLICY-1216
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
ramverma [Wed, 24 Oct 2018 18:35:48 +0000 (19:35 +0100)]
Fix refering to snapshot in policy/drools-pdp
Issue-ID: POLICY-1213
Change-Id: I485c15044ba5cc0d3daceaf0876f543cc5c8af82
Signed-off-by: ramverma <ram.krishna.verma@ericsson.com>
Jorge Hernandez [Thu, 11 Oct 2018 22:36:16 +0000 (17:36 -0500)]
Updated the keystore to include pdp wildcard
This allows to talk directly to OOM PDP-X pods
without going through the service
Change-Id: I9acd171f483c28473442afad80361be374bd4901
Issue-ID: POLICY-1198
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Jorge Hernandez [Wed, 10 Oct 2018 00:47:25 +0000 (19:47 -0500)]
Regenerate policy keystore
The keystore has been regenerated using the latest tooling
from AAF.
Previous versions seem to add a bogus " fqdn" which makes
the the particular policy.api.simpledemo.onap.org entry invalid.
The latest version does not append it.
This change is done for consistency with policy/engine for
which proper format of this entry is necessary to interact
with CLAMP.
Drools is never accessed with this identity, therefore the
changes are complimentary and do not require release of new
artifacts.
Change-Id: Ibf6c2e7130dda247ac320f334765e04d369d6b20
Issue-ID: POLICY-1193
Signed-off-by: Jorge Hernandez <jh1730@att.com>
Jim Hahn [Mon, 8 Oct 2018 16:23:06 +0000 (12:23 -0400)]
Add coverage to test-transaction
Fixed bug in test-transaction, wherein it was sometimes using the controller
instead of the controller name as the key into the map.
Changed test to use latch instead of sleep.
Added a little more register/unregister testing.
Change-Id: I2647b44cf164038d211063bd499c25af70c2d9d7
Issue-ID: POLICY-1148
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 5 Oct 2018 20:06:17 +0000 (16:06 -0400)]
Add coverage to policy-core
Added easy junit test coverage cases.
Fixed sonar issue: removed sleep from DroolsContainerTest.
Fixed sonar bug in ClassExtractors.
Change-Id: I942badf17c42346c1735bc3951450fc31c02a769
Issue-ID: POLICY-1148
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Thu, 4 Oct 2018 21:47:24 +0000 (17:47 -0400)]
Add junit coverage to PolicyEngine class
Also fixed a typo in a test comment.
Change-Id: I4ad72cc7c103014e6f5920f912c862560af5a331
Issue-ID: POLICY-1148
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Thu, 4 Oct 2018 14:14:12 +0000 (14:14 +0000)]
Merge "Add coverage for policy-management"
Pamela Dragosh [Thu, 4 Oct 2018 01:53:12 +0000 (01:53 +0000)]
Merge "Add more coverage to drools-pdp health check"
Jim Hahn [Tue, 2 Oct 2018 20:46:57 +0000 (16:46 -0400)]
Add coverage for policy-management
Added coverage for PolicyControllerFactory and AggregatedPolicyController.
Fixed some typos in comments.
Reformatted some code.
Change-Id: I33aea8e1e7dde29bd51218d0ecad7b34047b33e5
Issue-ID: POLICY-1148
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Tue, 2 Oct 2018 19:29:54 +0000 (15:29 -0400)]
Add more coverage to drools-pdp health check
Added getProperties() method to Factory, as the system properties could
not be found in the jenkins build, for some reason.
Removed Factory, as not needed for junit testing.
Change-Id: I5070b9502ae06be6995cccbb005653928591512c
Issue-ID: POLICY-1148
Signed-off-by: Jim Hahn <jrh3@att.com>
Liam Fallon [Tue, 2 Oct 2018 21:02:28 +0000 (21:02 +0000)]
Merge "Add junit coverage to drools-pdp"
Jorge Hernandez [Tue, 2 Oct 2018 14:49:45 +0000 (09:49 -0500)]
Recreate latest keystore
Some changes have been made since the first set of
stores were generated from the cert manager tooling
in the windriver test instance used for this purpose.
Change-Id: Ic9a0b056fb2c4e8fb23a0c0e0462087b8b7125da
Issue-ID: POLICY-1156
Signed-off-by: Jorge Hernandez <jh1730@att.com>
Jim Hahn [Mon, 1 Oct 2018 17:52:03 +0000 (13:52 -0400)]
Add junit coverage to drools-pdp
Added coverage to distributed locking.
Added coverage to test-transaction - still more to do.
Added coverage to healthcheck - still more to do.
Also fixed "code smell" in pooling.
Also fixed "code smell" in session persistence.
Fixed typo in comment.
Removed unneeded setUp() method from test.
Fixed new checkstyle errors.
Fixed another new checkstyle error.
Change-Id: I0d2ab13fcbd64486af88affb02e114e624c6a3d1
Issue-ID: POLICY-1148
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Fri, 28 Sep 2018 08:58:26 +0000 (04:58 -0400)]
Set drools-pdp checkstyle config
Fixed last remaining checkstyle issues along with
setting the pom.xml to the correct path setting.
Fixed forbidden summary fragments, not allowed
to prepend summary with "This method returns"
Issue-ID: POLICY-1153
Change-Id: I267842080494132a7b5507731e14f027a3f6fe44
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Jim Hahn [Wed, 26 Sep 2018 14:29:44 +0000 (10:29 -0400)]
Use powermock artifacts from parent pom
Change-Id: I0a42dd468b44fc732c526701bb6dd8f8c040233c
Issue-ID: POLICY-1148
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 21 Sep 2018 20:11:46 +0000 (16:11 -0400)]
new sonar issues in drools-pdp
No "@Test" methods - renamed class from XxxTest to XxxMock.
Changed functional call syntax.
Change-Id: I954c2549705e80c00aed8ecbcb19f386cc8b0310
Issue-ID: POLICY-1137
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Wed, 19 Sep 2018 19:35:22 +0000 (14:35 -0500)]
AAF Configuration in PDP-D
AAF is disabled by default until pairwise testing is completed.
Change-Id: Ica83873a2605742689ed0c2e06dfade20bef8bf0
Signed-off-by: Jorge Hernandez <jh1730@att.com>
Issue-ID: POLICY-1043
Signed-off-by: Jorge Hernandez <jh1730@att.com>
Pamela Dragosh [Tue, 18 Sep 2018 23:18:25 +0000 (19:18 -0400)]
Fixes for oparent upgrade
Clean out the defined properties to allow oparent version
to pull through.
Issue-ID: POLICY-1126
Change-Id: Ib521110493bdb01712d3e81bdfd0128511f748b7
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Jim Hahn [Mon, 17 Sep 2018 18:41:02 +0000 (14:41 -0400)]
don't begin new transaction
Persistence code was not checking to see if a transaction was already
in progress before beginning a transaction.
Fix checkstyle issue with comments and parameter for EntityMgrException.
Restore other checkstyle fixes.
More checkstyle fixes.
Rename some variables.
Change-Id: Ic820944781571ba2ef411cb86d12fa32fb206124
Issue-ID: POLICY-1106
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Fri, 14 Sep 2018 13:39:53 +0000 (09:39 -0400)]
Use policy/parent mariadb version
Use the same version of mariadb across policy repositories.
This will also clear a license issue, albeit a false
positive.
Issue-ID: POLICY-1061
Change-Id: I4267975518fe9efce9530db687a2cfd3bf872641
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Pamela Dragosh [Fri, 14 Sep 2018 00:37:15 +0000 (20:37 -0400)]
Fix checkstyle for features submodules.
These are the remaining submodules that have checkstyle. Pretty
clean compile after this. There were a couple of sonar fixes
in there also.
Issue-ID: POLICY-882
Change-Id: I8191ea1aa261f4a7b9d3d21c108572fd31db1b8c
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Pamela Dragosh [Thu, 13 Sep 2018 23:35:18 +0000 (19:35 -0400)]
Fix checkstyle in policy-management
The submodule policy-management checkstyle fixes. There may be
one or two sonar fixes in there.
Issue-ID: POLICY-882
Change-Id: I9cb43c573c6811dd058943650ba1ea5f6dc880aa
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Jorge Hernandez [Wed, 12 Sep 2018 19:06:32 +0000 (19:06 +0000)]
Merge "Remove unnecessary properties"
Pamela Dragosh [Wed, 12 Sep 2018 18:01:41 +0000 (14:01 -0400)]
Remove unnecessary properties
In upgrading dmaap client, these properties were found
and were unnecessary to be defined here. They are already
defined in policy/parent and dmaap/cambria code was moved
to policy/common.
Issue-ID: POLICY-1116
Change-Id: Ic85b46e556167387acd82af3f21a7446adb43216
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Jorge Hernandez [Tue, 11 Sep 2018 19:52:33 +0000 (14:52 -0500)]
disable http for healthchecks
Change-Id: If1d6d86e7622432d4f8b4de6b1f86bd212adc233
Signed-off-by: Jorge Hernandez <jh1730@att.com>
Issue-ID: POLICY-1108
Pamela Dragosh [Tue, 11 Sep 2018 14:40:05 +0000 (14:40 +0000)]
Merge "Revert back to Drools 6.5.0.Final"
Jim Hahn [Tue, 11 Sep 2018 14:11:29 +0000 (10:11 -0400)]
Revert back to Drools 6.5.0.Final
Decided to abandon the conversion to Drools 7.9.0.Final. This undoes the
associated changes.
Change-Id: I457266d09f7e481da5c0415290241a348786f8ea
Issue-ID: POLICY-1093
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Tue, 11 Sep 2018 04:27:53 +0000 (23:27 -0500)]
disabling http for configuration services
per security recommendations.
Change-Id: Ic195f8270c2270239408e33e27f87436878e28b4
Signed-off-by: Jorge Hernandez <jh1730@att.com>
Issue-ID: POLICY-1104
Jim Hahn [Mon, 10 Sep 2018 14:23:56 +0000 (10:23 -0400)]
Switch to drools 7.9.0.Final
Note: This will break policy/drools-applications until the corresponding
change is merged there, too.
Reformatted lengthy line.
Change-Id: I4ae7838dfbc2d537580636eccc545710b5ebc799
Issue-ID: POLICY-1093
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Fri, 7 Sep 2018 00:17:27 +0000 (20:17 -0400)]
Fix checkstyle policy-core
Working on the policy-core submodule in drools pdp.
Issue-ID: POLICY-882
Change-Id: I58d418110fe0fda90f97117ef17edfc13d648ccc
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Pamela Dragosh [Thu, 6 Sep 2018 21:07:46 +0000 (17:07 -0400)]
Fix checkstyle in utils
Just focusing on the policy-utils submodule.
Issue-ID: POLICY-882
Change-Id: I9f2ecac8f435f2d743b1fafc477d320b10852bdc
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Pamela Dragosh [Tue, 4 Sep 2018 15:18:15 +0000 (11:18 -0400)]
Fix security issues
Guava was not fully defined correctly. In order to exclude
an older version being pulled in, the dependencyManagement
needs to come from oparent and not overriden in drools-pdp.
Issue-ID: INT-619
Change-Id: I58dfb815f02d61e47552e671540144b7b1ed3df5
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Pamela Dragosh [Tue, 4 Sep 2018 13:01:34 +0000 (09:01 -0400)]
Remove guava override
The oparent repo now declares guava for all the ONAP projects
to inherit from. Removing the override so we are upgrading to
a version without security or license issues.
Issue-ID: INT-619
Change-Id: I5ff9745b723db74cf46d63520f7cf00796bb2a01
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Pamela Dragosh [Thu, 30 Aug 2018 12:26:14 +0000 (12:26 +0000)]
Merge "handle null drools object in configuration"
Liam Fallon [Thu, 30 Aug 2018 08:09:41 +0000 (08:09 +0000)]
Merge "Set parent to policy/parent"
Jim Hahn [Wed, 29 Aug 2018 21:15:37 +0000 (17:15 -0400)]
handle null drools object in configuration
Modified code to explicitly check for missing drools object, and
to not throw an exception during MDC setup.
Change-Id: Iac16f2fc46e2ffff03195985383b09b814fa4008
Issue-ID: POLICY-1082
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Tue, 28 Aug 2018 22:10:51 +0000 (18:10 -0400)]
Set parent to policy/parent
Set the parent to point to policy/parent instead of
oparent. Clean up some duplicate management versions.
Change-Id: I28957b05b80c9564ad32c958143822b6b0768219
Issue-ID: INT-619
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Michael Mokry [Tue, 28 Aug 2018 21:39:50 +0000 (16:39 -0500)]
Fixed feature-healthcheck issue
Modified properties to true for https on PAP and PDP
Found a minor typo in do-start.sh that is benign currently but could
cause an issue in the future so figured I would clean it up now.
Change-Id: I06385d36d69955d49cabeb39b09d75ffeaec2fdc
Issue-ID: POLICY-781
Signed-off-by: Michael Mokry <mm117s@att.com>
Pamela Dragosh [Mon, 20 Aug 2018 18:33:55 +0000 (18:33 +0000)]
Merge "https certs with aaf+pdpd containers compatibility"
Jorge Hernandez [Fri, 17 Aug 2018 21:40:58 +0000 (16:40 -0500)]
https certs with aaf+pdpd containers compatibility
Updated license date (jrh3).
Change-Id: I1bc244da64f4a1e683f8c6a1be53157474f46ee9
Issue-ID: POLICY-1026
Signed-off-by: Jorge Hernandez <jh1730@att.com>
Krishnajinka [Thu, 16 Aug 2018 07:59:07 +0000 (16:59 +0900)]
Fix sonar issues in drools-pdp
Fix sonar issues about nested control loops in drools-pdp.
Rework1 build failed due to incorrect condition. fixing it
Fix checkstyle. Add modified copyright notice
Issue-ID: POLICY-1017
Change-Id: I21a4ad9399b1d234b8d5416ab0d595302a441f10
Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
krishnajinka [Sun, 5 Aug 2018 09:27:28 +0000 (18:27 +0900)]
Fix basic Java issue in pdp drools sys comp
Modify pdp drools system component files to fix basic
Java warnings from analysis tools. Possibly flagged by
Sonar tool as well.Rework based on comments
Issue-ID: POLICY-1017
Change-Id: I1f2a5d727d2673cade5f69a07f708e16754c78e4
Signed-off-by: krisjinka <kris.jinka@samsung.com>
mmis [Mon, 30 Jul 2018 18:24:09 +0000 (19:24 +0100)]
Copy policy-endpoints from drools-pdp to common
Issue-ID: POLICY-967
Change-Id: Ib19d3a89ffa328c39f7871bff59efb3dd1617f7a
Signed-off-by: mmis <michael.morris@ericsson.com>
mmis [Thu, 19 Jul 2018 12:21:08 +0000 (13:21 +0100)]
Copy policy-endpoints from drools-pdp to common
Removed policy-endpoints, and 3 classes from policy-core. Replaced
refenences to the deleted classes with references to the corresponding
classes in policy-common
Issue-ID: POLICY-967
Change-Id: I547cde4894424b8f40b7ddd4e2342ebb729cb588
Signed-off-by: mmis <michael.morris@ericsson.com>
Jim Hahn [Wed, 18 Jul 2018 17:49:42 +0000 (13:49 -0400)]
Deny subsequent lock()
This is the final step of separating the lock "refresh" operation
from the original "lock" operation. This step entails rejecting
subsequent "lock" requests, even by the same owner, when a resource
is already locked; "refresh" should now be used, instead, to extend
a lock.
Modified comments to indicate that the lock can only be extended
using "refresh".
Change-Id: I406cf60c076dbce87afbd94fb301732359dbd2db
Issue-ID: POLICY-872
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Wed, 18 Jul 2018 11:48:03 +0000 (07:48 -0400)]
Upgrade jetty to 9.3.24 security
Upgrade to clear security flag in CLM.
Removed unnecessary properties already declared
Issue-ID: POLICY-987
Change-Id: Iefe4a9b264148a6bd661d5cff3bff6019b0b3def
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Jorge Hernandez [Tue, 17 Jul 2018 14:04:29 +0000 (14:04 +0000)]
Merge "Distinguish lock from refresh"
Jim Hahn [Thu, 12 Jul 2018 21:47:09 +0000 (17:47 -0400)]
Distinguish lock from refresh
This is the first step of separating the lock "refresh" operation
from the original "lock" operation. This step entails adding the
refresh() method to both the default and the feature-distriubted
locking mechanisms.
Change method call, in junit test, from lock to refresh.
Change branch name in git review.
Change-Id: I506de7a96cb3ee786839aca04ad67cdd7378832c
Issue-ID: POLICY-872
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 13 Jul 2018 21:11:33 +0000 (17:11 -0400)]
Don't stop controller on dmaap failure
Modified feature-pooling-dmaap so that it continues to work even
if it's unable to communicate with the internal DMaaP topic. When
that happens, it simply starts processing locally, until communication
is re-established and it receives a bucket assignment.
Fixed typo in comment.
Added to comment for State.internalTopicFailed().
Removed extra space before @Ignore.
Change-Id: I9c851c66c9162c608f2df98e11d49fc526539434
Issue-ID: POLICY-878
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Tue, 3 Jul 2018 22:45:50 +0000 (22:45 +0000)]
Merge "Fix sonar issues on new code"
Pamela Dragosh [Tue, 3 Jul 2018 14:08:14 +0000 (14:08 +0000)]
Merge "Final piece to remove lock Callback"
Jim Hahn [Tue, 3 Jul 2018 13:27:02 +0000 (09:27 -0400)]
Fix sonar issues on new code
Removed new technical debt.
Change-Id: I04e86b85897ab42deca17ecee55f29d48cc24427
Issue-ID: POLICY-872
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 29 Jun 2018 17:11:58 +0000 (13:11 -0400)]
Final piece to remove lock Callback
Now that drools-applications no longer uses the lock Callback, it
can be removed from drools-pdp.
Change-Id: Ie82a6d382b54041ab612e73ad8c96176bd01a9f6
Issue-ID: POLICY-872
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 29 Jun 2018 14:54:00 +0000 (10:54 -0400)]
Use DB time instead of jvm time
Modified distributed locking code to use the DB time (i.e., "now()") when
determining expiration times of locks. This will eliminate concerns that
may arise from different timestamps on different JVMs. As part of the
change, the expirationTime column was changed from BIGINT to TIMESTAMP.
Rename 1810 sql scripts to 1811, to match release date.
Change-Id: Ibfb15742f447133b001e4340027657ac202864a6
Issue-ID: POLICY-872
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Wed, 27 Jun 2018 14:12:45 +0000 (10:12 -0400)]
Add time limit to locking facility
Modified the locking facility to add a time limit and remove the
callback parameter. This affected both the default facility as
well as the distributed locking feature. It will also require
a change to the rules for Closed Loop.
Changed testUnlock() to try locking with a different owner.
Default feature API should be OPER_UNHANDLED.
Put a few things back so-as not to break the drools-applications
build. They can be removed once drools-applications is updated.
Fix newlines in API java.
Change-Id: I3ed7835cac6a582493a9bc8f6d1d4f3e6cb6289e
Issue-ID: POLICY-872
Signed-off-by: Jim Hahn <jrh3@att.com>