summaryrefslogtreecommitdiffstats
path: root/models-interactions/model-impl
AgeCommit message (Collapse)AuthorFilesLines
2020-08-24Remove deprecated SDC and Model-yamlPamela Dragosh16-1205/+0
Deprecated as we now use TOSCA and the SDC catalog objects isn't useful for control loop design and implementation. Issue-ID: POLICY-2428 Change-Id: Ib4adfbf25ba70c3cad47a8494333a1f20a5c4e23 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-08-20Sonar Fixes policy/models, removing model-yamluj426b1-30/+28
Change-Id: Icd82ea1aef90e4d638b13958519aac5ed5a53f73 Issue-ID: POLICY-2714 Signed-off-by: uj426b <uj426b@att.com>
2020-08-06Exclude javaparser due to license issueJim Hahn1-0/+6
javaparser is included indirectly by aai-schema jar. Modified the pom to excluded javaparser when including aai-schema jar. Verified that models aai code still works and that drools-apps use case tests still work. Issue-ID: POLICY-2736 Change-Id: Iba137cf7ee4be6f2e35e3053413a4a9068860823 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-07-21Fix some sonars in policy-modelsJim Hahn39-480/+400
Fixed the following sonar issues in some of the project directories: - use assertNull, assertEquals, etc. - swap assertEquals arguments - extract a constant - don't invoke toString() in logger calls - TODOs - generic types Issue-ID: POLICY-2714 Change-Id: Id8803f9bf617ea9fc173a67b8606600709b55bdc Signed-off-by: Jim Hahn <jrh3@att.com>
2020-07-13Remove legacy actor code from modelsJim Hahn6-1488/+0
Deleted legacy actor code. That includes deleting most of the XxxManager classes. Issue-ID: POLICY-2559 Change-Id: I1ef1b900ca1d23e88da64b2c95a18986feb1b765 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-07-09Bump policy/models to 2.3.1-SNAPSHOTRam Krishna Verma13-13/+13
Issue-ID: POLICY-2695 Change-Id: I64473cc81ae48942010472f15faac75c13cb0b7d Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-06-26Clean up of Pair classes - modelswaynedunican10-336/+283
Removed Pair class from policy-models and replaced with Aoache Common Pair class Issue-ID: POLICY-2202 Change-Id: I786467ac02ecb2d433dba94deba45785be3dcf23 Signed-off-by: waynedunican <wayne.dunican@est.tech>
2020-06-24Updating models dependencies to latest versionsRossC1-1/+1
Issue-ID: POLICY-2387 Change-Id: Id89dac64139490f6d9b83b295cfe99c43ed657cf Signed-off-by: RossC <ross.carter@est.tech>
2020-06-18Changes for Checkstyle 8.32liamfallon66-125/+52
Issue-ID: POLICY-2188 Change-Id: I6db16763c1d2d80ff934302081a8dfc16afa7d9a Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-06-11Fixing issue with Jacoco coverage being stored above project directoryRossC1-6/+6
Issue-ID: POLICY-2497 Change-Id: Ia0df647c9adc25dea51d4e5baab0191daa1c877e Signed-off-by: RossC <ross.carter@est.tech>
2020-05-29Copy Dbao from drools-apps to modelsJim Hahn4-4/+186
Drools-apps and xacml-pdp each have their own copy of Dbao. Made a copy of it in models as a first step toward eliminating the other copies. Also changed its package name be consistent with the other interface package names and renamed it to OperationsHistory. Also reordered the modules in the pom to make it alphabetical. Issue-ID: POLICY-2581 Change-Id: I45afa680c6344eeac6b2d35c9e4f04a5ba7af431 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-05-19Bump models master to 2.3.0-SNAPSHOTRam Krishna Verma12-12/+12
Issue-ID: POLICY-2514 Change-Id: I6a3d4e588a0ff0d15fccf49de66c51ea7d709b4b Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-05-19Bump models to 2.2.7-SNAPSHOTRam Krishna Verma12-12/+12
Issue-ID: POLICY-2514 Change-Id: Ie482926a56a5250be5d78a97aa7c1c19311a292c Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-05-15Cannot parse finishTime in legacy SO responsesJim Hahn2-2/+73
Adding the actual sample responses to the SO simulator broke the drools-apps junit for usecases. Fixed (in theory) by updating the legacy SO actor to properly decode the finishTime. Refactored the new SO actor, extracting the type adapter into its own class file so it could be shared between the new and legacy actors. Issue-ID: POLICY-2570 Change-Id: I061b603172440b1a91da16d09b4f2a0d289dfc41 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-05-12Fix race condition in AaiCqResponseJim Hahn4-75/+66
The JAXB unmarshaller used by AaiCqResponse is not thread safe. As a result, if two responses are decoded at the same time, it will generate exceptions. Issue-ID: POLICY-2556 Change-Id: I5e81d5f3c39b9ba321c146dc6f4f73e558aaca3e Signed-off-by: Jim Hahn <jrh3@att.com>
2020-04-27Remove provided scope for endpoints in model-impl/cdsa.sreekumar1-1/+0
Change-Id: Ic3571df8ed874267fb803d1f384ec5cb02fb80bb Issue-ID: POLICY-2524 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2020-04-24Bump models patch 2.2.6-SNAPSHOTPamela Dragosh12-12/+12
Also point to parent, common snapshots Issue-ID: POLICY-2510 Change-Id: Iad79c341bcfb8cb6bb828ee71e199ba3bb9a838b Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-04-17Add PNF support to new CDS actorJim Hahn4-3/+35
Made the following updates: - added new A&AI get-PNF Operation by refactoring AaiGetOperation, separating out Tenant and PNF operations - added PNF support to the CDS actor - added logging to the CDS Handler - added get-pnf to the A&AI simulator Issue-ID: POLICY-2505 Change-Id: Iff140e7c864f762790d8e2ecaba62c161c859e6e Signed-off-by: Jim Hahn <jrh3@att.com>
2020-04-14Bump models to 2.2.5-SNAPSHOTRam Krishna Verma12-12/+12
Issue-ID: POLICY-2378 Change-Id: I5461bafd3c2d19f4f457da0816bba117a2d8b550 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-04-11Bump models patch 2.2.4-SNAPSHOTPamela Dragosh12-12/+12
Issue-ID: POLICY-2378 Change-Id: I51c6c57bdcc0299c25b5ee05f47c20f4542bc02d Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-04-08More sonar fixes in modelsJim Hahn2-2/+9
Addressed the following sonar issues: - missing assert in junit - duplicate code blocks - fixed those in the simulators - leaving the others in the concept classes for Liam/"G" Issue-ID: POLICY-2305 Change-Id: Icfe80afb378b4cdec4de3d33d0e33227e04845d8 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-04-07Address sonar issues in modelsJim Hahn22-735/+218
Addressed the following sonar issues: - use RE2 instead of java.util Pattern for "+" and "*" - don't use deprecated methods - for Date(long), sonar appeared not to parse the argument's type correctly. Modified the code slightly to make sonar happy - duplicate blocks of code - either log or throw - missing assert in junit - for SDNR & VFC, eliminated threads, as they are unnecessary - duplicate code block in different branches - useless assignments - redeclaring abstract methods - cyclomatic complexity - used lombok in some cases (e.g., EqualsAndHashCode) - assert argument order - actually deleted ControlLoopTargetType, because it is not needed and sonar complains regardless of which order is used - add private constructor to utility classes - use StandardCharsets instead of literals Also: - added logback-test.xml to SO to eliminate the voluminous output from the junit test Issue-ID: POLICY-2305 Change-Id: I586c331781bedbd54a115a71847d04d293689445 Signed-off-by: Jim Hahn <jrh3@att.com>
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