aboutsummaryrefslogtreecommitdiffstats
path: root/controlloop/common
AgeCommit message (Collapse)AuthorFilesLines
2017-10-11Fix nullPointerException non-200 guard response.Temoc Rodriguez1-6/+7
Added a check for when the guard response from pdp-x is not 200. When the response is unauthorized or forbidden, it will have an empty body, try to convert to json, and throw an exception. Added a null check on the response and returns indeterminate in the case of an empty body. Issue-ID: POLICY-280 Change-Id: I9d384472e230495130bd41d377e25b74fe9ea9bd Signed-off-by: Temoc Rodriguez <cr056n@att.com>
2017-10-06Add fix for guard db on disableTemoc Rodriguez1-0/+7
Added a fix so that the guard database is not attempted to be accessed while guard is set to disabled. The guard db access is done in the operations manager which has no context of guardat the moment. Because of this separation, the boolean must be grabbed from the PolicyEngine properties. We should consider some guard refactoring. Issue-ID: POLICY-296 Change-Id: Ida7a2a7c19e568b076731e0f04bdc8a9fd0fcb26 Signed-off-by: Temoc Rodriguez <cr056n@att.com>
2017-10-06Merge "Fix JUnit Race Conditions"Jorge Hernandez2-3/+66
2017-10-05Fix JUnit Race Conditionsdaniel2-3/+66
This fix now implements the observer pattern for the PolicyEngineJUnitImpl so that the test cases can be notified when an event is available to be pulled. This eliminates the need to sleep the thread for some arbitrary time to let the rules process events. Issue-ID: POLICY-291 Change-Id: I884c959c20b95a1b58f357602099d8a01c8d2e3c Signed-off-by: Daniel Cruz <dc443y@att.com>
2017-10-04Fixed Sonar blockers/criticalsHockla, Ali (ah999m)3-6/+6
Issue-ID: POLICY-292 Change-Id: Id53e9d3b6ba23b20d7e45d4d3b39f8092f126333 Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
2017-09-28Make Guard Configurabledaniel1-0/+10
This allows the user to disable or enable guard through the .properties.environment file. Verified and tested in a pdp. Properties were added to the simulators properties file for the simulators to work out of the box. Issue-ID: POLICY-259 Change-Id: I0027a5d28f1b30e81bdbe42fa17621b36a61c850 Signed-off-by: Daniel Cruz <dc443y@att.com>
2017-09-28Fix Sonar CriticalsHockla, Ali (ah999m)1-10/+11
Made MSBServiceFactory serializable Issue-ID: POLICY-115 Change-Id: I8c8abdf656a49bc20ecefb42a7f4f7bacde57726 Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
2017-09-28Merge "Fix Sonar criticals"Jorge Hernandez5-49/+56
2017-09-28Fix Sonar criticalsCharles Cole5-49/+56
Fixed two Sonar criticals. Changed VFC actor service provider to eliminate redundant AAI queries. Issue-ID: POLICY-115 Change-Id: Ic4993b5d498a1cb3d3fc51ce1d2b4e90bb26353d Signed-off-by: Charles Cole <cc847m@att.com>
2017-09-28Fix Retries for Policiesdaniel4-12/+10
This applies changes to make retries work properly for all control loops. The current design was ignoring the upper bound of the retries and retrying until either a success or control loop timeout occured. This is now fixed to only do retries until the limit is reached that is specified from the policy. The operation is now started in the GUARD.PERMITTED rule. I think this is better because it stops Policy from doing extra processing if there is a guard deny. This is also needed so that we can properly do retries for all cases. The notifications sent in GUARD_NOT_YET_QUERIED and GUARD.RESPONSE are now more informative with the message specifying the actor and recipe. The not queried rule has a message stating that we are sending a query to guard and the guard response message in the guard response rule specifices the result from guard. During a retest of vDNS it appeared that the archetype template was no longer working, this was because there were changes in the JUnit template that were not reflected in the archetype template. These were added to archetype and vDNS is verified to work again. Another small fix needed was making sure the action for vCPE is "Restart" instead of "restart". APPC will reject our request if "Restart" is not sent as the action. Issue-ID: POLICY-259 Change-Id: I28dd3c9a629d297b408775a01afadd5c19351e37 Signed-off-by: Daniel Cruz <dc443y@att.com>
2017-09-28Merge "Add missing auth headers to guard request"Jorge Hernandez5-119/+406
2017-09-28Add missing auth headers to guard requestTemoc Rodriguez5-119/+406
Added guard authentication, client authentication, and environment http headers to the pdp-x guard restful request. Properties are set to PolicyEngine.manager. Property getter, setter, and properties in guard/.../Util.java. Test properties defined in junits themselves. Added code from GuardContext.java to grab the properties and make restful request. PolicyGuardXacmlHelper now closely resembles GuardContext in order to mimic functionality. Guard url no longer is passed into CallGuardTask, it is now a property. Issue-ID: POLICY-260 Change-Id: I5b144764828b6da0e7b738a578e4f6596a0f4f36 Signed-off-by: Temoc Rodriguez <cr056n@att.com>
2017-09-28Merge "Fix major sonar issues"Pamela Dragosh2-1/+4
2017-09-28Merge "Use MSB for service discovery"Pamela Dragosh8-0/+451
2017-09-28Merge "Fix major sonar issues"Jorge Hernandez1-8/+8
2017-09-28Merge "Add functionality for VFC request retries"Jorge Hernandez1-2/+5
2017-09-28Merge "Cleanup for VFC Actor code"Jorge Hernandez2-27/+30
2017-09-27Merge "Added @Override annotation to method signature"Jorge Hernandez1-0/+2
2017-09-27Merge "Create common object to consolidate AAI response"Jorge Hernandez18-989/+0
2017-09-27Added changes for SO Request retriesHockla, Ali (ah999m)1-2/+7
This change will allow the control loop to increment the operation attempts in the case of an SO failure in order to retry the operation if defined in the yaml. Issue-ID: POLICY-268 Change-Id: I1fee2ce64524e58fc3068f19c5cf31ed91159e0f Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
2017-09-27Add functionality for VFC request retriesRitu Sood1-2/+5
This allows the control loop to track operation attempts in case of VFC failures. This will allow retries of the operation if required in the YAML file. Issue-ID: POLICY-270 Change-Id: Ieeaf6770a8d03fa4eecc976535301d9236d19972 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2017-09-27Cleanup for VFC Actor codeRitu Sood2-27/+30
Fix some sonar critical issues and other clean up Issue-ID: POLICY-57 Change-Id: Iec9b94ff238ea6a65cfe39fd5cdfb200c773c1a9 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2017-09-27Fix major sonar issuesshashikanth2-1/+4
Fix major sonar issues in policy/drools-applications module https://sonar.onap.org/component_issues?id=org.onap.policy.drools-applications%3Adrools-pdp-apps#resolved=false|severities=MAJOR|rules=squid%3AS1161 Added "@Override" annotation above this method signature. Issue-Id:POLICY-239 Change-Id: I578d0e740a6c04ba02df400a3abc99f9b774908a Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
2017-09-27Added @Override annotation to method signatureshashikanth1-0/+2
Fix major sonar issues in policy/drools-applications module https://sonar.onap.org/component_issues?id=org.onap.policy.drools-applications%3Adrools-pdp-apps#resolved=false|severities=MAJOR|rules=squid%3AS1161 Added the "@Override" annotation above this method signature. Issue-Id:POLICY-239 Change-Id: Ibb71db82d78b0df02d5d6416ac3f3f00a3780695 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
2017-09-27Fix major sonar issuesshashikanth1-8/+8
Fix major sonar issues in policy/drools-applications module https://sonar.onap.org/component_issues?id=org.onap.policy.drools-applications%3Adrools-pdp-apps#resolved=false|severities=MAJOR|rules=squid%3AS1132 Fixed string literal comparison for for SO and VF Module Create and few optimizations. Issue-Id:POLICY-239 Change-Id: I8e228463ebc7f3114e5caba9b423552bb84dd52d Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
2017-09-27Create common object to consolidate AAI responseJoseph Chou18-989/+0
Remove duplicate/obsolete code (NQF199) Change-Id: Ibe0d4d958a1fe5ae0bae93f740e8b32196a3b07b Issue-ID: POLICY-228 Signed-off-by: Joseph Chou <jc2555@att.com>
2017-09-27Fix Use Case Templatedaniel3-7/+13
This is a WIP for getting guard to work. Currently the A&AI GET and named queries are connecting to the simulator and working in the labs. Guard is not connecting to simulator and needs further analysis. Issue-ID: POLICY-259 Change-Id: If9875bfd83cbd82dcae04a876b3818ec9c07b1f7 Signed-off-by: Daniel Cruz <dc443y@att.com>
2017-09-26Use MSB for service discoverywangxinyuan101133328-0/+451
Change-Id: I524946a1c352b5e9225b7fb37d35fa03a3f77e82 Issue-ID: POLICY-172 Signed-off-by: wangxinyuan10113332 <wang.xinyuan1@zte.com.cn>
2017-09-25Merge "Create common object to consolidate AAI response"Jorge Hernandez25-0/+1651
2017-09-25Merge "Fix Usecase Template for VoLTE"Jorge Hernandez2-3/+16
2017-09-25Fix Usecase Template for VoLTEdaniel2-3/+16
This includes VoLTE support for the amsterdam template. As of right now all use cases are able to get a final success with guard disabled and no A&AI GET queries. Currently, the GET query is not working in the lab. I will address this in another pull request. Issue-ID: POLICY-259 Change-Id: I216aa84daaa1e93ab12c56ee53283b4cb413a7c3 Signed-off-by: Daniel Cruz<dc443y@att.com>
2017-09-25override guard url when simulator feature enabledJorge Hernandez1-0/+1
Change-Id: I6af04238d043b95960a29484bcfbb08d2eab5b13 Issue-ID: POLICY-256 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-09-25add guard simulator to pdp-d feature for labsJorge Hernandez2-0/+2
Change-Id: Id1852e55c3b03cf2c9e3800e40067806c6b9be5e Issue-ID: POLICY-256 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-09-25Create common object to consolidate AAI responseJoseph Chou25-0/+1651
Add Junit test to improve sonar coverage Change-Id: I32688dad756d2cba80559cd1d090e334ebf77aa3 Issue-ID: POLICY-228 Signed-off-by: Joseph Chou <jc2555@att.com>
2017-09-25Merge "Added the Override annotation"Jorge Hernandez3-4/+5
2017-09-25Merge "Fix Blocker/Critical sonar issues"Jorge Hernandez2-4/+8
2017-09-25Added the Override annotationrama-huawei3-4/+5
Added diamond symbol on RHS side Change-Id: I3945e5f2217f74b71fa143b128f271e48b4882a7 Issue-ID: POLICY-239 Signed-off-by: rama-huawei <rama.subba.reddy.s@huawei.com>
2017-09-25Merge "Added Override annotation"Jorge Hernandez1-0/+1
2017-09-25Merge "Added private constructor"Jorge Hernandez1-1/+4
2017-09-25Merge "Fix for Sonar major issues"Jorge Hernandez1-1/+2
2017-09-25Merge "Fix for Sonar major issues"Jorge Hernandez1-1/+1
2017-09-25Added Override annotationramanjaneya1-0/+1
Issue-ID: POLICY-239 Change-Id: Ia84e5656744289be52cf22b1b68d870a03b85404 Signed-off-by: ramanjaneya <ramanjaneya.palleti@huawei.com>
2017-09-25Added private constructorramanjaneya1-1/+4
Reorder the modifiers to comply with the Java Language Specification Issue-ID: POLICY-239 Change-Id: I1c156dd420d27c45d496b07841f6375aec1b8de3 Signed-off-by: ramanjaneya <ramanjaneya.palleti@huawei.com>
2017-09-22Merge "Added private constructor"Pamela Dragosh1-0/+3
2017-09-22Merge "Add simple JUnit test for LCMResponse"Pamela Dragosh2-2/+110
2017-09-22Add simple JUnit test for LCMResponsePamela Dragosh2-2/+110
This covers all the methods Issue-ID: POLICY-32 Change-Id: I6da6c54c257f6254f5116c99a64c02dbf0c77e05 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-09-22Merge "Fix Use Case Testing"Jorge Hernandez8-11/+69
2017-09-22Added private constructorramanjaneya1-0/+4
Issue-ID: POLICY-239 Change-Id: I2ed90fc27c70ae03a772913bf3fefd28b692cec7 Signed-off-by: ramanjaneya <ramanjaneya.palleti@huawei.com>
2017-09-22Added private constructorramanjaneya1-0/+3
Issue-ID: POLICY-239 Change-Id: I261d3aa1b9f67c3e78e1016a84ed64924e306f43 Signed-off-by: ramanjaneya <ramanjaneya.palleti@huawei.com>
2017-09-22Fix Use Case Testingdaniel8-11/+69
These changes are necessary to get the use cases working on an actual PDP. So far vCPE, vFW, and vDNS have been tested successfully on a pdp. These are priliminary tests to just test a FINAL SUCCESS without A&AI GET queries being used. A&AI named queries for vFW and vDNS have been verified to work. Changes in the template were made for SO as there were changes in the JUnit template that did not get reflected in the archetype template. Changes in the code were made in various places to use the environment properties for REST urls, usernames, and passwords. Due to VoLTE not being tested yet, the url for VFC is still hard coded and will be changed later. It has been confirmed with APPC that LCM will have two topics: APPC-LCM-READ and APPC-LCM-WRITE. Policy needs to sink to APPC-LCM-READ and pull from source APPC-LCM-WRITE. This has been reflected in the controller properties file. Issue-ID: POLICY-259 Change-Id: Ib9a8df07ae5ad9d3052c88907c1e522952af474d Signed-off-by: Daniel Cruz <dc443y@att.com>