summaryrefslogtreecommitdiffstats
path: root/models-sim
AgeCommit message (Collapse)AuthorFilesLines
2020-09-04Revert "point to 2.1.0 policy-alpine base - model-sim"Jim Hahn4-5/+13
This reverts commit e46f74d64fe69d33d5038704b64993aa9cab59fc. Reason for revert: some CSITs broken because the can't find the image Issue-ID: POLICY-2789 Change-Id: Id6355c21789281a3f25467b3bd6e2e48d22533f5 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-09-04point to 2.1.0 policy-alpine base - model-simTaka Cho4-13/+5
In G-rel, using 2.1.0 base. Issue-ID: POLICY-2789 Change-Id: I165debaf20267c0b1c3141bff805a29595f1eccf Signed-off-by: Taka Cho <takamune.cho@att.com>
2020-08-27Fix random failures in dmaap-simJim Hahn1-5/+53
Modified the code to use a separate topic for the format tests, as well as a separate consumer name for each test. Issue-ID: POLICY-2749 Change-Id: Ia93f17109b761e98a4f676066024b51dd9024dc0 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-08-25update keystore certTaka Cho1-0/+0
new expiration date is 3/17/2021 Issue-ID: POLICY-2795 Change-Id: I6c4b636b48ca2aef8165c1f4fd19067b242aedb4 Signed-off-by: Taka Cho <takamune.cho@att.com>
2020-08-14Remove annotations from dmaap common test classJim Hahn4-82/+43
Jenkins builds are randomly failing in the junits for the dmaap simulator. From the console output, it appears that the simulator is being shut down before all of the test methods have executed. Moved the code for managing the "Main" object from the common superclass to the only subclass that needed it. Issue-ID: POLICY-2749 Change-Id: I2615bbef9b790dbb633ed7f123aeb3f880826862 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-07-31Allocate unique port for dmaap simulator junitsJim Hahn4-17/+28
The junits for the dmaap simulator were randomly failing, because the port was already in use. Modified the junits to allocate their own, individual ports. Issue-ID: POLICY-2749 Change-Id: I3f3858091ee8f36ed00346ad9fa002a76d0348ae Signed-off-by: Jim Hahn <jrh3@att.com>
2020-07-21Fix some sonars in policy-modelsJim Hahn2-6/+8
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-09Bump policy/models to 2.3.1-SNAPSHOTRam Krishna Verma4-4/+4
Issue-ID: POLICY-2695 Change-Id: I64473cc81ae48942010472f15faac75c13cb0b7d Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-06-18Changes for Checkstyle 8.32liamfallon12-15/+4
Issue-ID: POLICY-2188 Change-Id: I6db16763c1d2d80ff934302081a8dfc16afa7d9a Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-06-12Merge "Change related to log4j removal needed in models"Ram Krishna Verma1-3/+2
2020-06-12Remove logback.xml files bundled as part of jara.sreekumar9-177/+6
Change-Id: I4d603ea67eca5d8d75b9df004e1ff4a6be2b2a9e Issue-ID: POLICY-2627 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2020-06-11Change related to log4j removal needed in modelsuj426b1-3/+2
Change-Id: I449aef2c1f83edecc88c379525b8da6c80e9d35f Issue-ID: POLICY-2623 Signed-off-by: uj426b <uj426b@att.com>
2020-05-19Bump models master to 2.3.0-SNAPSHOTRam Krishna Verma4-4/+4
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 Verma4-4/+4
Issue-ID: POLICY-2514 Change-Id: Ie482926a56a5250be5d78a97aa7c1c19311a292c Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-04-24Bump models patch 2.2.6-SNAPSHOTPamela Dragosh4-4/+4
Also point to parent, common snapshots Issue-ID: POLICY-2510 Change-Id: Iad79c341bcfb8cb6bb828ee71e199ba3bb9a838b Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-04-17Updating pdp-simulator as per recent changes to send PdpGroup in statusa.sreekumar8-9/+15
Change-Id: Ic2ad6bd7f65633eef73d6432f244be77d7c760f9 Issue-ID: POLICY-2499 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-04-16Fixing minor bug in policy-models/pdp-simulator scripta.sreekumar1-2/+2
Change-Id: I3b7bdfdd2fdd73b38cf7996457f6bea735752d46 Issue-ID: POLICY-2499 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-04-14Bump models to 2.2.5-SNAPSHOTRam Krishna Verma4-4/+4
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 Dragosh4-4/+4
Issue-ID: POLICY-2378 Change-Id: I51c6c57bdcc0299c25b5ee05f47c20f4542bc02d Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-04-09Disable sonar main args for modelsJim Hahn3-1/+14
Issue-ID: POLICY-2305 Change-Id: Ie8c45fb767ec9b2f9b1b541532fede52306c36b4 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-04-07Address sonar issues in modelsJim Hahn6-10/+23
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-03-27Cleanup sonar bugs and security hotspotPamela Dragosh2-5/+5
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-25Bump models 2.2.3-SNAPSHOTPamela Dragosh4-4/+4
Released 2.2.2 Issue-ID: POLICY-2378 Change-Id: I829f0dfc88aeaf1f9b7efad91c983628f2a5d706 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-25Cleanup eclipse warningsPamela Dragosh1-3/+1
Issue-ID: POLICY-2165 Change-Id: Iaad54af1b1210fe96fa44dcaa609834c46557877 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-24Bump policy-models to version 2.2.2-SNAPSHOTliamfallon4-4/+4
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 Hahn1-0/+18
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-20Bug fixes in models simulatorsJim Hahn3-33/+57
Fixed these issues: - topics weren't started - appc topics were reversed - prevent appc simulator from responding to a response (i.e., infinite loop) Issue-ID: POLICY-2434 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I1f43be72d35f874fec98f48f1a112c055c00eee5
2020-03-20Add docker file for all simulatorsJim Hahn24-0/+1472
Some CSITs may require multiple simulators. This adds a class that will start all of the simulators. A tarball is generated from which a docker image can be built. Added simulators for Topics: appc and appc-lcm. Fixed licenses in files in packages directory. Fixed per review comments: - add version to Dockerfile Issue-ID: POLICY-2434 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: Id7aa9cb5a5874f7b4185273ab0d2c074198554ff
2020-03-17renew policy certs till 03/17/2021jhh2-0/+0
Issue-ID: POLICY-2402 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I42919180d73058bc78cc70a29a6d5d45823aa9eb
2020-02-18Add safe entity delete, fix multiple entity getliamfallon1-20/+0
This review implements checks on whether entities are being used or referenced propr to allowing deletes. The review also fixes bugs on multiple entity get returning 4040 not found Issue-ID: POLICY-1402 Change-Id: I9cebb9a873098740e9ff4be6284d6307e19838bd Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-01-17Update Dockerfiles for java11 in policy-modelsJim Hahn6-42/+8
Also modified docker build scripts so they work with SNAPSHOT or release versions of the tarballs. Issue-ID: POLICY-1586 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: Ib5b8c0b83d7736180ab213b0b67d457eab7ee48e
2020-01-16Ensure one jacoco output filePamela Dragosh1-0/+5
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-10Remove deprecated methods from modelsJim Hahn1-6/+5
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 upgradesHOCKLA4-12/+14
Issue-ID: POLICY-1592 Change-Id: Iaa6b61c5f1c76f3e7c2043691f4d29dbc43d144e Signed-off-by: HOCKLA <ah999m@att.com>
2020-01-10Bumped patch version for policy/modelsHOCKLA3-4/+5
Issue-ID: POLICY-1592 Change-Id: Iafc35fe53e28c815a79041f289cb17b6354ceccd Signed-off-by: HOCKLA <ah999m@att.com>
2020-01-10Remove supportedPolicyTypes from PdpStatusramverma1-3/+2
Removing supportedPolicyTypes from PdpStatus in policy/models as it is no longer expected from the Pdps to send it as part of the heartbeat or initial registration message. Instead the PdpGroupName is expected from the Pdps in the initial registration message. Issue-ID: POLICY-2256 Change-Id: I14b76a737027e146d69d89c2fe2c3f098a89e196 Signed-off-by: ramverma <ram.krishna.verma@est.tech>
2019-12-11Fix timeout bug in dmaap simulatorJim Hahn4-10/+46
Also added a start script that can be used to execute the simulator in stand-alone mode (i.e., outside of a docker container). Change-Id: I26550ad36cfd2448c96cf0c09fec24e60ffd815b Issue-ID: POLICY-2298 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-10-14Clean up minor things in policy-modelsliamfallon1-6/+12
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-11Fix dmaap simulator junitJim Hahn1-49/+42
Modified the code to leave the topics open through-out the test cases, and simply clear the queues between each test case. Hopefully that will fix the EndToEndTest junit in the dmaap simulator. Change-Id: I3658df4dbc70cd47fec1cfb84c7a2365133105ff Issue-ID: POLICY-2144 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-10-07Flesh out DMaaP simulatorJim Hahn36-415/+2805
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-09-10Bump versions for models masterJim Hahn3-3/+3
Change-Id: I351d1a0ebd3c7cfa76d57297ce44ef6a6fa8c753 Issue-ID: POLICY-2045 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-08-22update keystorejhh2-0/+0
Issue-ID: POLICY-1988 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I565d8ca294750b748ba2709eedab032cd5eb0936 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2019-08-06Bump version in policy/modelsJim Hahn3-3/+3
Change-Id: Ie8761ccbd05edc80af51e0ae5e8c90a4dfaf7715 Issue-ID: POLICY-1965 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-08-05Bump versions to 2.1.2jhh3-3/+3
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 Hahn5-28/+9
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-08Fix models due to sonar changes in commonJim Hahn3-8/+9
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>
2019-07-05Remove topic.properties and incorporate into overall config file for ↵a.sreekumar18-118/+149
pdp-simulator Change-Id: Iac882c7ffb28a80ef474d15a90307cd68b78d417 Issue-ID: POLICY-1744 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-06-21Bump models to 2.1.1 SNAPSHOTPamela Dragosh3-3/+3
Released 2.1.0 Issue-ID: POLICY-1737 Change-Id: I2bc12dd4a9cdad7a867e3d710bb427493de6c7f4 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-06-18Change getCanonicalName to getName in modelsJim Hahn2-2/+4
Per javadocs, getName() should generally be used instead of Class.getCanonicalName(). This change only applies to classes; it does not apply to File objects. Note: this impacts the output from PfValidationMessage, as it will now list the names of embedded classes with a "$" separator instead of a ".". Change-Id: I2cd64bc0281dd324bf80eac57335a7299a516447 Issue-ID: POLICY-1646 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-06-17Fix simple sonar issues in models: errors to sim-pdpJim Hahn11-96/+64
models-errors models-pdp models-provider models-sim-pdp Also had to work around this checkstyle issue: src/test/java/org/onap/policy/models/sim/pdp/comm/ TestPdpStateChangeListener.java:[77,32] (javadoc) JavadocMethod: Unable to get class information for @throws tag 'PdpSimulatorException'. The error appears to be bogus, as PdpSimulatorException is on the "throws" line thus indicating that the class IS accessible to the above java file. Change-Id: Iaca58457a32b00121000fc0bab12a8be4cb19bac Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>