summaryrefslogtreecommitdiffstats
path: root/controlloop/common/model-impl
AgeCommit message (Collapse)AuthorFilesLines
2018-11-01Merge "Add /serviceInstances/ to SO URL for scale-out"Pamela Dragosh2-3/+3
2018-10-31Add /serviceInstances/ to SO URL for scale-outJim Hahn2-3/+3
Also reformatted line that was subsequently too long. Change-Id: I5c634c5157f18de64d37a0f451cd65f3002f35d3 Issue-ID: POLICY-1238 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-10-31Set new master version for Dublinliamfallon12-19/+15
Issue-ID: POLICY-1232 Change-Id: I6dfd85e9407c4d7400f593f035c627a303f397de Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-10-25Fix refering to snapshot in drools-application1.3.1ramverma12-19/+19
Issue-ID: POLICY-1213 Change-Id: I91e4928e33d4e39286bf340e42602890446d9401 Signed-off-by: ramverma <ram.krishna.verma@ericsson.com>
2018-10-05Add new actor SDNC to support CCVPN Closed LoopXin Miao23-0/+1486
Issue-ID: POLICY-1183 Change-Id: I1b77b5b9cefca104382d9d84dd00bbd63b20e0f2 Signed-off-by: Xin Miao <xin.miao@huawei.com> Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-10-02Fixing sonar issuesPamela Dragosh12-0/+713
Some trivial functional interface and ordering. Added some missing JUnit tests. Issue-ID: POLICY-1129 Change-Id: Iad6fe757a40819ca39e007b41dae1bf4b3f6cc0c Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-09-27Fix more sonar issuesPamela Dragosh10-65/+62
Most of these are minor issues along with a few others. They have been bugging me so I thought I would get them done. Some also do not show up on sonarlint. Issue-ID: POLICY-1129 Change-Id: I31f2765f6babdfa80b23f0589daacc98da8d2002 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-09-27Fix for checkstyle declarationsPamela Dragosh2-4/+1
I found the problem with policy-yaml. An exception was occuring due to an extra line between an @return for javadoc vs. just printing a warning. See: https://github.com/checkstyle/checkstyle/issues/2398 I also messed up some of the other declarations in the sub-modules. Copyright Issue-ID: POLICY-1153 Change-Id: I848e0b19340d494775e161bab86ffb60a97d83ab Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-09-24Fix checkstyle declarationsPamela Dragosh14-37/+397
I fixed what I thought would be tolerable for this release. Same issue as policy/common I had to defined the checkstyle in each repo where the suppressions were needed. Issue-ID: POLICY-1135 Change-Id: I8f30bee7e9cddc692ddad3cf88acedb2e6b4781b Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-09-21new sonar issues in drools-applicationsJim Hahn3-39/+17
Don't return null lists from AAI. Transient TargetLock. Extract aai.url, et. al., constants. Don't allocate extra unneeded variable. Re-order fields in xacml attributes. Extract "vserver" constant from simulator. Replace thread sleep with join. Change-Id: Iee1bd182862632af1f131cca5db5b526f5865b9f Issue-ID: POLICY-1129 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-09-12Add implementation for OOF PCI use caseSaravanan A23-2/+2444
Receive DMaaP message from PCI-Handler MS with PCI Config change recommendations through DCAE_CL_OUTPUT topic. Trigger SDN-R (if allowed by policy) by sending DMaaP request through SDNR-CL topic. When the response is received from SDNR through SDNR-CL-RSP topic, just parse and print. Code review comments addressed Change-Id: If340a23ae18367b7f98e31fe79c09a09e645b2ad Issue-ID: POLICY-1089 Signed-off-by: Saravanan A<saravanan.a75@wipro.com>
2018-08-31Added support for VF Module Delete recipePiyush Garg13-277/+547
Enhanced SOActorServiceProvider to support VF Module Delete Recipe. Added SOOperationType enum to map the policy recipe with the SO API that we want to call for a recipe. vf module id from non-base vf module is used to construct the delete request url and same will be deleted. Updated SOManager so that it sends request to SO based on the SOOperationType enum value. Enhanced RESTManager to add support for the http delete using new class HttpDeleteWithBody (to allow pass the payload to the SO delete VF module API). Change-Id: I15b678ed9ebc85dfa7cb62bbf23e41c0fe6e4c69 Issue-ID: POLICY-1079 Signed-off-by: Piyush Garg <piyush.garg1@amdocs.com>
2018-08-29Fix remaining checkstylePamela Dragosh61-1079/+1195
Lots of formatting, missing javadoc, distance from use, imports must be explicit, ordering of methods. Fixed some abbreviation problems in classes and renamed JUnit tests to fix this. Issue-ID: POLICY-883 Change-Id: I8494f63d88d63c0232aca97f7bcc848816228fb1 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-08-28Remove overriding dependencies warningsPamela Dragosh9-41/+24
With the move to oparent for dependencies, there are still some warnings in the pom's for overriding managed dependencies. Issue-ID: INT-619 Change-Id: I7ea771cc4536d8dfc77b4d1717e59cf6bfcfcda9 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-08-28use new SO API for scale-outJim Hahn9-180/+208
Updated licenses and serialization IDs. Moved hashCode() and equals() methods to be in same location as in the original code so it can be more easily compared. Changed vDNS yaml timeout and retry to 1200 and 0, respectively, to match the original values. Removed extra newline from yaml, to match original yaml. Reformatted source to wrap lines at 120 characters and removing trailing white space. Change-Id: I3f5e59a1f44750347de49164f587d4ffefdee8b4 Issue-ID: POLICY-962 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-08-24use new vf-walk code in SO requestJim Hahn2-23/+23
Methods were added to AaiNqResponseWrapper to extract VF modules and generate the new VF module name. This step modifies the SO code to use those methods. It was also determined that the SO code needs the VF module container object, not just the VF module, itself. As a result, AaiNqResponseWrapper was modified to return a list of the containers instead of a list of the VF modules. Also modified the AAI simulator to return two VF modules in the response to the vserver named query. As part of that, a method was added to the simulator so that JSON responses can be read from files rather than having to convert them to Java Strings. Modified simulator to work even if vnf-id is null. Change-Id: I68fdf07ea80ee0daf9e16403e35b11710315a8a8 Issue-ID: POLICY-1037 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-08-23walk VF module namesjh73587-53/+732
Added code to walk the VF modules to count the number of modules and to generate the new module instance name. Added comment to test method. Fix checkstyle errors. Read json files instead of resources. Removed checkstyle plugin from aai pom, as it continues to barf every time I use some automated feature of Eclipse. Use Files.readAllBytes() instead of IoUtils.toString(uri). Try concatenating file path. Turned out to be a problem with file name case sensitivity - renamed the file. Change-Id: I1ce98d846dfa1d29e109b161c869108425d29771 Issue-ID: POLICY-1037 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-08-21move AAI named queryJim Hahn1-2/+1
The AAI vserver named-query was being done as a preliminary step for the SO request. However, it will now be needed during the guard query, which happens much earlier. Thus it has been moved from the SO classes into the event manager class, where it is retrieved in a lazy fashion and cached. Also removed some trailing white space. Update licenses. Make test method private. Change-Id: Id7353a2e0f2d42601d5142cb92961528fa21aa94 Issue-ID: POLICY-1011 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-08-15add prov-status check to AAI queriesJim Hahn2-0/+14
Also had to add prov-status field to AaiGetVnfResponse class. Removed bogus comment from test. Verify response is not null in test. Verify no requery by vnf name in test. Add prov-status to template.demo tests. Add prov-status to sample json for archetype-cl's. Change-Id: I3f36a2bb6de8265ce5b10103690d6d8813c15b1a Issue-ID: POLICY-964 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-08-14update AAI response classes per APIJim Hahn29-655/+830
Several of the AAI response classes did not match the new AAI interface. Updated AaiGetVnfResponse and AaiGetVserverResponse and the classes they use to reflect the new API; other top-level classes were left untouched. Fix checkstyle errors. Change-Id: Ife5830c45ba8aece8d676a10f0fd8a9c9fe6cb66 Issue-ID: POLICY-964 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-07-30Copy policy-endpoints from drools-pdp to commonmmis6-186/+217
Replaced references to classes deleted from drools-pdp with references to the corresponding in policy-common Issue-ID: POLICY-967 Change-Id: Ia9d2ac704e6b7c434e5a9e7aee6d7dcf9198e4f2 Signed-off-by: mmis <michael.morris@ericsson.com>
2018-07-11Username & password should be optional for VFCJim Hahn2-23/+19
Also updated licenses. Replace tabs with spaces in new junit method. Updated licenses again. Change-Id: Iebff19353c052e59bfd69da1677e9a05c44592a0 Issue-ID: POLICY-869 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-05Update drools-applications to SNAPSHOT-1.3.0liamfallon10-10/+10
Snapshot updated for Casablanca. Issue-ID: POLICY-875 Change-Id: I0307282c4eabdb9ccd03282f918f4cd727ac4f86 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
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