Jim Hahn [Fri, 1 Nov 2019 12:51:08 +0000 (12:51 +0000)]
Merge "Add common Jersey version"
liamfallon [Fri, 1 Nov 2019 11:45:21 +0000 (11:45 +0000)]
Add common Jersey version
Add a common version of Jersey for all Policy Framework components.
Issue-ID: POLICY-2209
Change-Id: I18134fa72710db9abe045b07013162a7a1002553
Signed-off-by: liamfallon <liam.fallon@est.tech>
Jim Hahn [Thu, 31 Oct 2019 21:58:45 +0000 (17:58 -0400)]
Add tests for policy type in notifications
The junit tests verified that the policy specified in the notifications,
but did not verify the policy type. Added additional tests.
Issue-ID: POLICY-2190
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Iad2a06163f9dce3dff3753cddef98db9e9ad2eea
jh7358 [Wed, 16 Oct 2019 15:51:46 +0000 (11:51 -0400)]
Generate notifications when policies change
Updated existing PAP code to make use of new notification classes.
Change-Id: I4637ad92ac4f432f215cfc837e672c75074d88b5
Issue-ID: POLICY-1841
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 25 Oct 2019 13:25:59 +0000 (09:25 -0400)]
Add notifier for generating notifications
Also modified the Publisher class to make it generic so that it
could be used to publish PdpMessage AND PolicyNotification.
Issue-ID: POLICY-1841
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I305de21a4ef84730f163af63446bafadab11a809
Jim Hahn [Thu, 24 Oct 2019 15:17:14 +0000 (11:17 -0400)]
Add trackers for generating notifications
Issue-ID: POLICY-1841
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I7d6fe29707685e4711120b6a1e8448f25870a0ef
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Thu, 24 Oct 2019 13:05:09 +0000 (13:05 +0000)]
Merge "Add PolicyPdpNotificationData for generating notifications"
Jim Hahn [Wed, 23 Oct 2019 14:43:45 +0000 (10:43 -0400)]
Add PolicyPdpNotificationData for generating notifications
Issue-ID: POLICY-1841
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Icf5616190a8c3da38e2a1e33122b47a78e729d08
Jim Hahn [Tue, 22 Oct 2019 22:05:42 +0000 (18:05 -0400)]
Add PolicyTrackerData for generating notifications
Change-Id: Ife3ab77c0664101bbf32def5fb4d1a5ac194f459
Issue-ID: POLICY-1841
Signed-off-by: Jim Hahn <jrh3@att.com>
jhh [Thu, 17 Oct 2019 00:39:55 +0000 (19:39 -0500)]
override cert stores
Issue-ID: POLICY-2064
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I9a6077b51c1684b7c34a1cec827288cfb7dc58bc
jrh3 [Thu, 19 Sep 2019 19:09:45 +0000 (15:09 -0400)]
Use snapshot version of models in pap
Issue-ID: POLICY-2065
Signed-off-by: jrh3 <jrh3@att.com>
Change-Id: I0c4b764dff548599fccb6ea9ef977b2f54e32bcd
jrh3 [Thu, 12 Sep 2019 18:34:30 +0000 (14:34 -0400)]
Add yaml support to pap rest server
Change-Id: I3e3d5c46bfa4f1d093e64b8be9a9720570e6000c
Issue-ID: POLICY-2085
Signed-off-by: jrh3 <jrh3@att.com>
jrh3 [Tue, 10 Sep 2019 15:04:50 +0000 (11:04 -0400)]
Bump versions for pap master
Issue-ID: POLICY-2045
Signed-off-by: jrh3 <jrh3@att.com>
Change-Id: I31bb75b39a3232ef7448fadcd79941d5191f61c2
Pamela Dragosh [Tue, 10 Sep 2019 00:28:00 +0000 (20:28 -0400)]
Release pap 2.1.2
Releasing 2.1.2
Issue-ID: POLICY-2045
Change-Id: I0d0a0297be062fb15b8adc9eda0d6f43f4a7a7bf
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Pamela Dragosh [Mon, 9 Sep 2019 23:35:51 +0000 (19:35 -0400)]
Upgrade to released artifacts
Upgrade to released parent, common and models.
Issue-ID: POLICY-2045
Change-Id: Ib6690c27d4b7d01385f0d2ad5ddc79c270d8bd0d
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
liamfallon [Wed, 4 Sep 2019 17:37:18 +0000 (17:37 +0000)]
Knock on of changing policy types to map
This review adapts policy-pap for the change in the structure
of the toasca service template from a list of maps to a plain map.
There is only a change to one test file.
Issue-ID: POLICY-2047
Change-Id: Ieeeeb43d8f0300d075b3072b67f8d459def27ee7
Signed-off-by: liamfallon <liam.fallon@est.tech>
jhh [Fri, 23 Aug 2019 03:41:26 +0000 (22:41 -0500)]
update keystore
Issue-ID: POLICY-1988
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I3e7d08621b6ac529f3517de8c2b910d2fa7c5151
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Bruno Sakoto [Wed, 7 Aug 2019 12:41:14 +0000 (08:41 -0400)]
Upgrade to snapshot integration parent artifact
Issue-ID: POLICY-1603
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: I18d3914e227d09cbb440c31779c21b9e8ab3eb24
jrh3 [Wed, 7 Aug 2019 16:31:00 +0000 (12:31 -0400)]
Bump version of policy/pap
Issue-ID: POLICY-1965
Signed-off-by: jrh3 <jrh3@att.com>
Change-Id: I23b13145a769055bdfef97d6a7deca1ccf710337
jhh [Tue, 6 Aug 2019 16:36:54 +0000 (11:36 -0500)]
Add release 2.1.1 file
Issue-ID: POLICY-1953
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I3ee82a9736a5d69286f978d1d0f39f304a3834d6
jhh [Mon, 5 Aug 2019 13:42:22 +0000 (08:42 -0500)]
Update to latest common/models released versions
policy/models: 2.1.2
policy/common: 1.5.1
Issue-ID: POLICY-1953
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: If4cb2c63e8880d2fc921cbcecdabe7c02e30b13f
Jorge Hernandez [Thu, 1 Aug 2019 12:42:43 +0000 (12:42 +0000)]
Merge "Remove hardcoded ip in PAP testsuites"
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>
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>
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
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>
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
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>
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
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>
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>
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>
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>
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>
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>
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>
Jorge Hernandez [Fri, 21 Jun 2019 16:31:55 +0000 (16:31 +0000)]
Merge "Allow integer version when using PDP Group Deploy"
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>
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>
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>
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>
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>
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"
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
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>
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>
Jorge Hernandez [Wed, 5 Jun 2019 12:46:29 +0000 (12:46 +0000)]
Merge "Undeploy policies when subgroup is deleted"
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Jorge Hernandez [Wed, 24 Apr 2019 15:02:02 +0000 (15:02 +0000)]
Merge "Rebase image on policy-common-alpine"
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>
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>
Jorge Hernandez [Sat, 20 Apr 2019 16:09:11 +0000 (16:09 +0000)]
Merge "Handle null policy lists"
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>
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>
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>
Pamela Dragosh [Wed, 17 Apr 2019 11:21:28 +0000 (11:21 +0000)]
Merge "Audit and metric logs contain everything"
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>
Jorge Hernandez [Tue, 16 Apr 2019 22:07:57 +0000 (22:07 +0000)]
Merge "Set DAO factory in request map parameters"
Jorge Hernandez [Tue, 16 Apr 2019 22:07:38 +0000 (22:07 +0000)]
Merge "Clear servlets at the start of tests"
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>
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>
Pamela Dragosh [Tue, 16 Apr 2019 17:18:10 +0000 (17:18 +0000)]
Merge "Fix more sonar issues"
Jorge Hernandez [Tue, 16 Apr 2019 16:48:27 +0000 (16:48 +0000)]
Merge "Fix sonar issue in PdpStatusMessageHandler"
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Jorge Hernandez [Wed, 10 Apr 2019 18:24:05 +0000 (18:24 +0000)]
Merge "Add junit tests for PdpGroupDeleteProvider"
Jorge Hernandez [Wed, 10 Apr 2019 18:23:32 +0000 (18:23 +0000)]
Merge "Refactor request map"
Jorge Hernandez [Wed, 10 Apr 2019 17:31:38 +0000 (17:31 +0000)]
Merge "Adding final dmaap & db configurations"
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>
Liam Fallon [Wed, 10 Apr 2019 16:22:25 +0000 (16:22 +0000)]
Merge "Current draft of undeploy"
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>