summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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>
2018-04-16Merge "Switch to cambria client 1.2.1-oss"Pamela Dragosh7-35/+64
2018-04-16Merge "Sonar cleanup"Jorge Hernandez4-12/+18
2018-04-16Add missing licensesPamela Dragosh16-1/+256
Adding missing licenses to files that should not harm compilation, JUnit tests and instantiation. Issue-ID: POLICY-741 Change-Id: I3075e3493676ee28693323f978c0b5b210b20a34 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-04-16Switch to cambria client 1.2.1-ossJim Hahn7-35/+64
Switched to new version of cambria client. Added code to set cambria socket timeout. Modified code to use cambria client instead of dmaap client. Removed extra, unnecessary items that had been added to the top-level pom.xml Change-Id: If71d36f50da5423ec0cf21b30e66aff5b1c9222a Issue-ID: POLICY-742 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-14Sonar cleanupMagnusen, Drew (dm741q)4-12/+18
Sonar cleanup for distributed-locking Issue-ID: POLICY-728 Change-Id: I52523a0149436805509706a4a732d1da8a1b4511 Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>
2018-04-13Merge "Update SNAPSHOT to 1.2.1"Jorge Hernandez17-17/+17
2018-04-13Update SNAPSHOT to 1.2.1Pamela Dragosh17-17/+17
Issue-ID: POLICY-736 Change-Id: Ic293a7347db4e5001a4084e1b98c5d44a145d16c Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-04-12Sonar fixes for policy-core locksJim Hahn10-199/+183
Made a number of changes to the locking code in policy-core, to address sonar issues. This entaileed changing some of the Lock API methods to return OperResult instead of Boolean. Updated distributed locking with the new API return types. Simplified Thread creation using functional methods. Change-Id: If32bf7a435d2aedb969de1b77c7e7e27e110ecb0 Issue-ID: POLICY-728 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-12Merge "Distributed-locking feature sonar cleanup"Jorge Hernandez3-42/+44
2018-04-05Optionally load available applicationsv1.2.0Jorge Hernandez3-24/+10
During container instantiation, it will check for available applications to preload, ie. control loop or any other ones. It will install them if available or start with no applications loaded otherwise. Change-Id: I6908d279cbe34e04bcabf830ed30480ba147598f Issue-ID: POLICY-735 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-04-05Distributed-locking feature sonar cleanupMagnusen, Drew (dm741q)3-42/+44
Code cleanup and some refactoring to resolve sonar issues. Issue-ID: POLICY-728 Change-Id: I19051dcc8e1cec293d5d7104e63239fc2b89071e Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>
2018-04-04Small modification to resolve junit failuresMagnusen, Drew (dm741q)4-13/+75
Added protected method to Heartbeat class that allowed for the passing of a CountDown latch. This will resolve the timing-related junit failures in Jenkins environment. Issue-ID: POLICY-729 Change-Id: I3d2d8bddfb6d9f82be54a2f13bdcd7e1fc65a286 Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>
2018-04-04Merge "disable problematic private keystore"Pamela Dragosh1-4/+4
2018-04-03Merge "Add api-resource-locks feature"Jorge Hernandez12-0/+2186
2018-04-03Merge "Add pooling capability"Jorge Hernandez80-0/+13640
2018-04-03Merge "Implementation of distributed locking feature"Jorge Hernandez18-0/+1648
2018-04-03disable problematic private keystoreJorge Hernandez1-4/+4
it causes bad interactions fetching dependencies with nexus libraries, it has been disabled (at least for the short term) and rely on the JVM one instead. Change-Id: Ie9d1ae7fe304c06807e457c5bfcf34d07e8d83b8 Issue-ID: POLICY-720 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-04-03Implementation of distributed locking featureMagnusen, Drew (dm741q)18-0/+1648
This feature is a very basic implementation of a distributed locking system. Issue-ID: POLICY-699 Change-Id: I012fd37926ccbbdd87a3e4acb2788b53680115f0 Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>
2018-04-03Add api-resource-locks featureJim Hahn14-0/+2637
Added ResourceLockFeatureAPI, to provide an interface for PolicyGuard to use to access other locking mechanisms. Move lock API to policy-core. Changed the interface and added Callback support. Added a class to invoke the API implementers. Changed to set a future instead of expecting the callback to implement the future interface. Also refactored, creating "lock" sub-package. Add junit tests. Increase junit coverage. IsLocked & isLockedBy should check all arguments. Make ImplFuture protected instead of public. Simplify locking - move callback support to an optional feature. Move Reference class to policy-utils. Return plain Future instead of LockRequestFuture. Change-Id: I65154d33833914b4332e02d1ef2512f4c5f09b16 Issue-ID: POLICY-577 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-02Companion changes to apps startup improvementsJorge Hernandez3-12/+9
see https://gerrit.onap.org/r/40577 for reference Change-Id: I76eb0d791a012d1ad2046ef27ec9f8b181cf3cb3 Issue-ID: POLICY-534 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-03-29Merge "Update docker tag convention"Pamela Dragosh3-5/+5
2018-03-29Merge "persit controller configuration upon restarts"Pamela Dragosh3-34/+51
2018-03-29Update docker tag conventionmmis3-5/+5
Update docker scripts to comply with ONAP docker standard tag format $VERSION-STAGING-YYYYMMDDTHHMMSSZ Issue-ID: CIMAN-132 Change-Id: I7e40c6769612842dceae7698279abc7cbda3ed3f Signed-off-by: mmis <michael.morris@ericsson.com>
2018-03-28Add pooling capabilityJim Hahn80-0/+13640
Add an optional feature that that supports session pooling, wherein more than one host can be active at a time. Use beforeInsert() instead of beforeOffer(), where possible. Move request-id-extraction from policy-managment to feature-pooling. Combined AdditionalProperties into PoolingProperties. Finished junit tests for DmaapManager. Adjusted filters for all XxxState classes, and added testGetFilter to all XxxStateTest classes. Always publish Offline message when the internal topic fails. Remove DelayedExtractor, as it isn't needed. Renamed ExtractorMap to ClassExtractors, and added property name prefix to the constructor to give more control over property naming to invokers. Remove State copy constructor. Use class name instead of class in ClassExtractors map. Remove BucketAssignments from ProcessingState. Remove some TODO items. Add META-INF for implemented feature APIs. Fix ClassExtractor bug where it can't find a field in a superclass, and add a test for classes defined in another file. Add assembly and rename project directory. Add more junit coverage. Change-Id: I7f132f84a7b284a58ab09c9069db19b853acd7e9 Issue-ID: POLICY-577 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-03-28Upgrade jackson 2.9.5Pamela Dragosh1-1/+1
May not clear the security issue yet as this was just released. Issue-ID: POLICY-506 Change-Id: I61eaac9edfb3802c5508a9812d685a1464585af2 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-03-28persit controller configuration upon restartsJorge Hernandez3-34/+51
case of drools containers restarts or pulling new images. Change-Id: I30747a605bf1cb5ae351cd1359263728d82afcca Issue-ID: POLICY-575 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-03-28Remove ECOMP trademarkPamela Dragosh1-2/+0
Issue-ID: POLICY-696 Change-Id: I98e06bb466c5bae985e55a4a1192b69acae06e89 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-03-27Merge "Support server-side filtering for UEB"Jorge Hernandez3-6/+89
2018-03-26Support server-side filtering for UEBJim Hahn3-6/+89
Cambria client supports server-side filtering. Enhanced the TopicSource classes that use cambria client to support server-side filtering. Updated license date in one of the files. Change-Id: Ia56d73c7a5f3ab960418709c1ea7f1e73aa4ba87 Issue-ID: POLICY-577 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-03-26l2 management maturity pdp-dJorge Hernandez20-176/+1921
configurable log location metric/audit log for transaction metrics conforming to new field definition. support metrics/audits records with custom logback filters so they are not intrusive with developer log testing. Change-Id: I7a4dcc6790b85539e613ad8705e731e7298ce106 Issue-ID: POLICY-533 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-03-21Fix bugs identified by Sonar on drools-pdpliamfallon3-59/+74
Three bugs fixed: 1. Set of static variable in DMaaPSimulatorJaxR 2. Use of opssibly null variable "output" in RepositoryAudit 3. Unreachable statement error in RepositoryAudit Change-Id: I72e028cfc51a82250afd02fb4109d3dea08072dc Issue-ID: POLICY-691 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-03-16Merge "Renamed policy-drools docker image"Pamela Dragosh3-15/+15
2018-03-14Update oparent version to 1.1.0liamfallon1-1/+1
Directive from ONAP project that all repos should be updated. Change vierified with a build with .m2 /org/onap cleared. Change-Id: I19d3554bdc9aef4576de1917d5258f23a4ec42d9 Issue-ID: POLICY-693 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-03-14Renamed policy-drools docker imagemmis3-15/+15
Renamed from: onap/policy/policy-drools to onap/policy-drools to enable consistent naming across nexus and docker hub Issue-ID: POLICY-674 Change-Id: Ib0b9df97f398c5c1715f736f11f6481cf6d8427f Signed-off-by: mmis <michael.morris@ericsson.com>
2018-03-14Unit test modified to be order independentliamfallon1-13/+43
The change of dmaap version caused the order of execution of unit tests to change. This triggered an assertion fail in this test. The test has been redesigned to be independent of test invocation order. Also some small Sonar issues fixed. Change-Id: I3b3a5b1cb69785c69f818eab2473fdbfbb85dbd1 Issue-ID: POLICY-694 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-03-14Upgrade dmaap release 1.1.3Pamela Dragosh1-1/+1
Dmaap released this dependency, the snapshot is no longer available. Issue-ID: POLICY-694 Change-Id: Ia376af2e457ae95d5f16a90e6c6f3a08653f4b37 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-03-09Merge "configurable logs dir and creation as root"Pamela Dragosh1-2/+4
2018-03-08configurable logs dir and creation as rootJorge Hernandez1-2/+4
Change-Id: Ib23ee897372f0911394441739da5c7b9e7398910 Issue-ID: POLICY-554 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-03-08Remove filtering from packages/docker/pommmis1-1/+0
Filtering should not be applied in the maven-resources-plugin execution as this incorecttly modifes the scripts copied by this plugin Issue-ID: POLICY-652 Change-Id: I57595711c4a6f4522d679016370012e0dc8833d6 Signed-off-by: mmis <michael.morris@ericsson.com>
2018-03-07Copy files for docker image in packages/docker/pommmis4-37/+44
Copying the files in the pom removes the need to do the copying in various locations the docker build is executed from and allows the docker image be built without building the entire repo (as the install.zip can be pulled from nexus) Issue-ID: POLICY-652 Change-Id: I77d0f76bd1c11261b3d4d8bdd60572e545a98aa1 Signed-off-by: mmis <michael.morris@ericsson.com>
2018-03-05Merge "Update Dockerfile to remove policy-base, policy-os"Pamela Dragosh1-1/+30
2018-03-05Update Dockerfile to remove policy-base, policy-osmmis1-1/+30
Correction to previous commit "Move docker_*.sh scripts into policy/engine" as attempt to build docker image will result in failure to pull the policy-base image from nexus The policy-base and policy-os images are removed in favour of including the contents of those images directly in the policy-pe image Issue-ID: POLICY-651 Change-Id: I46f4ac0d529fc95ea702809eee466af3d1121717 Signed-off-by: mmis <michael.morris@ericsson.com>
2018-03-02Merge "Upgrade dmaap client"Jorge Hernandez1-26/+1
2018-03-02Upgrade dmaap clientPamela Dragosh1-26/+1
This should have security fixes Issue-ID: POLICY-619 Change-Id: I8636117f3f599e0fb86ded8b292112205f5d8c7c Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-03-02Move docker_*.sh scripts in policy/drools-pdpmmis10-0/+1396
Added files for building policy-drools docker image Issue-ID: POLICY-623 Change-Id: If335653d6ede74ae808c3fddf84ee96d88a75727 Signed-off-by: mmis <michael.morris@ericsson.com>
2018-02-22Force dependency upgrade and exclusionsPamela Dragosh2-7/+33
LCM security issues are identified with plexus-utils and xstream. There is no clear upgrade to the org.kie.* dependencies with a fix for both of these. We will determine via testing as to whether these exclusions will result in failure. Issue-ID: POLICY-506 Change-Id: I9cefb814bb11a9babc4e4a2e47071ab74a46c011 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-02-21Merge "interception of facts before injection"Pamela Dragosh2-15/+91
2018-02-20Sonar fixes to drools-pdpJim Hahn50-856/+792
Fixed most of the instances of the following sonar issues: Moved array designator Used diamond operator Changed System.out/err to use a logger Changed several Thread.sleep() in test code to a single sleep() Useless assignments Replaced comparison with "" to string.isEmpty() Merged if's Replaced ArrayList with List in method returns Reordered type modifiers Reordered constructor methods Defined constants for literals, or replaced them with method calls Removed "throws Xxx" for subclasses of RuntimeException Combined identical "catch" blocks Re-interrupted the current thread after catching an InterruptedException Removed tests against the literal "false" Fix indentation of new makeTopicOperError() method. Fix exception variable name in new methods, logNoUebEncoder() and logNoDmaapEncoder(). Change-Id: Iddae5210553662f733b67333b372dec8c3fe2c94 Issue-ID: POLICY-336 Signed-off-by: Jim Hahn <jrh3@att.com>