policy/models.git
4 years agoDisable sonar main args for models 80/105680/1
Jim Hahn [Thu, 9 Apr 2020 13:55:43 +0000 (09:55 -0400)]
Disable sonar main args for models

Issue-ID: POLICY-2305
Change-Id: Ie8c45fb767ec9b2f9b1b541532fede52306c36b4
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoMore sonar fixes in models 01/105501/1
Jim Hahn [Wed, 8 Apr 2020 14:04:29 +0000 (10:04 -0400)]
More sonar fixes in models

Addressed the following sonar issues:
- missing assert in junit
- duplicate code blocks
  - fixed those in the simulators
  - leaving the others in the concept classes for Liam/"G"

Issue-ID: POLICY-2305
Change-Id: Icfe80afb378b4cdec4de3d33d0e33227e04845d8
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoAddress sonar issues in models 47/105447/2
Jim Hahn [Tue, 7 Apr 2020 17:58:09 +0000 (13:58 -0400)]
Address sonar issues in models

Addressed the following sonar issues:
- use RE2 instead of java.util Pattern for "+" and "*"
- don't use deprecated methods
  - for Date(long), sonar appeared not to parse the argument's
    type correctly.  Modified the code slightly to make sonar happy
- duplicate blocks of code
- either log or throw
- missing assert in junit
  - for SDNR & VFC, eliminated threads, as they are unnecessary
- duplicate code block in different branches
- useless assignments
- redeclaring abstract methods
- cyclomatic complexity
  - used lombok in some cases (e.g., EqualsAndHashCode)
- assert argument order
  - actually deleted ControlLoopTargetType, because it is not needed
    and sonar complains regardless of which order is used
- add private constructor to utility classes
- use StandardCharsets instead of literals

Also:
- added logback-test.xml to SO to eliminate the voluminous output
  from the junit test

Issue-ID: POLICY-2305
Change-Id: I586c331781bedbd54a115a71847d04d293689445
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoMerge "Models junits are failing locally"
Jim Hahn [Mon, 6 Apr 2020 14:00:11 +0000 (14:00 +0000)]
Merge "Models junits are failing locally"

4 years agoModels junits are failing locally 08/105108/2
Jim Hahn [Fri, 3 Apr 2020 21:45:29 +0000 (17:45 -0400)]
Models junits are failing locally

Junits were failing in my local eclipse environment.  Fixed the
following:
- more cases of "is marked @NonNull but is null" (I thought Liam had
  already fixed all of these, but I'm still seeing errors, so fixed
  some more)
- comparing "Instant" values in event time stamps assumes that
  the times will be different, but may not be, if the JVM is fast
  enough.  Modified the test to set the times of the new events to
  Instant+1, to ensure that they are different from the original

Issue-ID: POLICY-2305
Change-Id: Ic05bc6a58b559ba589583ce887711ee01f76691c
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoRefer io.netty from policy/parent 98/105098/1
Ram Krishna Verma [Fri, 3 Apr 2020 17:35:33 +0000 (13:35 -0400)]
Refer io.netty from policy/parent

Issue-ID: POLICY-2467
Change-Id: If06f5fbf26269f7a34104bb2194258494a6488bf
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
4 years agochange drools op. policies controller name 34/105034/1
jhh [Thu, 2 Apr 2020 19:22:23 +0000 (14:22 -0500)]
change drools op. policies controller name

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

4 years agoSet sub request ID before start callback 79/104879/3
Jim Hahn [Wed, 1 Apr 2020 15:03:31 +0000 (11:03 -0400)]
Set sub request ID before start callback

Modified new actor code to generate the sub request ID
before invoking the start callback.

Issue-ID: POLICY-2461
Change-Id: I4adabd6efda2c30c0e2da31f95f01dd5fe546c0a
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoFix the policy model metadata for CLAMP 16/104716/1
sebdet [Mon, 30 Mar 2020 23:02:25 +0000 (01:02 +0200)]
Fix the policy model metadata for CLAMP

Fix the metadata section for CDS/operation, there was a mistake in the parameter value

Issue-ID: CLAMP-801
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ic25173dc24874d0877969872f20ad4d8df0703fd

4 years agoTest new actors against simulators 17/104617/4
Jim Hahn [Fri, 27 Mar 2020 16:35:23 +0000 (12:35 -0400)]
Test new actors against simulators

Also modified HttpParams to allow "path" to be blank to support any
cases that really have no "path" to append to the context URI base
path.

Issue-ID: POLICY-2405
Change-Id: I49eebde6759659d2804b5a11c1504c37674bd0c4
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoPoint to latest snapshot 87/104587/1
Pamela Dragosh [Fri, 27 Mar 2020 16:56:44 +0000 (12:56 -0400)]
Point to latest snapshot

Issue-ID: POLICY-2378
Change-Id: I5cd316100ee01b81a3cc59d57095beb6d97d7ec3
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoCleanup sonar bugs and security hotspot 77/104577/1
Pamela Dragosh [Fri, 27 Mar 2020 15:25:29 +0000 (11:25 -0400)]
Cleanup sonar bugs and security hotspot

Just some trivial sonar bugs for missing argument and a
couple sonar overrides to clear security hotspots.

Issue-ID: POLICY-2165
Change-Id: I392e5fee458465c66313a16a8912e23a3a119848
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoDiscard requests in APPC legacy actor 23/104523/1
Jim Hahn [Thu, 26 Mar 2020 15:51:52 +0000 (11:51 -0400)]
Discard requests in APPC legacy actor

The new actor for legacy APPC attempts to discard request
messages received on the response topic by discarding those
that have a null response.  Unfortunately, when it decodes them,
the Response object creates a status object, even if there isn't
one in the json message, thus the test fails and the actor treats
it as a failed response.

Issue-ID: POLICY-2434
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I26cfb25443ff2ed394781d309f9097d50b8f160b
Signed-off-by: Jim Hahn <jrh3@att.com>
4 years agoBump models 2.2.3-SNAPSHOT 46/104446/1
Pamela Dragosh [Wed, 25 Mar 2020 23:57:02 +0000 (19:57 -0400)]
Bump models 2.2.3-SNAPSHOT

Released 2.2.2

Issue-ID: POLICY-2378
Change-Id: I829f0dfc88aeaf1f9b7efad91c983628f2a5d706
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoRelease models 2.2.2 98/104398/1
Pamela Dragosh [Wed, 25 Mar 2020 17:24:56 +0000 (13:24 -0400)]
Release models 2.2.2

This includes a change in the Operational Common policy
type for CLAMP team via pairwise testing.

Issue-ID: POLICY-2378
Change-Id: Ifd0790af8f90a3299c38cfbe4e3f677094c88aa7
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoMerge "Cleanup eclipse warnings"
Pamela Dragosh [Wed, 25 Mar 2020 16:36:25 +0000 (16:36 +0000)]
Merge "Cleanup eclipse warnings"

4 years agoChange metadata for clamp 79/104379/3
sebdet [Wed, 25 Mar 2020 15:21:57 +0000 (08:21 -0700)]
Change metadata for clamp

Update metadata form clamp in the operational common model, so that it helps the user in the UI.

Issue-ID: CLAMP-786
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ib44391bd58a478558c3881243839b65cf2b1846d

4 years agoCleanup eclipse warnings 73/104373/1
Pamela Dragosh [Wed, 25 Mar 2020 13:55:19 +0000 (09:55 -0400)]
Cleanup eclipse warnings

Issue-ID: POLICY-2165
Change-Id: Iaad54af1b1210fe96fa44dcaa609834c46557877
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoSecurity fixes for cds actor in policy/models 65/104265/1
Ram Krishna Verma [Tue, 24 Mar 2020 15:38:01 +0000 (11:38 -0400)]
Security fixes for cds actor in policy/models

Upgrading io.netty to 4.1.48.Final as the current version has security issues.

Issue-ID: POLICY-2442
Change-Id: I5dbfdc7890c85571ef6b6bcc7a9f95310868f6a0
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
4 years agoBump policy-models to version 2.2.2-SNAPSHOT 32/104232/2
liamfallon [Tue, 24 Mar 2020 09:50:17 +0000 (09:50 +0000)]
Bump policy-models to version 2.2.2-SNAPSHOT

Issue-ID: POLICY-2378
Change-Id: I644e45822154f57d2bf6a81e55df07e2e4ca6966
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agoRelease models 2.2.1 69/104169/2
Pamela Dragosh [Mon, 23 Mar 2020 14:37:23 +0000 (10:37 -0400)]
Release models 2.2.1

Releasing for RC0

Issue-ID: POLICY-2378
Change-Id: I9e1c17a966265ddc1f02f9d1225c08a668c3b844
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoMerge "Add version to compliant operational policies"
Pamela Dragosh [Mon, 23 Mar 2020 22:14:17 +0000 (22:14 +0000)]
Merge "Add version to compliant operational policies"

4 years agoAdd version to compliant operational policies 83/104183/2
jhh [Mon, 23 Mar 2020 20:59:49 +0000 (15:59 -0500)]
Add version to compliant operational policies

Issue-ID: POLICY-2356
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I5636ec4e92ff87fdefb9a6372a150ad021aeec16
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
4 years agoNew Guard actor request structure is incorrect 81/104181/3
Jim Hahn [Mon, 23 Mar 2020 19:04:46 +0000 (15:04 -0400)]
New Guard actor request structure is incorrect

Missing various fields within the request structure (e.g.,
ONAPName).  Fixed.
In the process, also modified makeGuardPayload() so that it
only constructs the inner "guard" JSON object, making it easier
for invoking code to modify it.

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

4 years agoUpdate new SDNR actor with v2.0 structures 70/104170/2
Jim Hahn [Mon, 23 Mar 2020 15:36:09 +0000 (11:36 -0400)]
Update new SDNR actor with v2.0 structures

SDNR v2.0 introduced an extra "input" and "output" layer within
the body of the messages.  Added POJOs to match that, and updated
the actor to use the new POJOs so that no extra steps are needed
during serialization or deserialization.
Also modified the SDNR and APPC-LCM simulators to discard request messages
when looking for the response, if the sink and source topics happen to
be the same.
Added the SDNR simulator.
Added more coverage to the SDNR actor.
Fixed a sonar issue in the SDNR junit code:
- use a constant instead of a literal (i.e., for "ModifyConfig")

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

4 years agoMerge "Bug fixes in models simulators"
Liam Fallon [Mon, 23 Mar 2020 12:22:15 +0000 (12:22 +0000)]
Merge "Bug fixes in models simulators"

4 years agoMerge "Exception not propagated by processResponse"
Liam Fallon [Mon, 23 Mar 2020 12:21:50 +0000 (12:21 +0000)]
Merge "Exception not propagated by processResponse"

4 years agoFix legacy APPC handling of Request 98/104098/2
Jim Hahn [Fri, 20 Mar 2020 22:08:52 +0000 (18:08 -0400)]
Fix legacy APPC handling of Request

Legacy APPC uses the same topic for both requests and responses.
Unfortunately, when the actor sees the request, thinking it's a
response, it throws an exception because it can't find the status
code.  Fixed.

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

4 years agoException not propagated by processResponse 99/104099/1
Jim Hahn [Fri, 20 Mar 2020 22:29:21 +0000 (18:29 -0400)]
Exception not propagated by processResponse

If the topic processResponse() method throws an exception, then
the actor/operation is left in an incomplete state.

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

4 years agoBug fixes in models simulators 92/104092/2
Jim Hahn [Fri, 20 Mar 2020 19:53:47 +0000 (15:53 -0400)]
Bug fixes in models simulators

Fixed these issues:
- topics weren't started
- appc topics were reversed
- prevent appc simulator from responding to a response (i.e., infinite
  loop)

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

4 years agoMerge "Add docker file for all simulators"
Jim Hahn [Fri, 20 Mar 2020 18:07:33 +0000 (18:07 +0000)]
Merge "Add docker file for all simulators"

4 years agoTest cascaded multiple revision gets 52/104052/1
liamfallon [Fri, 20 Mar 2020 12:50:35 +0000 (12:50 +0000)]
Test cascaded multiple revision gets

This patch tests cascaded get requests with multiple revisions.

Issue-ID: POLICY-2377
Change-Id: Ie7dc849d7b930b861d38c386a9950ae7e84e2a05
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agoAdd docker file for all simulators 12/103912/7
Jim Hahn [Tue, 17 Mar 2020 21:41:59 +0000 (17:41 -0400)]
Add docker file for all simulators

Some CSITs may require multiple simulators.  This adds a class that
will start all of the simulators.  A tarball is generated from which
a docker image can be built.
Added simulators for Topics: appc and appc-lcm.
Fixed licenses in files in packages directory.
Fixed per review comments:
- add version to Dockerfile

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

4 years agoMerge "Point to released common and parent"
Liam Fallon [Fri, 20 Mar 2020 09:51:38 +0000 (09:51 +0000)]
Merge "Point to released common and parent"

4 years agoMerge "Misc simple sonar issue fixes"
Liam Fallon [Fri, 20 Mar 2020 09:31:29 +0000 (09:31 +0000)]
Merge "Misc simple sonar issue fixes"

4 years agoPoint to released common and parent 19/104019/1
Pamela Dragosh [Fri, 20 Mar 2020 00:17:05 +0000 (20:17 -0400)]
Point to released common and parent

common 1.6.2 and parent 3.1.1

Issue-ID: POLICY-2378
Change-Id: I668814f6d121db4f22050d2b6d307d5d3743ddf4
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoMisc simple sonar issue fixes 16/103816/2
Chris Ramstad [Tue, 17 Mar 2020 18:52:02 +0000 (11:52 -0700)]
Misc simple sonar issue fixes

Issue-ID: POLICY-2389
Signed-off-by: Chris Ramstad <cramstad@ciena.com>
Change-Id: I7ce91e331a128aaadaab5ac837e19873a3388164

4 years agoAdd unit test for Version fetch change 89/103989/1
liamfallon [Thu, 19 Mar 2020 17:37:05 +0000 (17:37 +0000)]
Add unit test for Version fetch change

Issue-ID: POLICY-2377
Change-Id: Iaad1da84de058fcb50d24663156b4b0bcedd427e
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agoAllow fetch of old policy type verisons 77/103977/1
liamfallon [Thu, 19 Mar 2020 15:28:49 +0000 (15:28 +0000)]
Allow fetch of old policy type verisons

Due to the problems with TOSCA and version handling, the filtering for
policy types on old versions did not work. This change fixes that
problem.

Issue-ID: POLICY-2377
Change-Id: I462bd5710b9dea37475861d1021d28b2c7391a24
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agoMerge "renew policy certs till 03/17/2021"
Pamela Dragosh [Wed, 18 Mar 2020 19:54:16 +0000 (19:54 +0000)]
Merge "renew policy certs till 03/17/2021"

4 years agoReturn latest entity on null versions 54/103854/1
liamfallon [Wed, 18 Mar 2020 11:47:20 +0000 (11:47 +0000)]
Return latest entity on null versions

This review amends the behaviour of "get" operations on entities to
always return the latest version of an entity when the version of the
search key is the null key (value of 0.0.0).

Issue-ID: POLICY-2377
Change-Id: I4f7c12637c90bc1a83ce2ba5ef40e15b461a7d51
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agorenew policy certs till 03/17/2021 27/103827/1
jhh [Wed, 18 Mar 2020 00:40:32 +0000 (19:40 -0500)]
renew policy certs till 03/17/2021

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

4 years agoMerge "Consistent returns on Service Template gets"
Pamela Dragosh [Mon, 16 Mar 2020 19:29:00 +0000 (19:29 +0000)]
Merge "Consistent returns on Service Template gets"

4 years agoConsistent returns on Service Template gets 68/103668/3
liamfallon [Fri, 13 Mar 2020 12:34:58 +0000 (12:34 +0000)]
Consistent returns on Service Template gets

This review enables specification of versions of entities on incoming
service templates using a ':' delimiter.

So this will load version 1.00, version 2.0.0, and version 3.0.0:
org.onap.entitiy:1.0.0:
   version: 1.0.0
org.onap.entity:2.0.0:
   version: 2.0.0
org.onap.entity
   version: 3.0.0

So this will load version 1.00, version 2.0.0, and version 4.0.0:
org.onap.entitiy:1.0.0:
   version: 1.0.0
org.onap.entity:2.0.0:
   version: 2.0.0
org.onap.entity:
   version: 3.0.0
org.onap.entity:
   version: 4.0.0

This will load
org.onap.entity:1.0.0
   name: org.onap.entity
   version: 1.0.0

This will throw an exception
org.onap.entity:1.0.0
   name: org.onap.some.other.entity
   version: 1.0.0

This will throw an exception
org.onap.entity:1.0.0:
   name: org.onap.entity
   version: 2.0.0

Issue-ID: POLICY-2377
Change-Id: I34bccf065b4ee4d2fe71b052bf009d4a40e2cba8
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agoAdding APEX example to policy models 73/103673/1
a.sreekumar [Fri, 13 Mar 2020 13:54:28 +0000 (13:54 +0000)]
Adding APEX example to policy models

Change-Id: Idc3da44d99d8d8228a9bc6be49039c2fa02b350e
Issue-ID: POLICY-2424
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
4 years agoRevert some UUID variable names 47/103647/2
Jim Hahn [Thu, 12 Mar 2020 22:55:21 +0000 (18:55 -0400)]
Revert some UUID variable names

Unfortunately, some code uses "new Yaml(...)" to decode policies and
"Yaml" doesn't understand GSON annotations.  As a result, this means
that the field names must match the serialized name, thus they must
continue to end with "UUID" instead of "Uuid".

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

4 years agoMerge "Clean up minor checkstyle/sonar issues"
Pamela Dragosh [Thu, 12 Mar 2020 19:25:47 +0000 (19:25 +0000)]
Merge "Clean up minor checkstyle/sonar issues"

4 years agoClean up minor checkstyle/sonar issues 05/103605/5
liamfallon [Thu, 12 Mar 2020 12:15:04 +0000 (12:15 +0000)]
Clean up minor checkstyle/sonar issues

A few minor eclipse warnings and checkstyle warnings in policy models.

Issue-ID: POLICY-1910
Change-Id: I612c6514fa7d88cb8658a7ee1618869a525e48d7
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agoSONAR: Squelch bug regarding non-initalized lombok.NonNull values 64/103564/1
Chris Ramstad [Wed, 11 Mar 2020 23:06:14 +0000 (16:06 -0700)]
SONAR: Squelch bug regarding non-initalized lombok.NonNull values

Issue-ID: POLICY-2389
Signed-off-by: Chris Ramstad <cramstad@ciena.com>
Change-Id: Iba9faf9e878d55022be7882e862ebed826dc76c1

4 years agoAdd message to DecisionResponse 48/103548/1
Pamela Dragosh [Wed, 11 Mar 2020 18:05:05 +0000 (14:05 -0400)]
Add message to DecisionResponse

For better error message information to be returned.

Issue-ID: POLICY-2242
Change-Id: I704249c9f4c85b0893b3e004aa1022bd70c87f2e
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoMerge "Add VFC Actor"
Jim Hahn [Wed, 11 Mar 2020 13:18:07 +0000 (13:18 +0000)]
Merge "Add VFC Actor"

4 years agoMerge "Immediately finish if guard is disabled"
Liam Fallon [Tue, 10 Mar 2020 21:20:40 +0000 (21:20 +0000)]
Merge "Immediately finish if guard is disabled"

4 years agoAdd VFC Actor 10/102910/6
Pamela Dragosh [Tue, 3 Mar 2020 21:08:37 +0000 (16:08 -0500)]
Add VFC Actor

Adding first cut at VFC Actor.

Issue-ID: POLICY-2386
Change-Id: I4749ed3f350f01d05026057ffe4149f3843d8475
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
4 years agoFix field names in SO Actor messages 45/103445/1
Jim Hahn [Tue, 10 Mar 2020 14:30:37 +0000 (10:30 -0400)]
Fix field names in SO Actor messages

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

4 years agoImmediately finish if guard is disabled 64/103364/3
Jim Hahn [Mon, 9 Mar 2020 14:22:29 +0000 (10:22 -0400)]
Immediately finish if guard is disabled

Modified the Guard Actor to check the "disabled" flag during
start() instead of waiting until it gets down into startOperationAsync.

Issue-ID: POLICY-1625-guard-disabled
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Id6ccf506b82504552d6e1f4637ad11e2e41e77e5

4 years agoMerge "Add subrequest ID to OperationOutcome"
Liam Fallon [Tue, 10 Mar 2020 09:18:30 +0000 (09:18 +0000)]
Merge "Add subrequest ID to OperationOutcome"

4 years agoMerge "Add optional controllerName in Op. Legacy Policies"
Jorge Hernandez [Mon, 9 Mar 2020 22:25:16 +0000 (22:25 +0000)]
Merge "Add optional controllerName in Op. Legacy Policies"

4 years agoMerge "Fix guard policy types and policies"
Pamela Dragosh [Mon, 9 Mar 2020 18:04:56 +0000 (18:04 +0000)]
Merge "Fix guard policy types and policies"

4 years agoAdd optional controllerName in Op. Legacy Policies 84/103184/3
jhh [Thu, 5 Mar 2020 20:32:21 +0000 (14:32 -0600)]
Add optional controllerName in Op. Legacy Policies

Optional controllerName has been added to Legacy Operational
policies to be able to route Operational Policies to an
specific drools controller.

Currently, the policies are deployed to all controllers that
support a policy type.   In the case, that there are multiple
controllers set, and the policy is only to be routed to one of
them, this field should be populated.

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

4 years agoFix guard policy types and policies 29/103329/2
Pamela Dragosh [Sun, 8 Mar 2020 14:39:21 +0000 (10:39 -0400)]
Fix guard policy types and policies

Ensured the correct properties are available for each guard
Policy Type.

Added vDNS blacklist policy for testing.

Issue-ID: POLICY-2243
Change-Id: I1cdcd3810f226446cd12f2123f8a9f41e6b5b4b2
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoAdd subrequest ID to OperationOutcome 13/103313/1
Jim Hahn [Fri, 6 Mar 2020 23:22:28 +0000 (18:22 -0500)]
Add subrequest ID to OperationOutcome

Rule notifications need the subrequest ID to be populated in the
OperationOutcome object, where possible.

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

4 years agoLog full URL for REST calls 03/103303/2
Jim Hahn [Fri, 6 Mar 2020 19:00:58 +0000 (14:00 -0500)]
Log full URL for REST calls

Actors only log the URI, without the host and port info.  Modified
to log the full URL.
Also adjusted URLs for trailing "/".

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

4 years agoFull version in policy metadata version 96/103296/1
liamfallon [Fri, 6 Mar 2020 17:17:36 +0000 (17:17 +0000)]
Full version in policy metadata version

Major, minor, and patch version of policy now in policy metadata
version.

Issue-ID: POLICY-2243
Change-Id: I1f3c7054a12e724264b117e399890c9e1c3347f2
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agoMerge "TOSCA Compliant Guard Policies"
Pamela Dragosh [Fri, 6 Mar 2020 15:58:15 +0000 (15:58 +0000)]
Merge "TOSCA Compliant Guard Policies"

4 years agoTOSCA Compliant Guard Policies 27/103127/8
Pamela Dragosh [Thu, 5 Mar 2020 12:55:57 +0000 (07:55 -0500)]
TOSCA Compliant Guard Policies

Fixing the legacy guard policies and renaming them so we are
able to differentiate them.

Adding newer, cleaner TOSCA Guard Policies that match the operational
guard policies.

Removing legacy guard policies.

Fixing JUnit so that they don't use indexes to test whether versions
are changed correctly.

Added back in new guard policies. Fixed the guard policy types to use
camel case.

Issue-ID: POLICY-2243
Change-Id: Ie611f26f73f41e64c0b467f524f470739158f437
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoAdd other APPC-LCM operations 03/103203/4
Jim Hahn [Thu, 5 Mar 2020 21:41:15 +0000 (16:41 -0500)]
Add other APPC-LCM operations

Also added legacy ModifyConfig as an operation within APPC-LCM.
Added logging to topic registration keys.

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

4 years agoMerge "Add SO VF Module Delete Operation"
Jim Hahn [Fri, 6 Mar 2020 01:49:43 +0000 (01:49 +0000)]
Merge "Add SO VF Module Delete Operation"

4 years agoAdd SO VF Module Delete Operation 22/102922/10
Jim Hahn [Wed, 4 Mar 2020 02:02:13 +0000 (21:02 -0500)]
Add SO VF Module Delete Operation

Redesigned the SO Operation classes; moved some code from the subclass
to the superclass so it could be reused by the VF Module Delete Operation.
JerseyClient does not support DELETE with a request body, so had to
implement a delete() method using java11 HttpClient.
Fix some issues found while testing with drools-apps.
Added "delete" operation to SO simulator.

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

4 years agoMake Controller policy type derived from native 69/103169/2
jhh [Thu, 5 Mar 2020 18:50:37 +0000 (12:50 -0600)]
Make Controller policy type derived from native

onap.policies.drools.Controller has been made to
be derived from native, and it has been consolidated
under the onap.policies.native.Drools.yaml.
Additionallly some renaming of fields has been done in
an attempt to be more representative of its content.

Issue-ID: POLICY-2388
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I5b1cf04f36db01b917b77eff4ab5254073be9b0c
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
4 years agoMerge "Add APPC-LCM actor"
Ram Krishna Verma [Thu, 5 Mar 2020 16:22:53 +0000 (16:22 +0000)]
Merge "Add APPC-LCM actor"

4 years agoAdd APPC-LCM actor 83/102783/8
Peyton Puckett [Mon, 2 Mar 2020 22:02:07 +0000 (16:02 -0600)]
Add APPC-LCM actor

Issue-ID: POLICY-2403
Change-Id: Ia7b26cce9ec8308c3d83c374e5ac6aea3af38a1d
Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
4 years agoMerge "SDNC Actor doesn't use full URL"
Pamela Dragosh [Thu, 5 Mar 2020 13:24:05 +0000 (13:24 +0000)]
Merge "SDNC Actor doesn't use full URL"

4 years agoMerge "Fix tca monitoring tca_policy type"
Liam Fallon [Thu, 5 Mar 2020 08:14:58 +0000 (08:14 +0000)]
Merge "Fix tca monitoring tca_policy type"

4 years agoSDNC Actor doesn't use full URL 53/103053/1
Jim Hahn [Wed, 4 Mar 2020 20:02:45 +0000 (15:02 -0500)]
SDNC Actor doesn't use full URL

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

4 years agoFix exception message in Actors 32/103032/2
Jim Hahn [Wed, 4 Mar 2020 17:01:06 +0000 (12:01 -0500)]
Fix exception message in Actors

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

4 years agoFix tca monitoring tca_policy type 18/103018/4
Pamela Dragosh [Wed, 4 Mar 2020 15:29:54 +0000 (10:29 -0500)]
Fix tca monitoring tca_policy type

Should not use map or entry_schema

Issue-ID: POLICY-2408
Change-Id: Ieebe625676edab6c44323b7c69a50cc22099235f
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoTranslate APPC Instant to Long 17/103017/1
Jim Hahn [Tue, 3 Mar 2020 21:54:52 +0000 (16:54 -0500)]
Translate APPC Instant to Long

APPC uses encode Instant fields as milliseconds instead of as
ISO date strings.

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

4 years agoMerge "Fix path issues"
Ram Krishna Verma [Tue, 3 Mar 2020 19:41:16 +0000 (19:41 +0000)]
Merge "Fix path issues"

4 years agoReturn incoming service templates on create 80/102880/1
liamfallon [Tue, 3 Mar 2020 16:14:34 +0000 (16:14 +0000)]
Return incoming service templates on create

We should return the incoming service template on create requests. This
change is required for CSIT tests.

Issue-ID: POLICY-1402
Change-Id: I1072c9c16d2b267c34fa015e7e7a355ba9f5338a
Signed-off-by: liamfallon <liam.fallon@est.tech>
4 years agoMerge "Don't log cancellation exception"
Jim Hahn [Tue, 3 Mar 2020 14:57:35 +0000 (14:57 +0000)]
Merge "Don't log cancellation exception"

4 years agoLog topic message before publishing 09/102809/1
Jim Hahn [Tue, 3 Mar 2020 04:55:07 +0000 (23:55 -0500)]
Log topic message before publishing

Code was publishing and then logging the message.  Reversed the
order.

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

4 years agoDon't log cancellation exception 98/102798/1
Jim Hahn [Tue, 3 Mar 2020 02:50:28 +0000 (21:50 -0500)]
Don't log cancellation exception

When an Actor operation is canceled it's done on purpose, yet the whole
exception stack trace is included in the log.  Modified the code to
leave out the stack trace for cancellations.  I don't THINK this will
cause a sonar issue, as it isn't the exception is never caught via
a "catch" clause.

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

4 years agoFix path issues 78/102778/4
Jim Hahn [Mon, 2 Mar 2020 21:17:36 +0000 (16:17 -0500)]
Fix path issues

A&AI tenant query is prepending the target entity with "/", but it should
not.  Fixed it.
Modified A&AI and SO actors to get path prefixes from parameters.
Fixed a bug in an A&AI simulator response (extra "}" at the end.

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

4 years agoMerge "Log Actor parameter error message"
Ram Krishna Verma [Mon, 2 Mar 2020 21:36:02 +0000 (21:36 +0000)]
Merge "Log Actor parameter error message"

4 years agoLog Actor parameter error message 71/102771/1
Jim Hahn [Mon, 2 Mar 2020 19:50:11 +0000 (14:50 -0500)]
Log Actor parameter error message

When an operation cannot be configured, the message did not
include information describing the issue.  Fixed it.

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

4 years agoTestcases for cds actor 42/102642/2
Ram Krishna Verma [Fri, 28 Feb 2020 22:53:54 +0000 (17:53 -0500)]
Testcases for cds actor

Adding test cases for cds actor, operator, operation & manager.
Coverage is more than 95% overall.
Fixed review comments.

Issue-ID: POLICY-2384
Change-Id: I64beeb0c46918b990ad7e67248559169fc7940a1
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
4 years agoAdd SDNR Actor 62/102162/6
Pamela Dragosh [Fri, 21 Feb 2020 19:57:50 +0000 (14:57 -0500)]
Add SDNR Actor

Actor for SDNR and necessary JUnit tests.

Removed the Pair code.

Issue-ID: POLICY-2382
Change-Id: I3da1d95f431cc076f12e9ad26280b92058fe51cc
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
4 years agoMerge "Add sequence number to Actors"
Ram Krishna Verma [Sun, 1 Mar 2020 15:44:26 +0000 (15:44 +0000)]
Merge "Add sequence number to Actors"

4 years agoMerge "Sequence throws NPE if task outcome is null"
Liam Fallon [Sun, 1 Mar 2020 14:38:22 +0000 (14:38 +0000)]
Merge "Sequence throws NPE if task outcome is null"

4 years agoGuard Actor is adding the wrong type of Operator 60/102660/1
Jim Hahn [Sat, 29 Feb 2020 19:34:53 +0000 (14:34 -0500)]
Guard Actor is adding the wrong type of Operator

The Guard Actor should be adding a GuardOperator, but it was
adding an HttpOperator, instead.  Fixed the code.

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

4 years agoAdd sequence number to Actors 59/102659/1
Jim Hahn [Sat, 29 Feb 2020 18:20:06 +0000 (13:20 -0500)]
Add sequence number to Actors

When actors with duplicate names are loaded, a way is needed to
determine which should take precedence. Added a sequence number to
Actor to facilitate this.  Unfortunately, couldn't use OrderedServiceImpl,
because it only creates the Actors once, which would break a number
of junit tests.

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

4 years agoSequence throws NPE if task outcome is null 54/102654/1
Jim Hahn [Sat, 29 Feb 2020 13:16:34 +0000 (08:16 -0500)]
Sequence throws NPE if task outcome is null

If a task outcome is null, then sequence() throws an NPE.  Modified
it to treat a null outcome as a failure.

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

4 years agoRemove controllerVersion (no use at this point). 31/102531/1
jhh [Fri, 28 Feb 2020 01:28:59 +0000 (19:28 -0600)]
Remove controllerVersion (no use at this point).

It is not clear what would be the controller version for
at this point.   We could add back if we find a good use
for this field.

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

4 years agoChange ActorService config to Map<String,Object> 45/102445/1
Jim Hahn [Wed, 26 Feb 2020 22:14:34 +0000 (17:14 -0500)]
Change ActorService config to Map<String,Object>

It's a bit of a pain to pass Map<String, Map<String,Object>> to
the ActorService configure() method.  Changed it to simply take
a Map<String,Object>, as it had been in a previous iteration.

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

4 years agoMerge "ActorService constructor should be public"
Ram Krishna Verma [Wed, 26 Feb 2020 21:03:39 +0000 (21:03 +0000)]
Merge "ActorService constructor should be public"

4 years agoActorService constructor should be public 37/102437/1
Jim Hahn [Wed, 26 Feb 2020 18:37:21 +0000 (13:37 -0500)]
ActorService constructor should be public

Now that ActorService is no longer a singleton, the constructor
should be public so other classes can create an instance.
Also added a test to verify that each ActorService instance gets
its own instances of the actors.

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

4 years agoCustom Query should always use vserver 25/102425/2
Jim Hahn [Wed, 26 Feb 2020 16:07:35 +0000 (11:07 -0500)]
Custom Query should always use vserver

Modified the Custom Query Operation to ignore the target entity
passed via the "params" and always use the vserver name found in
the enrichment data.

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

4 years agoMerge "Add actor for CDS"
Liam Fallon [Wed, 26 Feb 2020 15:37:35 +0000 (15:37 +0000)]
Merge "Add actor for CDS"

4 years agoMerge "Remove ActorService singleton"
Ram Krishna Verma [Wed, 26 Feb 2020 14:14:58 +0000 (14:14 +0000)]
Merge "Remove ActorService singleton"

4 years agoEliminate a couple more xxxAsync calls in Actors 49/102349/2
Jim Hahn [Tue, 25 Feb 2020 23:33:47 +0000 (18:33 -0500)]
Eliminate a couple more xxxAsync calls in Actors

Eliminated a few more xxxAsync calls in Actors.  Now, the remaining
xxxAsync calls are necessary so that the callbacks are executed using
the executor specified via the "params".

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