aboutsummaryrefslogtreecommitdiffstats
path: root/models-interactions/model-impl
AgeCommit message (Collapse)AuthorFilesLines
2020-04-06Merge "Models junits are failing locally"Jim Hahn4-6/+6
2020-04-03Models junits are failing locallyJim Hahn4-6/+6
Junits were failing in my local eclipse environment. Fixed the following: - more cases of "is marked @NonNull but is null" (I thought Liam had already fixed all of these, but I'm still seeing errors, so fixed some more) - comparing "Instant" values in event time stamps assumes that the times will be different, but may not be, if the JVM is fast enough. Modified the test to set the times of the new events to Instant+1, to ensure that they are different from the original Issue-ID: POLICY-2305 Change-Id: Ic05bc6a58b559ba589583ce887711ee01f76691c Signed-off-by: Jim Hahn <jrh3@att.com>
2020-04-03Refer io.netty from policy/parentRam Krishna Verma1-4/+1
Issue-ID: POLICY-2467 Change-Id: If06f5fbf26269f7a34104bb2194258494a6488bf Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-03-27Cleanup sonar bugs and security hotspotPamela Dragosh1-1/+1
Just some trivial sonar bugs for missing argument and a couple sonar overrides to clear security hotspots. Issue-ID: POLICY-2165 Change-Id: I392e5fee458465c66313a16a8912e23a3a119848 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-26Discard requests in APPC legacy actorJim Hahn1-1/+6
The new actor for legacy APPC attempts to discard request messages received on the response topic by discarding those that have a null response. Unfortunately, when it decodes them, the Response object creates a status object, even if there isn't one in the json message, thus the test fails and the actor treats it as a failed response. Issue-ID: POLICY-2434 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I26cfb25443ff2ed394781d309f9097d50b8f160b Signed-off-by: Jim Hahn <jrh3@att.com>
2020-03-25Bump models 2.2.3-SNAPSHOTPamela Dragosh12-12/+12
Released 2.2.2 Issue-ID: POLICY-2378 Change-Id: I829f0dfc88aeaf1f9b7efad91c983628f2a5d706 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-25Merge "Cleanup eclipse warnings"Pamela Dragosh1-46/+30
2020-03-25Cleanup eclipse warningsPamela Dragosh1-46/+30
Issue-ID: POLICY-2165 Change-Id: Iaad54af1b1210fe96fa44dcaa609834c46557877 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-24Security fixes for cds actor in policy/modelsRam Krishna Verma1-1/+1
Upgrading io.netty to 4.1.48.Final as the current version has security issues. Issue-ID: POLICY-2442 Change-Id: I5dbfdc7890c85571ef6b6bcc7a9f95310868f6a0 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-03-24Bump policy-models to version 2.2.2-SNAPSHOTliamfallon12-12/+12
Issue-ID: POLICY-2378 Change-Id: I644e45822154f57d2bf6a81e55df07e2e4ca6966 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-23Update new SDNR actor with v2.0 structuresJim Hahn2-0/+68
SDNR v2.0 introduced an extra "input" and "output" layer within the body of the messages. Added POJOs to match that, and updated the actor to use the new POJOs so that no extra steps are needed during serialization or deserialization. Also modified the SDNR and APPC-LCM simulators to discard request messages when looking for the response, if the sink and source topics happen to be the same. Added the SDNR simulator. Added more coverage to the SDNR actor. Fixed a sonar issue in the SDNR junit code: - use a constant instead of a literal (i.e., for "ModifyConfig") Issue-ID: POLICY-2434 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I70914a299dd5e9ee8eaccb5d42a2596cab814091
2020-03-20Merge "Misc simple sonar issue fixes"Liam Fallon1-5/+5
2020-03-19Misc simple sonar issue fixesChris Ramstad1-5/+5
Issue-ID: POLICY-2389 Signed-off-by: Chris Ramstad <cramstad@ciena.com> Change-Id: I7ce91e331a128aaadaab5ac837e19873a3388164
2020-03-12Revert some UUID variable namesJim Hahn4-78/+61
Unfortunately, some code uses "new Yaml(...)" to decode policies and "Yaml" doesn't understand GSON annotations. As a result, this means that the field names must match the serialized name, thus they must continue to end with "UUID" instead of "Uuid". Issue-ID: POLICY-1910 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I97c2f5c7e59b758b13a1dbcceed709b2e2e064a2
2020-03-12Clean up minor checkstyle/sonar issuesliamfallon7-402/+131
A few minor eclipse warnings and checkstyle warnings in policy models. Issue-ID: POLICY-1910 Change-Id: I612c6514fa7d88cb8658a7ee1618869a525e48d7 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-02Testcases for cds actorRam Krishna Verma1-1/+1
Adding test cases for cds actor, operator, operation & manager. Coverage is more than 95% overall. Fixed review comments. Issue-ID: POLICY-2384 Change-Id: I64beeb0c46918b990ad7e67248559169fc7940a1 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-03-01Add SDNR ActorPamela Dragosh1-0/+36
Actor for SDNR and necessary JUnit tests. Removed the Pair code. Issue-ID: POLICY-2382 Change-Id: I3da1d95f431cc076f12e9ad26280b92058fe51cc Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-02-24Move CQ operation name from actor.aai to aaiJim Hahn1-0/+1
Issue-ID: POLICY-2385 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I12a7d55b118baa5f0f849855fbcf0602a1208b52
2020-02-19Add SO actorJim Hahn1-0/+3
Issue-ID: POLICY-2371 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I3faf0276e8039dc43a976d18ff8e704fdbec3d49
2020-02-11Add more code to facilitate actor implementationJim Hahn5-2/+43
Added obtain() to Context Added startGuardAsync(), in anticipation of adding guards. Moved logRestXxx() from Util to HttpOperation. Added actor.test to facilitate testing of actors. Changed timeoutSec from long to int in various places. Made a couple of methods public to support junit testing. Most of the methods required Params to be passed, which indicated a design issue. Split Operator and Operation so that the Params could be kept in a field and thus need not be passed to every method. Basically, renamed OperatorPartial.java to OperationPartial.java and created a new OperatorPartial.java. Of course, this makes it look to gerrit like it's all new code, when in fact, most of it is unchanged, other than removing the Params argument to the method calls. That accounts for about half of the "lines changed" count. Issue-ID: POLICY-1625 Change-Id: I9e98c9dadcbed145bf84deb06c9db1c864a3c24a Signed-off-by: Jim Hahn <jrh3@att.com>
2020-02-03Actor redesign.Jim Hahn2-2/+7
Left original code intact so that it can continue to be used until everything has been converted to use the new approach. Simply added new methods and classes. (A few minor edits were required to the old code, e.g., added constructors to the Actor implementations). Code to be removed is annotated with "TODO". This only contains one revised actor, SDNC. This actor combines code from actor.sdnc, sdnc, and drools-applications. Coverage tests are incomplete, but I anticipate some simplification to this design in a couple of days; coverage will be added at that time. Issue-ID: POLICY-1625 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I4b75730e3621a9ee026ad10e557abe92df10dcf4
2020-01-16Merge "Ensure one jacoco output file"Jorge Hernandez1-0/+4
2020-01-16Ensure one jacoco output filePamela Dragosh1-0/+4
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 Hahn2-0/+10
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 upgradesHOCKLA7-8/+4
Issue-ID: POLICY-1592 Change-Id: Iaa6b61c5f1c76f3e7c2043691f4d29dbc43d144e Signed-off-by: HOCKLA <ah999m@att.com>
2020-01-10Bumped patch version for policy/modelsHOCKLA12-23/+24
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 modelsliamfallon11-26/+33
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-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.jamkhedkar58-3893/+1
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-04PNF support changes in policy/modelsRashmi Pujar5-50/+85
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-modelsliamfallon1-1/+0
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 Hernandez30-2158/+514
2019-10-25Refactor Appc LCM ModelDaniel Cruz30-2158/+514
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-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-15Fix remaining fixable Sonar issues on policy modelsliamfallon1-7/+5
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-modelsliamfallon5-96/+109
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-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-07Changes in model to integrate cds actorBruno Sakoto2-0/+47
* Create class for CDS response Issue-ID: POLICY-2088 Change-Id: I813a310f7d5123fac4bb1c3880d108391096250f Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
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 Hahn12-12/+12
Change-Id: I351d1a0ebd3c7cfa76d57297ce44ef6a6fa8c753 Issue-ID: POLICY-2045 Signed-off-by: Jim Hahn <jrh3@att.com>