summaryrefslogtreecommitdiffstats
path: root/controlloop/common/eventmanager
AgeCommit message (Collapse)AuthorFilesLines
2020-05-21Insert pending record when operation startsJim Hahn4-37/+139
Modified code to insert a pending record when an operation starts. Also modified it to update the existing record when the operation completes, rather than adding a new record. Note: the "outcome" for a "pending" record is left unset (i.e., it is null). Issue-ID: POLICY-2581 Change-Id: Ia1a02ed5a16b8af1328a49b22478fd57c4b9aca0 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-05-18Add getter for ControlLoopPolicy instance in ControlLoopProcessordc443y1-0/+1
This is to allow other frameworks, such as M2, to obtain the ControlLoopPolicy instance after the raw ToscaPolicy has been adapted. Issue-ID: POLICY-2574 Change-Id: I003e60991f6e4007bd30f0e9392f6fa8bf21733a Signed-off-by: dc443y <dc443y@att.com>
2020-05-13Handle duplicate events in drools-appsJim Hahn1-0/+18
Modified the frankfurt rules to compare the event objects instead of comparing the request ID when determining if an event is new. The event object's equals() method ignores the request ID when doing the comparison, thus it will treat an event as a duplicate even if the request ID is different, which is the behavior we want. Also removed the @Ignore from the junit that tests for duplicate events in the hope that this change will fix it. If the docker build still breaks, then @Ignore can be added back in. Issue-ID: POLICY-2557 Change-Id: If2b9fd26473d78a356218b951bfe160f93daeb32 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-04-28Bump drools-apps to 1.6.4-SNAPSHOTPamela Dragosh1-1/+1
Issue-ID: POLICY-2510 Change-Id: Ic431fa80f7b389c84b799f8662df81b4f0ea124f Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-04-27Bump drools-apps 1.6.3-SNAPSHOTPamela Dragosh1-1/+1
Before I can re-release, the patch needs to be bumped. Issue-ID: POLICY-2510 Change-Id: Ib868d0d72cd28f87b5eb7c233f239d219f699954 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-04-15bump to 1.6.2-SNAPSHOTjhh1-1/+1
Issue-ID: POLICY-2378 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I8feb308f90755a078d0b35e0d8742e385916c225
2020-04-08Add SDNR notifications to frankfurt rulesJim Hahn2-0/+16
Issue-ID: POLICY-2468 Change-Id: Ibf4d3e5f62fa3106028dcf85050c270b8eab0a89 Signed-off-by: Jim Hahn <jrh3@att.com>
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-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-25Bump drools-applications to 1.6.1-SNAPSHOTPeyton Puckett1-1/+1
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-23Enable guards in junit testsJim Hahn4-2/+30
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-13Fix sonar issues in drools-applicationsJim Hahn8-434/+21
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-10Use predefined domain policies from drools corejhh2-14/+15
Issue-ID: POLICY-2388 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I5948ed5152297e4addbab444ed65dcd3b8002492
2020-03-09Bug fixes to new rulesJim Hahn4-16/+71
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 Hahn28-8/+5425
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-03use policy/parent awaitilityPamela Dragosh1-15/+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 supportjhh5-89/+65
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 vFirewalljhh5-16/+83
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 testjhh11-346/+483
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 Hahn1-2/+2
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 Verma1-2/+2
Issue-ID: POLICY-2355 Change-Id: If13badaf332f5e4341e23b9dcf22e177e9b67ff2 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-01-16policy/drools-apps jdk11 upgradesHockla, Ali (ah999m)2-4/+4
Issue-ID: POLICY-1587 Change-Id: I02bef6c829f2f24954ae73fb0c540ab7198775ce Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
2020-01-09Add ControlLoopParams from models repo.jhh4-4/+159
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
2019-12-09moved proto-definition dependencyjhh1-0/+4
It shows in the /tmp/policy-install directory in the docker image. It does not need to be applied to all the drools-applications subprojects. Issue-ID: POLICY-2191 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Ia2048b6e21068a7cd5e36439af368cf024975f01
2019-11-21Use dependency management for cds proto-definition artifactRashmi Pujar1-4/+0
Refer to: https://gerrit.onap.org/r/#/c/policy/parent/+/98733/ Issue-ID: POLICY-2254 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: Ia7fe2f294187f5c108781c8798890045445ab825
2019-11-15Removing Named Querypramod.jamkhedkar4-1097/+207
Removing all the related files and necessary modifications for removing named query. The code now only supports Custom Query. Issue-ID: POLICY-2125 Change-Id: I2d376eb955d69f45c39ad4d4a1cfacb4d620ca8e Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
2019-11-08Fix more sonar issues in drools-applicationsJim Hahn9-318/+65
Addressed the following sonar issues: - unused imports - unused method parameters - superfluous "throws" declaration - fields within a serializable class must also be serializable; this was/will be fixed with a change to AaiCqResponse in policy-models - use logger instead of System.out; turns out that the code that used System.out is no longer needed. In fact, deleted several classes that are no longer needed: ControlLoopLogger and ControlLoopPublisher - cyclomatic complexity and switch/case statements too big; used eclipse to extract chunks of code into separate methods - duplicate code Note: extracted common code and used lambdas to eliminate duplicate code in PolicyGuardYamlToXacml. However, a better approach would be to use object-oriented programming, using mini/nested objects to do the generation. The lambdas would then become abstract methods. Nevertheless, that would entail significantly more re-write of this class than desired at this time Issue-ID: POLICY-2225 Change-Id: Ie503ffd7accbad3e410af602d32b29c0095c3a33 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-11-06Update drools-application due to ↵Rashmi Pujar2-7/+7
https://gerrit.onap.org/r/#/c/policy/models/+/97989/ Issue-ID: POLICY-1896 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: I6125a1c83f58411f08bb143ff21ccd66d4db4977
2019-11-04PNF support changes for drools-applicationRashmi Pujar4-24/+129
Conditional checks for enrichment and validation by target-types PNF specific AAI enrichment Fixed Unit Tests Issue-ID: POLICY-1187 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: I78bf73e454828253ca69695f9196047449b4d9d6
2019-10-29Update APPC LCM Model referencesDaniel Cruz4-60/+72
Updates to all references of APPC LCM model code based on changes in policy models for APPC LCM. Issue-ID: POLICY-2043 Change-Id: I0102eb27f449578636cfc0bf22124fa863f05724 Signed-off-by: Daniel Cruz <dc443y@att.com>
2019-10-22Modify drools-applications to use new Lock APIJim Hahn5-139/+420
Modified code to use new Lock API. Also deleted TargetLock and PolicyGuard, as they are no longer needed. Issue-ID: POLICY-2113 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I5bc9b7732f9cfc6056789b2902d9f6f838b560be
2019-10-16Integrate cds actor service providerBruno Sakoto5-9/+228
* Add request enrichment with aai service instance id and vnf id * Implement cds grpc request * Implement VfwControlLoopCdsTest Issue-ID: POLICY-2088 Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca> Change-Id: Ib44d447d6a3a70ff800a5760032b676fdfa32d9c
2019-09-10Bump versions for drools-apps masterJim Hahn1-1/+1
Change-Id: Ia94e1ba31d0e8b6a980d891df9b26fb6977acc95 Issue-ID: POLICY-2045 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-09-04Changes drl filespramod.jamkhedkar1-377/+3574
Changes to the DRL file to change the rules to support custom query. Added new VdnsControlLoop test for custom query, and supporting yaml request Issue-ID: POLICY-1858 Change-Id: Ic1b9e771bd36fe0642e9a3439189076a4906a4b8 Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
2019-08-15Modify to work with new drools-pdpJim Hahn4-52/+56
Due to sonar fixes, drools-pdp changed in a way that requires changes to drools-applications. In the case of template.demo, lots of test cases had to be modified, so they were refactored to extract common setup and tear down code. Fixed checkstyle issues. Fixed license date. Change-Id: Ie9e0239b95916ae7ef8c1b669987f7bb07d841b9 Issue-ID: POLICY-1968 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-08-13Fix sonar issues in drools-applicationsJim Hahn2-49/+62
Addressed sonar issue, "Move constants to a class or enum.", by moving the "manager" object from the ControlLoopMetrics interface into a utility class, ControlLoopMetricsManager. Addressed sonar issue, "duplicated blocks of code must be removed.", by refactoring PolicyGuardYamlToXacml, extracing common functions. Addressed sonar issue, "Remove this unused import", in RestControlLoopManager. Addressed sonar issue, "Refactor this method to throw at most one checked exception", in event manager. Fixed likely new sonar issue with assigning to a parameter. Moved logging line to more appropriate place. Addressed reviewer comment: Use "replace" instead of "replaceAll", thus avoiding escaping Change-Id: I47db957c83c1b3e2bd2330474e261987c6f0aac6 Issue-ID: POLICY-1967 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-08-07Bump version of drools-applicationsJim Hahn1-1/+1
Change-Id: I79d59efc93e33f7f234092b34cab0ae935d5ab7b Issue-ID: POLICY-1965 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-08-01Add AAI test tooling to telemetry.jhh1-23/+33
Issue-ID: POLICY-1956 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Icceab57db9c19364afbedbf63ecc8e52c1572cba Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2019-07-09Fix drools-applications due to sonar changes in commonJim Hahn2-4/+4
Fixed breakages due to changes made in policy/common to satisfy sonar. Repointed op.pom to correct parent, which allowed the other version to be dropped and properties used in the rest of the pom. Change-Id: Ib19c228c38b7f27fb9e9f508e5cf2566a8939cdd Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-07-01Bump drools-apps to 1.5.1-SNAPSHOTPamela Dragosh1-1/+1
Released 1.5.0 Issue-ID: POLICY-1737 Change-Id: I41b9af7672985a681bf4e6ce4ceddc8798caf281 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-06-27Fix some sonar issues in drools-applicationsJim Hahn13-1026/+843
Added coverage to: - feature-controlloop-management Fixed sonar issues, but didn't add coverage to: - feature-controlloop-trans - eventmanager - guard Change-Id: I12f09c4a533e838c6fb9762ba56194e51ce864eb Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-06-20Set timeout to CL timeout if zeroJim Hahn4-1/+129
Modified the rules to set the operational timeout to the overall CL timeout if the operational timeout is zero. Added code to check for zero timeout for the overall CL, too. Change-Id: I28d41632f59e9bc2fce953267883d567abc92a49 Issue-ID: POLICY-1859 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-06-17Change getCanonicalName() to getName() in drools-appsJim Hahn3-4/+6
Per javadocs, getName() should generally be used instead of Class.getCanonicalName(). This change only applies to classes; it does not apply to File objects. Change-Id: Ie402ab9239b2d5149c420d495f16bb82417d2d25 Issue-ID: POLICY-1646 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-05-31Bump version to 1.5.0Pamela Dragosh1-1/+1
Due to dublin branch. Issue-ID: POLICY-1747 Change-Id: I650e8e293551b61a047bd3796324749ed366c9a5 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-05-24Bump to 1.4.2-SNAPSHOTPamela Dragosh1-1/+1
Released 1.4.1 Issue-ID: POLICY-1700 Change-Id: I9fd966de8165a5f387bb74fedc22a7502d82b870 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>