liamfallon [Fri, 22 Nov 2019 17:28:02 +0000 (17:28 +0000)]
Reduce volume of log information on A&AI calls
The AaiManager class is logging all the http requests and responses to
and from A&AI to logger.info, creating a large volume of logging text,
the logging of these messages is now set logger.debug, so they are off
by default but can be enabled for debugging.
Issue-ID: POLICY-2125
Change-Id: I5f9674db0f9e5b271606e7af34d5218f5c629b09
Signed-off-by: liamfallon <liam.fallon@est.tech>
liamfallon [Thu, 21 Nov 2019 13:59:07 +0000 (13:59 +0000)]
Fix minor checkstyle issuse in models A&AI
Some minor checkstyle issues in the policy models Custom Query support
in A&AI fixed.
Issue-ID: POLICY-2125
Change-Id: I520caa044966acbe28d3cd864b53fb398df2f385
Signed-off-by: liamfallon <liam.fallon@est.tech>
Jim Hahn [Fri, 15 Nov 2019 19:12:23 +0000 (14:12 -0500)]
Support wild cards in "supported policy types"
Refactored PfConceptKey, extracting most of it into PfKeyImpl.
Added PfSearchableKey as a subclass of PfKeyImpl.
Change-Id: I524f4ce9208fc9ba09e77db4cc7dde5a21e1d7fc
Issue-ID: POLICY-2224
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Fri, 15 Nov 2019 14:18:05 +0000 (14:18 +0000)]
Merge "Removing Named Query."
pramod.jamkhedkar [Wed, 13 Nov 2019 18:21:16 +0000 (13:21 -0500)]
Removing Named Query.
Removing all the related files and necessary modifications for removing named query. The code now only supports Custom Query
Issue-ID: POLICY-2125
Change-Id: Ifa5ccb74142aa424359c0dea85b90bbcf70147cb
Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
Jim Hahn [Wed, 13 Nov 2019 18:05:58 +0000 (13:05 -0500)]
Remove duplicate dao object
Code was creating the DAO object twice - removed the extra line.
Note: this properly doesn't fix the race condition, but it should fix
a memory leak.
Change-Id: I5f5c6002d42f9bb0525d1b5013b1300e80264645
Issue-ID: POLICY-1832
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 8 Nov 2019 14:17:42 +0000 (09:17 -0500)]
Fix sonar issue affecting in drools-applications
Drools-applications has a serializable class that contains AaiCqResponse.
Sonar complained that the latter class must also be serializable, so
made the change in policy-models to fix that. In addition, the latter
class contained a list of Object. To ensure that those are also
serializable, the list was changed to a list of Serializable instead.
The latter change can be reverted, if it causes compilation issues
elsewhere. However, it seems safer to enforce serializability in the
list rather than risk having a later change inject a non-serializable
object into the list.
Change-Id: Ia741a1a96ec4efcc63451e9af31c19b4fe99dd7d
Issue-ID: POLICY-2225
Signed-off-by: Jim Hahn <jrh3@att.com>
Rashmi Pujar [Tue, 5 Nov 2019 22:10:00 +0000 (17:10 -0500)]
Use lombok annotations for objects in models-interaction/models-impl module
Issue-ID: POLICY-1896
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: I425afe25876cea91908391418582ef584e6fe6fc
Rashmi Pujar [Tue, 5 Nov 2019 16:19:58 +0000 (11:19 -0500)]
Cleanup up unused actor.test maven module
Issue-ID: POLICY-1894
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: Ib662aa6a28beb40c2a1e6814b103e95ebf4ee2e1
Liam Fallon [Mon, 4 Nov 2019 17:59:31 +0000 (17:59 +0000)]
Merge "PNF support changes in policy/models"
Rashmi Pujar [Tue, 29 Oct 2019 20:13:05 +0000 (16:13 -0400)]
PNF support changes in policy/models
AAI Enrichment method for PNF target-type and unit tests.
Addition of a hashmap field to ControlLoopEvent class to hold event specific parameters.
Update CDS actor to include additional event parameters
Issue-ID: POLICY-1187
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: Ie0ceb320943531de6e6bc8675844b29a358dfb7e
Pamela Dragosh [Fri, 1 Nov 2019 15:22:34 +0000 (11:22 -0400)]
Add SDNC Naming Policy Type and example policy
Will be used to create naming application for XACML PDP.
Issue-ID: POLICY-1740
Change-Id: I996537da16bdb386f4bcddd0008055b8ffac417e
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
liamfallon [Fri, 1 Nov 2019 11:24:26 +0000 (11:24 +0000)]
Add common Jersey version
Add a common version of Jersey for all Policy Framework components.
Issue-ID: POLICY-2209
Change-Id: Ic1d2ea808bb41156f776d18b875e44de22fbf06b
Signed-off-by: liamfallon <liam.fallon@est.tech>
Jorge Hernandez [Fri, 1 Nov 2019 13:22:20 +0000 (13:22 +0000)]
Merge "Change field names in policy notifications to match wiki"
liamfallon [Fri, 1 Nov 2019 06:55:23 +0000 (06:55 +0000)]
Fix Checkstyle issues in policy-models
Some minor checkstyle issues were introduced into policy-models by
recent reviews.
Issue-ID: POLICY-2088
Change-Id: I84af19926432081d72e2054af788cdc35850a99c
Signed-off-by: liamfallon <liam.fallon@est.tech>
Jim Hahn [Thu, 31 Oct 2019 21:39:47 +0000 (17:39 -0400)]
Change field names in policy notifications to match wiki
Field names looked like "policyType.name". Changed them to look like
"policy-type", instead, to match the wiki for the notifications to be
sent to DCAE.
Change-Id: Ib3cef1712fd12a44db8acdcff2245d800b21137a
Issue-ID: POLICY-2190
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Wed, 30 Oct 2019 15:56:26 +0000 (15:56 +0000)]
Merge "Changes in preparation for the m2 model (part 2)"
Straubs, Ralph (rs8887) [Tue, 29 Oct 2019 12:17:23 +0000 (07:17 -0500)]
Changes in preparation for the m2 model (part 2)
This change was missed earlier: convert 'ResourceType' to a 'String',
so application-specific types can be added.
Issue-ID: POLICY-1948
Change-Id: Ie8a35e7fb0746d8c8e3a6db11c09ca31dc4763cc
Signed-off-by: Straubs, Ralph (rs8887) <rs8887@att.com>
Jorge Hernandez [Tue, 29 Oct 2019 13:25:58 +0000 (13:25 +0000)]
Merge "Refactor Appc LCM Model"
Daniel Cruz [Wed, 23 Oct 2019 22:33:28 +0000 (17:33 -0500)]
Refactor Appc LCM Model
Added model classes for APPC LCM Input and APPC LCM Output
and removed adding the input/output tag to the JSON via
the APPC LCM custom serializer.
Issue-ID: POLICY-2043
Signed-off-by: Daniel Cruz <dc443y@att.com>
Change-Id: I54e1b5f589a4b29357cf1a45dbdf2173610870ce
Jim Hahn [Fri, 25 Oct 2019 14:12:25 +0000 (14:12 +0000)]
Merge "Changes in preparation for the m2 model"
Straubs, Ralph (rs8887) [Tue, 22 Oct 2019 15:43:09 +0000 (10:43 -0500)]
Changes in preparation for the m2 model
1) Replace enum 'ControlLoopTargetType' with 'String' -- symbols such as
'ControlLoopTargetType.VM' still work, but now expand into a String.
This gives the ability to add new application-specific types.
2) Move 'ControlLoopEvent.payload' to 'VirtualControlLoopEvent'. This
symbol isn't common to all 'ControlLoopEvent' types, and this
definition collides with a 'payload' defined in our application.
3) Add 'RestManager.patch(...)', which performs a REST patch.
4) Add lombok getters and setters
5) Remove trailing spaces
6) Fix order of arguments in 'assertEquals' in 'ControlLoopTargetTypeTest'
7) Update Junit tests in 'RestTest' to include 'RestManager.patch(...)'
Issue-ID: POLICY-1948
Signed-off-by: Straubs, Ralph (rs8887) <rs8887@att.com>
Change-Id: I08e04ea3cbcf368c760b630bcfe23a4370cf94dc
Jim Hahn [Thu, 24 Oct 2019 15:50:42 +0000 (11:50 -0400)]
Changed the serialized name of policy notifications
Changed the serialized name of the policy identifier from "policy"
to "policy-id".
Change-Id: I7188b65428728b65fef38c70e9fae99202ab0eea
Issue-ID: POLICY-1841
Signed-off-by: Jim Hahn <jrh3@att.com>
Liam Fallon [Thu, 24 Oct 2019 13:18:20 +0000 (13:18 +0000)]
Merge "Flatten the CDS grpc request payload"
Rashmi Pujar [Tue, 22 Oct 2019 19:58:38 +0000 (15:58 -0400)]
Flatten the CDS grpc request payload
Before:
{
"vfw-modify-config-request":{
"resolution-key":"
1234567890",
"aai-properties":{
"service-instance.service-instance-id":"1234",
"generic-vnf.vnf-id":"5678"
},
"policy-payload":{
"data":"{\"active-streams\":\"5\"}"
}
}
}
After:
{
"vfw-modify-config-request":{
"resolution-key":"
1234567890",
"vfw-modify-config-properties":{
"service-instance.service-instance-id":"1234",
"generic-vnf.vnf-id":"5678",
"data":"{\"active-streams\":\"5\"}"
}
}
}
Issue-ID: POLICY-2089
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: I139a7ca3e1e2d0cd50bbd86d0cdf499f215be74f
Pamela Dragosh [Mon, 21 Oct 2019 17:59:02 +0000 (13:59 -0400)]
Update optimization policies to have version
These should be version 1.0.0. Add in a no version test.
Issue-ID: POLICY-2066
Change-Id: Ie113c02c37e95b86dbb31247bf7a9fda09f724b1
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Liam Fallon [Fri, 18 Oct 2019 09:47:22 +0000 (09:47 +0000)]
Merge "Add PolicyNotification.isEmpty() method"
Jim Hahn [Thu, 17 Oct 2019 18:58:59 +0000 (14:58 -0400)]
Add PolicyNotification.isEmpty() method
Change-Id: I5cf5f21b968975018bd1f18daa1653289b837d2e
Issue-ID: POLICY-1841
Signed-off-by: Jim Hahn <jrh3@att.com>
Rashmi Pujar [Thu, 17 Oct 2019 15:43:02 +0000 (11:43 -0400)]
Remove the CDS blueprint name and version from its payload.
This information is redundant since it is included in the request header.
Found during integration testing
Issue-ID: POLICY-2089
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: Icdb4753ccae687f85318f5efeed09d5e13a6853b
Jorge Hernandez [Tue, 15 Oct 2019 16:19:40 +0000 (16:19 +0000)]
Merge "Remove actor and recipe checks from ControlLoopCompiler.java"
dg5762 [Tue, 8 Oct 2019 21:04:55 +0000 (16:04 -0500)]
Remove actor and recipe checks from ControlLoopCompiler.java
Remove actor and recipe checks from ControlLoopCompiler.java
and adjusted associated JUNIT tests for the changes that were
implented. Removed some redundant variables, replaced null check
in actor/recipe with blank string, which checks for null as
well as empty/blank strings. drools-applications still builds
correctly.
Issue-ID: POLICY-2128
Change-Id: I83d9e3b1152d87c9c8d2c90586300aebdd53b8e2
Signed-off-by: dg5762 <dg5762@att.com>
Jim Hahn [Mon, 14 Oct 2019 15:34:15 +0000 (11:34 -0400)]
Add PAP Policy Notification classes
Added classes that PAP will use to publish to DMaaP to indicate policy
status changes (i.e., added/removed from PDPs).
Modified serialized name of the policy identified to match other uses
(e.g., PAP REST API calls).
Added policy type, per review comments.
Change-Id: I66131fa9ae0b63081f239e7f402b7fea65c434a5
Issue-ID: POLICY-1841
Signed-off-by: Jim Hahn <jrh3@att.com>
liamfallon [Tue, 15 Oct 2019 11:26:48 +0000 (12:26 +0100)]
Fix remaining fixable Sonar issues on policy models
This patch fixes the remaining easy to fix Sonar issues on policy
models. The remaining issues are
- methods that do not follow Java naming conventions and fixing those
will probably break policies that use those methods
- TODO statements to do with functionality we didn't get done in Dublin
and will address in Frankfurt
Issue-ID: POLICY-2165
Change-Id: I7f604bc2335388bdc0dd9286ae17a5ab76517665
Signed-off-by: liamfallon <liam.fallon@est.tech>
liamfallon [Mon, 14 Oct 2019 13:25:58 +0000 (14:25 +0100)]
Clean up minor things in policy-models
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>
Liam Fallon [Mon, 14 Oct 2019 13:19:26 +0000 (13:19 +0000)]
Merge "Clean up SONAR issues in CDS actor"
Jim Hahn [Fri, 11 Oct 2019 16:02:58 +0000 (12:02 -0400)]
Fix dmaap simulator junit
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>
liamfallon [Fri, 11 Oct 2019 13:56:46 +0000 (14:56 +0100)]
Clean up SONAR issues in CDS actor
Issue-ID: POLICY-2165
Change-Id: I2ccfb32193c85958d525af19a7744a74c97a3485
Signed-off-by: liamfallon <liam.fallon@est.tech>
Jorge Hernandez [Thu, 10 Oct 2019 21:37:37 +0000 (21:37 +0000)]
Merge "Added new policy example to support junit test for new simplified API"
Chenfei Gao [Wed, 9 Oct 2019 20:39:35 +0000 (16:39 -0400)]
Added new policy example to support junit test for new simplified API
Issue-ID: POLICY-1991
Change-Id: Ib52bffe7895dc0625c77da7aa954bb71ed16187d
Signed-off-by: Chenfei Gao <cgao@research.att.com>
pramod.jamkhedkar [Wed, 9 Oct 2019 17:42:25 +0000 (13:42 -0400)]
Added ModelType to SO Req.
Added ModelType to SO Request and set it to vfModule
Issue-ID: POLICY-2156
Change-Id: Icfd824ff1f521ec32a711506d01283566d2a7ed9
Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
Rashmi Pujar [Tue, 8 Oct 2019 18:46:09 +0000 (14:46 -0400)]
Correct the CDS basic auth header in the request
Issue-ID: POLICY-2088
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: Ibcdfdbd1de66fcf193e52fcc14a1220c7520f140
Pamela Dragosh [Mon, 7 Oct 2019 23:59:30 +0000 (23:59 +0000)]
Merge "Flesh out DMaaP simulator"
Jim Hahn [Wed, 31 Jul 2019 13:45:27 +0000 (09:45 -0400)]
Flesh out DMaaP simulator
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>
Bruno Sakoto [Fri, 27 Sep 2019 19:51:11 +0000 (15:51 -0400)]
Changes in model to integrate cds actor
* Create class for CDS response
Issue-ID: POLICY-2088
Change-Id: I813a310f7d5123fac4bb1c3880d108391096250f
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Rashmi Pujar [Mon, 30 Sep 2019 16:12:07 +0000 (12:12 -0400)]
Update CDS grpc request generation in CDS Actor service provider
- 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
Jim Hahn [Thu, 19 Sep 2019 15:30:07 +0000 (11:30 -0400)]
Change policy/common version in models
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>
liamfallon [Wed, 11 Sep 2019 22:01:59 +0000 (23:01 +0100)]
Fix derivedFrom field
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>
Rashmi Pujar [Tue, 10 Sep 2019 23:28:13 +0000 (19:28 -0400)]
Upgrade io.netty : netty-codec-http2 and netty-common to 4.1.39.Final
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
Jim Hahn [Tue, 10 Sep 2019 14:14:41 +0000 (10:14 -0400)]
Bump versions for models master
Change-Id: I351d1a0ebd3c7cfa76d57297ce44ef6a6fa8c753
Issue-ID: POLICY-2045
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Mon, 9 Sep 2019 18:14:40 +0000 (14:14 -0400)]
Add release yaml file to models
Change-Id: I5053071a63c67770986181fe034d7371ac98ddca
Issue-ID: POLICY-2045
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Sun, 8 Sep 2019 21:04:49 +0000 (17:04 -0400)]
Add metadata to properties
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>
Jim Hahn [Mon, 9 Sep 2019 13:52:42 +0000 (09:52 -0400)]
Use released versions in models pom
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>
Pamela Dragosh [Fri, 6 Sep 2019 16:05:23 +0000 (16:05 +0000)]
Merge "CDS Actor service-provider implemntation"
Rashmi Pujar [Wed, 12 Jun 2019 18:59:10 +0000 (14:59 -0400)]
CDS Actor service-provider implemntation
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
liamfallon [Thu, 5 Sep 2019 21:10:46 +0000 (21:10 +0000)]
Repair policy types in TOSCA service template
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>
Pamela Dragosh [Tue, 3 Sep 2019 17:51:56 +0000 (17:51 +0000)]
Merge "Added VFModule count"
pramod.jamkhedkar [Wed, 28 Aug 2019 15:39:15 +0000 (11:39 -0400)]
Added VFModule count
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
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>
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>
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
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>
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>
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
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
Jim Hahn [Thu, 20 Jun 2019 20:42:22 +0000 (20:42 +0000)]
Merge "Upgrade to release 3.0.0 parent"
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>
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>
Pamela Dragosh [Wed, 19 Jun 2019 14:25:37 +0000 (14:25 +0000)]
Merge "Change getCanonicalName to getName in models"
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>
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>
Pamela Dragosh [Tue, 18 Jun 2019 12:22:21 +0000 (12:22 +0000)]
Merge "Fix simple sonar issues in models: errors to sim-pdp"
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"
Pamela Dragosh [Tue, 18 Jun 2019 12:17:01 +0000 (12:17 +0000)]
Merge "Fix more sonar issues in models: yaml to dao"
Liam Fallon [Tue, 18 Jun 2019 12:09:49 +0000 (12:09 +0000)]
Merge "Fix simple sonar issues in models-tosca"
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>
Jorge Hernandez [Mon, 17 Jun 2019 21:13:40 +0000 (21:13 +0000)]
Merge "Fix sonar issues in models: sdc to vfc"
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>
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>
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>
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>
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>
Jorge Hernandez [Mon, 17 Jun 2019 13:43:19 +0000 (13:43 +0000)]
Merge "Allow multiple versions of entities to be returned"
Liam Fallon [Mon, 17 Jun 2019 08:51:21 +0000 (08:51 +0000)]
Merge "Remove isNullVersion from identifier class"
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>
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>
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)
Pamela Dragosh [Fri, 14 Jun 2019 02:22:53 +0000 (02:22 +0000)]
Merge "Fixed SO request creation"
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>
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>
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"
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