summaryrefslogtreecommitdiffstats
path: root/controlloop/common/model-impl
AgeCommit message (Collapse)AuthorFilesLines
2018-05-24Don't build credentials if user name is emptyv1.2.32.0.0-ONAPbeijing2.0.0-ONAPJim Hahn3-1/+18
Modified code to skip building credentials if user name is empty, in addition to case where user name is null. Change-Id: I5b53d4f97263df98cfe082f44a4e6af64b1e488b Issue-ID: POLICY-868 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-05-21Update Drools Applcations to 1.2.3-SNAPSHOTliamfallon10-10/+10
These reviews must be merged in order because of layering. This review should be merged THIRD. Issue-ID: POLICY-844 Change-Id: I61d128f3244cd420abab15ab70c5c0e9d9afa625 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-05-16Fix authentication info in request to SOJim Hahn1-20/+2
The code was passing two different sets of credentials to the REST manager, and the wrong one was taking precedence. Modified the code to only pass the correct set of credentials. Updated license date. Change-Id: I13e2db93a8eebbb0cd77fdfaca80125cd28a2553 Issue-ID: POLICY-800 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-05-16Upgrade SNAPSHOT to 1.2.2liamfallon10-10/+10
These reviews must be merged in order because of layering. This review should be merged FOURTH PLD added version.properties Change-Id: If7af7b3ae37166e88af92c0d1f1c558e5b60ab8e Issue-ID: POLICY-798 Signed-off-by: liamfallon <liam.fallon@ericsson.com> Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-04-23Send credentials to AAIJim Hahn3-24/+37
Per this link: http://www.baeldung.com/httpclient-4-basic-authentication apache HttpClient does not send the credentials by default, but instead waits for the server to issue a challenge before sending them. Modified RESTManager to construct and send the Authorization header always instead of waiting for the challenge. Remove unused imports. Also add Authorization header for POST request. Change error message to match original error message when username is null. Preempt sonar issue. Allow null user name, which indicates that the Authorization header should not be sent. Note: this only impacts the RESTManager class; invoking classes (e.g., AaiManager) still enforce that the user name exists in the properties. Fix license dates in modified test code. Change-Id: I3cb26e76562db746939631437775727809553390 Issue-ID: POLICY-754 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-04-16Add missing license headersPamela Dragosh9-3/+109
I removed a couple of empty README and added licenses. Issue-ID: POLICY-741 Change-Id: I10aad3536d02b738a1dc606f7311de6b3a2777cd Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-04-13Update to SNAPSHOT 1.2.1Pamela Dragosh10-10/+10
Issue-ID: POLICY-736 Change-Id: I2bc455510e925764d18a1d8e96e072bdadb251c6 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-04-03Fix Event Syntaxv1.2.0Daniel Cruz3-1/+33
The "requestID" field was changed to "requestId" which brakes the use cases since this does not conform to the events DCAE will be sending. To avoid further issues with changed variable names, all onset fields now have a serialized name that will be used when serializing/deserializing with gson. Issue-ID: POLICY-681 Change-Id: I731b0c83a9b6c9bbaae0312f76382d7f4644db8c Signed-off-by: Daniel Cruz <dc443y@att.com>
2018-03-27Removed checkstyle warningsmmis56-2692/+3016
Removed checkstyle warnings from: policy/drools-applications/controlloop/common/model-impl/appc policy/drools-applications/controlloop/common/model-impl/appclcm policy/drools-applications/controlloop/common/model-impl/events including changes to template files due to renamed methods Issue-ID: POLICY-705 Change-Id: Ieb93baf43268aa608f204eef1a610354f2adec32 Signed-off-by: mmis <michael.morris@ericsson.com>
2018-03-27Merge "Add timeout to SO to wait for success"Jorge Hernandez5-442/+1131
2018-03-26Removed checkstyle warningsmmis93-3813/+3962
Removed checkstyle warnings from policy/drools-applications/controlloop/common/model-impl/aai including renaming classes: AAI* -> Aai* PNF* -> Pnf* and renaming some methods in those classes Issue-ID: POLICY-705 Change-Id: I2d59a668728aa58a2c9fbe78c44e924e6cfb4531 Signed-off-by: mmis <michael.morris@ericsson.com>
2018-03-25Add timeout to SO to wait for successliamfallon5-442/+1131
The timeout implementation assumes that a finished request is a HTTP-200 together with either a request state of COMPLETE or FAILED in the embedded request in the response in the JSON. This is the same as what is done earlier in this class and in, for example, VFC. Unit test for timeout has also been added. Change-Id: I637dbecb8d230b8060f7ced76d92d11ec482503e Issue-ID: POLICY-448 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-03-23Create archetype for Beijing ReleaseDaniel Cruz1-0/+87
This new archetype is a proof of concept for removing template expansion from the BRMSGW. The idea is to have a ueb or dmaap topic that the BRMSGW uses to send params json and then the pdp-d will deserialize it into a ControlLoopParams object. The rules engine will then insert that fact in to the working memory which will be used for rules matching between onset events and corresponding policies. Issue-ID: POLICY-692 Change-Id: I4237221c2216dab16160e79a8f2fdcab6571e1eb Signed-off-by: Daniel Cruz <dc443y@att.com>
2018-03-21Fix Serialized Names for Legacy APPCCRUZ6-0/+46
The legacy APPC request and response messages must be upper camel case. Issue-ID: POLICY-681 Change-Id: I439fa22b76dd2cb35a054bf93260705b8cf1af51 Signed-off-by: dc443y <dc443y@att.com>
2018-03-19Fix Serialized Names of A&AI Subtagdc443y2-0/+6
Onset events received from DCAE contain an "AAI" subtag that is capitalized. The casing of the AAI variable was changed to lower case which was making the gson serializer unable to deserialze a simulated onset event that matches the casing DCAE uses, which resulted in Policy rejecting the events because they appear to be missing "AAI". A serialized name was added to preserve the lower cased variable as sonar wants but will also allow onsets with capitalized AAI subtags to be processed by the rules engine. Issue-ID: POLICY-681 Change-Id: Ia37694f606b3fb0898d6c4dadea7c48c5372e64e Signed-off-by: dc443y <dc443y@att.com>
2018-03-02Reduce Technical Debt on drools-applicationsliamfallon16-149/+151
This commit mops up the technical debt issues in drools-applications that are reaistic to fix witout major surgery on the code. note: warnings on non compliant Java class names that are used in yaml serializaiton and deserailization are ignored. note: warnings on complexity figures for equals() methods are ignored. Issue-ID: POLICY-455 Change-Id: I99ccda4bd9932ceb5ccbcfd2778730234b55d7a5 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-02-19Rename maven modules to mirror directory structureliamfallon52-3423/+3430
The naming of Maven modules in drools-applications was not aligned with the directory structure in the git repository of drools-applications. Therefore it was difficult to see the strucutre of the repository in Eclipse and other IDEs. This change amends the Maven module IDs to reflect the repository directory structure. This patch reset fixes the previos patch set, where many references to maven modules internally in drools-applciations were missed. See also changes in engine and docker repos. Updated to reflect repo directory structure in maven artifact groups. Issue-ID: POLICY-238 Change-Id: I8ab1a7ecdb664045222bbbfda269135e3e449109 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-02-11Tidy dependencies and scopes in POMsliamfallon3-3/+3
There were some duplicate dependencies in the POMs that were causing warnings. These have been removed. In cases where the revision of the duplicate dependencies were different,the latest revision was used. The scope of the "junit" dependency was "provided" in some POMs. These have been corrected with the scope of "test" being used for junit dependencies. Issue-ID: POLICY-238 Change-Id: Ib1cc6f040b0c4d7f2b39ae02bc6fb4590d395809 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-02-07Resolve security issues SONATYPE-2017-0359Pamela Dragosh1-1/+1
Upgrade httpclient to 4.5.5 - the latest version. Issue-ID: POLICY-612 Change-Id: I5e79918bc447889b1dbcd1bf897c3324f6a0cc0d Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-01-31Merge "Fix technical debt/JUnit on SO/VFC/SO ACTOR"Jorge Hernandez14-229/+697
2018-01-30Fix technical debt/JUnit on SO/VFC/SO ACTORliamfallon14-229/+697
Unit test expanded for SO POJOs, technical debt removed in SO actor and VFC pojos. Change-Id: I23b886c40c1ac6ac8dc2ebbaade315b71cca9dd0 Signed-off-by: liamfallon <liam.fallon@ericsson.com> Issue-ID: POLICY-455
2018-01-29Do not enforce hostname validationAlexis de Talhouët1-2/+11
Change-Id: I1c4e5d58126e35a64140c91c0c3afda5e9b3a5bd Issue-ID: POLICY-510 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2018-01-23Implement JUnit tests for actor.vfcliamfallon1-6/+0
JUnit tests for the VFC actor implemented. Change-Id: Ifcd433a4ce6f46cad46d50f4ce4c7c03e2abec67 Issue-ID: POLICY-455 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-01-22Merge "Fix Tech Debt/JUnit on VFC POJOs"Jorge Hernandez18-185/+985
2018-01-21Fix Tech Debt/JUnit on APPC and APPCLCM actorsliamfallon1-1/+1
Unit test updated to increase coverage on getter methods. Constants added for some string literals to reduce technical debt warnings. Change-Id: I3b175de7c65aa9d342e71adc951d1ee08c9d781b Issue-ID: POLICY-455 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-01-20Fix Tech Debt/JUnit on VFC POJOsliamfallon18-185/+985
Making fields private, fixing field and methods to follow Java guidelines, and adding getter and setter methods. Unit test added for all classes in org.onap.policy.vfc Issue-ID: POLICY-455 Change-Id: I262337a816706cd5243849cd51e57689275545bf Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-01-19Merge "Fix Technical Debt, add Unit tests for SO"Jorge Hernandez39-747/+2308
2018-01-18Merge "Fix Technical Debt, Unit Test for APPCLCM POJOs"Jorge Hernandez14-158/+835
2018-01-18Merge "Fix Tech Debt/JUnit on control loop event POJOs"Jorge Hernandez9-109/+429
2018-01-18Fix Technical Debt, Unit Test for APPCLCM POJOsLiam Fallon14-158/+835
Mainly making fields private, fixing field and methods to follow Java guidelines, and adding getter and setter methods. Unit test added for all classes in org.onap.policy.appclcm Issue-ID: POLICY-455 Change-Id: Iae873f94a236cc9faeac5542a9633ca840b696ed Signed-off-by: Liam Fallon <liam.fallon@ericsson.com>
2018-01-18Merge "Fix Technical Debt, basic JUnit tests for Rest"Jorge Hernandez4-85/+233
2018-01-18Fix Technical Debt, add Unit tests for SOvdmeer39-747/+2308
Converted to POJOs, fixed sona lint errors, added JUnit tests POJOs now have only private members and getters/setters This implicated actors, simulators, and existing tests Issue-ID: POLICY-455 Change-Id: I4b80f729565e8675822a890892b15676908f73b4 Signed-off-by: vdmeer.sven <sven.van.der.meer@ericsson.com>
2018-01-18Merge "Fix Technical Debt for TrafficGenerator"Pamela Dragosh5-55/+52
2018-01-18Fix Tech Debt/JUnit on control loop event POJOsLiam Fallon9-109/+429
Mainly making fields private, fixing field and methods to follow Java guidelines, and adding getter and setter methods. Unit test added for all classes in org.onap.policy.controlloop Issue-ID: POLICY-455 Change-Id: I445b7cfaf9eb921a230bbb72b06ff4455fe003ce Signed-off-by: Liam Fallon <liam.fallon@ericsson.com>
2018-01-17Fix Technical Debt, basic JUnit tests for Restvdmeer4-85/+233
Basic tests for get and post (not testing full user/pw/body) Issue-ID: POLICY-455 Change-Id: I186ebf969abc239e5056199c2fd8da9f3253d2fc Signed-off-by: vdmeer.sven <sven.van.der.meer@ericsson.com>
2018-01-17Fix Technical Debt for TrafficGeneratorvdmeer5-55/+52
Changed formatting for checkstyle, changed sequence of statements Left empty constructors as requested Issue-ID: POLICY-455 Change-Id: I0e443bba69cede4c006a841d8d34c82391ff1040 Signed-off-by: vdmeer.sven <sven.van.der.meer@ericsson.com>
2018-01-17Added all J Unit tests SDCvdmeer5-0/+622
Issue-ID: POLICY-455 Change-Id: I8192e8a595642e0d36608591d95f21f3ee574d13 Signed-off-by: vdmeer.sven <sven.van.der.meer@ericsson.com>
2018-01-16Fix Sonar Technical Debt, Unit Test for APPC POJOsLiam Fallon13-133/+859
Mainly making fields private, fixing field and methods to follow Java guidelines, and adding getter and setter methods. Unit test added for all classes in org.onap.policy.appc Change-Id: If3db740bc146a09f8f7387f02c12b048ad00b201 Signed-off-by: Liam Fallon <liam.fallon@ericsson.com> Issue-ID: POLICY-455 Signed-off-by: Liam Fallon <liam.fallon@ericsson.com>
2018-01-15Restore getters and setters to AAINQResponse classLiam Fallon1-0/+12
Some get and set methods were deleted from this class in error. This patch restores them. Change-Id: I4dfaf1215e56f30a1d62d19624fe4da570e99171 Signed-off-by: Liam Fallon <liam.fallon@ericsson.com> Issue-ID: POLICY-455
2017-12-14Cleanup of A&AI message model module.Liam Fallon63-778/+1923
Fields have been made fields private in POJOs, and wrote JUnit unit tests to bring up code coverage. AAIManager also changed to use non-static methods so that it can be stubbed with Mockito. Change-Id: I871427ced5db8a1dfd6495fef4e6d84adf264e65 Signed-off-by: Liam Fallon <liam.fallon@ericsson.com> Issue-ID: POLICY-455 Signed-off-by: Liam Fallon <liam.fallon@ericsson.com>
2017-12-06Technical Debt in AAI.Liam Fallon42-347/+375
Eliminate the technical debt identified in the drools-applications/controlloop/common/model-impl/aai module by Sonar Change-Id: I72125baacc217386a4984be04bfc023439eddd13 Signed-off-by: Liam Fallon <liam.fallon@ericsson.com> Issue-ID: POLICY-455 Signed-off-by: Liam Fallon <liam.fallon@ericsson.com>
2017-11-21Bump minor versionJessica Wagantall10-10/+10
Bump minor version in preparation for Amsterdam branching. Change-Id: Ia7e97a72053a2d1cd10c0b9d5c179817c3ac7e23 Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-11-15Upgrade to 1.1.2-SNAPSHOTPamela Dragosh10-10/+10
Released 1.1.1, now must bump patch by 1 Issue-ID: POLICY-436 Change-Id: I3f5e4c369575f6fe1fa06cabb96a5bd43cb11087 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-11-09Fix SO Request structureHockla, Ali (ah999m)2-0/+5
Issue-ID: POLICY-438 Change-Id: I05e634782004fff5540b3e6fabb9e22846438cb1 Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
2017-11-09Merge "Fix SO Request body"Jorge Hernandez5-27/+117
2017-11-08Merge "Update SNAPSHOT version"Jorge Hernandez10-10/+10
2017-11-08Fix SO Request bodyHockla, Ali (ah999m)5-27/+117
- Renamed modelNameVersionId to modelVersionId in SOModelInfo - Removed requestID from SO Request body - As a result of this, an SOResponseWrapper was needed in order to attach the control loop event requestId to use in the SOResponse rule in drl (the requestID that is returned in the SO response is a newly generated requestId with no relation to the Policy control loop event requestId as per Arthur) - Updated drl to reflect the above mentioned change - Updated simulator and junits to reflect changes - Added an additional null httpResponse check/logger statement in SOManager and RestManager Issue-ID: POLICY-438 Change-Id: I5f414ba69b60b5565cca9073b47f4c4835e5abbf Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
2017-11-08Fix SO url to remove suffix HTTPS/1.1Hockla, Ali (ah999m)1-1/+1
Issue-ID: POLICY-437 Change-Id: I19679d9782f78ff73e3a90d0c8c95b2b6e9d319f Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
2017-11-08Update SNAPSHOT versionPamela Dragosh10-10/+10
Releasing v1.1.0 so need to update version to 1.1.1 Issue-ID: POLICY-436 Change-Id: I8b85de39bb3a32f5f4faeeb4fcdfb5d95291ae31 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-11-07SNAPSHOT present in policy core and msb depsv1.1.0Jorge Hernandez1-2/+2
Change-Id: I61c8d698f8cf984c648e510997498d41e7d9744a Issue-ID: POLICY-433 Signed-off-by: Jorge Hernandez <jh1730@att.com>