summaryrefslogtreecommitdiffstats
path: root/controlloop/common
AgeCommit message (Collapse)AuthorFilesLines
2021-02-17Use new version of A&AI APIsJim Hahn2-8/+8
Just changed the version numbers; the APIs appear to be the same otherwise. Issue-ID: POLICY-2788 Change-Id: I842d88184a816c7fd24d935488875ba1337a1754 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-02-12Fix sonars from dependency upgradeJim Hahn21-131/+83
The dependency upgrades in policy-parent caused some new sonars. In particular, initMocks() has been deprecated - replaced with calls to the Mockito Runner. Issue-ID: POLICY-2910 Change-Id: I257b74626f4393aa89d2bf1b7502478422213b71 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-02-10More sonars in drools-appsJim Hahn3-11/+7
Addressed the following issues: - commented-out code - don't use eq() with verify() - use class::cast lambda Issue-ID: POLICY-2910 Change-Id: I12f4f85fb226f3ddb8305105e988fa90e276e9f6 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-02-09Merge "Delete unused persistence.xml"Ram Krishna Verma1-43/+0
2021-02-09Delete unused persistence.xmlJim Hahn1-43/+0
Deleted the file, as it is no longer needed. Issue-ID: POLICY-3005 Change-Id: Ia8de5838440c38dc31177e316118db75965d9338 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-02-09Upgrade dependenciesJim Hahn4-5/+26
Added target-database property. Also moved the db-driver value out of persistence.xml and into properties. Issue-ID: POLICY-3005 Change-Id: I2c9e53c099e400c32d11632f8732e770a7abba9f Signed-off-by: Jim Hahn <jrh3@att.com>
2021-02-05Give better messages than NPE for missing dataJim Hahn2-15/+96
When data is not available to actor operations, an NPE is generally thrown. Modified the code to provide more info about what is missing than simply NPE. Issue-ID: POLICY-2913 Change-Id: Ic56376ef5fdd0f2e46c2996405fff9aafa3692b9 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-01-04Changed identifiers to concept identifiersliamfallon2-5/+7
The policy models tosca classes ToscaPolicyIdentifier and ToscaPolicyIdentifierOptVersion can be used to identify any TOSCA concept, not just TOSCA policies so they are renamed to ToscaConceptIdentifier and ToscaCinceptIdentifierOptVersion respectively. The class ToscaPolicyTypeIdentifier is redundant and is replaced by ToscaConceptIdentifier. Issue-ID: POLICY-2900 Change-Id: Id5da4e5894a0d646f9f4b68c1e6b0476d4deae05 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-11-23Merge "Use Params makeOutcome() without targetEntity"Ram Krishna Verma2-2/+5
2020-11-20Remove legacy simulatorsJim Hahn14-1596/+0
Drools-apps now uses simulators from policy/models. Deleted the legacy simulators. Issue-ID: POLICY-2804 Change-Id: Ie118237a52a4272d2f86fbb15b320ea2175ac7f4 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-11-20Use Params makeOutcome() without targetEntityJim Hahn2-2/+5
Planning to remove the second flavor of makeOutcome() from the Params, so modifying the drools-apps code to work with the first flavor. Issue-ID: POLICY-2804 Change-Id: Iddb288f7cf53e93919e77aca8afe3869fadb0d37 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-11-20Merge "Delete preprocessed flag from actors"Pamela Dragosh9-12/+27
2020-11-18Delete preprocessed flag from actorsJim Hahn9-12/+27
Removed the "preprocessed" flag from the Actor parameters, now that the actors no longer have a startPreprocess() method. Also removed targetEntity from the parameters. Issue-ID: POLICY-2804 Change-Id: I13bc80e1b6bb22d8d21b176796ca062109ce6658 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-11-18Merge "move all bash to ash shell scripts for drools-apps"Jorge Hernandez2-5/+5
2020-11-16move all bash to ash shell scripts for drools-appsTaka Cho2-5/+5
this gerrit would be the first step to not to use any GPL-3.0 and plus license Issue-ID: POLICY-2847 Change-Id: I6787af6afd4a90d09d3cca86fa2ee7c5b6ea4eb0 Signed-off-by: Taka Cho <takamune.cho@att.com>
2020-11-16Make drools-apps event agnosticJim Hahn54-8196/+47
Removed tdjam and frankfurt controllers, which use event-specific actors. Issue-ID: POLICY-2804 Change-Id: Ica05f80bf72d039d9c4903591af7fb3793a81159 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-11-10Allow mixed case in check of prov-statusJim Hahn4-4/+58
Apparently SO/AAI in Frankfurt are setting the prov-status to "active" instead of "ACTIVE". Modified the code to ignore case when comparing. Issue-ID: POLICY-2890-prov-status2 Change-Id: I9e868d320dadcb3ac51570718d10f33d0011ae47 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-11-06Fix upcoming checkstyle issuesPamela Dragosh1-1/+1
When we upgrade to oparent, these will fail as oparent upgrades to 8.37 of puppycrawl which fixes a few bugs that should have flagged these previously. Issue-ID: POLICY-2887 Change-Id: I2ea37eef859aac08f54ffd1f4b1d6b9e702218e9 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-10-27Bump drools-apps master to 1.8.0 SNAPSHOTJim Hahn13-13/+13
Bumping minor version now that guilin branch has been created. Also repointed to snapshot versions for dependencies. Issue-ID: POLICY-2875 Change-Id: Ieb3f8d6ff141d3035141ab8672d3259074f432be Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-20Bump drools-apps to 1.7.5 SNAPSHOTJim Hahn13-13/+13
Issue-ID: POLICY-2869 Change-Id: I627c5b1c4c5f946c1187a6966b30d3943825fa71 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-10bump drools-apps to 1.7.4-SNAPSHOTTaka Cho13-13/+13
Issue-ID: POLICY-2839 Change-Id: Ie0bc82d0f8a09dc4d65e056dc7836870dae58835 Signed-off-by: Taka Cho <takamune.cho@att.com>
2020-10-08Bump drools-apps to 1.7.3 snapshotTaka Cho13-13/+13
Issue-ID: POLICY-2839 Change-Id: Iafbc4a301ee8bc2b5fb10f34677f752a87997879 Signed-off-by: Taka Cho <takamune.cho@att.com>
2020-10-02Merge "Remove cds actor timeout"Pamela Dragosh1-1/+3
2020-10-01Remove cds actor timeoutRam Krishna Verma1-1/+3
During testing we found that cds actor is picking up the timeout from policy configuration. As discussed, adding a comment for now and we will remove it in next release alog with related code. Issue-ID: POLICY-2843 Change-Id: I63b589bea344ad7f33e6fc0d34f0ab331411146b Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-09-30Fix new sonars in drools-appsJim Hahn10-61/+101
Addressed the following sonars: - too many assertions in test method - rename test class - use static method to modify static field - use already defined constant - code always returns the same value - use assertNotSame - use appropriate class name to access static method - define a constant - extract nested try block - don't always return the same value - use remove() instead of set(null) for thread-local-storage - add @Override Issue-ID: POLICY-2852 Change-Id: Icc62acd4ad57afa2d44ed4cdca504a3ac0810228 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-09-14Release locks between junit testsJim Hahn5-18/+66
Tdjam junits were randomly failing. Traced it down to the fact that the locks were being released asynchronously and thus were not always released when the next test cases requested them. Also simplified logging for tdjam junit tests. Fixed the property file so it isn't overwritten by the junit tests. Changes per review comments: - changed "Pattern" to "pattern" in logback xml Issue-ID: POLICY-2789 Change-Id: I325ec69cf7affa531d3c575e3a34bc0b0e1edac7 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-09-09bump snapshot version to 1.7.2-SNAPSHOTjhh13-13/+13
Issue-ID: POLICY-2789 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I4335cf77bd4a228fe0bec2d5eb529789e8144406
2020-09-09disable TdjamTest junitsjhh1-0/+2
junits consistently fail in staging jobs Issue-ID: POLICY-2789 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I968bd9ec2c3e8278358ef3c487592c0b833cef36
2020-09-09delete guard dependency for tdjamjhh2-9/+0
staging job fails as there is no guard dependency. Issue-ID: POLICY-2789 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I4d803e269c7199ddeb2ebb52df5368259e4f22cd
2020-09-08Update common/models/drools to 1.7.1/2.3.1/1.7.1jhh5-35/+0
Issue-ID: POLICY-2789 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Ia78684b0f56007941ad6038d78b97bc70f9aa1bb Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2020-09-03Merge "update the toscapolicy in ruletest set"Ram Krishna Verma2-2/+2
2020-09-03Merge "Add guard filter properties to controller"Jim Hahn4-7/+212
2020-09-02Add guard filter properties to controllerPamela Dragosh4-7/+212
Adding new properties to guard Decision call. Issue-ID: POLICY-2590 Change-Id: Ie4a37990e062c76ac4d6dd1b904ad354736fd27a Signed-off-by: Pamela Dragosh <pdragosh@research.att.com> Signed-off-by: Jim Hahn <jrh3@att.com> Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-09-02update the toscapolicy in ruletest setTaka Cho2-2/+2
modelVersion has to be a string instead an integer Issue-ID: POLICY-2814 Change-Id: I31c89d69f96076d490c665f4912d25e3892d011a Signed-off-by: Taka Cho <takamune.cho@att.com>
2020-09-02Merge "Allow guards to be dynamically enabled/disabled"Ram Krishna Verma3-4/+45
2020-08-31Allow guards to be dynamically enabled/disabledJim Hahn3-4/+45
Modified drools-apps so that guards can be dynamically enabled and disabled. Due to the current design, there are two properties that control this: - an actor-level property: when enabled, the DB connection is created, otherwise a stub connection is created. This property is NOT dynamic - an engine-level property: when enabled, the connection created by the actor is used, otherwise a stub connection is used. This property IS dynamic Issue-ID: POLICY-2748 Change-Id: I2a5baf908ce274f2eb46a6a3f01df1b3532038ff Signed-off-by: Jim Hahn <jrh3@att.com>
2020-08-31Merge "Add tdjam-controller"Jim Hahn28-51/+3384
2020-08-28Add tdjam-controllerStraubs, Ralph (rs8887)28-51/+3384
the details is on wiki: https://wiki.onap.org/display/DW/tdjam+Feature+for+Tosca-Driven+Control+Loops Fixed some eclipse warnings. Revised the interaction between a manager and its SerialWorkQueue to address some threading issues. The original code started processing the event as soon as the manager was created, WHILE it was still being added to the map. During junit tests, the event responses came back, within the same thread, which then attempted to remove the manager from the map. This resulted in a ConcurrentHashMap exception. Issue-ID: POLICY-2415 Change-Id: I94a4152637be76e5b2aea2d869afd84dfb413a0e Signed-off-by: Straubs, Ralph (rs8887) <rs8887@att.com> Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Signed-off-by: Taka Cho <takamune.cho@att.com> Signed-off-by: Jim Hahn <jrh3@att.com>
2020-08-28Tweaks to drools-apps for new usecases controllerJim Hahn4-5/+5
Made the following updates: - modified feature-controlloop-utils to pull from the usecases controller instead of the frankfurt controller - modified ONAPInstance in the xacml-pdp Decision request - log Step2 property changes as info() instead of error() - log Lock acquisition as info() instead of warn() Issue-ID: POLICY-2748 Change-Id: I6b4b5877bbd6731acb761d09d0f0dec85561b163 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-08-28Remove legacy policy from rulesJim Hahn1-25/+24
Issue-ID: POLICY-2428 Change-Id: I87b66758c8984febcd5fb6e724fac3493f5d4cdf Signed-off-by: Jim Hahn <jrh3@att.com>
2020-08-28Merge "Use ToscaPolicy instead of legacy Policy"Pamela Dragosh29-601/+444
2020-08-27Use ToscaPolicy instead of legacy PolicyJim Hahn29-601/+444
Removed usage of policy-yaml and old targetType definition. Switched to using TOSCA operational policy classes and new definitions for Target type enum. Issue-ID: POLICY-2428 Change-Id: I25d1c5219764df27bdae7f2cbeb7ada7bcef4e1e Signed-off-by: Jim Hahn <jrh3@att.com> Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-08-26Move java code to rulesJim Hahn15-2/+1636
Added new usecases rules and feature. Updates per review comments: - kmodule.xml(s) Issue-ID: POLICY-2748 Change-Id: I2f5cb05a4269f98a3b0a778730434955f0919b4a Signed-off-by: Jim Hahn <jrh3@att.com>
2020-08-25Add Usecases-specific event managerJim Hahn4-5/+1840
Created new "usecases" event manager. Also fixed a couple of sonar issues in the new code. Issue-ID: POLICY-2748 Change-Id: I17a2c41bbf4f4e8158adbd8aa5e32ef570daa9d3 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-08-24Add Step classes for usecases controllerJim Hahn14-0/+2235
Add usecases-specific classes for managing preprocessor steps. Issue-ID: POLICY-2748 Change-Id: I62a2bf8fbeb656a5017531a3f3de6a6dbad5a004 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-08-24Merge "Add "special" Operation classes for new usecases"Pamela Dragosh13-9/+1253
2020-08-21remove legacy operational policies supportjhh7-57/+11
Issue-ID: POLICY-2765 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I454365943465863b108ba8668b2bc4b201986959
2020-08-21Add "special" Operation classes for new usecasesJim Hahn13-9/+1253
Created place-holder for new "usecases" controller. Note: as of yet, this is still just a normal java project; it will be turned into a full-fledged kie-based controller in a later review. Added some Operation and a few other support classes that will be needed. Note: the detmTarget() method and it's various supporting methods, detmXxx(), found in GetTargetEntityOperation2 were cloned from the pre-existing ControlLoopOperationManager2 class, and modified to fit the strategy of the new controller. Likewise for the junit tests of those methods. Issue-ID: POLICY-2748 Change-Id: Idffa135a11a56bd6afdd2728706fd40168e80912 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-08-20Add generic eventmanager classesJim Hahn6-0/+1331
Added classes that are event-agnostic and support moving control from java into rules. Updates per review comments: - removed policy scope Issue-ID: POLICY-2748-event-mgr Change-Id: Icf811cc25a3975543fc5c725766b7b9df2bb87b0 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-08-14Remove legacy operational policy from drools-appsJim Hahn9-136/+4
Issue-ID: POLICY-2766 Change-Id: I1ff7bbc4e301cfe6fa746f38c839acf83f7584b6 Signed-off-by: Jim Hahn <jrh3@att.com>