policy/models.git
4 years agoReplace copyTo methods with copy constructors 54/94354/3
Jim Hahn [Mon, 26 Aug 2019 16:20:27 +0000 (12:20 -0400)]
Replace copyTo methods with copy constructors

Deleted the copyTo() method from PfConcepts and replaced uses
with deep-copy constructors.  Also added mapMap() and makeCopy()
methods to PfUtils to facilitate.

Change-Id: Id6391bb806ef0dfab6c1089278bf2b514c7e303e
Issue-ID: POLICY-1600
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoupdate keystore 75/94175/2
jhh [Fri, 23 Aug 2019 03:40:10 +0000 (22:40 -0500)]
update keystore

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>
4 years agoReview maven dependency for snakeyaml 03/92903/2
Bruno Sakoto [Wed, 7 Aug 2019 14:23:10 +0000 (10:23 -0400)]
Review maven dependency for snakeyaml

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

4 years agoreplace hashCode function with compareTo 48/92848/1
Henry.Sun [Wed, 7 Aug 2019 03:41:50 +0000 (03:41 +0000)]
replace hashCode function with compareTo

Issue-ID: POLICY-1600
Change-Id: If660cbe84424e492b6db3ab11ef97b37f046b3aa
Signed-off-by: Henry.Sun <henry.a.sun@est.tech>
4 years agoBump version in policy/models 03/92803/2
Jim Hahn [Tue, 6 Aug 2019 13:52:31 +0000 (09:52 -0400)]
Bump version in policy/models

Change-Id: Ie8761ccbd05edc80af51e0ae5e8c90a4dfaf7715
Issue-ID: POLICY-1965
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoAdd release file for 2.1.2 34/92734/1
jhh [Mon, 5 Aug 2019 22:06:43 +0000 (17:06 -0500)]
Add release file for 2.1.2

Issue-ID: POLICY-1953
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I09cb51c15330d76a746a2671133ef7145d776b28

4 years agoBump versions to 2.1.2 18/92718/3
jhh [Mon, 5 Aug 2019 18:25:22 +0000 (13:25 -0500)]
Bump versions to 2.1.2

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>
4 years agoAdd self-release 2.1.1 file 46/92646/1
jhh [Sun, 4 Aug 2019 22:21:46 +0000 (17:21 -0500)]
Add self-release 2.1.1 file

Issue-ID: POLICY-1953
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I8cc6a79507817690139db04ac8bd1808b90da9d1
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
4 years agoPoint to policy/common 1.5.1 released version 34/92634/1
jhh [Sun, 4 Aug 2019 00:10:30 +0000 (19:10 -0500)]
Point to policy/common 1.5.1 released version

Issue-ID: POLICY-1953
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I4c2739dac8d9a0648b419635c6198c7dfa3fb720

4 years agoUse new addTopic() method in models 03/92303/2
Jim Hahn [Tue, 30 Jul 2019 14:33:13 +0000 (10:33 -0400)]
Use new addTopic() method in models

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>
4 years agoRemoved all mention of www.example.org from tests 26/91026/3
JohnKeeney [Tue, 9 Jul 2019 12:32:41 +0000 (12:32 +0000)]
Removed all mention of www.example.org from tests
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>
4 years agoFix models due to sonar changes in common 35/91035/1
Jim Hahn [Mon, 8 Jul 2019 13:53:26 +0000 (09:53 -0400)]
Fix models due to sonar changes in common

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>
4 years agoRemove topic.properties and incorporate into overall config file for pdp-simulator 48/90948/1
a.sreekumar [Fri, 5 Jul 2019 13:00:35 +0000 (13:00 +0000)]
Remove topic.properties and incorporate into overall config file for pdp-simulator

Change-Id: Iac882c7ffb28a80ef474d15a90307cd68b78d417
Issue-ID: POLICY-1744
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
4 years agoUse ToStringTester from utils-test 83/90583/1
ramverma [Thu, 27 Jun 2019 11:11:24 +0000 (11:11 +0000)]
Use ToStringTester from utils-test

Changing ToStringTester from utils to utils-test
Bump up common to 1.5.1-SNAPSHOT

Change-Id: I7427673c73bd1cc52d5f24a0542e89eb33a39ae8
Issue-ID: POLICY-1746
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
4 years agoBump models to 2.1.1 SNAPSHOT 35/90335/1
Pamela Dragosh [Fri, 21 Jun 2019 20:29:00 +0000 (16:29 -0400)]
Bump models to 2.1.1 SNAPSHOT

Released 2.1.0

Issue-ID: POLICY-1737
Change-Id: I2bc12dd4a9cdad7a867e3d710bb427493de6c7f4
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoUpgrade to release common 1.5.0 05/90305/1 2.1.0
Pamela Dragosh [Fri, 21 Jun 2019 13:14:39 +0000 (09:14 -0400)]
Upgrade to release common 1.5.0

Released

Issue-ID: POLICY-1737
Change-Id: I9e448a340643a5cc3a9fade226e6e40fcc63e1d9
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoMerge "Upgrade to release 3.0.0 parent"
Jim Hahn [Thu, 20 Jun 2019 20:42:22 +0000 (20:42 +0000)]
Merge "Upgrade to release 3.0.0 parent"

4 years agoUpgrade to release 3.0.0 parent 51/90251/1
Pamela Dragosh [Thu, 20 Jun 2019 20:11:44 +0000 (16:11 -0400)]
Upgrade to release 3.0.0 parent

Policy/parent released

Issue-ID: POLICY-1737
Change-Id: I34a4af77caf8e371089480b467833119d07ae937
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoAdding pdps class for pdpgroup healthcheck 27/90227/1
ramverma [Thu, 20 Jun 2019 12:26:15 +0000 (12:26 +0000)]
Adding pdps class for pdpgroup healthcheck

Adding Pdps class to hold the response for PdpGroup Heatlcheck REST API
of PAP.

Change-Id: I69b4979c8fdaefd3451fa0e9286dace2485cdc73
Issue-ID: POLICY-1770
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
4 years agoMerge "Change getCanonicalName to getName in models"
Pamela Dragosh [Wed, 19 Jun 2019 14:25:37 +0000 (14:25 +0000)]
Merge "Change getCanonicalName to getName in models"

4 years agoChange getCanonicalName to getName in models 03/90103/1
Jim Hahn [Tue, 18 Jun 2019 16:47:14 +0000 (12:47 -0400)]
Change getCanonicalName to getName in models

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>
4 years agoRemoved unused imports from models 96/90096/1
Jim Hahn [Tue, 18 Jun 2019 15:20:24 +0000 (11:20 -0400)]
Removed unused imports from models

Change-Id: I1f64127e1d783a962304c0add1524a57d6c24e4b
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoMerge "Fix simple sonar issues in models: errors to sim-pdp"
Pamela Dragosh [Tue, 18 Jun 2019 12:22:21 +0000 (12:22 +0000)]
Merge "Fix simple sonar issues in models: errors to sim-pdp"

4 years agoMerge "Fix the bug of cannot return multiple versions of particular tosca policy...
Pamela Dragosh [Tue, 18 Jun 2019 12:20:57 +0000 (12:20 +0000)]
Merge "Fix the bug of cannot return multiple versions of particular tosca policy and policy type"

4 years agoMerge "Fix more sonar issues in models: yaml to dao"
Pamela Dragosh [Tue, 18 Jun 2019 12:17:01 +0000 (12:17 +0000)]
Merge "Fix more sonar issues in models: yaml to dao"

4 years agoMerge "Fix simple sonar issues in models-tosca"
Liam Fallon [Tue, 18 Jun 2019 12:09:49 +0000 (12:09 +0000)]
Merge "Fix simple sonar issues in models-tosca"

4 years agoFix simple sonar issues in models: errors to sim-pdp 23/90023/6
Jim Hahn [Fri, 14 Jun 2019 19:02:00 +0000 (15:02 -0400)]
Fix simple sonar issues in models: errors to sim-pdp

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>
4 years agoMerge "Fix sonar issues in models: sdc to vfc"
Jorge Hernandez [Mon, 17 Jun 2019 21:13:40 +0000 (21:13 +0000)]
Merge "Fix sonar issues in models: sdc to vfc"

4 years agoFix the bug of cannot return multiple versions of particular tosca policy and policy... 38/90038/1
Chenfei Gao [Mon, 17 Jun 2019 20:54:28 +0000 (16:54 -0400)]
Fix the bug of cannot return multiple versions of particular tosca policy and policy type

Issue-ID: POLICY-1807
Change-Id: I831c720993930a911d301a82b59a74cda7cb0c50
Signed-off-by: Chenfei Gao <cgao@research.att.com>
4 years agoFix more sonar issues in models: yaml to dao 36/89936/6
Jim Hahn [Thu, 13 Jun 2019 22:18:39 +0000 (18:18 -0400)]
Fix more sonar issues in models: yaml to dao

Extracted common Strings into constants.
Reduced "cyclomatic complexity" in some return statements.
Used assertj to eliminate "log or rethrow" messages in junit tests.

models-yaml
models-base
models-dao

Change-Id: I20548d4cf5e67d085245e0d54df8ba0116ec86ec
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoFix sonar issues in models: sdc to vfc 24/90024/2
Jim Hahn [Fri, 14 Jun 2019 23:20:55 +0000 (19:20 -0400)]
Fix sonar issues in models: sdc to vfc

sdc
sdnc
snr
so
vfc

Still haven't done the "rest" project yet, as still awaiting removal
of www.examples.org.

Change-Id: Icc4948799e2423bd4568232ee5629b88b7ecb996
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoFix simple sonar issues in models-tosca 22/90022/1
Jim Hahn [Fri, 14 Jun 2019 22:20:38 +0000 (18:20 -0400)]
Fix simple sonar issues in models-tosca

Change-Id: I36a91fbbd95df7aff2656a97dd09b778cdbb798f
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoFix simple sonar issues in models 41/89841/4
Jim Hahn [Thu, 13 Jun 2019 14:39:55 +0000 (10:39 -0400)]
Fix simple sonar issues in models

Added @FunctionalInterface where needed.
Replaced anonymous classes with lambda expressions.
Replaced duplicate strings with a constant.
Removed unused BeforeClass & AfterClass test methods.
Removed some trailing spaces.

Fixed:
aai
actor.appc
actor.appclcm
actor.sdnc
actor.sdnr
actor.so
actor.vfc
actorServiceProvider
appc
appclcm
cds
events

Change-Id: I0e21cbb10db6d1217bbd0e00e6dd4fac3eb84e31
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoMerge "Allow multiple versions of entities to be returned"
Jorge Hernandez [Mon, 17 Jun 2019 13:43:19 +0000 (13:43 +0000)]
Merge "Allow multiple versions of entities to be returned"

4 years agoMerge "Remove isNullVersion from identifier class"
Liam Fallon [Mon, 17 Jun 2019 08:51:21 +0000 (08:51 +0000)]
Merge "Remove isNullVersion from identifier class"

4 years agoFix copyright 14/89914/1
Pamela Dragosh [Fri, 14 Jun 2019 17:14:32 +0000 (13:14 -0400)]
Fix copyright

Missed on earlier reviews

Issue-ID: POLICY-1855
Change-Id: Ib172059e105e2940dce43f5da79b81dbd80f527d
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoAllow multiple versions of entities to be returned 55/89855/1
liamfallon [Fri, 14 Jun 2019 07:38:26 +0000 (07:38 +0000)]
Allow multiple versions of entities to be returned

Fix .gitreviw file to point at "master" rather than "dublin"

Allow return of multiple versions of policy types and data types in
TOSCA service templates and multiple policies in TOSCA topology
templates.

Because the return type is a list of singleton maps, utility methods
were added to return flat maps of poliicy types, data types, and
policies keyed by a compound ToscaEntityKey name/version key.

Issue-ID: POLICY-1807
Change-Id: I355038aaca26f41064d0e3cb3b45b1de2294cf5f
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agoFix fieldname for guard 50/89850/1
Pamela Dragosh [Thu, 13 Jun 2019 23:44:56 +0000 (19:44 -0400)]
Fix fieldname for guard

The correct name is 'clname'.

Issue-ID: POLICY-1855
Change-Id: I27314576bb84615ccf225f0b57bfd710e2015e60
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
(cherry picked from commit f2b9a074416f814f8b4c071296a0abaf373db1b9)

4 years agoMerge "Fixed SO request creation"
Pamela Dragosh [Fri, 14 Jun 2019 02:22:53 +0000 (02:22 +0000)]
Merge "Fixed SO request creation"

4 years agoFixed SO request creation 47/89847/1
pramod.jamkhedkar [Fri, 14 Jun 2019 02:08:07 +0000 (22:08 -0400)]
Fixed SO request creation

Fixed the SO creation from aai custom query.

Issue-ID: POLICY-1856
Change-Id: I5842a4dccbd61c774d84c8e897a876eae76d3a79
Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
4 years agoRemove isNullVersion from identifier class 12/89812/1
Jim Hahn [Thu, 13 Jun 2019 14:02:07 +0000 (10:02 -0400)]
Remove isNullVersion from identifier class

ToscaPolicyIdentifierOptVersion had an isNullVersion() method
which is not being used.  Removed this version, thus eliminating
the need to include a jackson @JsonIgnore annotation.

Change-Id: I03309099a1173591736f69b82b549ebce7994169
Issue-ID: POLICY-1653
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoMerge "GRPC Client impl to send process message to CDS blueprint-processor endpoint"
Jorge Hernandez [Wed, 12 Jun 2019 18:28:59 +0000 (18:28 +0000)]
Merge "GRPC Client impl to send process message to CDS blueprint-processor endpoint"

4 years agoGRPC Client impl to send process message to CDS blueprint-processor endpoint 68/89368/13
Rashmi Pujar [Tue, 4 Jun 2019 20:31:54 +0000 (16:31 -0400)]
GRPC Client impl to send process message to CDS blueprint-processor endpoint

Issue-ID: POLICY-1762
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: Iecef458b1f25db8e2989cc40ccd399be15867497

4 years agoFix version field to represent policy version instead of type version 88/89588/5
Chenfei Gao [Fri, 7 Jun 2019 15:14:16 +0000 (11:14 -0400)]
Fix version field to represent policy version instead of type version

Added changes to make version field in return of GET guard policy call
represent the version of guard policy instead of its type version.

Issue-ID: POLICY-1809
Change-Id: Ie8db6e89d8439576ee5f6ee99c3222386775b195
Signed-off-by: Chenfei Gao <cgao@research.att.com>
4 years agoFix dmaap-sim docker chmod 69/89169/2
Jim Hahn [Mon, 3 Jun 2019 18:49:12 +0000 (14:49 -0400)]
Fix dmaap-sim docker chmod

The chmod in the docker builder for my local VM does not appear to
support the "+x" style options.  Modified the dmaap-simulator docker
file to use "755" instead.
Also fixed the PDP simulator.

Change-Id: I3dd906d2ef63303f8c8872ce38a5711d61e35c3e
Issue-ID: POLICY-1829
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoChange version to 2.1.0 81/88881/1
Pamela Dragosh [Wed, 29 May 2019 11:44:50 +0000 (07:44 -0400)]
Change version to 2.1.0

Bump for El Alto

Issue-ID: POLICY-1747
Change-Id: I72ec2583715744e9e6debe84b75d0c1d3ffab997
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoUpdate dublin .gitreview 73/88673/1
Pamela Dragosh [Tue, 28 May 2019 14:22:03 +0000 (10:22 -0400)]
Update dublin .gitreview

Update default.

Issue-ID: POLICY-1747
Change-Id: I6851fb292a68f1abf0534dd4cd04475a16c3382f
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoBump to 2.0.2-SNAPSHOT 24/88424/1
Pamela Dragosh [Thu, 23 May 2019 23:06:27 +0000 (19:06 -0400)]
Bump to 2.0.2-SNAPSHOT

Released 2.0.1

Issue-ID: POLICY-1700
Change-Id: I0f40470e9a8bfb7f8136d34b65977b1b4c54e10e
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoAdd logging to model providers 72/88372/2
liamfallon [Thu, 23 May 2019 15:47:57 +0000 (15:47 +0000)]
Add logging to model providers

Issue-ID: POLICY-1777
Change-Id: I67bf56a7848bbb0495d9e8c215b665fde5c67f1d
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agoUpdate INFO.yaml to add Jim and Ram 57/88257/1
liamfallon [Wed, 22 May 2019 14:41:46 +0000 (14:41 +0000)]
Update INFO.yaml to add Jim and Ram

Issue-ID: POLICY-1775
Change-Id: Ie4a34a44b9f415363d7261db2660c7ed4c92abd3
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agoFix name/version regexp in model keys 12/88212/1
liamfallon [Wed, 22 May 2019 02:38:32 +0000 (02:38 +0000)]
Fix name/version regexp in model keys

The regular expressions for checking names and versions
in policy key names and versions were not expressive enough
to restrict all error names and versions.

Issue-ID: POLICY-1777
Change-Id: I037eca051f6c7a9f1e7182150d40d8b8d906a75c
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agoAdd version on legacy get/delete 83/88183/1
liamfallon [Tue, 21 May 2019 16:11:39 +0000 (16:11 +0000)]
Add version on legacy get/delete

Issue-ID: POLICY-1777
Change-Id: I5b07ad1acdb4a614a50cb15978130c19bc5786f7
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agoFix policy version compare on versions > 9 48/88148/2
liamfallon [Tue, 21 May 2019 11:13:17 +0000 (11:13 +0000)]
Fix policy version compare on versions > 9

Issue-ID: POLICY-1777
Change-Id: I83d6d15653a5bd934515980186349b8bd710c113
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoAllow policy type prefix on policy guard policy id 03/87903/3
liamfallon [Thu, 16 May 2019 16:28:39 +0000 (16:28 +0000)]
Allow policy type prefix on policy guard policy id

In order to identify the policy type of a guard policy,
we need to have the first part of the policy id as the
policy type identifier prefix.

Issue-ID: POLICY-1776
Change-Id: I1d6a3c4b122d978ff7ef40ce76ced7f160ebd4fa
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoVf module info is not present in SDNC request 80/87880/1
Vidyashree Rama [Thu, 16 May 2019 14:08:27 +0000 (19:38 +0530)]
Vf module info is not present in SDNC request

Vf module info is not present in SDNC request

Change-Id: I9a0c59ac40fcfe7028c55bc285006545d989c683
Issue-ID: POLICY-1774
Signed-off-by: Vidyashree Rama <vidyashree.rama@huawei.com>
5 years agoChanged aai dependency 69/87869/1
pramod.jamkhedkar [Thu, 16 May 2019 13:11:29 +0000 (09:11 -0400)]
Changed aai dependency

Changed aai dependency to 1.0.3

Issue-ID: POLICY-1717
Change-Id: I8f38d27b9af8dabba1eb491fd9e70307718e47ae
Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
5 years agoIncorrect SDNC API called for CCVPN Bandwidth on demand policy 37/87837/1
Vidyashree Rama [Thu, 16 May 2019 05:16:03 +0000 (10:46 +0530)]
Incorrect SDNC API called for CCVPN Bandwidth on demand policy

Incorrect SDNC API called for CCVPN Bandwidth on demand policy

Issue-ID: POLICY-1774

Change-Id: I6a8f2fa57aef6d5a4d5c679dfb96fe4160e55da5
Signed-off-by: Vidyashree Rama <vidyashree.rama@huawei.com>
5 years agoStep snapshot version of policy models 67/87767/3
liamfallon [Wed, 15 May 2019 19:57:09 +0000 (19:57 +0000)]
Step snapshot version of policy models

Issue-ID: POLICY-1630
Change-Id: I163b4566030f9beebdbb546814b1a7a777ce1205
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoAdding pdp simulator for testing purposes 86/87686/2 2.0.0 2.0.1
a.sreekumar [Tue, 14 May 2019 15:10:11 +0000 (15:10 +0000)]
Adding pdp simulator for testing purposes

Change-Id: I809e229bf363f3b18942b20521b05e2dc06643b4
Issue-ID: POLICY-1768
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
5 years agoRemove sonar issue in simple provider 79/87679/1
liamfallon [Tue, 14 May 2019 13:20:01 +0000 (13:20 +0000)]
Remove sonar issue in simple provider

Issue-ID: POLICY-1738
Change-Id: Id85d710154727c7c535db7cc50af88f52114a358
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoMerge "request-action parameter value is changed in SDNC"
Pamela Dragosh [Mon, 13 May 2019 11:32:17 +0000 (11:32 +0000)]
Merge "request-action parameter value is changed in SDNC"

5 years agoChanged Aai schema dependency 38/87538/1
pramod.jamkhedkar [Mon, 13 May 2019 10:43:49 +0000 (06:43 -0400)]
Changed Aai schema dependency

Changed Aai schema dependency to 1.0.2 and removed exclusions.

Issue-ID: POLICY-1717
Change-Id: I5cf192f85a3233bc133a6daaa54618ba0ddd1243
Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
5 years agorequest-action parameter value is changed in SDNC 18/87518/1
Vidyashree Rama [Mon, 13 May 2019 04:09:21 +0000 (09:39 +0530)]
request-action parameter value is changed in SDNC

Enum name SdwanBWPolicyChange  changed to SdwanBandwidthChange.

Change-Id: Ia9305414621de83d0e330ece8c2e09b76639d271
Issue-ID: POLICY-1750
Signed-off-by: Vidyashree Rama <vidyashree.rama@huawei.com>
5 years agoStore legacy op policy properties as plain strings 99/87399/2
liamfallon [Thu, 9 May 2019 20:59:37 +0000 (20:59 +0000)]
Store legacy op policy properties as plain strings

THe properties of legacy operational policies are already
encoded and should not be stored in JSON format.

Issue-ID: POLICY-1759
Change-Id: I3e2a69f216348c02c2ef9c23282f87da52a7f390
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoMerge "Change vFW payload from pg-streams to streams"
Jorge Hernandez [Thu, 9 May 2019 20:02:29 +0000 (20:02 +0000)]
Merge "Change vFW payload from pg-streams to streams"

5 years agoStore policy type version in policy before DB write 80/87380/1
liamfallon [Thu, 9 May 2019 15:54:41 +0000 (15:54 +0000)]
Store policy type version in policy before DB write

The policy type version must be updated on a policy before it is stored
to the database, otherwise the database value is incorrect.

Issue-ID: POLICY-1738
Change-Id: I0a7f2da3837497dd999141f40466d6507c26159b
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoChange vFW payload from pg-streams to streams 82/87282/4
Jim Hahn [Wed, 8 May 2019 19:39:37 +0000 (15:39 -0400)]
Change vFW payload from pg-streams to streams

Changed APPC payload from pg-streams to streams.
Also removed trafficgenerator.
Updated licenses.
Added log message when payload is null.
Replaced "ref$" with real payload values in yaml and docs.

Change-Id: I4b38b0f64784d5fffc8f62f3a26cd007e500fbc7
Issue-ID: POLICY-1752
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoAdd JSON encoding to legacy policy properties 83/87283/1
liamfallon [Wed, 8 May 2019 20:59:09 +0000 (20:59 +0000)]
Add JSON encoding to legacy policy properties

Now that all properties on policies are stored as JSON, the properties
on legacy policies must also be stored as JSON in the database.

Issue-ID: POLICY-1753
Change-Id: Ia75a02c8d6f595ce0fb68ac1fa2f2399fbc08f6e
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoSet default and check existance of Policy Type 38/87138/2
liamfallon [Tue, 7 May 2019 12:42:26 +0000 (12:42 +0000)]
Set default and check existance of Policy Type

The TOSCA specification has a "bug" in that it does not have a field to specify
the version of a policy type to use. We already had introduced the "type_version" field
for this.

This review introduces setting of the default version of a policy type to be
be used by a policy as the latest version of the policy type in the database.
As a side effect of this, we now have to check for existence of the policy type
of a policy in the database. This means that creation/update of a policy with
a non-existant policy type specified will now fail.

Issue-ID: POLICY-1738
Change-Id: I27080cf6cd358948810dab6897c72dfe4d41fe91
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoMerge "Supports new aai changes."
Jorge Hernandez [Tue, 7 May 2019 00:33:47 +0000 (00:33 +0000)]
Merge "Supports new aai changes."

5 years agoSupports new aai changes. 91/86991/2
pramod.jamkhedkar [Mon, 6 May 2019 04:00:24 +0000 (00:00 -0400)]
Supports new aai changes.

Made changes to support model and model version additions to Aai custom
query response.

Issue-ID: POLICY-1729
Change-Id: I84a202105d477548e9e8e060d983bf9cd47d3885
Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
5 years agoSerializaiton of properties to DB as JSON 81/86981/1
liamfallon [Sun, 5 May 2019 21:26:36 +0000 (21:26 +0000)]
Serializaiton of properties to DB as JSON

Properties should be serialized to JSON prior to writing to database
and deserialized from JSON when read from database.

Issue-ID: POLICY-1736
Change-Id: I5ad3fd4a87079f4557f5fcb825395f0b4bec3318
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoDecision should return dictionary 20/86920/1
Pamela Dragosh [Fri, 3 May 2019 17:57:11 +0000 (13:57 -0400)]
Decision should return dictionary

Should not be an array of policies, should be a
dictionary.

Issue-ID: POLICY-1735
Change-Id: Ia88ef65dd332933aafbe6b57693344d5d43c53b8
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoFixed guard simulator 98/86898/1
Pamela Dragosh [Fri, 3 May 2019 12:37:15 +0000 (08:37 -0400)]
Fixed guard simulator

The guard simulator should simulate the new xacml pdp
decision api not the old.

Issue-ID: POLICY-1730
Change-Id: I97f5df9d698e8c852a0e2c71dbef6ac5912a2d2c
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoMerge "Fix version.properties"
Jorge Hernandez [Thu, 2 May 2019 18:12:17 +0000 (18:12 +0000)]
Merge "Fix version.properties"

5 years agoFix bug in guard policy metadata creation 40/86840/2
liamfallon [Thu, 2 May 2019 16:53:57 +0000 (16:53 +0000)]
Fix bug in guard policy metadata creation

Issue-ID: POLICY-1728
Change-Id: Ie33a30a811fcd8c128dfac87c17dcb37da6d42b4
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoFix version.properties 25/86825/1
Pamela Dragosh [Thu, 2 May 2019 14:39:39 +0000 (10:39 -0400)]
Fix version.properties

Not in synch with pom.xml. Should be 2.0.0

Issue-ID: POLICY-1700
Change-Id: I3a761c703ce39523d13607f8ef29c58e47f6b11f
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoUpgrade to release parent and common 98/86698/1
Pamela Dragosh [Wed, 1 May 2019 11:07:23 +0000 (07:07 -0400)]
Upgrade to release parent and common

For Dublin release parent and common are released.

Issue-ID: POLICY-1700
Change-Id: I33e4524c30472cfc789c0daaa771dad8e089c6c8
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoFix SONAR issues on DMaaP Simulator 96/86696/1
liamfallon [Wed, 1 May 2019 10:14:09 +0000 (10:14 +0000)]
Fix SONAR issues on DMaaP Simulator

Fixed interrupt issue and stack trace printout on
DMaaP simulator.

Issue-ID: POLICY-1643
Change-Id: I0a7898b7ea230960df8052981fe22dfeb3a04365
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoDocker container for DMaaP Simulator 16/86616/2
liamfallon [Tue, 30 Apr 2019 13:31:03 +0000 (13:31 +0000)]
Docker container for DMaaP Simulator

THis review brings in a Docker container for the DMaaP
simulator for CSIT testing. This container should NOT
be submitted to the ONAP nexus as it is only for testing.

Issue-ID: POLICY-1643
Change-Id: I0e2147da9b7c0a85db68044439d48378d3a3e5b5
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoAddress sonar issue in policy-models/pdp 50/86550/1
Jim Hahn [Mon, 29 Apr 2019 16:33:16 +0000 (12:33 -0400)]
Address sonar issue in policy-models/pdp

Extracted a common constant.

Change-Id: I24504109e9c7bbed352fa3e845d7d3f7b07db970
Issue-ID: POLICY-1708
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoAdd copy constructor for PdpStatus 31/86331/1 3.0.2-ONAP
Jim Hahn [Thu, 25 Apr 2019 22:39:48 +0000 (18:39 -0400)]
Add copy constructor for PdpStatus

Change-Id: Id818d3b16355ad3f3a96ff4456ec8e8062055f98
Issue-ID: POLICY-1645
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoPopulate policies, even if empty 85/86285/1
Jim Hahn [Thu, 25 Apr 2019 12:55:05 +0000 (08:55 -0400)]
Populate policies, even if empty

Modified PdpUpdate to create an empty policy list, by default,
rather than leaving it null.

Change-Id: I81906410bcc7da21d6471d496713ec9b375632a2
Issue-ID: POLICY-1692
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoExclude commons-beanutils 77/86077/1
Pamela Dragosh [Tue, 23 Apr 2019 17:21:06 +0000 (13:21 -0400)]
Exclude commons-beanutils

Per A&AI team, this can be safely excluded. commons-beanutils has
security vulnerabilities https://nvd.nist.gov/vuln/detail/CVE-2014-0114

Issue-ID: POLICY-1659
Change-Id: Ic70cc7cea4f2b3b7609219a0641252e37b8b2de9
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoMerge "Fix a bug in adding one-digit policy-version in metadata"
Jorge Hernandez [Sat, 20 Apr 2019 16:06:07 +0000 (16:06 +0000)]
Merge "Fix a bug in adding one-digit policy-version in metadata"

5 years agoFix a bug in adding one-digit policy-version in metadata 46/85846/1
Chenfei Gao [Fri, 19 Apr 2019 19:09:19 +0000 (15:09 -0400)]
Fix a bug in adding one-digit policy-version in metadata

Original change of adding single digit policy-version in tosca policy
metadata does not take effect actually. It is added into metadata of
authorative tosca policy but not jpa tosca policy. Identify the issue
at the last minute and fix it.

Issue-ID: POLICY-1442
Change-Id: I8aefa546f757f7841554e3caf00ccc476d23ebf5
Signed-off-by: Chenfei Gao <cgao@research.att.com>
5 years agoExclude jackson-databind 28/85828/1
Pamela Dragosh [Fri, 19 Apr 2019 15:52:40 +0000 (11:52 -0400)]
Exclude jackson-databind

Jackson databind has security issues, sometimes its easier to
just exclude it if possible.

This repo doesn't use it directly, the swagger dependency pulls
it in. It doesn't look like our usage of swagger dependency would
require the jackson-databind as we only use the annotation:
@ApiModelProperty

NOTE: Swagger also pulls in jackson-annotations, which seems to
be used by a few modules for JSON annotations. eg. those modules
are using jackson-annotations indirectly via the swagger
dependency pulling in that dependency. Not a big deal.

Compilation of policy/api repo works with this exclusion.

Issue-ID: POLICY-1507
Change-Id: Ic8501df5ad4f4fc8f6cd93e739d7ff2e52d98785
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoAdd DMaaP simulator for CSIT testing 93/85593/1
liamfallon [Wed, 17 Apr 2019 13:58:26 +0000 (13:58 +0000)]
Add DMaaP simulator for CSIT testing

A rudimentary DMaaP simulator that simply holds requests and responds
to all readers with whatever message comes in on a topic. The simulator
is placed in policy models for now but should be submitted to DMaaP.

The simulator is now working but is still extremely rough.

Issue-ID: POLICY-1643
Change-Id: I28645a73cf198fe825c897243b30cd34dc29f20d
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoDon't include "nullVersion" in swagger API 15/85515/2
Jim Hahn [Tue, 16 Apr 2019 19:32:12 +0000 (15:32 -0400)]
Don't include "nullVersion" in swagger API

Swagger sitll uses jackson, thus it is including
ToscaPolicyIdentifierOptVersion.isNullVersion() in the API that it
generates.  Added @JsonIgnore annotation to prevent it from being
included.  Similar issue with get/setVersion() in PdpGroup.
Created POLICY-1653 to remove the isNullVersion() method altogether in
El Alto.

Change-Id: I6cb7b7d1d75258eeb9d6f9b6c7a48eeb32174307
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoFix null not accepted on PDP message 47/85447/1
liamfallon [Tue, 16 Apr 2019 11:08:38 +0000 (11:08 +0000)]
Fix null not accepted on PDP message

Issue-ID: POLICY-1648
Change-Id: I580d1c433cd3a5730b115ef6353770f17939cf3a
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoMerge "Add serialized name for typeVersion"
Jorge Hernandez [Mon, 15 Apr 2019 20:47:06 +0000 (20:47 +0000)]
Merge "Add serialized name for typeVersion"

5 years agoAdd serialized name for typeVersion 57/85357/1
Chenfei Gao [Mon, 15 Apr 2019 18:38:39 +0000 (14:38 -0400)]
Add serialized name for typeVersion

Add serialied name and swagger ui rendering name for
attribute typeVersion in ToscaPolicy.

Issue-ID: POLICY-1515
Change-Id: I42e85117c5f47901bf8c16d3cc6f162a8b6db5e1
Signed-off-by: Chenfei Gao <cgao@research.att.com>
5 years agoFix sonar issue in PdpGroups 56/85356/1
Jim Hahn [Mon, 15 Apr 2019 18:21:18 +0000 (14:21 -0400)]
Fix sonar issue in PdpGroups

Extracted common string constant.

Change-Id: I5721641d8a45e7dce317cb6a1b75570a715779ea
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Use keys to speed DB queries"
Pamela Dragosh [Mon, 15 Apr 2019 16:50:51 +0000 (16:50 +0000)]
Merge "Use keys to speed DB queries"

5 years agoUse keys to speed DB queries 36/85336/1
Jim Hahn [Mon, 15 Apr 2019 15:10:58 +0000 (11:10 -0400)]
Use keys to speed DB queries

When a filter specifies a name (and possibly version), those can
be used to speed DB searches.  Modified the code to use the keys
rather than always retrieving every record before applying the
filter.

Change-Id: I6b48d9e6880ab7e8132d5d8f770394720031b9b5
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoAdd conversion from plain Ident to IdentOptVersion 23/85323/1
Jim Hahn [Mon, 15 Apr 2019 13:55:12 +0000 (09:55 -0400)]
Add conversion from plain Ident to IdentOptVersion

Added a "copy constructor" that copies an Ident to an Ident
with an optional version.  The reverse does not make sense,
so did not add that (e.g., version may be null or may just
be a prefix, while the version in Ident is major.minor.patch).

Change-Id: Ifd3935a998cd4c1cb5113a59c5f36a7d9baf79ff
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Add prefix matching for policy version"
Pamela Dragosh [Mon, 15 Apr 2019 13:09:53 +0000 (13:09 +0000)]
Merge "Add prefix matching for policy version"

5 years agoAdd prefix matching for policy version 59/85259/9
Jim Hahn [Sat, 13 Apr 2019 13:05:13 +0000 (09:05 -0400)]
Add prefix matching for policy version

Re-introduced regular expressions to match policy version
so that the policy version found in the metadata, which is just
the major number, can be matched with a policy's version, which
is of the form, major.minor.patch.
Simplified equals() test, as we already know "text!=null".
Added filterPrefixPred() and modified policy filter to use it when
matching versions, as it is simpler to use when matching a version
prefix.
Also added tests to PfObjectFilterTest to test each of the XxxPred()
methods.

Change-Id: I0734873f701a539e883fe25b8eecfdde60cc8b6d
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoDisallow empty subgroup list in group request 62/85262/2
Jim Hahn [Sun, 14 Apr 2019 00:26:33 +0000 (20:26 -0400)]
Disallow empty subgroup list in group request

Change-Id: I8a00caf1b22363fe3ab90bdf57244af687a2cb6d
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoCheck for duplicates in lists 44/85244/5
Jim Hahn [Fri, 12 Apr 2019 19:53:08 +0000 (15:53 -0400)]
Check for duplicates in lists

Modified duplicate subgroup check to eliminate sonar issue.
Added duplicate group check.
Modified ModelsTest to exclude PdpMessage, which seemed to cause
intermittent junit failures.

Change-Id: Id281874506d3a39610739e24cee49360b345724f
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>