summaryrefslogtreecommitdiffstats
path: root/controlloop/common
AgeCommit message (Collapse)AuthorFilesLines
2020-04-02remove drools-pdp parent from junit testjhh1-6/+1
parent was wrong an was running into build problems. Issue-ID: POLICY-2459 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I502c85934d8d7f88321805f540448c6d280d856b
2020-04-02Synchronize methods for rulesJim Hahn1-9/+9
Added "synchronized" to a few more methods in the event manager class, just to be safe, as they view/modify data that may be viewed/modified by other threads. Issue-ID: POLICY-2385 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: Ia8404fd3fd53b0de95f939dfff2088867e0f3b24
2020-03-30Update path properties for new actorsJim Hahn2-6/+12
Some of the new actors were modified to get their path prefixes from the property files. In addition, the models code was modified to allow an empty "path", so that is now used, where appropriate. Issue-ID: POLICY-2441 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I4573c5e2a506fb67be9bd040ce047612007fd969 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-03-26Fix userName property for http clientsJim Hahn6-8/+8
The http client property files had "username", but the correct property name is "userName". Fixed. Also updated the models version to the latest snapshot to pick up the fix to the APPC actor. Issue-ID: POLICY-2441 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I4d64efcb5b639526beb145ee0231c6d650098d0f
2020-03-26Expand env variables in frankfurt propertiesJim Hahn3-33/+14
Issue-ID: POLICY-2434 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I1109a053e46dc8201ff9676da0c9ff93d8b631d5 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-03-25Merge "Fix db exception in frankfurt junit"Jorge Hernandez7-27/+41
2020-03-25Merge "Fix db exception in usecases junit"Jorge Hernandez2-1/+49
2020-03-25Merge "Restore SO_URL to usecases controller"Jorge Hernandez1-1/+1
2020-03-25Merge "Bump drools-applications to 1.6.1-SNAPSHOT"Pamela Dragosh14-14/+14
2020-03-25Restore SO_URL to usecases controllerJim Hahn1-1/+1
When a trailing "/" is added to the CONTEXT_URI, it will likely break the usecases SO operations. Thus the SO_URL is being reinstituted for this one actor. Issue-ID: POLICY-2441 Change-Id: I360d1701a0615309a27afbdf7da83f68505626d4 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-03-25Bump drools-applications to 1.6.1-SNAPSHOTPeyton Puckett14-14/+14
Issue-ID: POLICY-2378 Change-Id: Ia97bc810e6ae23ffb0ecea28ddbab385d7d9af6d Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
2020-03-25Fix db exception in frankfurt junitJim Hahn7-27/+41
Frankfurt junits were generating the following output: Value too long for column "TARGET VARCHAR(50)": "'Target [type=VNF, resourceId=bbb3cefd-01c8-413c-9bdd-2b92f9ca3d38]' The issue turned out to be caused by the fact that the rules for the new actor were storing the "Target" instead of the "TargetEntity" in the DB field. Modified the code to store the target entity, as the the usecases rules do. Issue-ID: POLICY-2441 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I91ee517ef073e3dc3fea4698c814b57a06d87095
2020-03-25Fix db exception in usecases junitJim Hahn2-1/+49
Issue-ID: POLICY-2441 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I1233d985f3e6fc6260912e4ad00d46e7c3e58430 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-03-25Adjust properties for context URI with slashJim Hahn6-12/+10
Added a trailing "/" to the context URI for the various actors. Updated the properties to accomodate it. Also fixed the "path" for a couple of actors; the path property only applies at the individual operation level, not at the actor level. Issue-ID: POLICY-2441 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I4e8c4cd07de5ac075dbfa56d83116e1e87bdee1c
2020-03-25Add @Ignore to test that is failing during docker buildPeyton Puckett1-0/+4
Issue-ID: POLICY-2378 Change-Id: I7b466a3846b99cd8630d793139799a6885688748 Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
2020-03-24Replace url with host/port in drools-appsJim Hahn1-24/+24
Issue-ID: POLICY-2441 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: Id81638d76d0bf71d49d8663ee569b43bfbe6b1aa
2020-03-24Configure http client URIs via env propertiesJim Hahn5-25/+25
The context URI path for the various actors needs to be configurable via properties specified in the OOM charts. Issue-ID: POLICY-2441 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I7348d0c4f47a33dbc806ad117f35b96c887b5394
2020-03-24Merge "Remove vLB from drools-apps"Pamela Dragosh5-103/+21
2020-03-23Enable guards in junit testsJim Hahn9-9/+48
Flipped the flag(s) to enable guard checks in the various junit tests for the Usecases and Frankfurt controllers. Note: the guard checks use the guard simulator. Modified new actor code to not include operation history on first "guard denied" report (i.e., make it work like usecases does). Issue-ID: POLICY-2434 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I2897da4a0c8fb76fa00cb0f6cf8562c0703005d3
2020-03-23Remove vLB from drools-appsJim Hahn5-103/+21
Added a test for legacy policy to vDNS. Issue-ID: POLICY-2434 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I92fc7813067d3e98562e5d1c7f0da7afe5aac96d
2020-03-23Fix frankfurt controller propertiesJim Hahn3-11/+19
Fleshed out more of SDNC properties. Still don't know what the "path" should be. Added SDNR. Removed invalid topic sources and sinks. Changed some types from source to sink (or vice versa). Issue-ID: POLICY-2434 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I80d22243111eaf4cabb59823d327060f83bc2c28
2020-03-20Disable guard via env variableJim Hahn1-1/+1
Default to "false". Can override in CSITs. Issue-ID: POLICY-2434 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I72d8d5a87adef2cd66d8afb78117264fb4c05e9a
2020-03-20Merge "Last sonar fix for drools-apps"Liam Fallon2-6/+5
2020-03-19Last sonar fix for drools-appsJim Hahn2-6/+5
Remaining issues will be examined/addressed in Guilin. Issue-ID: POLICY-2426 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I2354122ed40e27de472a346001aff4e46d27ccf6
2020-03-18Add rainyDayTest for VFWPeyton Puckett8-5/+234
Added less restrictive filter condition to consider discarded messages Issue-ID: POLICY-2431 Change-Id: I0bc5e34636699094c97bd7e5669f66df875cd6ae Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
2020-03-17More sonar fixes in drools-appsJim Hahn5-27/+167
Issue-ID: POLICY-2426 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: Idfdcb229d05ee7f0220f44f8099284caaed754d4
2020-03-16Fix artifact name in frankfurt controllerJim Hahn1-1/+1
Issue-ID: POLICY-2385 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: Ie250fd7f2e4a97c81c83f176159fc60d69a001af
2020-03-13Merge "Fix sonar issues in drools-applications"Ram Krishna Verma14-451/+42
2020-03-13Merge "Delete template.demo submodule, amsterdam controller"Jim Hahn9-619/+0
2020-03-13Fix sonar issues in drools-applicationsJim Hahn14-451/+42
Fixed various sonar issues, including moving some code to policy-common. Fixed some eclipse warnings, including deprecated junit APIs. Issue-ID: POLICY-2426 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I10b40c1e5af62308f2e4c315e4d399aafff2998f
2020-03-12Delete template.demo submodule, amsterdam controllerPeyton Puckett9-619/+0
Issue-ID: POLICY-2421 Change-Id: I0e61e7b3272f5c7babceb41e4e249716af4529cf Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
2020-03-12Retool rules testsJim Hahn76-2508/+4103
Extracted common code from various XxxBaseTest classes into: - Topics class to manage messages for test topics - HttpClients class to manage HttpClient objects for tests - Simulators class to manage simulators for tests - Rules class to manage start up and shutdown of rules Merged remaining code from XxxBaseTest classes into a single class. Modified the Frankfurt and Usescases tests to subclass from this new class and specify just the relevant tests to be executed. Issue-ID: POLICY-2385 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: Iaf83c9d2b205a4c343e0dde23ec86508f5773693
2020-03-10Use predefined domain policies from drools corejhh15-1095/+15
Issue-ID: POLICY-2388 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I5948ed5152297e4addbab444ed65dcd3b8002492
2020-03-09Bug fixes to new rulesJim Hahn12-18/+686
Also added VdnsTest, VfwTest, and VcpeTest. Fixed a number of issues with notifications: - event data (e.g., AAI) was missing - notification was missing for the start of an operation - "message" and "history" fields should contain Target object, target entity - "message" field was missing various details (e.g., start time) Still missing subRequestId - that will require enhancements to the actors. Issue-ID: POLICY-2385 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I7fc33ebcd5939d2f33a9d209ac6119e390e0836d
2020-03-06Add frankfurt rules for Actor redesignJim Hahn66-13/+7857
Note: VcpeTest and VfwTest are not included, as they depend on updates to the APPC and APPC-LCM Actors. Added feature-controlloop-frankfurt. Added HTTP client property files to feature-controlloop-management. Updates per review comments: - pom changes - simplify FrankfurtBase - rename event-svc-http.properties - change "usescases" to "frankfurt" - use blanks for CDS property defaults - trailing spaces in http-client files - add https property to http-client files Added newlines to config files that appear to be missing them (based on feedback from gerrit). Issue-ID: POLICY-2385 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: Ib4a4d75461c734ae47309e41dc9d099e8815d55d
2020-03-04Merge "decouple topics from controllers"Jorge Hernandez9-27/+188
2020-03-03decouple topics from controllersjhh9-27/+188
native policies will require topics configured at installation (there's no policy to add them). This configuration style also cleans the installation tidier (topics can be overriden or new ones added when being placed in the mounted config directory). Issue-ID: POLICY-2181 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I87fd6889c651147e9229b3487db8c95b34516dfd
2020-03-03use policy/parent awaitilityPamela Dragosh11-115/+0
Also cleaned up a bunch of these pom's, they do not all need to declare JUnit, assertjr, mockito testing classes. Can use more cleanup in some other common dependencies, but we'll defer. Issue-ID: POLICY-2381 Change-Id: Ib1149a0cd0215d1a38d5b625634440413cf79089 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-01Use apache Pair not Sdnr custom PairPamela Dragosh1-7/+7
Companion review to https://gerrit.onap.org/r/c/policy/models/+/102162 in which use of Pair from apache vs creating our own. Removed an unused import. Issue-ID: POLICY-2382 Change-Id: Id3cf9a170480c7a621dddf93540d61f993f3553a Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-02-29Tosca policies missing "final_xxx" fieldsJim Hahn1-12/+27
The code that makes Tosca policies backward compatible was not copying the final_xxx fields (e.g., final_failure_retries). Added code to copy the fields. Issue-ID: POLICY-2376 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I05d746ee9c8ace263c7b33a245221c5eb71b612c
2020-02-24vDNS tosca compliant policies supportjhh10-128/+197
Issue-ID: POLICY-2383 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I5d5d864b2853f6e7e0c7e1096cb17746500f2495 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2020-02-21Tosca compliant vFirewalljhh11-47/+173
Issue-ID: POLICY-2376 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I362ebbd941c400a6ffc3e952e66ca2d624afbfdd Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2020-02-17tosca compliant op policy support + vcpe testjhh33-510/+1656
Tosca Compliant and Toscal Legacy Operational policies are both supported for backwards compatibility. vCPE usecase junits to support 2 equivalent policies, one tosca compliant and the other one legacy. Issue-ID: POLICY-2360 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Iafbfc92bbec42e6a3fe4ceb4a9a17c85e636ea14 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2020-02-09Merge "Updating module names to resolve conflicts"Jim Hahn12-14/+24
2020-02-07activate refactoring in ControlLoopEventManagerjhh1-62/+69
This is to support backwards compatible implementation of Tosca Compliant Operational Policies. Issue-ID: POLICY-2360 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I0e8b96b19375c58e4b62e0dcd1da5c508091ea2f Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2020-02-07Updating module names to resolve conflictsRam Krishna Verma12-14/+24
Issue-ID: POLICY-2355 Change-Id: If13badaf332f5e4341e23b9dcf22e177e9b67ff2 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-02-06Use CanonicalOnset in usecases.drljhh2-23/+16
Issue-ID: POLICY-2323 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Ic1258e17c08eacbf8d3a57a6562ba470420e615f
2020-01-17DCAE Onset flood preventionjhh6-9/+64
Issue-ID: POLICY-2323 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I08cd55b442ccce3e0eaaa63c1ebd4422c1e0a0d5 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2020-01-16policy/drools-apps jdk11 upgradesHockla, Ali (ah999m)13-46/+35
Issue-ID: POLICY-1587 Change-Id: I02bef6c829f2f24954ae73fb0c540ab7198775ce Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
2020-01-09Add ControlLoopParams from models repo.jhh9-14/+169
This class is only useful under drools applications and eventually will be deprecated to accommodate the new Operational Policy Types. Issue-ID: POLICY-2146 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I68927cb144a33fac6fe330be15fe60aee32b15a1