summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-07-18Upgrade jetty to 9.3.24 securityPamela Dragosh3-6/+1
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>
2018-07-17Merge "Distinguish lock from refresh"Jorge Hernandez9-2/+375
2018-07-16Distinguish lock from refreshJim Hahn9-2/+375
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>
2018-07-13Don't stop controller on dmaap failureJim Hahn11-569/+83
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>
2018-07-03Merge "Fix sonar issues on new code"Jorge Hernandez1-3/+1
2018-07-03Merge "Final piece to remove lock Callback"Pamela Dragosh2-31/+0
2018-07-03Fix sonar issues on new codeJim Hahn1-3/+1
Removed new technical debt. Change-Id: I04e86b85897ab42deca17ecee55f29d48cc24427 Issue-ID: POLICY-872 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-29Final piece to remove lock CallbackJim Hahn2-31/+0
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>
2018-06-29Use DB time instead of jvm timeJim Hahn5-29/+65
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>
2018-06-27Add time limit to locking facilityJim Hahn15-1148/+230
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>
2018-06-27Merge "Added expiration timer to default locking strategy"Liam Fallon5-16/+371
2018-06-25Added expiration timer to default locking strategyJim Hahn5-16/+371
Fixed comment (missing "}"). Changed default age from 15 hours to 15 minutes. Only increment test time by 1 when testing hashCode. Change-Id: I70ef6cfd34e31ded45b3975f33e5b0ba22afa627 Issue-ID: POLICY-912 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-25Use connection pooling for lockingJim Hahn4-30/+76
Modified distributed locking to use connection pooling. Add comment for new dataSource parameter. Change-Id: I5dc33605797f95072af9b6911a468457f6fd9f3d Issue-ID: POLICY-910 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-20Merge "Remove references to SpecPropertyConfiguration"Pamela Dragosh8-384/+58
2018-06-19Merge "Add setXxx methods for @Property annotation"Liam Fallon5-181/+131
2018-06-19Remove references to SpecPropertyConfigurationJim Hahn8-384/+58
Change-Id: Ib4779611f124277cf8be2b3eddfe41bf69dfd74b Issue-ID: POLICY-907 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-18Add setXxx methods for @Property annotationJim Hahn5-181/+131
We'll be modifying the PropertyConfiguration class so that, instead of directly setting values in private fields, it will use public setXxx methods. Consequently, we have to add the setXxx methods to the PropertyConfiguration subclasses so that they're available when the superclass is modified policy/common. Change-Id: Idff9942eabec182670cbb427b960f6308a2ca30c Issue-ID: POLICY-906 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-18Fix fortify issue with pooling extractor classJim Hahn6-29/+17
The pooling extractor class was using reflection to extract values from private fields. It has been modified to only extract from public fields or to use public getXxx() methods instead. Change-Id: I3aafe9ebfcd41d0e71dc3529030597609b704f53 Issue-ID: POLICY-906 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-05Update drools-pdp to SNAPSHOT-1.3.0liamfallon22-34/+34
Snapshot updated for Casablanca. Change-Id: I75c0a41ce2c1a56ab658be8bfd27a5c81977f990 Issue-ID: POLICY-875 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-05-24Change extractor log level from warn to infov1.2.32.0.0-ONAPbeijing2.0.0-ONAPJim Hahn1-1/+1
Change-Id: I26ae7c0c83b5e3c6b128af262bd334b09696590d Issue-ID: POLICY-870 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-05-21Update Policy Drools PDP to 1.2.3-SNAPSHOTliamfallon22-22/+22
These reviews must be merged in order because of layering. This review should be merged SECOND. Change-Id: I3d3fb84622686b23d435aaf0cd43d307684a4a1f Issue-ID: POLICY-844 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-05-16Upgrade 1.2.2 version.propertiesv1.2.2Pamela Dragosh1-1/+1
Upgrading the version.properties Issue-ID: POLICY-798 Change-Id: Ibfbd5b221a8f5a4eb79063b066d458c3512949b8 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-05-16Upgrade SNAPSHOT to 1.2.2liamfallon21-21/+21
These reviews must be merged in order because of layering. This review should be merged THIRD Change-Id: Icdb5c18106ade60bbc1eea67a1b42e70ac5383e5 Issue-ID: POLICY-798 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-05-14Remove unneeded dependencies from pomsJim Hahn2-0/+10
Changed scope to "provided" for jars that are already included with drools-pdp. Changed scope to "test" for utils-test. Change-Id: Ic2d85706e00e015cc7b0e3a0bd9855753fada64e Issue-ID: POLICY-794 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-05-14automatic upgrade/downgrade features dbJorge Hernandez3-2/+54
add enable and disable scripts to the feature-distributed-locking to upgrade/downgrade their databases when these features are enabled or disabled. Change-Id: Iff9368c915f6da7f7c75d9a5a20ffe27e290e7d3 Issue-ID: POLICY-788 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-05-10Update of StandbyStateManagementTestKevin McKiou1-19/+6
Patch 1: This change modifies StandbyStateManagementTest testPMStandbyStateChangeNotifer() to use a fresh instance of StateManagement to avoid interaction with previous tests. Issue-ID: POLICY-790 Change-Id: I5907ba6b50091bc4f7789f102f48a853d8498ed5 Signed-off-by: Kevin McKiou <km097d@att.com>
2018-05-09Discard Forward to wrong hostJim Hahn4-1/+16
Changed to discard Forward message if the channel does not match the host that received it. Change-Id: I9235bd3b0c5eb264f9b1cfe53552fadf66a0edc2 Issue-ID: POLICY-787 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-05-09Change pooling property namev1.2.1Jim Hahn3-13/+42
Removed "AMSTERDAM_" prefix from pooling topic property name. Added feature-specific conf file with pooling topic property. Enabled distributed locking DB properties. Change distributed locking DB name to "pooling" to match the code. Add default value to feature-specific conf file. Change "_" in default topic name to "-". Change-Id: I53de51787694e5920dc9ced07b5a9ac60bb63e45 Issue-ID: POLICY-782 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-05-08Removed unneeded extractor propertiesJim Hahn1-4/+2
Change-Id: I5a52ba7358d27a2db0176cb02289b1bdcce0e9e2 Issue-ID: POLICY-783 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-05-04Fix various problems in poolingJim Hahn15-281/+217
Renamed META-INF SessionAPI to EngineAPI, as it implements the latter. Created default PoolingFeature.factory object. Don't delete a controller's pooling manager when stop is called; do that in afterHalt and afterShutdown. This enables it to be restarted as long as the controller still exists. Only stop & start the internal DMaaP topic at the engine level instead of the controller level. This is necessary to prevent sinks for ALL controllers from being started each time an individual controller starts. Clear all bucket assignments when controller is stopped. Mark test methods with @Override annotation. Add default property file for pooling feature. Add license to default property file. Remove tests for doDeleteManager(), as it no longer exists. Changed " = " to "=" in the property file. Change-Id: I80c0c3f1879b5a320044db93e3dfa3b7281cda51 Issue-ID: POLICY-774 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-05-01Merge "Make custom preinstallation available in image"Pamela Dragosh5-22/+25
2018-05-01Add INFO.yaml fileJessica Wagantall1-0/+37
Add INFO.yaml to list: - Project description - Properties - PTL information - Meeting information - Committer information Change-Id: Ia97c9a2b6bc23b280467d930dbe06ed4437ed532 Issue-ID: CIMAN-134 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2018-04-30Make custom preinstallation available in imageJorge Hernandez5-22/+25
This script could be used by OOM installation to trigger the installation of a drools application or other purposes (ie. control loop) Change-Id: Iafdb413ee85aa341351481584e8c967cc1a3c112 Issue-ID: POLICY-566 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-04-26Merge "cook policy-keystore into drools image"Pamela Dragosh4-6/+21
2018-04-25cook policy-keystore into drools imageJorge Hernandez4-6/+21
OOM team reported issues with ONAP installation in terms of config map sizes. After discussion with OOM team, one solution is to cook it in the docker image itself. This will solve the size issue on the OOM side. Change-Id: I6848370f119cabdae450a1153a88ebd8c0f6b392 Issue-ID: POLICY-747 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-04-24Add locking and pooling to installation packageJim Hahn1-0/+12
Added feature-distributed-locking and feature-pooling-dmaap as dependencies to the packages/install pom. Change-Id: I2275ebcf93648ccdbf24355201bad9399e4143b1 Issue-ID: POLICY-760 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-23Fix simple sonar issues in BusConsumerJim Hahn1-7/+12
Fixed simple sonar issues in policy-endpoints BusConsumer. Change-Id: I6dbcdc58bf26d62eeb6bc0357d5f859474028984 Issue-ID: POLICY-728 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-23Merge "Close old UEB/DMaaP consumer"Jorge Hernandez1-22/+58
2018-04-23Merge "Fix simple sonar issues in policy-endpoints"Jorge Hernandez13-157/+128
2018-04-21Sonar fixes for latest pooling codeJim Hahn10-40/+103
Made changes to pooling code to address new sonar issues. Add comments to awaitActive() methods. Change-Id: I390173de00135a0a5fe50af82ed4ba780df9df80 Issue-ID: POLICY-728 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-20Fix simple sonar issues in policy-endpointsJim Hahn13-157/+128
Fixed various sonar issues. Did not fix issues in BusConsumer, as that has an update that is yet to be merged. Update license dates. Change-Id: I393dbb3852a218a62129f59cc84886fb10122ee1 Issue-ID: POLICY-728 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-20Add comprehensive junit tests for pooling featureJim Hahn25-391/+1201
Added FeatureTest.java and FeatureTest2.java. Fixed a number of issues that were identified via the above tests. Moved fixes of policy-endpoints to other JIRA tickets. Resolved potential sonar issue with commented-out code by making STD_XXX constants into plain variables to they could be changed via a method call. Changed stdEventWaitMs to stdEventWaitSec. Change-Id: Icf8fcc9b0dfe2578aa0787e0c9224a6f76a068ee Issue-ID: POLICY-748 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-19Set default consumer instance to hostnameJim Hahn2-7/+3
Modified the code to generate a consumer instance via UUID, when no consumer instance is provided. Removed DEFAULT_CONSUMER_INSTANCE. Set the consumer instance to the hostname instead of a UUID. Change-Id: I143eb6d2ec51a7913536a46041de761d51222006 Issue-ID: POLICY-749 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-19Close old UEB/DMaaP consumerJim Hahn1-22/+58
Modified code to close the old consumer when the filter is changed. Made some changes to toString() methods to resolve some sonar issues. Modified so-as to not interfere with fetch(). Use synchronized instead of AtomicReferences. Change-Id: I4c9d2cc32993208fd345e66ef1f1dce7a1e7de7d Issue-ID: POLICY-750 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-19Sonar cleanupMagnusen, Drew (dm741q)13-21/+69
More sonar cleanup. Resolved some of the simpler issues. Issue-ID: POLICY-728 Change-Id: If9c4718f10c6d3524239d2a05c09badb791ef2f0 Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>
2018-04-19Upgrade 1.2.1 SNAPSHOT packagesPamela Dragosh4-4/+4
These were missed in the initial review https://gerrit.onap.org/r/#/c/42783/ Issue-ID: POLICY-736 Change-Id: I63cc42f4cea4674e7f542bfeab262b1cd0c311fb Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-04-18support for AAF provided trustoreJorge Hernandez1-4/+2
Change-Id: I20c5136636f922ee31a773b462e5c2318b2f222f Issue-ID: POLICY-747 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-04-16strip timestamped versions in feature installsJorge Hernandez2-2/+2
This is to satisfy CSIT tests that contains a mix of SNAPSHOT and timestamped versions while running tests Change-Id: I1fe426dcca9250d0fe2c9c5264f1acb1ffbde57b Issue-ID: POLICY-745 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-04-16Merge "Sonar fixes to pooling"Jorge Hernandez42-1106/+2521
2018-04-16Sonar fixes to poolingJim Hahn43-1106/+2534
Made various changes to the pooling feature to address some of the sonar issues. Remove duplicate classes, Pair & Triple. Fix sonar issue about duplicate process(xxx) methods. Remove extra items from pom.xml and add assembly builder. Fix license text in pom.xml, inadvertently reformatted. Fix a few typos in comments and change LinkedList to Queue. Move assembly.xml to correct source directory. Replace ScheduledFuture<?> with CancellableScheduledTask, to satisfy sonar. Eliminate "TODO" items: add logging, delay after sending Offline message. Add more logging in process(Message) methods. Begin creating end-to-end junit test, fixed bugs found as a result. Restore logback-test.xml to WARN. Fix merge conflict - restored test properties file. Change-Id: Ic70a8cee49678ea0fc3da309699aec1f6088fe70 Issue-ID: POLICY-728 Signed-off-by: Jim Hahn <jrh3@att.com>