aboutsummaryrefslogtreecommitdiffstats
path: root/controlloop/common
AgeCommit message (Collapse)AuthorFilesLines
2018-09-04Added junit test for commitAbatement.Joshua Reich3-14/+110
Change-Id: Iee71481e357861618bed068f8b8ef37ec0ea2ab8 Issue-ID: POLICY-975 Signed-off-by: Joshua Reich <jreich@research.att.com>
2018-08-31Add code to store abatement events.Joshua Reich2-1/+55
Stores abatement events in history DB. Change-Id: Ifca6acd42cd9eea85e27765bd268a491028e305a Issue-ID: POLICY-975 Signed-off-by: Joshua Reich <jreich@research.att.com>
2018-08-29Fix remaining checkstylePamela Dragosh105-1663/+2139
Lots of formatting, missing javadoc, distance from use, imports must be explicit, ordering of methods. Fixed some abbreviation problems in classes and renamed JUnit tests to fix this. Issue-ID: POLICY-883 Change-Id: I8494f63d88d63c0232aca97f7bcc848816228fb1 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-08-28Remove overriding dependencies warningsPamela Dragosh9-41/+24
With the move to oparent for dependencies, there are still some warnings in the pom's for overriding managed dependencies. Issue-ID: INT-619 Change-Id: I7ea771cc4536d8dfc77b4d1717e59cf6bfcfcda9 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-08-28Merge "use new SO API for scale-out"Pamela Dragosh14-243/+410
2018-08-28use new SO API for scale-outJim Hahn14-243/+410
Updated licenses and serialization IDs. Moved hashCode() and equals() methods to be in same location as in the original code so it can be more easily compared. Changed vDNS yaml timeout and retry to 1200 and 0, respectively, to match the original values. Removed extra newline from yaml, to match original yaml. Reformatted source to wrap lines at 120 characters and removing trailing white space. Change-Id: I3f5e59a1f44750347de49164f587d4ffefdee8b4 Issue-ID: POLICY-962 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-08-28Change parent to policy/parentPamela Dragosh17-45/+6
Should be pointing to policy/parent rather than oparent directly. This will automatically support upgrades more easily. Also removing duplicated managed version override warnings from Maven. This is continuing work to support the integration effort to consolidate common versions of java dependencies across all projects. Issue-ID: INT-619 Change-Id: I37ac20e669262d9ac8fff09fd1ac540190b47a30 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-08-24use new vf-walk code in SO requestJim Hahn12-200/+1179
Methods were added to AaiNqResponseWrapper to extract VF modules and generate the new VF module name. This step modifies the SO code to use those methods. It was also determined that the SO code needs the VF module container object, not just the VF module, itself. As a result, AaiNqResponseWrapper was modified to return a list of the containers instead of a list of the VF modules. Also modified the AAI simulator to return two VF modules in the response to the vserver named query. As part of that, a method was added to the simulator so that JSON responses can be read from files rather than having to convert them to Java Strings. Modified simulator to work even if vnf-id is null. Change-Id: I68fdf07ea80ee0daf9e16403e35b11710315a8a8 Issue-ID: POLICY-1037 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-08-23walk VF module namesjh73587-53/+732
Added code to walk the VF modules to count the number of modules and to generate the new module instance name. Added comment to test method. Fix checkstyle errors. Read json files instead of resources. Removed checkstyle plugin from aai pom, as it continues to barf every time I use some automated feature of Eclipse. Use Files.readAllBytes() instead of IoUtils.toString(uri). Try concatenating file path. Turned out to be a problem with file name case sensitivity - renamed the file. Change-Id: I1ce98d846dfa1d29e109b161c869108425d29771 Issue-ID: POLICY-1037 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-08-21move AAI named queryJim Hahn6-181/+233
The AAI vserver named-query was being done as a preliminary step for the SO request. However, it will now be needed during the guard query, which happens much earlier. Thus it has been moved from the SO classes into the event manager class, where it is retrieved in a lazy fashion and cached. Also removed some trailing white space. Update licenses. Make test method private. Change-Id: Id7353a2e0f2d42601d5142cb92961528fa21aa94 Issue-ID: POLICY-1011 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-08-17fix new sonar issues with prov-status checkJim Hahn1-36/+37
Changes made while adding the prov-status check triggered some sonar thresholds in ControlLoopEventManager. Updated the code to resolve them. One of the changes that had been introduced was to check for the existence of both the is-closed-loop-disabled AND the prov-status fields. However, if one is there then the other should be there, thus the second check is redundant and was removed, which should reduce the cyclomatic complexity back under the threshold. Re-ordered the code a little, to make it less ambiguous. Removed trailing white space. Change-Id: If0ce74cedbf947c32cae3df3374cda6ba1305cd2 Issue-ID: POLICY-964 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-08-15add prov-status check to AAI queriesJim Hahn6-190/+455
Also had to add prov-status field to AaiGetVnfResponse class. Removed bogus comment from test. Verify response is not null in test. Verify no requery by vnf name in test. Add prov-status to template.demo tests. Add prov-status to sample json for archetype-cl's. Change-Id: I3f36a2bb6de8265ce5b10103690d6d8813c15b1a Issue-ID: POLICY-964 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-08-15Merge "Fix checkstyle issues"Jorge Hernandez11-58/+87
2018-08-15Merge "update AAI response classes per API"Pamela Dragosh31-717/+881
2018-08-14Fix checkstyle issuesPamela Dragosh11-58/+87
Spacing, missing javadoc Issue-ID: POLICY-883 Change-Id: Ice65c6c1baf0bb7c6273411f078bacfe3496b89b Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-08-14update AAI response classes per APIJim Hahn31-717/+881
Several of the AAI response classes did not match the new AAI interface. Updated AaiGetVnfResponse and AaiGetVserverResponse and the classes they use to reflect the new API; other top-level classes were left untouched. Fix checkstyle errors. Change-Id: Ife5830c45ba8aece8d676a10f0fd8a9c9fe6cb66 Issue-ID: POLICY-964 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-08-13Resolve checkstyle formattingPamela Dragosh27-1196/+1299
This submission is mostly focused on 120 spacing, missing spaces, rearranged imports, newlines before package and a few other items. Will have to submit further reviews to finish this. Issue-ID: POLICY-883 Change-Id: I772a2077ac97a0cb929810d8afadd2f415fae17b Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-08-07Merge "Fix basic code issues in controlloop"Jorge Hernandez8-42/+44
2018-08-06Fix basic code issues in controlloopKrishnajinka8-42/+44
Found few issues while going through the code. Fixing these issues in the controlloop package classes Issue-ID: POLICY-1017 Change-Id: I24d0ce1257ad689c3e9d9b7a3bea07eeb65383f1 Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-08-03rename rule template from beijing to casablancaJim Hahn12-25/+23
Changed assertTrue to assertEquals in CasablancaFeatureTest. Change-Id: I3bec009ddde2f10468575b4b7bf9c08c24748aae Issue-ID: POLICY-955 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-07-31https configuration for amsterdam controllerJorge Hernandez1-36/+42
configuration set to false until unblocked by DMAAP-547. Change-Id: I2efdafa8b143725fd73f05ec3d0a6a9ffc3b12c6 Issue-ID: POLICY-941 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-07-30Copy policy-endpoints from drools-pdp to commonmmis31-224/+308
Replaced references to classes deleted from drools-pdp with references to the corresponding in policy-common Issue-ID: POLICY-967 Change-Id: Ia9d2ac704e6b7c434e5a9e7aee6d7dcf9198e4f2 Signed-off-by: mmis <michael.morris@ericsson.com>
2018-07-16Use refresh() instead of lock() in guardJim Hahn2-43/+28
This is the second step of separating the lock "refresh" operation from the original "lock" operation. Modified PolicyGuard to use refresh() to extend a lock. Also removed the host name from the owner String, as it will no be longer needed (once the final step is done). Change-Id: I3a498e6f81d9dba1bbdfd6f7388087355192bcf5 Issue-ID: POLICY-872 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-07-12Merge "Username & password should be optional for VFC"Pamela Dragosh2-23/+19
2018-07-11Username & password should be optional for VFCJim Hahn2-23/+19
Also updated licenses. Replace tabs with spaces in new junit method. Updated licenses again. Change-Id: Iebff19353c052e59bfd69da1677e9a05c44592a0 Issue-ID: POLICY-869 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-07-11Include hostname as part of lock ownerJim Hahn2-29/+35
Because the lock owner string is constructed, using just the target type and request ID, lock requests made by different ONSETs running on different PDP-Ds may both succeed. Added the hostname to the owner string so that locks for ONSETs for the same request ID will be rejected if the request is made on different PDP-Ds. Change-Id: I1d45194cbb1c5b1a1f6000477fe51879a2fecc19 Issue-ID: POLICY-872 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-07-05Clean up objects for deleted rulesJim Hahn2-1/+13
When rules for a closed loop are deleted, associated working memory elements may be left around. Modified the code to retract the various elements. Re-added code to unlock when retracting TargetLock. Add junit tests for new methods. Forgot the junit test for request id. Change-Id: Iec2805adbdb147a643f6163badee05ea353ada88 Issue-ID: POLICY-872 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-07-05unlock should always return TargetLockJim Hahn2-7/+9
ControlLoopEventManager.unlock only returns the TargetLock if the PolicyGuard.unlock operation is successful. However, if the lock has already expired, then PolicyGuard.unlock will return false, and ControlLoopEventManager.unlock will then return null. As a result, the rules do not retract the TargetLock. (The rules do, however, retract any left-over TargetLock objects during the clean-up phase. Nevertheless, the earlier rules should not have to depend on the clean-up rules to do that.) Modified the code to address this issue. Change-Id: I2e6099a4e3511053d2e6e1373cae4b480798d1b6 Issue-ID: POLICY-872 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-29Add time limit to local guard locking facilityJim Hahn4-70/+71
Modified the local policy guard locking facility to add a time parameter. Modified the control loop event manager to extend the lock when lockCurrentOperation() is re-invoked. Modified the rules to retract the lock if the lock request was denied. Reorder assertions in junit test. Change-Id: Ic9b77acbb4881a5a516f30eb56664bad1a5c4d7e Issue-ID: POLICY-872 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-06Merge "Remove Eclipse lifecycle error on plugin"Pamela Dragosh1-9/+51
2018-06-06Remove Eclipse lifecycle error on pluginliamfallon1-9/+51
The kie-maven-plugin causes a lifecycle management error in Eclipse (not in normal build). A profile is added to the POM to remove this eclipse error. Change-Id: I6f5e5bec5e1e388edb083a910b9d1472af889a47 Issue-ID: POLICY-716 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-06-05Update drools-applications to SNAPSHOT-1.3.0liamfallon28-28/+28
Snapshot updated for Casablanca. Issue-ID: POLICY-875 Change-Id: I0307282c4eabdb9ccd03282f918f4cd727ac4f86 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-05-24Don't build credentials if user name is emptyv1.2.32.0.0-ONAPbeijing2.0.0-ONAPJim Hahn3-1/+18
Modified code to skip building credentials if user name is empty, in addition to case where user name is null. Change-Id: I5b53d4f97263df98cfe082f44a4e6af64b1e488b Issue-ID: POLICY-868 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-05-22Merge "Update Drools Applcations to 1.2.3-SNAPSHOT"Jorge Hernandez28-28/+28
2018-05-22reduce transaction cache sizeJorge Hernandez2-3/+4
- reduce memory footprint - avoid verbose logging from cache when the object is not in the cache to invalidate it. Change-Id: I819cfbcfe32f5afdd238397c79ccd5cebd4534b8 Issue-ID: POLICY-852 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-05-21Update Drools Applcations to 1.2.3-SNAPSHOTliamfallon28-28/+28
These reviews must be merged in order because of layering. This review should be merged THIRD. Issue-ID: POLICY-844 Change-Id: I61d128f3244cd420abab15ab70c5c0e9d9afa625 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-05-16Fix authentication info in request to SOJim Hahn1-20/+2
The code was passing two different sets of credentials to the REST manager, and the wrong one was taking precedence. Modified the code to only pass the correct set of credentials. Updated license date. Change-Id: I13e2db93a8eebbb0cd77fdfaca80125cd28a2553 Issue-ID: POLICY-800 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-05-16Upgrade SNAPSHOT to 1.2.2liamfallon28-28/+28
These reviews must be merged in order because of layering. This review should be merged FOURTH PLD added version.properties Change-Id: If7af7b3ae37166e88af92c0d1f1c558e5b60ab8e Issue-ID: POLICY-798 Signed-off-by: liamfallon <liam.fallon@ericsson.com> Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-05-11Remove requestId and instance appendPamela Dragosh2-22/+8
The requestId keeps creeping into this code. For the instance Id appending, we need a better strategy that conforms with robot test scripts in order to do multiple scale ups. Issue-ID: POLICY-793 Change-Id: Iab5d7608d5ee049cb6dd0508108bf77c2982db47 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-05-11Add missing service modelVersionIdPamela Dragosh1-0/+3
It seems this field is missing possibly from refactoring code. Issue-ID: POLICY-792 Change-Id: I6d13feb12a383d32dce3bbba431e32ad0b9d1e19 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-05-08allow dcae consumer group configurationv1.2.1Jorge Hernandez2-0/+2
this allows to change the dcase onset processing group behavior across pdp-ds. if installation sets DCAE_CONSUMER_GROUP, all PDP-Ds will share the same consumer group, therefore will have exclussive processing of onsets. Otherwise if installation unsets it (blank), all pdp-d's will process all onsets being placed in dcae topic on dmaap bus Change-Id: I4cc63005402ce66c09617b52dfad9a6094cbcb46 Issue-ID: POLICY-766 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-04-30AAI simulator fixeseikrwaq2-27/+44
AAI simulator fixes for multi onset messages in parallel Change-Id: Ia32dacf6caaded7fc45232ba4be8f49f3ccfd614 Issue-ID: POLICY-525 Signed-off-by: eikrwaq <waqas.ikram@ericsson.com>
2018-04-30Merge "Modify PolicyGuard to use new locking API"Jorge Hernandez3-84/+257
2018-04-27Modify PolicyGuard to use new locking APIJim Hahn3-84/+257
Modified PolicyGuard to use the locking API from policy-core instead of its own internal map. Initialized PolicyGuard.factory. Fixed bug in eventmanager junit test uncovered due to changes to PolicyGuard. Change-Id: I853ee5f146f3bde16b3f6e65bc188ca7c0cc4f73 Issue-ID: POLICY-577 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-27Fix failure in PIPEngineGetHistoryTestJim Hahn2-28/+43
Turns out that the getAttributesTest() method depends on testGetCountFromDb() being executed first, but junit does not guarantee this. Modified the code so that it is independent of the order in which the tests are executed. Change-Id: Ie081061e4e83895f4ac89242cf00d843b6e069d4 Issue-ID: POLICY-765 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-25Prevent AAI re-queryJim Hahn2-51/+61
Modified event manager code to not query AAI if there's already a response from a previous query. Modified code to store AAI properties in local variables instead of static to prevent any chance of a race condition in a multi-threaded situation. Updated junit tests to use a new manager for each subsequent query. Update license. Change variable name, in junit test, from onsetEvent to event, because it can be any type of event. Included fix to prevent initial AAI query if AAI data was already available in the initial onset event. Change-Id: Idf3e15ea8c5e297f22f23570c22fd837b72ba200 Issue-ID: POLICY-754 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-23Send credentials to AAIJim Hahn3-24/+37
Per this link: http://www.baeldung.com/httpclient-4-basic-authentication apache HttpClient does not send the credentials by default, but instead waits for the server to issue a challenge before sending them. Modified RESTManager to construct and send the Authorization header always instead of waiting for the challenge. Remove unused imports. Also add Authorization header for POST request. Change error message to match original error message when username is null. Preempt sonar issue. Allow null user name, which indicates that the Authorization header should not be sent. Note: this only impacts the RESTManager class; invoking classes (e.g., AaiManager) still enforce that the user name exists in the properties. Fix license dates in modified test code. Change-Id: I3cb26e76562db746939631437775727809553390 Issue-ID: POLICY-754 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-16Add missing license headersPamela Dragosh68-10/+940
I removed a couple of empty README and added licenses. Issue-ID: POLICY-741 Change-Id: I10aad3536d02b738a1dc606f7311de6b3a2777cd Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-04-13Exclude commons-collectionsPamela Dragosh1-0/+9
Since we are not using LDAP PIP we can get rid of this jar that has security issues. Issue-ID: POLICY-722 Change-Id: I93feacc8733a834866476db75933d8b2cf08c212 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-04-13Update to SNAPSHOT 1.2.1Pamela Dragosh28-28/+28
Issue-ID: POLICY-736 Change-Id: I2bc455510e925764d18a1d8e96e072bdadb251c6 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>