aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-04-12Close DB in junitsJim Hahn4-42/+70
Modified some of the junits to close the DB. In addition, one of the junits was apparently dependent on a previous test method adding records to the DB, thus the test methods were actually order dependent, even though no annotations were used to enforce the order. Modified that method to insert the data, itself, so the test methods are no longer order dependent. Issue-ID: POLICY-3171 Change-Id: I778c12796340f2a665b4ba00588c823c925c078c Signed-off-by: Jim Hahn <jrh3@att.com>
2021-04-08Use distinct names in DB junitsJim Hahn13-21/+30
Junits for models often use the same memory DB name which may leave garbage in the DB from one test to the next. Modified the code to use distinct names for each XxxTest class. Issue-ID: POLICY-3171 Change-Id: I2a4a0b4949d532d6949f5d39396288c54d03688b Signed-off-by: Jim Hahn <jrh3@att.com>
2021-03-26Merge "Fix Sonar Issues models-tosca-simple"Jim Hahn9-16/+203
2021-03-26Fix Sonar Issues models-tosca-simplelapentafd9-16/+203
Tests refactoring to reduce number of assertions Issue-ID: POLICY-3094 Change-Id: I8a9a02100e5d103f574cf2cb89d2e924d0f56507 Signed-off-by: lapentafd <francesco.lapenta@est.tech>
2021-03-24Merge "Fix sonar issues for tests in policy-models"Jim Hahn5-116/+141
2021-03-22Merge "Delete keystores from models"Ram Krishna Verma6-5/+10
2021-03-19Fix write failure on PDP statisticsliamfallon16-34/+169
Due to the precision of time stamps being saved to the nearest second, a millisecond precision timestamp was being compared to a second precision timestamp, causing the write to fail. This change fixes that. A unit test is also added to test for this on the provider. In addition, a USE-MARIADB flag is being introduced, which allows unit tests to be run against a locally installed MariaDB instance so that the unit tests can be verified against MariaDB locally rather than H2, the default in Gerrit. Issue-ID: POLICY-3146 Change-Id: I878f160956e89506743dc074679ee81ac1c48216 Signed-off-by: liamfallon <liam.fallon@est.tech>
2021-03-19Delete keystores from modelsJim Hahn6-5/+10
The Keystores are no longer needed in the tarballs, as they are supplied externally by the CSITs and Helm charts. Deleted those files. Also modified the junits to use utils-test to generate keystores at runtime, thus deleted the junit keystore file, too. Issue-ID: POLICY-3143 Change-Id: Idd24b735a908476765d40bdcb5c741257edc7bb6 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-03-19Fix sonar issues for tests in policy-modelslapentafd5-116/+141
Tests refactoring to reduce number of assertions Issue-ID: POLICY-3094 Change-Id: I445462f0ec5d49474b10c1940c7fa12e687636de Signed-off-by: lapentafd <francesco.lapenta@est.tech>
2021-03-18Merge "Fix Sonar Issues in models-pdp"Pamela Dragosh4-14/+127
2021-03-16Update policy-keystore with newer certificatesjhh4-0/+0
Issue-ID: POLICY-3139 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Id4a882b40ef142d0414518c5d5ab90367f0bbb73 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2021-03-16Fix Sonar Issues in models-pdplapentafd4-14/+127
Tests refactoring to reduce number of assertions Issue-ID: POLICY-3094 Change-Id: I23369c341c43df71b84392501d33739453f7c81f Signed-off-by: lapentafd <francesco.lapenta@est.tech>
2021-03-15Merge "Fix Sonar Issues on policy-models-tosca"Jim Hahn8-35/+93
2021-03-15Fix Sonar Issues on policy-models-toscalapentafd8-35/+93
Tests refactoring to reduce number of assertions Removed lines 167-169 in PfKeyImplTest Issue-ID: POLICY-3094 Change-Id: I94ef11068811c81108b0fbf3e5b878d02ab25306 Signed-off-by: lapentafd <francesco.lapenta@est.tech>
2021-03-12Remove more unnecessary plugins from modelsJim Hahn3-130/+9
Issue-ID: POLICY-3126 Change-Id: If93ce1a3412cd7342a78e478ea2684ff9bf6dd97 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-03-12Address plugin-not-found issuesJim Hahn1-32/+1
Removed references to archetype-packaging and lifecycle-mapping, where unnecessary due to pom inheritance. Issue-ID: POLICY-3126 Change-Id: Ia1124da66239b57d6a05cdbdcce7866a38f59120 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-03-10Bump version to 2.5.0 in modelsJim Hahn44-47/+47
Issue-ID: POLICY-3105 Change-Id: I01fe35f16609f9b8d98fb2083c8b18fc7ce3ccf3 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-03-10Merge "Add support for localName based filtering in PfReferenceTimestamp key."Jim Hahn1-3/+8
2021-03-09Bump models to 2.4.2-SNAPSHOTJim Hahn44-44/+44
Issue-ID: POLICY-3127 Change-Id: Ie37871c54dc5e7eab0ee7d553c6b38ea0e720a29 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-03-09Release models 2.4.1 artifactsJim Hahn1-0/+4
Issue-ID: POLICY-3127 Change-Id: I2350bed3a5679ac5edb87544c732c4c094b7c028 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-03-09Add support for localName based filtering in PfReferenceTimestamp key.rameshiyer271-3/+8
Issue : Currently we have a requirement to filter control loop statistics based on the UUID of the element which is "localName" of the PfREferenceTimestamp key. Adding UUID as part of filterMap in getFiltered() method which also requires this minor change in buildFilter. Issue-ID: POLICY-3051 Signed-off-by: zrrmmua <ramesh.murugan.iyer@est.tech> Change-Id: Idb9f4fc47c439f84bf8fc784bd9e228a2e05d8e9
2021-03-08Merge "Use Date instead of Timestamp"Jim Hahn4-29/+37
2021-03-08Use Date instead of TimestampJim Hahn4-29/+37
Use of Timestamp in JPA classes appears to cause EntityNotFoundException. Changed from Timestamp back to Date. Issue-ID: POLICY-3125 Change-Id: I3ee29675849e3feda2641e9b240207c96fd975d4 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-03-05Fix 4 newly added Sonar bugslapentafd2-4/+4
Added casting for 4 asserts in policy/models/base Issue-ID: POLICY-3094 Change-Id: Ibc97be3eca366a7e9b8b9611bc284f2473acff6e Signed-off-by: lapentafd <francesco.lapenta@est.tech>
2021-03-04Merge "Refactor models for common type handling"Liam Fallon16-180/+247
2021-03-04Merge "Fix sonar issues on policy-models"Jim Hahn8-152/+251
2021-03-03Refactor models for common type handlingliamfallon16-180/+247
Currently we have handling for "type" and "type_version" on TOSCA Policy class. However, the concept of a "type" and "type_version" also exists on the ToscaCapabilityAssignment, the ToscaNodeTemplate, and the ToscaRequriement classes. This review makes the type handling on Policy generic, thus extending it to the other three types. Issue-ID: POLICY-2983 Change-Id: Ia20e3a8c485f4841257075df08e0784eac415770 Signed-off-by: liamfallon <liam.fallon@est.tech>
2021-03-03Fix sonar issues on policy-modelslapentafd8-152/+251
Tests refactoring to reduce number of assertions to less then 25 Issue-ID: POLICY-3094 Change-Id: Icd3d83c7f8168dd81df13a584229eab36c646f37 Signed-off-by: lapentafd <francesco.lapenta@est.tech>
2021-03-03Fix Reference Key columns persistence issue in dbrameshiyer274-64/+181
Problem: When PfReferenceTimestamp Key is persisted in db, the parent class fields are ignored which causes inconsistent data while saving and fetching in db. Fix: JPA is not supporting inheritance in @Embeddable classes. Hence included the super class as @Embedded property in PfReferenceTimestamp key. @Embedded properties are unable to be queried directly. Slightly modified Dao methods to support querying @embedded fields. Issue-ID: POLICY-3049 Signed-off-by: zrrmmua <ramesh.murugan.iyer@est.tech> Change-Id: I5c2e03a5ae98525764a64dd6cce1a1298c5f9816
2021-02-25Merge "Fix Null key issue in PfReferenceTimestampKey"Liam Fallon2-3/+8
2021-02-25Fix Null key issue in PfReferenceTimestampKeyrameshiyer272-3/+8
isNUllKey check for PfReferenceTimestamp key is always returning false as the parent class is validating the child object in its method which has additional parameters (timestamp). Fixing the issue by validating only the fields of parent class. Issue-ID: POLICY-3069 Signed-off-by: zrrmmua <ramesh.murugan.iyer@est.tech> Change-Id: Ie22d09552c9d0cedb7535bda359df0d70e1ebe77
2021-02-24Update info.yaml in modelsRam Krishna Verma1-2/+2
Issue-ID: POLICY-3028 Change-Id: I9e3038fed7b4322cbf050fa56ffe77ee01e50a20 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2021-02-23Bump models to 2.4.1-SNAPSHOTRam Krishna Verma44-44/+44
Issue-ID: POLICY-3088 Change-Id: I7f6cc0ab5299200315c78f6e6c79c79349d2608c Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2021-02-23Release models 2.4.0 versionRam Krishna Verma1-0/+4
Issue-ID: POLICY-3088 Change-Id: I19c9020011dc4145894f726c1327670d409a7d78 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2021-02-23Point to non-snapshots in modelsJim Hahn1-2/+2
Issue-ID: POLICY-3088 Change-Id: I2789f3435514de5ef2be3f07f8419434bda89d6d Signed-off-by: Jim Hahn <jrh3@att.com>
2021-02-19Refactor timestamp property in policy models to use Instantrameshiyer2723-219/+244
Updated JPA classes to use java.sql.TImestamp rather than Instant. Issue-ID: POLICY-3069 Signed-off-by: zrrmmua <ramesh.murugan.iyer@est.tech> Change-Id: If5b874ec96931d4b8dd142d46a9980e83a4708fc
2021-02-18Merge "Remove more duplicate code from models"Ram Krishna Verma6-182/+214
2021-02-18Merge "Use new version of A&AI APIs"Ram Krishna Verma4-195/+11
2021-02-17Add time and date attributes to DecisionRequestPamela Dragosh1-1/+21
These are optional for clients, but may be necessary in configurations where the application enforcing a guard is running in a different time zone. Allows some flexibility instead of always using the time zone that the xacml pdp is running in. Issue-ID: POLICY-2810 Change-Id: I4057e5956e59803cc9505fae0ee4e2f67eaf0358 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2021-02-17Remove more duplicate code from modelsJim Hahn6-182/+214
Addressed sonar "duplicate code" issue by extracting a common ToscaNameVersion class from the XxxIdentifier classes. Also removed junit test for class that no longer exists and renamed another junit to match the renaming of the class being tested. Issue-ID: POLICY-2905 Change-Id: I4a28cd7de2478f2771a864439c0b440ad8310299 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-02-17Use new version of A&AI APIsJim Hahn4-195/+11
Just changed the version numbers; the APIs appear to be the same otherwise. Also removed unused APIs from the A&AI simulator. Issue-ID: POLICY-2788 Change-Id: I8c0ae11c1e42f487b34286d5dfd4ca536bb2c07b Signed-off-by: Jim Hahn <jrh3@att.com>
2021-02-17Fix sonars from removal of duplicate codeJim Hahn5-13/+347
The work to remove duplicate code from models introduced as many new sonars as it eliminated. :-( Addressed the following new issues: - visibility of constructor - use of more specific assertThat() calls Also added two junit test file that were somehow previously left out. Issue-ID: POLICY-2905 Change-Id: I7a0206bd157412d3c6d98bfe21797f106b37ac65 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-02-17PAP Deployment API changes - change url to uria.sreekumar2-10/+17
Change-Id: I6fa4b001a0c4573a34e1cefe0d32ca969ca5096e Issue-ID: POLICY-2526 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2021-02-16Merge "Fix duplicate code in Jpa classes"Pamela Dragosh25-766/+870
2021-02-16Add PfReference Timestamp key in policy-models-base to support timestamprameshiyer272-0/+375
property Issue-ID: POLICY-3011 Signed-off-by: zrrmmua <ramesh.murugan.iyer@est.tech> Change-Id: I7a9db3a4fb0345e0979952e5c086523cc1d960f9
2021-02-16Merge "Updating PAP deployment API to reflect actual status"Liam Fallon2-0/+70
2021-02-16Fix duplicate code in Jpa classesJim Hahn25-766/+870
Addressed the following issues: - remove duplicate code; extracted a common class containing properties Issue-ID: POLICY-2905 Change-Id: I80c423ab45c0c6823d338a034762d222ec334288 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-02-16Fix the Naming policy examplesebdet1-2/+2
Change the attribute derived_from of the policy.data.increment-sequence attribute in the Naming policy example. It should inherit from tosca.datatypes.Root Issue-ID: POLICY-3067 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I7a62b8c662b90a8481bb609d6a39e33ab9e7dada
2021-02-15Updating PAP deployment API to reflect actual statusa.sreekumar2-0/+70
Change-Id: I1fb0232d2f5fe37e95e87babb233a824212439ff Issue-ID: POLICY-2526 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2021-02-15Merge "Use type adapters from common"Ram Krishna Verma5-168/+34