summaryrefslogtreecommitdiffstats
path: root/models-interactions
AgeCommit message (Collapse)AuthorFilesLines
2020-01-16Merge "Ensure one jacoco output file"Jorge Hernandez3-0/+13
2020-01-16Ensure one jacoco output filePamela Dragosh3-0/+13
Sub-modules under sub-modules need to set the path to ensure a single jacoco-ut.exec file is produced and appended to. I think this only gives us .1% - but that's ok. Its a step towards consolidation. Issue-ID: POLICY-2321 Change-Id: I31023843f55200096a905482ee55ad19bf681494 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-01-16Added Time agnostic Onset and Abated classesjhh10-18/+493
These classes can be used for comparison of alarm skeletons independently of the time at which they were produced. Issue-ID: POLICY-2323 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I85b9d6a429de56f056eb0a6caa9e4f90fbd68918 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2020-01-10Remove deprecated methods from modelsJim Hahn3-2/+12
Addressed the following issues related to the java 11 upgrade: - forClass().newInstance() - java.xml.bind no longer included in jdk - new mockito doesn't clear captured lists Issue-ID: POLICY-1406 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: Ia254c1ed21f847d1824e7abc22528975372ee2b6
2020-01-10policy/models jdk 11 upgradesHOCKLA9-11/+9
Issue-ID: POLICY-1592 Change-Id: Iaa6b61c5f1c76f3e7c2043691f4d29dbc43d144e Signed-off-by: HOCKLA <ah999m@att.com>
2020-01-10Bumped patch version for policy/modelsHOCKLA24-44/+49
Issue-ID: POLICY-1592 Change-Id: Iafc35fe53e28c815a79041f289cb17b6354ceccd Signed-off-by: HOCKLA <ah999m@att.com>
2020-01-09Remove ControlLoopParams.jhh2-105/+0
This class is only useful in drools-applications repo. Issue-ID: POLICY-2146 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Ifbf281a3742950c3cad2c5b56689122dd766b41a
2019-12-10Fix minor checksyle issues in modelsliamfallon16-96/+93
New checkstyle profile flagged some minor issues in policy models. Issue-ID: POLICY-2165 Change-Id: I17ed070a3d55601ad31e48fdfd29fff01d29fa42 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-28Merge "Reduce volume of log information on A&AI calls"Ram Krishna Verma2-15/+61
2019-11-27Reduce volume of log information on A&AI callsliamfallon2-15/+61
The AaiManager class is logging all the http requests and responses to and from A&AI to logger.info, creating a large volume of logging text, the logging of these messages is now set logger.debug, so they are off by default but can be enabled for debugging. Issue-ID: POLICY-2125 Change-Id: I5f9674db0f9e5b271606e7af34d5218f5c629b09 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-26CDS actor payload to be JSON object when applicableRashmi Pujar3-12/+71
When the policy-payload supplied by CLAMP is a valid JSON string the CDS Blueprint payload must be a JSON object, else retain the CDS Blueprint payload to be a string. Issue-ID: POLICY-2253 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: I6380ab0424339603ecf52d298e4f6f0cd8df754b
2019-11-25Use dependency management for cds proto-definition artifactRashmi Pujar1-2/+0
Refer to: https://gerrit.onap.org/r/#/c/policy/parent/+/98733/ Issue-ID: POLICY-2254 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: Ie1053ee05f68e8b06bae20c4ce8514dd3aa21d33
2019-11-21Fix minor checkstyle issuse in models A&AIliamfallon1-13/+11
Some minor checkstyle issues in the policy models Custom Query support in A&AI fixed. Issue-ID: POLICY-2125 Change-Id: I520caa044966acbe28d3cd864b53fb398df2f385 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-13Removing Named Query.pramod.jamkhedkar71-4737/+112
Removing all the related files and necessary modifications for removing named query. The code now only supports Custom Query Issue-ID: POLICY-2125 Change-Id: Ifa5ccb74142aa424359c0dea85b90bbcf70147cb Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
2019-11-08Fix sonar issue affecting in drools-applicationsJim Hahn1-13/+14
Drools-applications has a serializable class that contains AaiCqResponse. Sonar complained that the latter class must also be serializable, so made the change in policy-models to fix that. In addition, the latter class contained a list of Object. To ensure that those are also serializable, the list was changed to a list of Serializable instead. The latter change can be reverted, if it causes compilation issues elsewhere. However, it seems safer to enforce serializability in the list rather than risk having a later change inject a non-serializable object into the list. Change-Id: Ia741a1a96ec4efcc63451e9af31c19b4fe99dd7d Issue-ID: POLICY-2225 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-11-07Use lombok annotations for objects in models-interaction/models-impl moduleRashmi Pujar90-3219/+466
Issue-ID: POLICY-1896 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: I425afe25876cea91908391418582ef584e6fe6fc
2019-11-05Cleanup up unused actor.test maven moduleRashmi Pujar2-84/+0
Issue-ID: POLICY-1894 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: Ib662aa6a28beb40c2a1e6814b103e95ebf4ee2e1
2019-11-04PNF support changes in policy/modelsRashmi Pujar8-53/+102
AAI Enrichment method for PNF target-type and unit tests. Addition of a hashmap field to ControlLoopEvent class to hold event specific parameters. Update CDS actor to include additional event parameters Issue-ID: POLICY-1187 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: Ie0ceb320943531de6e6bc8675844b29a358dfb7e
2019-11-01Add common Jersey versionliamfallon1-1/+0
Add a common version of Jersey for all Policy Framework components. Issue-ID: POLICY-2209 Change-Id: Ic1d2ea808bb41156f776d18b875e44de22fbf06b Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-01Fix Checkstyle issues in policy-modelsliamfallon6-19/+11
Some minor checkstyle issues were introduced into policy-models by recent reviews. Issue-ID: POLICY-2088 Change-Id: I84af19926432081d72e2054af788cdc35850a99c Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-10-30Merge "Changes in preparation for the m2 model (part 2)"Jorge Hernandez3-100/+18
2019-10-30Changes in preparation for the m2 model (part 2)Straubs, Ralph (rs8887)3-100/+18
This change was missed earlier: convert 'ResourceType' to a 'String', so application-specific types can be added. Issue-ID: POLICY-1948 Change-Id: Ie8a35e7fb0746d8c8e3a6db11c09ca31dc4763cc Signed-off-by: Straubs, Ralph (rs8887) <rs8887@att.com>
2019-10-29Merge "Refactor Appc LCM Model"Jorge Hernandez32-2235/+630
2019-10-25Refactor Appc LCM ModelDaniel Cruz32-2235/+630
Added model classes for APPC LCM Input and APPC LCM Output and removed adding the input/output tag to the JSON via the APPC LCM custom serializer. Issue-ID: POLICY-2043 Signed-off-by: Daniel Cruz <dc443y@att.com> Change-Id: I54e1b5f589a4b29357cf1a45dbdf2173610870ce
2019-10-25Merge "Changes in preparation for the m2 model"Jim Hahn10-323/+171
2019-10-24Changes in preparation for the m2 modelStraubs, Ralph (rs8887)10-323/+171
1) Replace enum 'ControlLoopTargetType' with 'String' -- symbols such as 'ControlLoopTargetType.VM' still work, but now expand into a String. This gives the ability to add new application-specific types. 2) Move 'ControlLoopEvent.payload' to 'VirtualControlLoopEvent'. This symbol isn't common to all 'ControlLoopEvent' types, and this definition collides with a 'payload' defined in our application. 3) Add 'RestManager.patch(...)', which performs a REST patch. 4) Add lombok getters and setters 5) Remove trailing spaces 6) Fix order of arguments in 'assertEquals' in 'ControlLoopTargetTypeTest' 7) Update Junit tests in 'RestTest' to include 'RestManager.patch(...)' Issue-ID: POLICY-1948 Signed-off-by: Straubs, Ralph (rs8887) <rs8887@att.com> Change-Id: I08e04ea3cbcf368c760b630bcfe23a4370cf94dc
2019-10-23Flatten the CDS grpc request payloadRashmi Pujar5-66/+146
Before: { "vfw-modify-config-request":{ "resolution-key":"1234567890", "aai-properties":{ "service-instance.service-instance-id":"1234", "generic-vnf.vnf-id":"5678" }, "policy-payload":{ "data":"{\"active-streams\":\"5\"}" } } } After: { "vfw-modify-config-request":{ "resolution-key":"1234567890", "vfw-modify-config-properties":{ "service-instance.service-instance-id":"1234", "generic-vnf.vnf-id":"5678", "data":"{\"active-streams\":\"5\"}" } } } Issue-ID: POLICY-2089 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: I139a7ca3e1e2d0cd50bbd86d0cdf499f215be74f
2019-10-17Remove the CDS blueprint name and version from its payload.Rashmi Pujar2-3/+8
This information is redundant since it is included in the request header. Found during integration testing Issue-ID: POLICY-2089 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: Icdb4753ccae687f85318f5efeed09d5e13a6853b
2019-10-15Merge "Remove actor and recipe checks from ControlLoopCompiler.java"Jorge Hernandez3-62/+20
2019-10-15Remove actor and recipe checks from ControlLoopCompiler.javadg57623-62/+20
Remove actor and recipe checks from ControlLoopCompiler.java and adjusted associated JUNIT tests for the changes that were implented. Removed some redundant variables, replaced null check in actor/recipe with blank string, which checks for null as well as empty/blank strings. drools-applications still builds correctly. Issue-ID: POLICY-2128 Change-Id: I83d9e3b1152d87c9c8d2c90586300aebdd53b8e2 Signed-off-by: dg5762 <dg5762@att.com>
2019-10-15Fix remaining fixable Sonar issues on policy modelsliamfallon3-26/+27
This patch fixes the remaining easy to fix Sonar issues on policy models. The remaining issues are - methods that do not follow Java naming conventions and fixing those will probably break policies that use those methods - TODO statements to do with functionality we didn't get done in Dublin and will address in Frankfurt Issue-ID: POLICY-2165 Change-Id: I7f604bc2335388bdc0dd9286ae17a5ab76517665 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-10-14Clean up minor things in policy-modelsliamfallon8-112/+127
Cleam up of some minor eclipse, checkstyle, and Sonar issues in policy-models Issue-ID: POLICY-2165 Change-Id: Id5682fd60e1a6cebbf716d9c258453aa53ca2482 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-10-11Clean up SONAR issues in CDS actorliamfallon1-1/+4
Issue-ID: POLICY-2165 Change-Id: I2ccfb32193c85958d525af19a7744a74c97a3485 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-10-09Added ModelType to SO Req.pramod.jamkhedkar1-0/+1
Added ModelType to SO Request and set it to vfModule Issue-ID: POLICY-2156 Change-Id: Icfd824ff1f521ec32a711506d01283566d2a7ed9 Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
2019-10-08Correct the CDS basic auth header in the requestRashmi Pujar2-3/+5
Issue-ID: POLICY-2088 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: Ibcdfdbd1de66fcf193e52fcc14a1220c7520f140
2019-10-07Merge "Flesh out DMaaP simulator"Pamela Dragosh5-1/+167
2019-10-07Flesh out DMaaP simulatorJim Hahn5-1/+167
Fleshed out the dmaap simulator with additional media types. Added more junit tests. Added buildDmaapSim() to simulators Util. Change-Id: I39acd3df8e8d0ded21228e56fa1ef919cafc3772 Issue-ID: POLICY-2144 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-10-07Changes in model to integrate cds actorBruno Sakoto4-24/+82
* Create class for CDS response Issue-ID: POLICY-2088 Change-Id: I813a310f7d5123fac4bb1c3880d108391096250f Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
2019-10-01Update CDS grpc request generation in CDS Actor service providerRashmi Pujar3-11/+33
- CDS payload requires resolution-key (random UUID) - Update the CDS request object to rename the payload child node key name from config-deploy-properties to policy-payload. - Generate dynamic childnode key name from the policy recipe-name aka CDS action-name. action-name itself is never included in serialization as is. Below is a sample: { "commonHeader": { "subRequestId": "$subReqId", "requestId": "$reqId", "originatorId": "POLICY" }, "actionIdentifiers": { "mode": "sync", "blueprintName": "$bpName", "blueprintVersion": "$bpVer", "actionName": "$recipeName" }, "payload": { "$recipeName-request": { "resolution-key": "{{$guid}}", "aai-properties": { "$key": "$value", ... }, "policy-payload": { "$clamp-payload" } } } } Issue-ID: POLICY-2120 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: Ia7f0551f94755bbe73b48ae387b4c53842729a81
2019-09-10Upgrade io.netty : netty-codec-http2 and netty-common to 4.1.39.FinalRashmi Pujar1-1/+19
These insecure dependencies are brought in by io.grpc:grpc-netty:1.17.1. Override the io.netty dependencies and add exclusions where version is mandated. Resulting dependencies in policy/models/models-interactions on master* $ mvn dependency:tree -Dverbose| grep io.netty [INFO] +- io.netty:netty-codec-http2:jar:4.1.39.Final:compile [INFO] | +- io.netty:netty-common:jar:4.1.39.Final:compile [INFO] | +- io.netty:netty-buffer:jar:4.1.39.Final:compile [INFO] | +- io.netty:netty-transport:jar:4.1.39.Final:compile [INFO] | | \- io.netty:netty-resolver:jar:4.1.39.Final:compile [INFO] | +- io.netty:netty-codec:jar:4.1.39.Final:compile [INFO] | +- io.netty:netty-handler:jar:4.1.39.Final:compile [INFO] | \- io.netty:netty-codec-http:jar:4.1.39.Final:compile [INFO] +- io.netty:netty-handler-proxy:jar:4.1.39.Final:compile [INFO] | \- io.netty:netty-codec-socks:jar:4.1.39.Final:compile [INFO] | +- io.netty:netty-codec-http2:jar:4.1.39.Final:provided [INFO] | | +- io.netty:netty-common:jar:4.1.39.Final:provided [INFO] | | +- io.netty:netty-buffer:jar:4.1.39.Final:provided [INFO] | | +- io.netty:netty-transport:jar:4.1.39.Final:provided [INFO] | | | \- io.netty:netty-resolver:jar:4.1.39.Final:provided [INFO] | | +- io.netty:netty-codec:jar:4.1.39.Final:provided [INFO] | | +- io.netty:netty-handler:jar:4.1.39.Final:provided [INFO] | | \- io.netty:netty-codec-http:jar:4.1.39.Final:provided [INFO] | +- io.netty:netty-handler-proxy:jar:4.1.39.Final:provided [INFO] | | \- io.netty:netty-codec-socks:jar:4.1.39.Final:provided Issue-ID: POLICY-2072 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: Ib3706e1c67e33fe73ebbfc80a6b474021b4a2679
2019-09-10Bump versions for models masterJim Hahn25-25/+25
Change-Id: I351d1a0ebd3c7cfa76d57297ce44ef6a6fa8c753 Issue-ID: POLICY-2045 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-09-06Merge "CDS Actor service-provider implemntation"Pamela Dragosh7-0/+632
2019-09-06CDS Actor service-provider implemntationRashmi Pujar7-0/+632
https://wiki.onap.org/display/DW/CDS+actor+support+in+Policy Issue-ID: POLICY-1763 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: Idcb6e9168b949745cc644e97ba77c479573a8bf5
2019-08-30Added VFModule countpramod.jamkhedkar6-1791/+3669
Added the function VFModuleCount to AaiCqResponse class. It counts the number of vf modules. Also changed the same custom query response in AaiSimulator. Issue-ID: POLICY-1858 Signed-off-by: pramod.jamkhedkar <pramod@research.att.com> Change-Id: If08de84f74d2bd9501b501b881cdd761089614dc
2019-08-08Review maven dependency for snakeyamlBruno Sakoto1-1/+0
Remove explicit version for snakeyaml maven dependency and inherit it from integration parent artifact. Upgrade snakeyaml to latest 1.24 version. Issue-ID: POLICY-1603 Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca> Change-Id: Id575085f220807a574758dd11fd6fef44fd2ffc8
2019-08-06Bump version in policy/modelsJim Hahn24-24/+24
Change-Id: Ie8761ccbd05edc80af51e0ae5e8c90a4dfaf7715 Issue-ID: POLICY-1965 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-08-05Bump versions to 2.1.2jhh24-24/+24
self-release process need to generate partial releases with some jars missing. Workaround is to bump versions an additional patch number. Issue-ID: POLICY-1953 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I4b8fa38f082d8f06c7fe56a26f8c55db91cd1d9e Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2019-07-31Use new addTopic() method in modelsJim Hahn1-0/+2
Replaced ParameterUtils with the use of the new addTopic(TopicParameterGroup) method. Used separate addTopicXxx() methods per review comment. Change-Id: I755b75f986a5c42f01bcad5a22472a46766d192d Issue-ID: POLICY-1953 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-07-09Removed all mention of www.example.org from testsJohnKeeney7-179/+424
Replaced those tests with test using a local/temp webserver to exercise the RestManager Updated with Jim/Pam's suggestions. Updated following SONAR changed to policy/common Change-Id: Ia2551fbcafd2cd30d74a881237b003216e8caec7 Issue-ID: POLICY-1665 Signed-off-by: JohnKeeney <John.Keeney@est.tech>
2019-07-08Fix models due to sonar changes in commonJim Hahn9-29/+28
Fixed breakages due to changes made in policy/common to satisfy sonar. Change-Id: I7de701e743664afb5963a454c59478d1a1c83e87 Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>