policy/pap.git
4 years agoMerge "Remove hardcoded ip in PAP testsuites"
Jorge Hernandez [Thu, 1 Aug 2019 12:42:43 +0000 (12:42 +0000)]
Merge "Remove hardcoded ip in PAP testsuites"

4 years agoAdjust timer manager logging 23/92423/1
jrh3 [Wed, 31 Jul 2019 19:31:06 +0000 (15:31 -0400)]
Adjust timer manager logging

Add a few more logging statements to the timer manager.  Also
changed logger.debug() to logger.info().
Replaced map.computeIfPresent() with map.remove(), as it simplified
the relevant code block significantly.

Change-Id: I211e9f07bd6df6a01532b1ecabdde5ae1585cc18
Issue-ID: POLICY-1960
Signed-off-by: jrh3 <jrh3@att.com>
4 years agoRemove hardcoded ip in PAP testsuites 91/92391/2
Chenfei Gao [Wed, 31 Jul 2019 17:46:40 +0000 (13:46 -0400)]
Remove hardcoded ip in PAP testsuites

Removed and parametrized hardcoded ip in stability test scripts

Issue-ID: POLICY-1958
Change-Id: I8f8f6efdf481179ecbc308284b041287b3fbf861
Signed-off-by: Chenfei Gao <cgao@research.att.com>
4 years agoRemove remaining ParameterUtils from PAP 79/92379/1
jrh3 [Wed, 31 Jul 2019 15:46:43 +0000 (11:46 -0400)]
Remove remaining ParameterUtils from PAP

Issue-ID: POLICY-1953
Signed-off-by: jrh3 <jrh3@att.com>
Change-Id: I2bc56dfe2d5982d7dadb54311a94d6c6f95fa595

4 years agoUse new addTopic(TopicParameterGroup) method in PAP 75/92275/2
jrh3 [Mon, 29 Jul 2019 16:11:34 +0000 (12:11 -0400)]
Use new addTopic(TopicParameterGroup) method in PAP

Issue-ID: POLICY-1953
Signed-off-by: jrh3 <jrh3@att.com>
Change-Id: I225dc5f03d867efe6167fd20781c9959af34e0e9
Signed-off-by: jrh3 <jrh3@att.com>
4 years agoAdd lombok.config to PAP 07/92107/1
jrh3 [Fri, 26 Jul 2019 12:57:43 +0000 (08:57 -0400)]
Add lombok.config to PAP

This prevents sonar from checking lombok annotations for code
coverage.

Issue-ID: POLICY-1938
Signed-off-by: jrh3 <jrh3@att.com>
Change-Id: Ibd2613cf7e8e9c49cb60b93bdb44416efe6245e2

4 years agoModify pap to use RestServer from common 95/91695/1
jrh3 [Wed, 17 Jul 2019 13:45:45 +0000 (09:45 -0400)]
Modify pap to use RestServer from common

Issue-ID: POLICY-1652
Signed-off-by: jrh3 <jrh3@att.com>
Change-Id: If97c5667f52811cfb3bdf1f7c8caf763e6bfa3b6
Signed-off-by: jrh3 <jrh3@att.com>
4 years agoFix pap due to sonar changes in common 41/91041/1
jrh3 [Mon, 8 Jul 2019 19:30:51 +0000 (15:30 -0400)]
Fix pap due to sonar changes in common

Fixed breakages due to changes made in policy/common to satisfy
sonar.

Issue-ID: POLICY-1791
Signed-off-by: jrh3 <jrh3@att.com>
Change-Id: If8685462e1dd5cbbe58c329defff74ff2accf559

4 years agoRemove topic.properties and incorporate into overall config file 45/90845/1
a.sreekumar [Wed, 3 Jul 2019 15:55:17 +0000 (15:55 +0000)]
Remove topic.properties and incorporate into overall config file

Changes in the scripts to accomodate the removal of topic.properties.

Change-Id: I0be390a6124248a4e9d3bf38437290b89cf36170
Issue-ID: POLICY-1744
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
4 years agoRemove topic.properties and incorporate into overall config file 34/90734/1
a.sreekumar [Mon, 1 Jul 2019 14:50:01 +0000 (14:50 +0000)]
Remove topic.properties and incorporate into overall config file

1) The properties in the topic.properties file is moved into overall
config json file and the topic.properties file is removed.
2) Common parameters such as RestServer and Topic related parameters
from policy-common is used.

Change-Id: I390bbe3cda101a69e7ce614404ecdfbf98598dd2
Issue-ID: POLICY-1744
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
4 years agoRemove POLICY_PAP_HOME in Dockerfile 61/89961/4
shaoqiu [Fri, 28 Jun 2019 05:02:39 +0000 (05:02 +0000)]
Remove POLICY_PAP_HOME in Dockerfile

To use POLICY_HOME not POLICY_XX_HOME

Issue-ID: POLICY-1702
Change-Id: I87db84593c2fec3071571b1a0e09552c764a3474
Signed-off-by: shaoqiu <tim.huang@est.tech>
4 years agoBump up models to 2.1.1-SNAPSHOT 85/90585/1
ramverma [Thu, 27 Jun 2019 11:17:15 +0000 (11:17 +0000)]
Bump up models to 2.1.1-SNAPSHOT

Change-Id: I6c030da968407edb23be6aa6d5092e1aac7c21b3
Issue-ID: POLICY-1746
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
4 years agoUse ToStringTester from utils-test 26/90526/2
ramverma [Wed, 26 Jun 2019 14:50:53 +0000 (14:50 +0000)]
Use ToStringTester from utils-test

Changing ToStringTester from utils to utils-test.
Correcting the policy/common & policy/models version.

Change-Id: Ib0a14da17227f0f65004dc525a47f17519e25110
Issue-ID: POLICY-1746
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
4 years agoBump pap patch to 2.1.1 16/90516/1
Pamela Dragosh [Wed, 26 Jun 2019 12:42:30 +0000 (08:42 -0400)]
Bump pap patch to 2.1.1

Released 2.1.0

Issue-ID: POLICY-1737
Change-Id: Id5cd42e6685f5745152526fab9f2d8947b27eade
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoUpgrade to released common & models 33/90333/1 2.1.0
Pamela Dragosh [Fri, 21 Jun 2019 20:18:29 +0000 (16:18 -0400)]
Upgrade to released common & models

Released common 1.5.0 and models 2.1.0

Issue-ID: POLICY-1737
Change-Id: I1ffdbbddeb52a0730e279ca2b09b28cbe925de50
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoMerge "Allow integer version when using PDP Group Deploy"
Jorge Hernandez [Fri, 21 Jun 2019 16:31:55 +0000 (16:31 +0000)]
Merge "Allow integer version when using PDP Group Deploy"

4 years agoAdding PdpGroup healthcheck REST API in PAP 29/90229/5
ramverma [Fri, 21 Jun 2019 12:53:27 +0000 (12:53 +0000)]
Adding PdpGroup healthcheck REST API in PAP

Adding PdpGroup healthcheck REST API in PAP to return the health status
of all the Pdps registered with this PAP instance. The healthcheck
status will be based on the regular heartbeat coming from the pdps.

Change-Id: Ia0f1603b513bf62ce1df3058427dc6ccaf179cb3
Issue-ID: POLICY-1770
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
4 years agoUpgrade to release 3.0.0 parent 58/90258/1
Pamela Dragosh [Thu, 20 Jun 2019 20:30:49 +0000 (16:30 -0400)]
Upgrade to release 3.0.0 parent

Policy/parent released

Issue-ID: POLICY-1737
Change-Id: I80a50c1a9a8b16cc7a53da2dec81843e03b6fc91
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoAllow integer version when using PDP Group Deploy 56/90256/1
jrh3 [Thu, 20 Jun 2019 18:57:50 +0000 (14:57 -0400)]
Allow integer version when using PDP Group Deploy

The policies listed in a "PDP Group Deploy" request may not have
fully qualified versions.  Modified the code to replace the versions
in the request with fully qualified versions.
Also improved performance by avoiding look-ups of policies that
are already in the subgroup.

Change-Id: I37899c2b45228b97a80b7ef44f69694ba57e8f4a
Issue-ID: POLICY-1784
Signed-off-by: jrh3 <jrh3@att.com>
4 years agoFix sonar issues in PAP 05/89905/2
jrh3 [Fri, 14 Jun 2019 14:31:40 +0000 (10:31 -0400)]
Fix sonar issues in PAP

Replace string concatenation with "{}" place-holders in logging
statements.
Refactored PdpStatusMessageHandler and PdpGroupStateChangeProvider
to extract common/duplicate code block into PdpMessageGenerator.
Refactored selectPdpGroupsForRegistration() to reduce "cyclomatic complexity";
extracted selectPdpSubGroupsForRegistration from it.

Issue-ID: POLICY-1791
Signed-off-by: jrh3 <jrh3@att.com>
Change-Id: Ia0ebc1cf41cd2fa288130b4a58614a4983f47f8b
Signed-off-by: jrh3 <jrh3@att.com>
4 years agoAdd PDP heart beat expiration timer 12/89612/7
jrh3 [Tue, 11 Jun 2019 14:56:25 +0000 (10:56 -0400)]
Add PDP heart beat expiration timer

Added heart beat interval to the PDP-UPDATE message sent in response
to a heart beat message received from a PDP.
Added timers to detect missing heart beats and remove the PDP from
the DB - PdpTracker.
Modified current heart beat listener to update PdpTracker when a
heart beat is received.
Allow 3 missed heart beats instead of 2.

Change-Id: I81621fefbe494e0c4d6f0b9767b00b2a9dd398d8
Issue-ID: POLICY-1795
Signed-off-by: jrh3 <jrh3@att.com>
4 years agoMerge "policy/pap must publish docker images with tag X.Y-SNAPSHOT-latest"
Pamela Dragosh [Tue, 11 Jun 2019 12:51:35 +0000 (12:51 +0000)]
Merge "policy/pap must publish docker images with tag X.Y-SNAPSHOT-latest"

4 years agopolicy/pap must publish docker images with tag X.Y-SNAPSHOT-latest 06/89606/1
Rashmi Pujar [Fri, 7 Jun 2019 19:53:59 +0000 (15:53 -0400)]
policy/pap must publish docker images with tag X.Y-SNAPSHOT-latest

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

4 years agoUndeploy all versions of a policy 93/89593/1
Jim Hahn [Fri, 7 Jun 2019 15:33:59 +0000 (11:33 -0400)]
Undeploy all versions of a policy

Modified the code to undeploy all versions of a policy if the
version is not specified.

Change-Id: Ic3815733b918e1cff8f381d54bceb710a35319b7
Issue-ID: POLICY-1782
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoReject policy deployment with version mismatch 97/89397/2
Jim Hahn [Wed, 5 Jun 2019 15:00:21 +0000 (11:00 -0400)]
Reject policy deployment with version mismatch

PAP should not allow multiple versions of a policy to be deployed
to the same PDP.  Modified the code to reject deployment requests
where a different version of the policy is already deployed.  This
impacts both the PDP-Group-Deploy and the Simple-Deploy REST APIs.

Change-Id: I586b764951c20228d0d80ec8326869215e970fdf
Issue-ID: POLICY-1785
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoMerge "Undeploy policies when subgroup is deleted"
Jorge Hernandez [Wed, 5 Jun 2019 12:46:29 +0000 (12:46 +0000)]
Merge "Undeploy policies when subgroup is deleted"

4 years agoUndeploy policies when subgroup is deleted 92/89292/3
Jim Hahn [Tue, 4 Jun 2019 21:27:31 +0000 (17:27 -0400)]
Undeploy policies when subgroup is deleted

When a subgroup is deleted via the PDP Group create/update API,
any PDPs in the subgroup should have all of its policies undeployed.
In the process, refactored addOrUpdateSubGroups() out of updateGroup().

Change-Id: I0750802bfb133a655e38493a868744b512ca3fb4
Issue-ID: POLICY-1803
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoFix pap docker chmod 72/89272/2
Jim Hahn [Tue, 4 Jun 2019 18:37:48 +0000 (14:37 -0400)]
Fix pap docker chmod

The chmod in the docker builder for my local VM does not appear to
support the "+x" style options. Modified the pap docker
file to use "755" instead.

Change-Id: Iac98ab903862e4d32ef9f86595e01a13929f8de8
Issue-ID: POLICY-1829
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoBump pap to version 2.1.0 11/88911/2
Jim Hahn [Thu, 30 May 2019 14:30:12 +0000 (10:30 -0400)]
Bump pap to version 2.1.0

Change-Id: I964d26a2812ae3e638f87587540b6881e1e6fa58
Issue-ID: POLICY-1747
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoUpdate pap stability testsuite 09/88709/2
ramverma [Wed, 29 May 2019 10:54:01 +0000 (10:54 +0000)]
Update pap stability testsuite

1) Adding test cases to the stability test plan.
2) Adding script & related files for setup of pap for testing
3) Adding script & related files for setup of simulator and dependencies
like dmaap simulator, pdp simulator, mariadb & policy/api.

Change-Id: Ib7a1e95dee108e9d8757ee18cbf5fb8c2b877274
Issue-ID: POLICY-1799
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoBump to 2.0.2-SNAPSHOT 22/88422/1
Pamela Dragosh [Thu, 23 May 2019 23:01:24 +0000 (19:01 -0400)]
Bump to 2.0.2-SNAPSHOT

Released 2.0.1

Issue-ID: POLICY-1700
Change-Id: I6c1e328ff0ccbdfd59856ee14a56990ae36df56c
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoUpgrade to released policy/models 90/88390/1 2.0.1 4.0.0-ONAP
Pamela Dragosh [Thu, 23 May 2019 17:13:54 +0000 (13:13 -0400)]
Upgrade to released policy/models

Released 2.0.1

Issue-ID: POLICY-1700
Change-Id: Ic03e49b17a4a2174e065afa7b852b73741ff59a8
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoUpdate INFO.yaml to add Jim and Ram 61/88261/1
liamfallon [Wed, 22 May 2019 14:42:30 +0000 (14:42 +0000)]
Update INFO.yaml to add Jim and Ram

Issue-ID: POLICY-1775
Change-Id: I08ece82243e8109f0442001dfc8c2fa395e6dc3f
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoUpgrade models version 46/88246/1
Jim Hahn [Wed, 22 May 2019 13:38:24 +0000 (09:38 -0400)]
Upgrade models version

Switch to the policy/models version containing the fix for
the latest-version query.

Change-Id: Iaaa81aebc3a03283813903e64b9049e2e7f23ecd
Issue-ID: POLICY-1777
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoAdd son handler to xacml pdp group 95/87995/1
Pamela Dragosh [Fri, 17 May 2019 13:34:58 +0000 (09:34 -0400)]
Add son handler to xacml pdp group

Need this for the 5G OOF PCI Use Case.

Issue-ID: POLICY-1776
Change-Id: I86758174840d376d6003f5200f0deeb72c3e01d9
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoStep snapshot version of policy-pap 52/87852/1
liamfallon [Thu, 16 May 2019 08:59:55 +0000 (08:59 +0000)]
Step snapshot version of policy-pap

Issue-ID: POLICY-1630
Change-Id: Ie38ed0cc191dcd657b7558102b77b0912170568d
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoUpgrade to policy/models release 24/87724/1 2.0.0
Pamela Dragosh [Wed, 15 May 2019 00:16:42 +0000 (20:16 -0400)]
Upgrade to policy/models release

Release 2.0.0

Issue-ID: POLICY-1630
Change-Id: Ib4f24732a62c1cfc6464283fb3af4d0b0cc1735f
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
5 years agoUpgrade policy/parent & policy/common in pap 32/87532/3
ramverma [Mon, 13 May 2019 10:14:42 +0000 (10:14 +0000)]
Upgrade policy/parent & policy/common in pap

Change-Id: I44938584e1ec6e65f8a08f42c3632bc912e2df18
Issue-ID: POLICY-1630
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoReturn 200 when policy successfully undeployed 64/87464/2
Jim Hahn [Fri, 10 May 2019 14:19:43 +0000 (10:19 -0400)]
Return 200 when policy successfully undeployed

The PAP Undeploy CSIT was failing, because it was returning 400.
The code was counting PDP UPDATE requests to determine whether or
not the policy had been found.  However, if a subgroup currently
has no PDPs assigned (as is the case with the CSIT), then there
will be no PDP UPDATEs, thus it will think that the policy was
not found and return 400.  Modified the code to count updates to
the DB instead.

Change-Id: I80cdcc738e07c418e0a7184284e7a228e3a6014d
Issue-ID: POLICY-1758
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoUse group from cache even with new policy type 00/87400/1
Jim Hahn [Thu, 9 May 2019 19:43:53 +0000 (15:43 -0400)]
Use group from cache even with new policy type

When multiple policies are deployed to the same group in a single
request, and the policies have different policy types, only the
changes associated with the last policy are kept.  Updated the
policy type lookup to use cached groups, when available.
This still needs a junit to verify the fix, but that can come
later.
Also added more logging.

Change-Id: Ieaf866da504b167c884bf53f88aa8cb9e9b5e32a
Issue-ID: POLICY-1761
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoReturn error when deleting non-existent policy 75/87375/2
Jim Hahn [Thu, 9 May 2019 15:28:28 +0000 (11:28 -0400)]
Return error when deleting non-existent policy

When undeploying a policy, if a policy's type is found in
a group, but the policy is not, then PAP returns 200.  It
should return an error instead.

Change-Id: I88273fdbd5d49095e8248ab9267cccc529af0ae0
Issue-ID: POLICY-1758
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoChanging the PAP initial db data 13/86813/1
ramverma [Thu, 2 May 2019 12:58:30 +0000 (12:58 +0000)]
Changing the PAP initial db data

Changing PAP initial db data to bring all the xacml supportedPolicyTypes
in one PdpGroup.

Change-Id: I9a0788c788bab470109b0f09fb631e7fbb90042e
Issue-ID: POLICY-1723
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoCancel PDP timers in PAP 67/86667/1
Jim Hahn [Tue, 30 Apr 2019 18:39:43 +0000 (14:39 -0400)]
Cancel PDP timers in PAP

When a response is received by PAP from a PDP, the associated timer
(and listener) are not being cancelled.  As a result, when the timer
later expired, PAP was re-sending the request.  Modified the code to fix
this.

Change-Id: Id63f76622c01d286c169b618f8369b849ff31085
Issue-ID: POLICY-1715
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoAdding algorithm for Pdp registration 45/86545/5
ramverma [Tue, 30 Apr 2019 08:53:31 +0000 (08:53 +0000)]
Adding algorithm for Pdp registration

1) Adding algorithm for improving Pdp registration. The flow is:
When a new Pdp comes for registration, PAP will shortlist a list of
PdpGroups based on the supportedPolicyTypes reported by PdpStatus
message and the supportedPolicyTypes in the PdpSubGroup.
Then PAP will find the PdpGroup which needs the Pdp most in two ways:
1) If there is a subgroup with no Pdp's then that takes the priority.
2) Otherwise the Pdp is allocated to the PdpGroup with highest
difference value of desiredInstanceCount - currentInstanceCount.

2) Changing the preconfigured TosaPolicyType for apex to avoid
interference with legacy operational policies of drools.

Change-Id: I77584c3c030bc27903c11689acaca33148e27e3c
Issue-ID: POLICY-1630
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoSonar fixes for PAP "duplicate code" 63/86563/1
Jim Hahn [Mon, 29 Apr 2019 17:02:35 +0000 (13:02 -0400)]
Sonar fixes for PAP "duplicate code"

Extracted common code from "delete" controller.
Extracted common code from "deploy" controller.
Not sure if this will actually fix the sonar issue or not.  If it's
really complaining about the code, then this should fix it.  On
the other hand, if it's complaining about the annotations, then
I don't think there's a way around it.

Change-Id: I7c68393f3fc1b9719987d850582bd8ed335b9663
Issue-ID: POLICY-1711
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoValidate supported types 66/86166/3 3.0.2-ONAP
Jim Hahn [Tue, 23 Apr 2019 17:27:55 +0000 (13:27 -0400)]
Validate supported types

When a group is created, PAP should verify that the "supported types"
exist in the DB.
Address potential sonar issue.
Address potential sonar issue in similar block of code.

Change-Id: Ib830550bc37d4ebe42c8782f3f874e463f3f51c2
Issue-ID: POLICY-1688
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Rebase image on policy-common-alpine"
Jorge Hernandez [Wed, 24 Apr 2019 15:02:02 +0000 (15:02 +0000)]
Merge "Rebase image on policy-common-alpine"

5 years agoRebase image on policy-common-alpine 68/83468/2
Dmitry Puzikov [Mon, 25 Mar 2019 16:04:12 +0000 (17:04 +0100)]
Rebase image on policy-common-alpine

Issue-ID: INT-1002
Change-Id: I77191f96b308a246933aa6dbd3b4e596e0514983
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
5 years agoReturn appropriate HTTP status code 75/86075/3
Jim Hahn [Tue, 23 Apr 2019 15:43:50 +0000 (11:43 -0400)]
Return appropriate HTTP status code

Return 404 instead of 500 when items are not found.  Bubble up other
HTTP error codes instead of changing them all to 500.

Change-Id: Ib614bb83f28cfb1ce2384679398f0a45058fc455
Issue-ID: POLICY-1686
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Handle null policy lists"
Jorge Hernandez [Sat, 20 Apr 2019 16:09:11 +0000 (16:09 +0000)]
Merge "Handle null policy lists"

5 years agoAdd end-to-end junits for PAP REST API 43/85643/5
Jim Hahn [Wed, 17 Apr 2019 19:30:46 +0000 (15:30 -0400)]
Add end-to-end junits for PAP REST API

Added test that checks sunny day scenarios for the PAP REST API.
Uses real PAP components for everything except DMaaP.  PDPs are
simulated.

Change-Id: If2adc3b1523b477c3efd3eb83fb7a7b04f40fa24
Issue-ID: POLICY-1670
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoHandle null policy lists 28/85728/3
Jim Hahn [Fri, 19 Apr 2019 00:24:24 +0000 (20:24 -0400)]
Handle null policy lists

UpdateReq throws NPE if the policy list in the request or the
response is null.

Change-Id: I0d71d6ad4cc9b96315c3b3ba89af8e4d8f3f94e6
Issue-ID: POLICY-1669
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoAdd DMaaP sim configuration files 94/85594/1
liamfallon [Wed, 17 Apr 2019 13:58:35 +0000 (13:58 +0000)]
Add DMaaP sim configuration files

Add configurtion files that work with the DMaaP simulator.

Issue-ID: POLICY-1643
Change-Id: I8e387163ab190b9610669029720ccf7b9989cfdf
Signed-off-by: liamfallon <liam.fallon@est.tech>
5 years agoMerge "Audit and metric logs contain everything"
Pamela Dragosh [Wed, 17 Apr 2019 11:21:28 +0000 (11:21 +0000)]
Merge "Audit and metric logs contain everything"

5 years agoAdd missing fields to initial subgroups 22/85522/2
Jim Hahn [Tue, 16 Apr 2019 22:08:54 +0000 (18:08 -0400)]
Add missing fields to initial subgroups

Some required fields were missing from the subgroups in the
inital DB.  Also added code to validate what is initially loaded into
the DB.

Change-Id: Iffa56a5a0dee833691d1bb7859b075c3b4d86595
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Set DAO factory in request map parameters"
Jorge Hernandez [Tue, 16 Apr 2019 22:07:57 +0000 (22:07 +0000)]
Merge "Set DAO factory in request map parameters"

5 years agoMerge "Clear servlets at the start of tests"
Jorge Hernandez [Tue, 16 Apr 2019 22:07:38 +0000 (22:07 +0000)]
Merge "Clear servlets at the start of tests"

5 years agoAudit and metric logs contain everything 19/85519/1
Jim Hahn [Tue, 16 Apr 2019 20:56:08 +0000 (16:56 -0400)]
Audit and metric logs contain everything

Currently, the audit and metric logs contain everything, because
there is no filtering configured in logback.xml.  After some discussion,
we decided to just remove those two log files for now, as they may
be completely revamped in a future release of ONAP.

Change-Id: I1f964e1bb97092e3795e368798e071a6d40832c2
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoSet DAO factory in request map parameters 09/85509/2
Jim Hahn [Tue, 16 Apr 2019 18:36:47 +0000 (14:36 -0400)]
Set DAO factory in request map parameters

While testing, saw NPE when PdpModifyRequestMap attempted to
create a DAO provider.  Forgot to add the DAO factory to the
list of parameters passed to the request map constructor.

Change-Id: I72bc63543bc58b11c3ef70f50342e72a24a8b653
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Fix more sonar issues"
Pamela Dragosh [Tue, 16 Apr 2019 17:18:10 +0000 (17:18 +0000)]
Merge "Fix more sonar issues"

5 years agoMerge "Fix sonar issue in PdpStatusMessageHandler"
Jorge Hernandez [Tue, 16 Apr 2019 16:48:27 +0000 (16:48 +0000)]
Merge "Fix sonar issue in PdpStatusMessageHandler"

5 years agoClear servlets at the start of tests 95/85495/1
Jim Hahn [Tue, 16 Apr 2019 15:58:37 +0000 (11:58 -0400)]
Clear servlets at the start of tests

Modified the junit tests to destroy the servlet factory before each
test to prevent previous configurations from interfering with
new configurations.

Change-Id: I558269e89af271bee13cb9db94eadbcbf08f14d4
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoFix sonar issue in PdpStatusMessageHandler 91/85491/1
Jim Hahn [Tue, 16 Apr 2019 15:44:18 +0000 (11:44 -0400)]
Fix sonar issue in PdpStatusMessageHandler

Change-Id: I389f61f9311bba35115a174c8526f897c98a3364
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoFix more sonar issues 72/85472/1
Jim Hahn [Tue, 16 Apr 2019 13:31:48 +0000 (09:31 -0400)]
Fix more sonar issues

Added another unused parameter from RequestImpl to a logging message.
Removed "throws PfModelException" from ProviderBase.
Shorten lambda function in SessionData.

Change-Id: I5c0ba99bd92ac94bdeacd2398fbc65f081ef85ad
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoOne year cert with new component names 83/85383/2
jhh [Mon, 15 Apr 2019 23:22:08 +0000 (18:22 -0500)]
One year cert with new component names

Change-Id: I46bc9b12d3edef995a2a04ee9a7fdc1830574bd5
Issue-ID: POLICY-1580
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
5 years agoFix sonar issues in PAP 71/85371/3
Jim Hahn [Mon, 15 Apr 2019 18:37:46 +0000 (14:37 -0400)]
Fix sonar issues in PAP

Moved methods into nested class of PdpModifyRequestMap.  Note: they
will have to be moved back out when the broadcast capability is
added.
Removed extra "continue" from Publisher.
Rather than remove unused parameters and cause significant clutter
to the code, chose to use the parameters in a logger call for RequestImpl.
Removed unnecessary cast from UpdateReq.
Use version constant in PapRestControllerV1.
Log exception in PdpGroupQueryControllerV1.
Log exception in PdpGroupStateChangeControllerV1.
Shortened functional in PdpGroupDeleteProvider.
Removed unnecessary type parameters from PdpGroupDeployProvider.
Removed unneeded parameter and exception from ProviderBase.
Extracted common string from Main.
Shorted functionals in PapActivator.
Changed uses of getCanonicalName() to getName(); the former only has
limited use, while the latter is typically what is wanted and is
actually required whenever forClass(name) is used.
Fix junit tests broken by rename of ToscaPolicy version from
"typeVersion" to "type_version".

Change-Id: Ia00e1b3541c9e25b196a951e45681f67aa7f1bfe
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoSupport integer policy-version 47/85347/2
Jim Hahn [Mon, 15 Apr 2019 14:19:26 +0000 (10:19 -0400)]
Support integer policy-version

The deploy/undeploy APIs used by CLAMP only pass the major number
when specifying a policy-version.  Modified the code to handle
policy-versions of the form, major or major.minor.

Change-Id: I3251df162984f287bd1430b8e46da675b4c265ee
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoSupport group-oriented REST API 37/85237/7
Jim Hahn [Fri, 12 Apr 2019 14:00:05 +0000 (10:00 -0400)]
Support group-oriented REST API

Added code to support PDP group create/update & delete REST API calls.
The create/update request can also be used to deploy/undeploy policies.
It is assumed that the create/update request specifies a valid
list of supported policy types for each subgroup (i.e., PDP type).
Updated due to elimination of "version" from group in policy/models.
Added/updated junits.

Change-Id: I1916d9b17dfd5f12129c6f6a2fcf54e706662c10
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoUpdate PDP with null group/subgroup when disabled 53/85253/5
Jim Hahn [Sat, 13 Apr 2019 01:02:53 +0000 (21:02 -0400)]
Update PDP with null group/subgroup when disabled

Modified the code so that, when a PDP is unable to fulfill a request,
an UPDATE is sent to the PDP with group=null and subgroup=null.
Also made updates to eliminate group version due to changes in
policy/models.

Change-Id: I9400ef5f8c365f492113a5b592b9ee6b7218756e
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoAdding code for db config & initial group creation 19/85119/2
ramverma [Thu, 11 Apr 2019 22:09:38 +0000 (22:09 +0000)]
Adding code for db config & initial group creation

1) Adding code for initial PdpGroup/Subgroup creation.
2) Adding db configuration
3) Updated code as per change in policy/models

Change-Id: If37870925001b333e0537e364eecb266c351cf5a
Issue-ID: POLICY-1635
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoDon't change group version number 09/85109/1
Jim Hahn [Wed, 10 Apr 2019 17:58:05 +0000 (13:58 -0400)]
Don't change group version number

Modified code to update a PdpGroup, adding or removing policies, without
changing the version number.

Change-Id: I10031dff5f6d9c7e568605a8d73af6fe3c740901
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoFix junits broken with policy-id change 03/85103/1
Jim Hahn [Thu, 11 Apr 2019 15:29:16 +0000 (11:29 -0400)]
Fix junits broken with policy-id change

Several junit tests were broken when the json-encoded names were
changed for the fields within ToscaPolicyIdentifierOptVersion.  This
review fixes those junit tests.

Change-Id: I963190b7792a2ebc3165ef04c74f4671c41c37da
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoRemove PDP from all active groups 71/84971/2
Jim Hahn [Wed, 10 Apr 2019 12:48:10 +0000 (08:48 -0400)]
Remove PDP from all active groups

The code to disable a PDP used the group name, extracted from a
prior PdpUpdate request, to identify the group from which the PDP
should be removed.  This is not sufficient, as the requests tracker
may have never seen an update request.  Therefore, the code was
modified to simply remove the PDP from all active groups.  Also
made removeFromGroups(pdpName) public so that it can be used by
other PAP code.

Change-Id: Iedec88cb23e586944563dcc5ac82ff3b9f122f8c
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Add junit tests for PdpGroupDeleteProvider"
Jorge Hernandez [Wed, 10 Apr 2019 18:24:05 +0000 (18:24 +0000)]
Merge "Add junit tests for PdpGroupDeleteProvider"

5 years agoMerge "Refactor request map"
Jorge Hernandez [Wed, 10 Apr 2019 18:23:32 +0000 (18:23 +0000)]
Merge "Refactor request map"

5 years agoMerge "Adding final dmaap & db configurations"
Jorge Hernandez [Wed, 10 Apr 2019 17:31:38 +0000 (17:31 +0000)]
Merge "Adding final dmaap & db configurations"

5 years agoAdd junit tests for PdpGroupDeleteProvider 05/84905/1
Jim Hahn [Wed, 10 Apr 2019 16:08:53 +0000 (12:08 -0400)]
Add junit tests for PdpGroupDeleteProvider

Change-Id: Id744a7d49b9fb608ba3379dd43bcbd6a0297891f
Issue-ID: POLICY-1541
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Current draft of undeploy"
Liam Fallon [Wed, 10 Apr 2019 16:22:25 +0000 (16:22 +0000)]
Merge "Current draft of undeploy"

5 years agoCurrent draft of undeploy 00/84300/2
Jim Hahn [Wed, 10 Apr 2019 13:26:59 +0000 (09:26 -0400)]
Current draft of undeploy

Change-Id: If3f01a6e92bef9eb889066115537f599e6b09229
Issue-ID: POLICY-1541
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoFix eclipse warning in SessionData 75/84875/1
Jim Hahn [Wed, 10 Apr 2019 13:17:48 +0000 (09:17 -0400)]
Fix eclipse warning in SessionData

Change-Id: I0c11b9704960f1b0b4d4c099a1b582ee259524e0
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoAdding final dmaap & db configurations 54/84854/2
ramverma [Wed, 10 Apr 2019 11:35:30 +0000 (11:35 +0000)]
Adding final dmaap & db configurations

Change-Id: I547f8a520d84d3593f90256fa91fc964c1d1e83c
Issue-ID: POLICY-1443
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoRefactor request map 62/84762/4
Jim Hahn [Mon, 8 Apr 2019 14:16:00 +0000 (10:16 -0400)]
Refactor request map

Refactored to facilitate the addition of broadcast requests in the
future.
Added disable-PDP capability.
Updated some comments.
Add junit tests.
Only treat null group as broadcast - empty strings are not broadcasts.
Added more logging.

Change-Id: I6f62b8755d20769c333f06752e9d63ac9ed83b57
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoFix review comments & add updateLock 56/84756/1
ramverma [Tue, 9 Apr 2019 21:39:55 +0000 (21:39 +0000)]
Fix review comments & add updateLock

1) Fixing review comments from previous review.
2) Adding updateLock to registration handler & state change provider.

Change-Id: I9f6e0de1f58190e490b28965c84a3a0c7aa90486
Issue-ID: POLICY-1443
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoAdding PdpGroup query & statechange providers 46/84646/5
ramverma [Tue, 9 Apr 2019 16:49:43 +0000 (16:49 +0000)]
Adding PdpGroup query & statechange providers

1) Adding implementation of PdpGroup Query & State change providers for
PAP REST API.
2) Adding support for unregistering Pdp after recieving TERMINATED state
in PdpStatus message.
3) Updating PdpStatusMessageHandler with new filter changes in models.
4) Removing updatePdpStatistics method as we will implement db provider
and REST provider in next release.
5) Fixing few bugs found during Pdp registration testing.
6) Updating the existing test cases to work.
7) Will be adding more exhaustive test cases in another review.

Change-Id: I7aa20bf422671fdc1e06dab5e90aef4ee19a6a02
Issue-ID: POLICY-1541
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoAdds basic performance tests for Policy PAP 46/84546/1
Bilal A [Mon, 8 Apr 2019 16:56:51 +0000 (12:56 -0400)]
Adds basic performance tests for Policy PAP

Includes
1) Basic health and stats tests
2) Log analysis script

Change-Id: I6d8f7a0203251d9b685b89c4d0c8e19cd74c24c6
Issue-ID: POLICY-1460
Signed-off-by: Bilal A <bilal@research.att.com>
5 years agoMerge "Wrong models-pdp in pap"
Pamela Dragosh [Mon, 8 Apr 2019 11:44:37 +0000 (11:44 +0000)]
Merge "Wrong models-pdp in pap"

5 years agoMerge "Add latest-version check to status msg handler"
Liam Fallon [Mon, 8 Apr 2019 05:39:56 +0000 (05:39 +0000)]
Merge "Add latest-version check to status msg handler"

5 years agoWrong models-pdp in pap 37/84437/1
Jim Hahn [Sun, 7 Apr 2019 14:34:45 +0000 (10:34 -0400)]
Wrong models-pdp in pap

Policy/pap was still referring to models-pdp instead of
policy-models-pdp.

Change-Id: Ia39647a7fe3d29fe5d67ee6f8f57a296f4cc4347
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoAdd latest-version check to status msg handler 10/84410/1
Jim Hahn [Fri, 5 Apr 2019 23:39:52 +0000 (19:39 -0400)]
Add latest-version check to status msg handler

PdpGroupFilter now supports filtering by latest version.  Removed a
TODO from PdpStatusMessageHandler and added the filter parameter.

Change-Id: I67983397b616d8e289c4dc79d912bb4cf26e97ae
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoDelay DB updates until all policies processed 08/84408/3
Jim Hahn [Fri, 5 Apr 2019 21:02:06 +0000 (17:02 -0400)]
Delay DB updates until all policies processed

If an exception is thrown in the middle of processing policies, it's
possible for the DB to reflect a partial deployment.  This change
queues the DB changes so that they're all made at once, after all
policies have been processed.
Extracted sort() into a common place.
Corrected some comments.
Simplified the list retrieval in the junits since all DB creates and
updates are now batched together into one operation each.

Change-Id: I835175fc16d4042c741d36ec69caa8f603d46d5a
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoMerge "Fix csit of policy/pap"
Pamela Dragosh [Fri, 5 Apr 2019 22:25:57 +0000 (22:25 +0000)]
Merge "Fix csit of policy/pap"

5 years agoFix csit of policy/pap 93/84393/1
ramverma [Fri, 5 Apr 2019 20:25:46 +0000 (20:25 +0000)]
Fix csit of policy/pap

Change-Id: I1158a6a7f0582dabafb22961d073db6d14cf2793
Issue-ID: POLICY-1443
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoFlesh out policy deployment REST API 52/84352/2
Jim Hahn [Fri, 5 Apr 2019 13:52:35 +0000 (09:52 -0400)]
Flesh out policy deployment REST API

Also moved the controller, the provider, and supporting classes
to their own dep_undep package.

Change-Id: Ifea1c4dd2ecbf93a8f4d45e130830cf9271103d3
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoFixes per latest models updates 47/84347/1
Jim Hahn [Fri, 5 Apr 2019 13:03:15 +0000 (09:03 -0400)]
Fixes per latest models updates

Changes made per the scrum call on 4/4 moved things around.  In
addition, filter classes were added to the tosca provider.  Both
of these necessitated changes to policy/pap so that things compile.

Change-Id: Iba4c52b650dab0f8d242b06be3fede42dd5b7264
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoAdding more code to pdp registration handler 56/84156/2
ramverma [Thu, 4 Apr 2019 08:57:18 +0000 (08:57 +0000)]
Adding more code to pdp registration handler

1) Adding more code to pdp registration handler.
2) Fixing few broken files.

Change-Id: Ic8b68f95f7022ce0572345ea358ff380ec8a3e61
Issue-ID: POLICY-1443
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoFix classes in pap to align with change in models 23/84123/2
ramverma [Wed, 3 Apr 2019 17:53:57 +0000 (17:53 +0000)]
Fix classes in pap to align with change in models

Change-Id: I0ecef8f004967e2fffa33eff2ee7e6f035d3d94c
Issue-ID: POLICY-1443
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoChanges in pdp registration handler 04/84104/1
ramverma [Wed, 3 Apr 2019 14:26:01 +0000 (14:26 +0000)]
Changes in pdp registration handler

1) Fix left over comments from previous review.
2) Change from PdpGroups to List<PdpGroup>

Change-Id: I833d4cf2837babf0947c9999220a651f9a69bf7e
Issue-ID: POLICY-1443
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoAdding PdpStatus listener & handler to policy/pap 91/83991/1
ramverma [Tue, 2 Apr 2019 17:50:15 +0000 (17:50 +0000)]
Adding PdpStatus listener & handler to policy/pap

1) Adding PdpHeartbeatListener to keep listening for PdpStatus messages
coming from Pdp's over DMaaP either for registration or just heartbeat.
2) Adding PdpStatusMessageHandler to handle new Pdp registration and
also heartbeat coming from Pdp's.
Registration Flow -
 1. Find the PdpSubgroup based on PdpType & SupportedPolicyTypes coming
    in PdpStatus message.
 2. If not found, don't register pdp and log the error message.
 3. If found, check if PdpInstance is already added.
 4. If not added, add PdpInstance to the subgroup and increment the
    currentInstanceCount.
 5. Create and send PdpUpdate & PdpStateChange message to the Pdp.
 6. Update the changes in DB.

Heatbeat Flow -
 1. Find the PdpInstance based on details in PdpStatus message.
 2. Validate the details from message to what in DB.
 3. If correct, persist the health & statistics information in DB.
 4. If not correct, send a PdpUpdate & PdpStateChange message to the Pdp.

3) Unit tests will come as seperate review.

Change-Id: If705193259999e2ab077b78961282c998b949f57
Issue-ID: POLICY-1443
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
5 years agoRemove pdpType from tests 82/83982/1
Jim Hahn [Tue, 2 Apr 2019 15:03:51 +0000 (11:03 -0400)]
Remove pdpType from tests

Somehow, pdpType is was still referenced by junit tests.  Thought I
had fixed that, but guess not.

Change-Id: I8060208129cb2c6ba1ecb21d65efb778a2778aa5
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
5 years agoAdd mapper class 58/83658/11
Jim Hahn [Fri, 29 Mar 2019 22:36:56 +0000 (18:36 -0400)]
Add mapper class

Added class to map between classes in models-pap and models-pdp.
Used constants in appropriate places.
Re-use maker functions.
Added some comment.
Corrected a comment.
Added mapping method for PdpDeployPolicies.
Added PdpDeployPolicies to "internal" package.
Updated to reflect refactoring of ToscaPolicy.
Fixed bug/typo in assertEquals test.

Updated tests to work with models-pdp not based on PfConceptKey.

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