summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-10-01Update CDS grpc request generation in CDS Actor service providerRashmi Pujar3-11/+33
- CDS payload requires resolution-key (random UUID) - Update the CDS request object to rename the payload child node key name from config-deploy-properties to policy-payload. - Generate dynamic childnode key name from the policy recipe-name aka CDS action-name. action-name itself is never included in serialization as is. Below is a sample: { "commonHeader": { "subRequestId": "$subReqId", "requestId": "$reqId", "originatorId": "POLICY" }, "actionIdentifiers": { "mode": "sync", "blueprintName": "$bpName", "blueprintVersion": "$bpVer", "actionName": "$recipeName" }, "payload": { "$recipeName-request": { "resolution-key": "{{$guid}}", "aai-properties": { "$key": "$value", ... }, "policy-payload": { "$clamp-payload" } } } } Issue-ID: POLICY-2120 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: Ia7f0551f94755bbe73b48ae387b4c53842729a81
2019-09-19Change policy/common version in modelsJim Hahn1-1/+1
Junits in policy/api were breaking. Tracked it down to the fact the policy/models was still referencing an old version of policy/common. Change-Id: I1aee40336382741d62cabbcac0f6268d2ceab263 Issue-ID: POLICY-2101 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-09-11Fix derivedFrom fieldliamfallon1-1/+1
TOSCA does not have a version on derivedFrom fields on policies and policy types. THerefore, we use the default value of 0.0.0 for versions on these fields in the database. When reading back out derivedFrom fields, we need to just take the name of the field and not the ID of the field. Issue-ID: POLICY-2075 Change-Id: I55e9c479047d6c1a9376a1713f4ddb2536476b29 Signed-off-by: liamfallon <liam.fallon@est.tech>
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 Hahn39-40/+40
Change-Id: I351d1a0ebd3c7cfa76d57297ce44ef6a6fa8c753 Issue-ID: POLICY-2045 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-09-09Add release yaml file to modelsJim Hahn1-0/+4
Change-Id: I5053071a63c67770986181fe034d7371ac98ddca Issue-ID: POLICY-2045 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-09-09Add metadata to propertiesPamela Dragosh5-4/+270
Properties should support metadata - adding it in. Added junit tests for the new metadata field. Issue-ID: POLICY-2060 Change-Id: I2e1933ca4260fe5989f36a098108893a366f657a Signed-off-by: Pamela Dragosh <pdragosh@research.att.com> Signed-off-by: Jim Hahn <jrh3@att.com>
2019-09-09Use released versions in models pomJim Hahn1-2/+2
Updated models pom.xml to use released version of parent and common artifacts. Change-Id: I21bf9911d1dcd3ea9cc0f065dc80f65e153da885 Issue-ID: POLICY-2045 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-09-06Merge "CDS Actor service-provider implemntation"Pamela Dragosh7-0/+632
2019-09-06CDS Actor service-provider implemntationRashmi Pujar7-0/+632
https://wiki.onap.org/display/DW/CDS+actor+support+in+Policy Issue-ID: POLICY-1763 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: Idcb6e9168b949745cc644e97ba77c479573a8bf5
2019-09-05Repair policy types in TOSCA service templateliamfallon26-1200/+1095
Changed policy types from a list of maps to a map. Changed data types from a list of maps to a map. Made all knock on changes to adapters and tests. Updated Issue ID. Added onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml policy type that is required to be preloaded in policy-api. Issue-ID: POLICY-2047 Change-Id: Ic8e809eab248fd7242f0e565fa2e3da75bcfbdeb Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-09-03Merge "Added VFModule count"Pamela Dragosh6-1791/+3669
2019-08-30Added VFModule countpramod.jamkhedkar6-1791/+3669
Added the function VFModuleCount to AaiCqResponse class. It counts the number of vf modules. Also changed the same custom query response in AaiSimulator. Issue-ID: POLICY-1858 Signed-off-by: pramod.jamkhedkar <pramod@research.att.com> Change-Id: If08de84f74d2bd9501b501b881cdd761089614dc
2019-08-27Replace copyTo methods with copy constructorsJim Hahn52-629/+337
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>
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-08Review maven dependency for snakeyamlBruno Sakoto2-3/+1
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
2019-08-07replace hashCode function with compareToHenry.Sun21-21/+21
Issue-ID: POLICY-1600 Change-Id: If660cbe84424e492b6db3ab11ef97b37f046b3aa Signed-off-by: Henry.Sun <henry.a.sun@est.tech>
2019-08-06Bump version in policy/modelsJim Hahn38-39/+39
Change-Id: Ie8761ccbd05edc80af51e0ae5e8c90a4dfaf7715 Issue-ID: POLICY-1965 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-08-05Add release file for 2.1.2jhh1-0/+4
Issue-ID: POLICY-1953 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I09cb51c15330d76a746a2671133ef7145d776b28
2019-08-05Bump versions to 2.1.2jhh38-38/+38
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-08-04Add self-release 2.1.1 filejhh1-0/+4
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>
2019-08-03Point to policy/common 1.5.1 released versionjhh1-1/+1
Issue-ID: POLICY-1953 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I4c2739dac8d9a0648b419635c6198c7dfa3fb720
2019-07-31Use new addTopic() method in modelsJim Hahn6-28/+11
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-09Removed all mention of www.example.org from testsJohnKeeney7-179/+424
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>
2019-07-08Fix models due to sonar changes in commonJim Hahn12-37/+37
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-27Use ToStringTester from utils-testramverma8-17/+27
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>
2019-06-21Bump models to 2.1.1 SNAPSHOTPamela Dragosh38-38/+38
Released 2.1.0 Issue-ID: POLICY-1737 Change-Id: I2bc12dd4a9cdad7a867e3d710bb427493de6c7f4 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-06-21Upgrade to release common 1.5.02.1.0Pamela Dragosh1-1/+1
Released Issue-ID: POLICY-1737 Change-Id: I9e448a340643a5cc3a9fade226e6e40fcc63e1d9 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-06-20Merge "Upgrade to release 3.0.0 parent"Jim Hahn1-1/+1
2019-06-20Upgrade to release 3.0.0 parentPamela Dragosh1-1/+1
Policy/parent released Issue-ID: POLICY-1737 Change-Id: I34a4af77caf8e371089480b467833119d07ae937 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-06-20Adding pdps class for pdpgroup healthcheckramverma1-0/+40
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>
2019-06-19Merge "Change getCanonicalName to getName in models"Pamela Dragosh21-27/+34
2019-06-18Change getCanonicalName to getName in modelsJim Hahn21-27/+34
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-18Removed unused imports from modelsJim Hahn2-6/+2
Change-Id: I1f64127e1d783a962304c0add1524a57d6c24e4b Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-06-18Merge "Fix simple sonar issues in models: errors to sim-pdp"Pamela Dragosh23-571/+533
2019-06-18Merge "Fix the bug of cannot return multiple versions of particular tosca ↵Pamela Dragosh4-9/+25
policy and policy type"
2019-06-18Merge "Fix more sonar issues in models: yaml to dao"Pamela Dragosh37-1791/+1490
2019-06-18Merge "Fix simple sonar issues in models-tosca"Liam Fallon33-1088/+787
2019-06-17Fix simple sonar issues in models: errors to sim-pdpJim Hahn23-571/+533
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>
2019-06-17Merge "Fix sonar issues in models: sdc to vfc"Jorge Hernandez24-417/+366
2019-06-17Fix the bug of cannot return multiple versions of particular tosca policy ↵Chenfei Gao4-9/+25
and policy type Issue-ID: POLICY-1807 Change-Id: I831c720993930a911d301a82b59a74cda7cb0c50 Signed-off-by: Chenfei Gao <cgao@research.att.com>
2019-06-17Fix more sonar issues in models: yaml to daoJim Hahn37-1791/+1490
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>
2019-06-17Fix sonar issues in models: sdc to vfcJim Hahn24-417/+366
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>
2019-06-17Fix simple sonar issues in models-toscaJim Hahn33-1088/+787
Change-Id: I36a91fbbd95df7aff2656a97dd09b778cdbb798f Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-06-17Fix simple sonar issues in modelsJim Hahn57-666/+608
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>
2019-06-17Merge "Allow multiple versions of entities to be returned"Jorge Hernandez12-30/+174
2019-06-17Merge "Remove isNullVersion from identifier class"Liam Fallon2-15/+0
2019-06-14Fix copyrightPamela Dragosh1-1/+1
Missed on earlier reviews Issue-ID: POLICY-1855 Change-Id: Ib172059e105e2940dce43f5da79b81dbd80f527d Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-06-14Allow multiple versions of entities to be returnedliamfallon12-30/+174
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>