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>
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>
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>
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>
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>
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>
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>
Pamela Dragosh [Mon, 8 Apr 2019 11:44:37 +0000 (11:44 +0000)]
Merge "Wrong models-pdp in pap"
Liam Fallon [Mon, 8 Apr 2019 05:39:56 +0000 (05:39 +0000)]
Merge "Add latest-version check to status msg handler"
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>
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>
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>
Pamela Dragosh [Fri, 5 Apr 2019 22:25:57 +0000 (22:25 +0000)]
Merge "Fix csit of policy/pap"
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>
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>
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>
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>
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>
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>
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>
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>
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>
Jim Hahn [Fri, 29 Mar 2019 13:57:17 +0000 (09:57 -0400)]
Fix issues with timer manager junits
Attempt to fix intermittent issues with junit tests for timer manager.
Eliminated duplicate method in junit test and renamed another method.
Always release a semaphore, just to be sure.
Logged different message depending whether timer is cancelled or expired.
Locked access to the current time to prevent the timer thread from
accessing it while registering a new timer.
Change-Id: Icb499acb18197fd8042eb186f88b61d5c30daeb0
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
ramverma [Wed, 27 Mar 2019 16:27:36 +0000 (16:27 +0000)]
Adding db provider parameters to pap config file
Change-Id: I573a345bcf69eb40782277f211fff2b7c69c4f55
Issue-ID: POLICY-1443
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
Jim Hahn [Wed, 27 Mar 2019 13:07:37 +0000 (09:07 -0400)]
Add and register DAO provider wrapper
Added a DAO provider wrapper supporting a single create() method
to create a DAO provider. PapActivator registers it at start-up.
Commented out some junit timer tests that seem to fail intermittently -
doesn't impact code coverage.
Removed TODO from close() method.
Change-Id: Ie3abd7c7a4f9ffa7aa086609515a0bb3891585d9
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Sun, 24 Mar 2019 12:13:58 +0000 (08:13 -0400)]
Add components for PDP communication
Added PAP DAO interfaces.
Added Publisher.
Added TimerManager.
Added RequestDataParams.
Added PdpModifyRequestMapParams.
Added RequestData.
Added PdpModifyRequestMapTest.
Updated timer test.
Extracted nested MessageData classes into their own files.
Addressed merge conflict.
Removed unneeded methods from PapActivator.
Fixed mismatchint action name.
Change-Id: I3aebef68a62b48d9154dd7a4c4ff366f9914717c
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Sun, 24 Mar 2019 12:13:58 +0000 (08:13 -0400)]
Changes to PAP infrastructure to support PDP
Modified PapActivator to implement the Startable interface and used
that to manage it instead of the original method names.
Replaced pdp-common enums with models-pdp enums.
Added the use of the Registry.
Added parameters to be used for PDP interaction.
Added DAO interface classes.
Modified HTTP client, in junit tests, to use GSON instead of Jackson.
Removed DAO code, as the interfaces are not merged into policy/common
yet.
Added pdpParameters to default json config file.
Changed tabs to spaces in json files.
Removed "internal" classes that were moved to models-pdp.
Change-Id: I969a7747e926680ad403557b44a0a52d289fb6d9
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
ramverma [Wed, 20 Mar 2019 15:05:45 +0000 (15:05 +0000)]
Adding query & state change PAP REST API's
Change-Id: I861ace4811032314c3ce2c3f227f17354e127e5e
Issue-ID: POLICY-1541
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
Jorge Hernandez [Sun, 17 Mar 2019 05:24:34 +0000 (00:24 -0500)]
Add NSS libraries to images
Alpine OpenJDK was updated 2 days ago (3/14), this
upgrade seems to break java applications that depend on libnss*.so
OS libraries, which seem are no longer installed with the jdk.
Added some other libraries to aid when debugging
Change-Id: I0f5cbe5792038cf569940a1b32c109c9dd1e66cc
Issue-ID: POLICY-1604
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Pamela Dragosh [Sat, 16 Mar 2019 14:56:13 +0000 (14:56 +0000)]
Merge "Update INFO.yaml file"
Jorge Hernandez [Sat, 16 Mar 2019 14:51:45 +0000 (14:51 +0000)]
Merge "Add additional constructors to Exception classes"
Jessica Wagantall [Fri, 15 Mar 2019 20:54:13 +0000 (13:54 -0700)]
Update INFO.yaml file
Update missing information blocks and
indentation to pass verify job.
Change-Id: I03eecae246a9da24c82d60aae19cce12b1f62d0b
Issue-ID: CIMAN-134
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Jim Hahn [Fri, 15 Mar 2019 17:23:57 +0000 (13:23 -0400)]
Updates to PDP deploy/undeploy per Ram's comments
Change-Id: Ic038ec8571cb50918c5f0d63602112ca05233629
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 15 Mar 2019 17:28:08 +0000 (13:28 -0400)]
Add additional constructors to Exception classes
Modified test class to use auto-tester.
Updated comments.
Updated licenses.
Change-Id: I993d0b78f31d15e6e6c35b701ed801616708628a
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Wed, 13 Mar 2019 21:58:17 +0000 (17:58 -0400)]
Add simple deploy/undeploy REST API
Change-Id: I4b789bfe4f92dae930f3675c6648b90f3c9fc9e4
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Tue, 12 Mar 2019 15:53:22 +0000 (11:53 -0400)]
Add PDP Group Deploy and Delete REST API stubs
Note: this will not build until the models-pap code has been added.
Added PDP group Delete methods, with and without version.
Added checks for OK status codes.
Added topic configuration.
Still does not have the "simplified" PDP Group deploy/undeploy.
Still won't build without "Move PDP Group classes to concepts subdirectory".
Will add junit tests for code changes in another review.
Updated comments about unlocking after updates.
Made ServiceManager final.
Included topic start/stop actions.
Fixed parameter comment.
Removed unneeded parameters from json files.
Fixed argument test in shell script.
Updated licenses.
Change-Id: I6176d51918ae758e04fb68562dc9ca70534137d4
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
Jorge Hernandez [Thu, 7 Mar 2019 16:10:34 +0000 (16:10 +0000)]
Merge "Refactor REST server tests"
Jorge Hernandez [Thu, 7 Mar 2019 14:53:45 +0000 (14:53 +0000)]
Merge "Use Alpine as base docker image in /policy/pap"
Jim Hahn [Wed, 6 Mar 2019 16:03:57 +0000 (11:03 -0500)]
Refactor REST server tests
Refactored the REST server tests so that each controller has
its own test class.
Also ensure things are shutdown by various tests.
Added comments.
Removed unneeded constant.
Updated license.
Modified code that restarts the REST server during tests.
Modified code to just change the activator's "alive" state to
false, leaving the REST server running.
Fixed comment.
Allocated server port.
Removed file that should not have been included.
Changed code to throw exceptions if activator methods are called while
in the wrong state.
Change-Id: I04a3a6654150797c23b3c86a6a39ecf8bb7f5a78
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Wed, 6 Mar 2019 16:33:58 +0000 (16:33 +0000)]
Merge "Use request id instead of PDP name in listener"
Jim Hahn [Tue, 5 Mar 2019 22:19:33 +0000 (17:19 -0500)]
Use request id instead of PDP name in listener
Modified the listener that receives messages from the PDPs
to use the request id instead of the PDP name for tracking
purposes.
Modified the listener to make it more generic so any arbitrary ID
can be used, depending on the context.
Combined extractId into handleEvent.
Corrected a comment.
Change-Id: I6b7097c67d73f51b78ae4063341bcb118eb14bbc
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
ning.xi [Wed, 6 Mar 2019 03:24:28 +0000 (03:24 +0000)]
Use Alpine as base docker image in /policy/pap
Issue-ID: POLICY-1553
Change-Id: Ie69d32c0d8c23ff2fadeb074e654f20c1acbdf76
Signed-off-by: ning.xi <ning.xi@est.tech>
Jim Hahn [Tue, 5 Mar 2019 20:15:28 +0000 (15:15 -0500)]
Refactor PAP REST controller
Split health check and statistics REST controllers out of the
PAP REST controller and made PAP REST controller into a superclass.
Change-Id: I6f492c9fd5d058d81143ed34d70760dbd05a5770
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Wed, 27 Feb 2019 20:35:22 +0000 (15:35 -0500)]
Receive PDP status messages
Added infrastructure code to facilitate receipt and tracking of
PDP status messages.
Removed temporary PdpStatus class.
Use variable for pdp-common version.
Change-Id: Id76c45f26b6d9f5eb9395332b637a0b1e90bc496
Issue-ID: POLICY-1444
Signed-off-by: Jim Hahn <jrh3@att.com>
Liam Fallon [Mon, 4 Mar 2019 14:04:58 +0000 (14:04 +0000)]
Merge "Update INFO.yaml Liam's email"
Jorge Hernandez [Thu, 28 Feb 2019 18:03:15 +0000 (18:03 +0000)]
Merge "Use Coder class"
Pamela Dragosh [Thu, 28 Feb 2019 15:24:56 +0000 (10:24 -0500)]
Update INFO.yaml Liam's email
est.tech
Issue-ID: POLICY-1556
Change-Id: I978b0df092c5bc2020ef16862d8653c230e3936b
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Pamela Dragosh [Thu, 28 Feb 2019 14:44:47 +0000 (09:44 -0500)]
Reference lombok from parent
Policy/parent now declares lombok dependency - remove the
version so that we are consistent.
Also must change this repo to point to correct policy/parent.
Issue-ID: POLICY-1547
Change-Id: I6530b7d34ba4f4bd826e07e9d27ec83d6be94b0d
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Jorge Hernandez [Thu, 28 Feb 2019 15:05:33 +0000 (15:05 +0000)]
Merge "Add code to publish to PDP"
Jim Hahn [Wed, 27 Feb 2019 16:31:34 +0000 (11:31 -0500)]
Use Coder class
Modified existing PAP code to use the Coder class instead of Gson.
Change-Id: I770d0adf201d7c1118085f85c36582e1143deb08
Issue-ID: POLICY-1444
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Tue, 26 Feb 2019 19:09:35 +0000 (14:09 -0500)]
Add code to publish to PDP
Added code to take an arbitrary object and send it to PDPs using a
topic sink. Does not include the code or properties needed to
configure the topic.
Fixed method name - test case does not cover what the method name
implied.
Fixed some comments.
Add test to verify that the PdpClient works with a real TopicSink.
Moved coder classes to policy/common.
Change-Id: I4dec746b07d384c5d9d1449ca91fa39a4f680260
Issue-ID: POLICY-1444
Signed-off-by: Jim Hahn <jrh3@att.com>
Code Review / policy / pap.git / log