policy/drools-applications.git
4 years agoRelease policy/drools-applications 1.6.0
jenkins-releng [Wed, 25 Mar 2020 16:10:30 +0000 (16:10 +0000)]
Release policy/drools-applications

4 years agoAdd @Ignore to test that is failing during docker build 80/104380/1
Peyton Puckett [Wed, 25 Mar 2020 15:29:18 +0000 (10:29 -0500)]
Add @Ignore to test that is failing during docker build

Issue-ID: POLICY-2378
Change-Id: I7b466a3846b99cd8630d793139799a6885688748
Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
4 years agoMerge "Replace url with host/port in drools-apps"
Jorge Hernandez [Wed, 25 Mar 2020 13:42:59 +0000 (13:42 +0000)]
Merge "Replace url with host/port in drools-apps"

4 years agoMerge "M2 junit intermittent timeout issue"
Liam Fallon [Wed, 25 Mar 2020 08:06:19 +0000 (08:06 +0000)]
Merge "M2 junit intermittent timeout issue"

4 years agoUpdate parent pom to point to drools-pdp image 10/104310/1
Peyton Puckett [Tue, 24 Mar 2020 21:10:51 +0000 (16:10 -0500)]
Update parent pom to point to drools-pdp image

Issue-ID: POLICY-2378
Change-Id: Ic5e2a1cd4c1934235f0ef65a624f80e1a7567f66
Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
4 years agoM2 junit intermittent timeout issue 97/104297/2
Joseph Chou [Tue, 24 Mar 2020 19:30:25 +0000 (15:30 -0400)]
M2 junit intermittent timeout issue

Update code to increase maximum wait time

Issue-ID: POLICY-2435
Change-Id: Ib9d7452743c6cdb39c56f4bbed0fd7fd903dc8bc
Signed-off-by: Joseph Chou <jc2555@att.com>
4 years agoReplace url with host/port in drools-apps 92/104292/1
Jim Hahn [Tue, 24 Mar 2020 19:08:31 +0000 (15:08 -0400)]
Replace url with host/port in drools-apps

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

4 years agoConfigure http client URIs via env properties 56/104256/3
Jim Hahn [Tue, 24 Mar 2020 14:41:21 +0000 (10:41 -0400)]
Configure http client URIs via env properties

The context URI path for the various actors needs to be
configurable via properties specified in the OOM charts.

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

4 years agoMerge "Remove vLB from drools-apps"
Pamela Dragosh [Tue, 24 Mar 2020 12:17:15 +0000 (12:17 +0000)]
Merge "Remove vLB from drools-apps"

4 years agoPoint to released artifacts 00/104200/2
Pamela Dragosh [Tue, 24 Mar 2020 00:07:38 +0000 (20:07 -0400)]
Point to released artifacts

Issue-ID: POLICY-2378
Change-Id: Ibb9bf09a8f6e678c87049d2154787c9e2ec3442b
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoEnable guards in junit tests 85/104185/2
Jim Hahn [Mon, 23 Mar 2020 19:49:28 +0000 (15:49 -0400)]
Enable guards in junit tests

Flipped the flag(s) to enable guard checks in the various junit
tests for the Usecases and Frankfurt controllers.  Note: the guard
checks use the guard simulator.
Modified new actor code to not include operation history on first
"guard denied" report (i.e., make it work like usecases does).

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

4 years agoRemove vLB from drools-apps 96/104096/4
Jim Hahn [Fri, 20 Mar 2020 21:17:00 +0000 (17:17 -0400)]
Remove vLB from drools-apps

Added a test for legacy policy to vDNS.

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

4 years agoFix frankfurt controller properties 97/104097/3
Jim Hahn [Fri, 20 Mar 2020 21:57:35 +0000 (17:57 -0400)]
Fix frankfurt controller properties

Fleshed out more of SDNC properties.  Still don't know what the
"path" should be.
Added SDNR.
Removed invalid topic sources and sinks.
Changed some types from source to sink (or vice versa).

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

4 years agoDisable guard via env variable 80/104080/2
Jim Hahn [Fri, 20 Mar 2020 18:05:42 +0000 (14:05 -0400)]
Disable guard via env variable

Default to "false".  Can override in CSITs.

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

4 years agoMerge "Last sonar fix for drools-apps"
Liam Fallon [Fri, 20 Mar 2020 09:29:31 +0000 (09:29 +0000)]
Merge "Last sonar fix for drools-apps"

4 years agoMerge "Add rainyDayTest for VFW"
Ram Krishna Verma [Thu, 19 Mar 2020 15:40:52 +0000 (15:40 +0000)]
Merge "Add rainyDayTest for VFW"

4 years agoLast sonar fix for drools-apps 55/103955/1
Jim Hahn [Thu, 19 Mar 2020 13:41:10 +0000 (09:41 -0400)]
Last sonar fix for drools-apps

Remaining issues will be examined/addressed in Guilin.

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

4 years agoAdd rainyDayTest for VFW 09/103809/5
Peyton Puckett [Tue, 17 Mar 2020 16:30:11 +0000 (11:30 -0500)]
Add rainyDayTest for VFW

Added less restrictive filter condition to consider discarded messages

Issue-ID: POLICY-2431
Change-Id: I0bc5e34636699094c97bd7e5669f66df875cd6ae
Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
4 years agoONAP junit code update 23/103823/2
Joseph Chou [Tue, 17 Mar 2020 22:29:53 +0000 (18:29 -0400)]
ONAP junit code update

M2 junit failed on AppcLcmTest

Issue-ID: POLICY-2435
Change-Id: I30a2db72b6b127857dc3db2aeda75e46fa919dcd
Signed-off-by: Joseph Chou <jc2555@att.com>
4 years agoMore sonar fixes in drools-apps 97/103797/3
Jim Hahn [Tue, 17 Mar 2020 13:52:03 +0000 (09:52 -0400)]
More sonar fixes in drools-apps

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

4 years agoFix artifact name in frankfurt controller 69/103769/1
Jim Hahn [Mon, 16 Mar 2020 22:26:08 +0000 (18:26 -0400)]
Fix artifact name in frankfurt controller

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

4 years agoMerge "Fix sonar issues in drools-applications"
Ram Krishna Verma [Fri, 13 Mar 2020 21:37:47 +0000 (21:37 +0000)]
Merge "Fix sonar issues in drools-applications"

4 years agoAdd frankfurt feature to apps/docker zips 80/103680/1
Jim Hahn [Fri, 13 Mar 2020 16:14:39 +0000 (12:14 -0400)]
Add frankfurt feature to apps/docker zips

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

4 years agoMerge "Delete template.demo submodule, amsterdam controller"
Jim Hahn [Fri, 13 Mar 2020 15:25:26 +0000 (15:25 +0000)]
Merge "Delete template.demo submodule, amsterdam controller"

4 years agoFix sonar issues in drools-applications 70/103670/2
Jim Hahn [Thu, 12 Mar 2020 19:16:44 +0000 (15:16 -0400)]
Fix sonar issues in drools-applications

Fixed various sonar issues, including moving some
code to policy-common.
Fixed some eclipse warnings, including deprecated junit APIs.

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

4 years agoDelete template.demo submodule, amsterdam controller 34/103534/3
Peyton Puckett [Wed, 11 Mar 2020 16:09:56 +0000 (11:09 -0500)]
Delete template.demo submodule, amsterdam controller

Issue-ID: POLICY-2421
Change-Id: I0e61e7b3272f5c7babceb41e4e249716af4529cf
Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
4 years agoRetool rules tests 99/103399/6
Jim Hahn [Mon, 9 Mar 2020 19:15:05 +0000 (15:15 -0400)]
Retool rules tests

Extracted common code from various XxxBaseTest classes into:
- Topics class to manage messages for test topics
- HttpClients class to manage HttpClient objects for tests
- Simulators class to manage simulators for tests
- Rules class to manage start up and shutdown of rules

Merged remaining code from XxxBaseTest classes into a single
class.  Modified the Frankfurt and Usescases tests to subclass
from this new class and specify just the relevant tests to be
executed.

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

4 years agoUse predefined domain policies from drools core 64/103464/1
jhh [Tue, 10 Mar 2020 17:41:49 +0000 (12:41 -0500)]
Use predefined domain policies from drools core

Issue-ID: POLICY-2388
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I5948ed5152297e4addbab444ed65dcd3b8002492

4 years agoBug fixes to new rules 11/103311/5
Jim Hahn [Fri, 6 Mar 2020 18:07:08 +0000 (13:07 -0500)]
Bug fixes to new rules

Also added VdnsTest, VfwTest, and VcpeTest.

Fixed a number of issues with notifications:
- event data (e.g., AAI) was missing
- notification was missing for the start of an operation
- "message" and "history" fields should contain Target object,
  target entity
- "message" field was missing various details (e.g., start time)

Still missing subRequestId - that will require enhancements to
the actors.

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

4 years agoMerge "ONAP m2 base junit coverage"
Pamela Dragosh [Mon, 9 Mar 2020 18:11:17 +0000 (18:11 +0000)]
Merge "ONAP m2 base junit coverage"

4 years agoAdd frankfurt rules for Actor redesign 79/102179/25
Jim Hahn [Sat, 22 Feb 2020 22:11:20 +0000 (17:11 -0500)]
Add frankfurt rules for Actor redesign

Note: VcpeTest and VfwTest are not included, as they depend on updates
to the APPC and APPC-LCM Actors.
Added feature-controlloop-frankfurt.
Added HTTP client property files to feature-controlloop-management.

Updates per review comments:
- pom changes
- simplify FrankfurtBase
- rename event-svc-http.properties
- change "usescases" to "frankfurt"
- use blanks for CDS property defaults
- trailing spaces in http-client files
- add https property to http-client files

Added newlines to config files that appear to be missing them (based
on feedback from gerrit).

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

4 years agoONAP m2 base junit coverage 58/100558/3
Chou, Joseph (jc2555) [Tue, 21 Jan 2020 18:07:21 +0000 (13:07 -0500)]
ONAP m2 base junit coverage

Added testcases to improve code coverage

Issue-ID: POLICY-2289
Change-Id: Ib573ae668b5bca008c4600df99e7f1cf4053d1a1
Signed-off-by: Joseph Chou <jc2555@att.com>
4 years agoMerge "decouple topics from controllers"
Jorge Hernandez [Wed, 4 Mar 2020 14:04:50 +0000 (14:04 +0000)]
Merge "decouple topics from controllers"

4 years agodecouple topics from controllers 19/102919/1
jhh [Wed, 4 Mar 2020 00:15:17 +0000 (18:15 -0600)]
decouple topics from controllers

native policies will require topics configured at installation
(there's no policy to add them).   This configuration style
also cleans the installation tidier (topics can
be overriden or new ones added when being placed in the mounted config
directory).

Issue-ID: POLICY-2181
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I87fd6889c651147e9229b3487db8c95b34516dfd

4 years agouse policy/parent awaitility 65/102865/1
Pamela Dragosh [Tue, 3 Mar 2020 14:14:57 +0000 (09:14 -0500)]
use policy/parent awaitility

Also cleaned up a bunch of these pom's, they do not all need to
declare JUnit, assertjr, mockito testing classes. Can use more
cleanup in some other common dependencies, but we'll defer.

Issue-ID: POLICY-2381
Change-Id: Ib1149a0cd0215d1a38d5b625634440413cf79089
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoUse apache Pair not Sdnr custom Pair 85/102685/2
Pamela Dragosh [Sun, 1 Mar 2020 23:02:35 +0000 (18:02 -0500)]
Use apache Pair not Sdnr custom Pair

Companion review to https://gerrit.onap.org/r/c/policy/models/+/102162
in which use of Pair from apache vs creating our own.

Removed an unused import.

Issue-ID: POLICY-2382
Change-Id: Id3cf9a170480c7a621dddf93540d61f993f3553a
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoTosca policies missing "final_xxx" fields 62/102662/1
Jim Hahn [Sun, 1 Mar 2020 03:48:59 +0000 (22:48 -0500)]
Tosca policies missing "final_xxx" fields

The code that makes Tosca policies backward compatible was not
copying the final_xxx fields (e.g., final_failure_retries).  Added
code to copy the fields.

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

4 years agovDNS tosca compliant policies support 75/102275/2
jhh [Tue, 25 Feb 2020 00:14:04 +0000 (18:14 -0600)]
vDNS tosca compliant policies support

Issue-ID: POLICY-2383
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I5d5d864b2853f6e7e0c7e1096cb17746500f2495
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
4 years agoTosca compliant vFirewall 05/102105/5
jhh [Fri, 21 Feb 2020 00:19:36 +0000 (18:19 -0600)]
Tosca compliant vFirewall

Issue-ID: POLICY-2376
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I362ebbd941c400a6ffc3e952e66ca2d624afbfdd
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
4 years agoMerge "tosca compliant op policy support + vcpe test"
Liam Fallon [Tue, 18 Feb 2020 16:12:02 +0000 (16:12 +0000)]
Merge "tosca compliant op policy support + vcpe test"

4 years agoMerge "Inherit from PDP-D (native policies) base image"
Jorge Hernandez [Tue, 18 Feb 2020 14:22:24 +0000 (14:22 +0000)]
Merge "Inherit from PDP-D (native policies) base image"

4 years agotosca compliant op policy support + vcpe test 45/101645/5
jhh [Thu, 13 Feb 2020 00:20:06 +0000 (18:20 -0600)]
tosca compliant op policy support + vcpe test

Tosca Compliant and Toscal Legacy Operational policies are
both supported for backwards compatibility.

vCPE usecase junits to support 2 equivalent policies,
one tosca compliant and the other one legacy.

Issue-ID: POLICY-2360
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Iafbfc92bbec42e6a3fe4ceb4a9a17c85e636ea14
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
4 years agoInherit from PDP-D (native policies) base image 03/101803/2
jhh [Mon, 17 Feb 2020 01:49:42 +0000 (19:49 -0600)]
Inherit from PDP-D (native policies) base image

Depends on https://gerrit.onap.org/r/#/c/policy/docker/+/101758/
for package cleanup and the native Dockerfile refactoring from
https://gerrit.onap.org/r/#/c/policy/drools-pdp/+/101802/.

Issue-ID: POLICY-2181
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I6cf2b945157a91abd9985bcff1e70ae6a30ae15d
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
4 years agoChange ip adresses used for m2 tests 64/101764/2
Bruno Sakoto [Fri, 14 Feb 2020 20:53:28 +0000 (15:53 -0500)]
Change ip adresses used for m2 tests

By default Mac OS is not able to use loopback addresses other than
127.0.0.1.

Issue-ID: POLICY-2368
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: Ibf4a884d2669a5f4969960963638aa213eebf172

4 years agoAdd tests to AppcLcm to increase coverage 42/101642/4
dg5762 [Wed, 12 Feb 2020 22:28:22 +0000 (16:28 -0600)]
Add tests to AppcLcm to increase coverage

Add additional test cases to AppcLcm to increase jUnit test coverage
this includs adding the file AppcLcmActorTest.java. Minimum test
converage for the java files is over 80%.

Issue-ID: POLICY-2291
Signed-off-by: dg5762 <dg5762@att.com>
Change-Id: I26ed2b90f12f51568ceed843b65d2f119155391f

4 years agoMerge "Updating module names to resolve conflicts"
Jim Hahn [Sun, 9 Feb 2020 06:43:12 +0000 (06:43 +0000)]
Merge "Updating module names to resolve conflicts"

4 years agoactivate refactoring in ControlLoopEventManager 05/101405/2
jhh [Fri, 7 Feb 2020 19:10:03 +0000 (13:10 -0600)]
activate refactoring in ControlLoopEventManager

This is to support backwards compatible implementation
of Tosca Compliant Operational Policies.

Issue-ID: POLICY-2360
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I0e8b96b19375c58e4b62e0dcd1da5c508091ea2f
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
4 years agoUpdating module names to resolve conflicts 96/101396/1
Ram Krishna Verma [Fri, 7 Feb 2020 18:03:27 +0000 (13:03 -0500)]
Updating module names to resolve conflicts

Issue-ID: POLICY-2355
Change-Id: If13badaf332f5e4341e23b9dcf22e177e9b67ff2
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
4 years agoUse CanonicalOnset in usecases.drl 69/101269/1
jhh [Thu, 6 Feb 2020 18:16:20 +0000 (12:16 -0600)]
Use CanonicalOnset in usecases.drl

Issue-ID: POLICY-2323
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Ic1258e17c08eacbf8d3a57a6562ba470420e615f

4 years agoDCAE Onset flood prevention 27/100427/3
jhh [Fri, 17 Jan 2020 20:48:07 +0000 (14:48 -0600)]
DCAE Onset flood prevention

Issue-ID: POLICY-2323
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I08cd55b442ccce3e0eaaa63c1ebd4422c1e0a0d5
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
4 years agoAdd jUnit Test Coverage M2 Guard 87/100387/7
Peyton Puckett [Thu, 16 Jan 2020 18:00:29 +0000 (12:00 -0600)]
Add jUnit Test Coverage M2 Guard

Issue-ID: POLICY-2290
Change-Id: I05a737333141576512841d6872ecdb0a089a0a90
Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
4 years agoUpdate m2 test to mockito2 for JDK 11 09/100409/1
Pamela Dragosh [Fri, 17 Jan 2020 12:55:30 +0000 (07:55 -0500)]
Update m2 test to mockito2 for JDK 11

Peyton's review was pulled in before Ali's JDK 11 fix. So
unfortunately this update did not get done.

Issue-ID: POLICY-1587
Change-Id: I9666b6e2f2327183e15bfe19d34515d0426c8ff0
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoMerge "Update sonar config"
Jorge Hernandez [Thu, 16 Jan 2020 17:37:39 +0000 (17:37 +0000)]
Merge "Update sonar config"

4 years agoUpdate sonar config 85/100385/3
Pamela Dragosh [Thu, 16 Jan 2020 17:06:43 +0000 (12:06 -0500)]
Update sonar config

Get rid of deprecated sonar settings, exclude sub-module that
doesn't have code, and ensure there is a single jacoco-ut.exec
file created.

Issue-ID: POLICY-2321
Change-Id: I05d1c0e4d599aff7c6ad0fec39ff1220cdb9a72d
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoMerge "policy/drools-apps jdk11 upgrades"
Pamela Dragosh [Thu, 16 Jan 2020 16:29:24 +0000 (16:29 +0000)]
Merge "policy/drools-apps jdk11 upgrades"

4 years agopolicy/drools-apps jdk11 upgrades 50/100350/3
Hockla, Ali (ah999m) [Wed, 15 Jan 2020 21:04:09 +0000 (15:04 -0600)]
policy/drools-apps jdk11 upgrades

Issue-ID: POLICY-1587
Change-Id: I02bef6c829f2f24954ae73fb0c540ab7198775ce
Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
4 years agoAdd jUnit Test Coverage M2 Util 60/100260/4
Peyton Puckett [Mon, 13 Jan 2020 16:51:34 +0000 (10:51 -0600)]
Add jUnit Test Coverage M2 Util

Issue-ID: POLICY-2293
Change-Id: Ia189239911053bd8937c0791aafcc55207c11dcf
Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
4 years agoMerge "Add m2 model, including the LCM application"
Pamela Dragosh [Mon, 13 Jan 2020 13:33:49 +0000 (13:33 +0000)]
Merge "Add m2 model, including the LCM application"

4 years agoMerge "Parameterize base-image version for drools-apps"
Pamela Dragosh [Mon, 13 Jan 2020 13:32:53 +0000 (13:32 +0000)]
Merge "Parameterize base-image version for drools-apps"

4 years agoMerge "Support override of xml config files"
Ram Krishna Verma [Mon, 13 Jan 2020 12:57:50 +0000 (12:57 +0000)]
Merge "Support override of xml config files"

4 years agoPoint to policy/models release version 23/100223/1
Hockla, Ali (ah999m) [Fri, 10 Jan 2020 21:52:56 +0000 (15:52 -0600)]
Point to policy/models release version

Issue-ID: POLICY-1592
Change-Id: I34ea6afc94d36802a695c7b15b61fcaa0112c427
Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
4 years agoSupport override of xml config files 12/100212/1
jhh [Fri, 10 Jan 2020 19:56:39 +0000 (13:56 -0600)]
Support override of xml config files

This included logback*.xml (including controller ones).

Issue-ID: POLICY-2308
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I69471fc0ce5b6ea143560f78019a55daedfd465b

4 years agoAdd m2 model, including the LCM application 89/98589/11
Straubs, Ralph (rs8887) [Tue, 19 Nov 2019 10:11:23 +0000 (04:11 -0600)]
Add m2 model, including the LCM application

Issue-ID: POLICY-1948
Change-Id: I18a5231d3102073c928a591c9e91b241b7093680
Signed-off-by: Straubs, Ralph (rs8887) <rs8887@att.com>
4 years agoAdd ControlLoopParams from models repo. 67/100167/1
jhh [Fri, 10 Jan 2020 00:29:35 +0000 (18:29 -0600)]
Add ControlLoopParams from models repo.

This class is only useful under drools applications and
eventually will be deprecated to accommodate the new
Operational Policy Types.

Issue-ID: POLICY-2146
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I68927cb144a33fac6fe330be15fe60aee32b15a1

4 years agoParameterize base-image version for drools-apps 70/100070/3
Bruno Sakoto [Tue, 7 Jan 2020 22:48:00 +0000 (17:48 -0500)]
Parameterize base-image version for drools-apps

Issue-ID: POLICY-2318
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: I5cc2761adb2621bca094fb035e626dd40baa08e1

4 years agoRevert "Parameterize base-image version for drools-apps" 92/99992/1
Pamela Dragosh [Fri, 3 Jan 2020 13:09:14 +0000 (13:09 +0000)]
Revert "Parameterize base-image version for drools-apps"

This reverts commit a894ffb5f580dec7ab4e8ea367107fcee09fca1b.

Reason for revert: Merge failure

Issue-ID: POLICY-2318
Change-Id: I6ea6681677e0ee18f5bce0217f9216e590a53b77
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoParameterize base-image version for drools-apps 41/99741/3
Rashmi Pujar [Tue, 17 Dec 2019 20:43:51 +0000 (15:43 -0500)]
Parameterize base-image version for drools-apps

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

4 years agochanges to support offline pdpd control loops 46/99446/1
jhh [Tue, 10 Dec 2019 21:38:12 +0000 (15:38 -0600)]
changes to support offline pdpd control loops

Issue-ID: POLICY-2191
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Ieb390de2f3324de2de8e6e54cdc10fbf5ede4070

4 years agomoved proto-definition dependency 45/99345/1
jhh [Mon, 9 Dec 2019 16:13:17 +0000 (10:13 -0600)]
moved proto-definition dependency

It shows in the /tmp/policy-install directory in the
docker image.

It does not need to be applied to all the drools-applications
subprojects.

Issue-ID: POLICY-2191
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Ia2048b6e21068a7cd5e36439af368cf024975f01

4 years agoPoint to release versions of policy/parent and policy/common 27/99227/4
Hockla, Ali (ah999m) [Thu, 5 Dec 2019 19:51:44 +0000 (13:51 -0600)]
Point to release versions of policy/parent and policy/common

Issue-ID: POLICY-1583
Change-Id: Iaff52d57d08689dedf2759afbd3b68cff4a9d22d
Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
4 years agoMerge "Use dependency management for cds proto-definition artifact"
Jim Hahn [Fri, 22 Nov 2019 14:02:47 +0000 (14:02 +0000)]
Merge "Use dependency management for cds proto-definition artifact"

4 years agoUse dependency management for cds proto-definition artifact 37/98737/1
Rashmi Pujar [Thu, 21 Nov 2019 19:09:07 +0000 (14:09 -0500)]
Use dependency management for cds proto-definition artifact

Refer to: https://gerrit.onap.org/r/#/c/policy/parent/+/98733/

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

4 years agoMerge "use case junit tests"
Jorge Hernandez [Thu, 21 Nov 2019 14:14:06 +0000 (14:14 +0000)]
Merge "use case junit tests"

4 years agouse case junit tests 36/98536/5
jhh [Mon, 18 Nov 2019 19:28:12 +0000 (13:28 -0600)]
use case junit tests

added vcpe support
added scale out support
addressed some review comments
added vfw support

Issue-ID: POLICY-2249
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I245f8fc8d520cd2511080c9aee61bf7a0c0a1499
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
4 years agoBuild tar.gz without requiring docker image build 34/98634/1
jhh [Tue, 19 Nov 2019 22:43:00 +0000 (16:43 -0600)]
Build tar.gz without requiring docker image build

This allows the tar.gz to be released by LF jobs.

Issue-ID: POLICY-2250
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I0e12b05c051e12728b9b646838ce0b54579f8009

4 years agoRemoving Named Query 83/98383/4
pramod.jamkhedkar [Wed, 13 Nov 2019 18:36:56 +0000 (13:36 -0500)]
Removing Named Query

Removing all the related  files and necessary modifications for removing named query. The code now only supports Custom Query.

Issue-ID: POLICY-2125
Change-Id: I2d376eb955d69f45c39ad4d4a1cfacb4d620ca8e
Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
4 years agoMerge "Do not hardcode io.fabric8 plugin"
Pamela Dragosh [Mon, 11 Nov 2019 17:35:21 +0000 (17:35 +0000)]
Merge "Do not hardcode io.fabric8 plugin"

4 years agoDo not hardcode io.fabric8 plugin 05/98205/2
Pamela Dragosh [Fri, 8 Nov 2019 19:53:08 +0000 (14:53 -0500)]
Do not hardcode io.fabric8 plugin

policy/parent now has this plugin defined

Issue-ID: POLICY-2222
Change-Id: I9b212969a34b58206fcd88e154b72902451f6868
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoFix more sonar issues in drools-applications 88/98188/2
Jim Hahn [Fri, 8 Nov 2019 13:54:40 +0000 (08:54 -0500)]
Fix more sonar issues in drools-applications

Addressed the following sonar issues:
- unused imports
- unused method parameters
- superfluous "throws" declaration
- fields within a serializable class must also be serializable; this
  was/will be fixed with a change to AaiCqResponse in policy-models
- use logger instead of System.out; turns out that the code that used
  System.out is no longer needed.  In fact, deleted several classes
  that are no longer needed: ControlLoopLogger and ControlLoopPublisher
- cyclomatic complexity and switch/case statements too big; used
  eclipse to extract chunks of code into separate methods
- duplicate code
  Note: extracted common code and used lambdas to eliminate duplicate
  code in PolicyGuardYamlToXacml.  However, a better approach would be
  to use object-oriented programming, using mini/nested objects to do
  the generation.  The lambdas would then become abstract methods.
  Nevertheless, that would entail significantly more re-write of this
  class than desired at this time

Issue-ID: POLICY-2225
Change-Id: Ie503ffd7accbad3e410af602d32b29c0095c3a33
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoUpdate drools-application due to https://gerrit.onap.org/r/#/c/policy/models/+/97989/ 73/98073/1
Rashmi Pujar [Wed, 6 Nov 2019 19:47:03 +0000 (14:47 -0500)]
Update drools-application due to https://gerrit.onap.org/r/#/c/policy/models/+/97989/

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

4 years agoMerge "PNF support changes for drools-application"
Liam Fallon [Tue, 5 Nov 2019 12:34:18 +0000 (12:34 +0000)]
Merge "PNF support changes for drools-application"

4 years agoInherit from snapshot drools docker image 26/97926/1
jhh [Mon, 4 Nov 2019 20:24:52 +0000 (14:24 -0600)]
Inherit from snapshot drools docker image

Issue-ID: POLICY-2113
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I806d7bb2e766e3f0eccd5c1457c8d2683204abfb

4 years agoPNF support changes for drools-application 09/97709/6
Rashmi Pujar [Tue, 29 Oct 2019 20:17:37 +0000 (16:17 -0400)]
PNF support changes for drools-application

Conditional checks for enrichment and validation by target-types
PNF specific AAI enrichment
Fixed Unit Tests

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

4 years agoupgrade to 7.28.0.Final drools libraries 51/97851/1
jhh [Fri, 1 Nov 2019 13:26:22 +0000 (08:26 -0500)]
upgrade to 7.28.0.Final drools libraries

Issue-ID: POLICY-1407
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Ia3cd03719b52e2d4e1fad3662090b7c35e2acf1f

4 years agoUpdate APPC LCM Model references 12/97512/4
Daniel Cruz [Wed, 23 Oct 2019 23:18:07 +0000 (18:18 -0500)]
Update APPC LCM Model references

Updates to all references of APPC LCM model code
based on changes in policy models for APPC LCM.

Issue-ID: POLICY-2043
Change-Id: I0102eb27f449578636cfc0bf22124fa863f05724
Signed-off-by: Daniel Cruz <dc443y@att.com>
4 years agoReset the custom query flag 22/97622/1
Jim Hahn [Fri, 25 Oct 2019 18:46:20 +0000 (14:46 -0400)]
Reset the custom query flag

Some junits fail, depending on the order.  Traced down to
VfwControlLoopCdsTest, which sets the custom query flag, but does
not reset it when the test is complete.  Modified the test superclass
to reset it at the start and end of each test class.

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

4 years agoModify drools-applications to use new Lock API 37/97437/1
Jim Hahn [Fri, 27 Sep 2019 15:22:47 +0000 (11:22 -0400)]
Modify drools-applications to use new Lock API

Modified code to use new Lock API.
Also deleted TargetLock and PolicyGuard, as they are no longer needed.

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

4 years agoIntegrate cds actor service provider 60/96360/21
Bruno Sakoto [Fri, 27 Sep 2019 20:15:49 +0000 (16:15 -0400)]
Integrate cds actor service provider

* Add request enrichment with aai service instance id and vnf id
* Implement cds grpc request
* Implement VfwControlLoopCdsTest

Issue-ID: POLICY-2088
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: Ib44d447d6a3a70ff800a5760032b676fdfa32d9c

4 years agoFix syntax error when starting policy 67/96767/1
Bruno Sakoto [Tue, 8 Oct 2019 21:19:05 +0000 (17:19 -0400)]
Fix syntax error when starting policy

Fix following syntax error in policy entry point:
/opt/app/policy/bin/docker-entrypoint.sh:
line 30: syntax error near unexpected token `fi'

Issue-ID: POLICY-2088
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: I517937f5ece8454d83f6c3cad1f96fba52b62317

4 years agoAllow override of maven settings at instantiation 95/96695/2
jhh [Mon, 7 Oct 2019 20:40:23 +0000 (15:40 -0500)]
Allow override of maven settings at instantiation

Issue-ID: POLICY-2111
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Ib7ec8beab2947fc9fbf55734d0412f444a963fe8
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
4 years agoUse snapshot version of models in drools-applications 32/96032/1
Jim Hahn [Thu, 19 Sep 2019 19:21:21 +0000 (15:21 -0400)]
Use snapshot version of models in drools-applications

Change-Id: Ifade840231beb3cb548d6dbb7ca69182dcce751a
Issue-ID: POLICY-2065
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoremove docker-cl script 36/95536/1
jhh [Wed, 11 Sep 2019 20:31:46 +0000 (15:31 -0500)]
remove docker-cl script

Issue-ID: POLICY-2077
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I4d085f33889cc6b6d3c2b9dbf093429adea2f10f

4 years agoBump versions for drools-apps master 96/95396/1
Jim Hahn [Tue, 10 Sep 2019 16:04:00 +0000 (12:04 -0400)]
Bump versions for drools-apps master

Change-Id: Ia94e1ba31d0e8b6a980d891df9b26fb6977acc95
Issue-ID: POLICY-2045
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoRelease drools-apps 1.5.2 64/95364/2
Pamela Dragosh [Tue, 10 Sep 2019 13:33:23 +0000 (09:33 -0400)]
Release drools-apps 1.5.2

Releasing 1.5.2 of drools-applications

Issue-ID: POLICY-2045
Change-Id: Ie3f7588a83158bdd49cfd43e7b8fe76907d16e8d
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoUpgrade drools-apps - JUnit op.pom 44/95344/1
Pamela Dragosh [Tue, 10 Sep 2019 11:42:57 +0000 (07:42 -0400)]
Upgrade drools-apps - JUnit op.pom

This should have been updated to released version of
drools-pdp.

Issue-ID: POLICY-2045
Change-Id: I81032a8da5ff83b43e84671ba7766edb16914e79
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoUpgrade to drools 1.5.2 released artifacts 91/95291/1
jhh [Tue, 10 Sep 2019 00:31:19 +0000 (19:31 -0500)]
Upgrade to drools 1.5.2 released artifacts

Issue-ID: POLICY-2045
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Ie77acc2f85b841004882dc4da021a055eb4fcb9c

4 years agoMerge "Changes drl files"
Pamela Dragosh [Thu, 5 Sep 2019 12:06:55 +0000 (12:06 +0000)]
Merge "Changes drl files"

4 years agoChanges drl files 73/94473/8
pramod.jamkhedkar [Wed, 28 Aug 2019 19:11:22 +0000 (15:11 -0400)]
Changes drl files

Changes to the DRL file to change the rules to support custom query.
Added new VdnsControlLoop test for custom query, and supporting yaml
request

Issue-ID: POLICY-1858
Change-Id: Ic1b9e771bd36fe0642e9a3439189076a4906a4b8
Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
4 years agocorrection when overriding with external truststore 28/94928/1
jhh [Wed, 4 Sep 2019 12:42:22 +0000 (07:42 -0500)]
correction when overriding with external truststore

Issue-ID: POLICY-1371
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Ief22f9d99acbd9c3d7335e59045d45c64296f783

4 years agoentrypoint: redirect std[out|err] to dev/null 28/94628/2
jhh [Thu, 29 Aug 2019 18:34:49 +0000 (13:34 -0500)]
entrypoint: redirect std[out|err] to dev/null

Issue-ID: POLICY-1371
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I8b4da1523925bbbbbed398365971c9efb7f6f1aa
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>