summaryrefslogtreecommitdiffstats
path: root/controlloop/common
AgeCommit message (Collapse)AuthorFilesLines
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-14Do not encode null fields in SO requestJim Hahn2-0/+2
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-13Merge "Handle duplicate events in drools-apps"Jorge Hernandez5-16/+43
2020-05-13Handle duplicate events in drools-appsJim Hahn5-16/+43
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-05-13Make that SO actor uses http by defaultjhh1-1/+1
Issue-ID: POLICY-2560 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I6cd3de9238793fef671c9e058c494c179d4cb25c
2020-05-08delete dependency section in junit test op.pomjhh1-8/+0
This is to correct junit failures Issue-ID: POLICY-2551 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I4522f01a8ed8a66ddcb09549d4281adbcd644ab7
2020-04-29change the @api path in rest transactions apijhh2-12/+15
Issue-ID: POLICY-2530 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: If21e0607edcf75f491be61012779ddfa5d880105 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2020-04-28Merge "Plain move from test dir to src"Jorge Hernandez1-0/+0
2020-04-28Bump drools-apps to 1.6.4-SNAPSHOTPamela Dragosh13-13/+13
Issue-ID: POLICY-2510 Change-Id: Ic431fa80f7b389c84b799f8662df81b4f0ea124f Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-04-27Plain move from test dir to srcjhh1-0/+0
The file was placed there by mistake. Issue-ID: POLICY-2456 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I37a0bad7963aa9fe2931d68f5779355471cda345 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2020-04-27Bump drools-apps 1.6.3-SNAPSHOTPamela Dragosh13-13/+13
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-23transaction tracking improvements with telemetryjhh11-74/+726
Issue-ID: POLICY-2456 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I75b7e8e787d567cf120d7ae7d65d1bff12e8e24e Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2020-04-20Add properties needed by A&AI PNF OperationJim Hahn2-0/+2
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 Hahn2-10/+10
Issue-ID: POLICY-2504 Change-Id: I4dec3dfd62fa230ad8f0de66c0d1b71e5393bcbd Signed-off-by: Jim Hahn <jrh3@att.com>
2020-04-16Fix CDS actor propertiesJim Hahn2-14/+10
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-SNAPSHOTjhh13-13/+13
Issue-ID: POLICY-2378 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I8feb308f90755a078d0b35e0d8742e385916c225
2020-04-10Added vpci and vsonh testspramod.jamkhedkar12-6/+347
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 Hahn6-3/+36
Issue-ID: POLICY-2468 Change-Id: Ibf4d3e5f62fa3106028dcf85050c270b8eab0a89 Signed-off-by: Jim Hahn <jrh3@att.com>
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