aboutsummaryrefslogtreecommitdiffstats
path: root/controlloop/common/controller-frankfurt
AgeCommit message (Collapse)AuthorFilesLines
2020-11-16Make drools-apps event agnosticJim Hahn8-958/+0
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-10-27Bump drools-apps master to 1.8.0 SNAPSHOTJim Hahn1-1/+1
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 Hahn1-1/+1
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 Cho1-1/+1
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 Cho1-1/+1
Issue-ID: POLICY-2839 Change-Id: Iafbc4a301ee8bc2b5fb10f34677f752a87997879 Signed-off-by: Taka Cho <takamune.cho@att.com>
2020-09-09bump snapshot version to 1.7.2-SNAPSHOTjhh1-1/+1
Issue-ID: POLICY-2789 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I4335cf77bd4a228fe0bec2d5eb529789e8144406
2020-09-08Update common/models/drools to 1.7.1/2.3.1/1.7.1jhh1-6/+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-08-28Add tdjam-controllerStraubs, Ralph (rs8887)1-7/+7
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-28Merge "Use ToscaPolicy instead of legacy Policy"Pamela Dragosh2-7/+0
2020-08-27Use ToscaPolicy instead of legacy PolicyJim Hahn2-7/+0
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 Hahn1-1/+1
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-24Merge "Add "special" Operation classes for new usecases"Pamela Dragosh1-1/+1
2020-08-21remove legacy operational policies supportjhh1-2/+1
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 Hahn1-1/+1
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-11Refactor BaseRuleTest for Drools appsTaka Cho1-2/+2
1, rename BaseRuleTest to BaseTest. 2, remove drools related code in BaseTest that would use for tdjam controller. 3, DroolsRuleTest extends BaseTest that would use for frankfurt controller for drools base. Issue-ID: POLICY-2750 Change-Id: Ica9637a850de6e929f09532f077ae3e997aa2045 Signed-off-by: Taka Cho <takamune.cho@att.com>
2020-07-14Remove usecases and legacy actor codeJim Hahn1-6/+0
Made the following changes to remove usescase and legacy actor code: - deleted the usecases controller and feature - deleted code associated with legacy actors, with the exception of AaiManager, which is needed by RestControlLoopManager - moved the contents of the "guard" project into the m2/guard project, as that is the only thing that still needs it - modified the m2/GuardContext to get the name of its persistence unit from the properties so it could be overridden by junit tests - used eclipselink constants Also fixed a bug in the properties for the VFC actor. Addressed review comment: - removed usecases from Dockerfile Issue-ID: POLICY-2558 Change-Id: I677d68c9efed9247c3d55773abdcc736b577a6b4 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-07-10Bump drools-apps to 1.7.1-SNAPSHOTJim Hahn1-1/+1
Issue-ID: POLICY-2695 Change-Id: Iec9af37a01ba35c5b5419399cfb3d3bc80093101 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-06-15Remove deprecated actor propertiesJim Hahn1-9/+0
Now that the actor change has been merged, the deprecated properties can be removed from drools-apps. Done. Issue-ID: POLICY-2632 Change-Id: If4dafc489c32da4dfccd6ebac97e8e7beac2454d Signed-off-by: Jim Hahn <jrh3@att.com>
2020-06-12Adjust properties in anticipation of actor changesJim Hahn1-5/+14
Issue-ID: POLICY-2632 Change-Id: I4d20fe6b46432298ba796fe978796d5d74e1eb14 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-06-11Remove deprecated properties for CDS and VFCJim Hahn1-15/+0
Now that the changes to the Actors have been merged, the former properties can be removed, too. Also fixed guard operator/operation name since it changed from "Guard" to "Decision". Issue-ID: POLICY-2629 Change-Id: I1c8d4575be598a8cab12b1aa4ad9b1d3e1f12113 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-06-10Match property changes to CDS and VFC actorsJim Hahn1-0/+15
An "operations" level is being added to the properties for the CDS and VFC actor. Added the new properties; the old ones can be deleted once the change to the actors has been merged. Issue-ID: POLICY-2629 Change-Id: Ib0bb3f62d6a2d3380aa6ec5a6e8b61ddd0a44c00 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-06-08Fix VFC actor propertiesJim Hahn1-3/+6
The VFC actor doesn't have the same property structure as the other actors, which meant that the properties listed in the file were incorrect. Fixed them. Renamed the operation to "Restart" per review comments. Issue-ID: POLICY-2407 Change-Id: Icb8ccad518d01a5f23253a9835976eae666566f4 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-05-29Use default serialization providerJim Hahn1-1/+0
The default provider has been changed to gson, so the provider property no longer has to be set. Issue-ID: POLICY-1527 Change-Id: I9b555ed3c3b735ca9622314e1ca06476416bae6e Signed-off-by: Jim Hahn <jrh3@att.com>
2020-05-26Bump Drools-Apps to 1.7.0a.sreekumar1-1/+1
Change-Id: I1b4b088d276da6aae3b577102470a6d8e3dcdc6a Issue-ID: POLICY-2514 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2020-05-26Bump drools-applications to 1.6.5a.sreekumar1-1/+1
Change-Id: I52c0b421e6ca94153b7f37ae67fdcd086f14f3fa Issue-ID: POLICY-2514 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2020-05-14Do not encode null fields in SO requestJim Hahn1-0/+1
Currently, the default serialization provider for HTTP clients is jackson, which encodes null fields in requests. Unfortunately, SO does not like the null fields. Fixed this by modifying the SO config parameters to use the GSON serialization provider. Issue-ID: POLICY-2568 Change-Id: I6c2e7c985f23e09940d89409c2a84303bfd54b8a Signed-off-by: Jim Hahn <jrh3@att.com>
2020-05-13Handle duplicate events in drools-appsJim Hahn1-2/+4
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-20Add properties needed by A&AI PNF OperationJim Hahn1-0/+1
Added properties needed by A&AI PNF Operation. Issue-ID: POLICY-2505 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I58966faf9eb9900123a085bf8093050440c15170
2020-04-16Change CDS operation name to generic "any"Jim Hahn1-5/+5
Issue-ID: POLICY-2504 Change-Id: I4dec3dfd62fa230ad8f0de66c0d1b71e5393bcbd Signed-off-by: Jim Hahn <jrh3@att.com>
2020-04-16Fix CDS actor propertiesJim Hahn1-7/+5
CDS actor properties in drools-apps did not match the properties in the actor, itself. Fixed them (as best I could be inspection). Issue-ID: POLICY-2501 Change-Id: Ibb4ac5ee59762bd740342c1d54fc472a9fca8968 Signed-off-by: Jim Hahn <jrh3@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-10Added vpci and vsonh testspramod.jamkhedkar1-3/+1
Added test cases for vpci and vsonh usecases Issue-ID: POLICY-2162 Change-Id: Ia69b16e74b82b92366b5065eeccab8d35f647742 Signed-off-by: pramod.jamkhedkar <pramod@research.att.com> Signed-off-by: Jim Hahn <jrh3@att.com> Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
2020-04-08Add SDNR notifications to frankfurt rulesJim Hahn3-2/+19
Issue-ID: POLICY-2468 Change-Id: Ibf4d3e5f62fa3106028dcf85050c270b8eab0a89 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-03-30Update path properties for new actorsJim Hahn1-3/+6
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 Hahn1-3/+3
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-25Merge "Bump drools-applications to 1.6.1-SNAPSHOT"Pamela Dragosh1-1/+1
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-25Adjust properties for context URI with slashJim Hahn2-5/+4
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-23Enable guards in junit testsJim Hahn2-2/+10
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-23Fix frankfurt controller propertiesJim Hahn2-9/+12
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-12Retool rules testsJim Hahn23-1603/+120
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-09Bug fixes to new rulesJim Hahn8-2/+615
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 Hahn22-0/+1816
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