Jim Hahn [Tue, 8 Sep 2020 17:40:08 +0000 (13:40 -0400)]
Release 2.3.1 models
Issue-ID: POLICY-2789
Change-Id: I2199abef6ff9e34f3bdcc0103c59e3d5a761df6c
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Tue, 8 Sep 2020 15:03:36 +0000 (11:03 -0400)]
Use released versions
Issue-ID: POLICY-2789
Change-Id: I94e3a329499365465db9e5c81461570506f86620
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 4 Sep 2020 21:45:57 +0000 (21:45 +0000)]
Revert "point to 2.1.0 policy-alpine base - model-sim"
This reverts commit
e46f74d64fe69d33d5038704b64993aa9cab59fc.
Reason for revert: some CSITs broken because the can't find the image
Issue-ID: POLICY-2789
Change-Id: Id6355c21789281a3f25467b3bd6e2e48d22533f5
Signed-off-by: Jim Hahn <jrh3@att.com>
Taka Cho [Fri, 4 Sep 2020 12:58:25 +0000 (08:58 -0400)]
point to 2.1.0 policy-alpine base - model-sim
In G-rel, using 2.1.0 base.
Issue-ID: POLICY-2789
Change-Id: I165debaf20267c0b1c3141bff805a29595f1eccf
Signed-off-by: Taka Cho <takamune.cho@att.com>
Pamela Dragosh [Tue, 1 Sep 2020 20:38:15 +0000 (16:38 -0400)]
Add new method to retrieve vnf-id
For guard filters, once the vnf-id is found. Then this convenience
method helps to retrieve the correct vnf information.
Issue-ID: POLICY-2590
Change-Id: I0b55b15582ddc58bbc5b2c0c2c2b130f3cdc88c3
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Signed-off-by: Jim Hahn <jrh3@att.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Jim Hahn [Tue, 1 Sep 2020 16:15:55 +0000 (16:15 +0000)]
Merge "Add Modify NSSI operation in SO actor"
krishnaa96 [Wed, 26 Aug 2020 09:29:04 +0000 (14:59 +0530)]
Add Modify NSSI operation in SO actor
Issue-ID: POLICY-2586
Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com>
Change-Id: I6ac184a6e731767f06401a0ac984c6b448c5d82f
Jim Hahn [Fri, 28 Aug 2020 19:26:04 +0000 (15:26 -0400)]
Default policies to usecases controller
The example operation policies specify the "frankfurt" controller.
Modified them to specify the "usecases" controller instead.
Issue-ID: POLICY-2748
Change-Id: I468b43a80e09dd054ba3b8fa8dbc47c8d7efd548
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 28 Aug 2020 12:29:16 +0000 (12:29 +0000)]
Merge "Remove commons-io dependency from models"
Jim Hahn [Fri, 28 Aug 2020 12:28:06 +0000 (12:28 +0000)]
Merge "Remove Target and TargetType"
Jim Hahn [Thu, 27 Aug 2020 21:39:06 +0000 (17:39 -0400)]
Remove commons-io dependency from models
Issue-ID: POLICY-2798-commons-io
Change-Id: I2b2593b5f00aa73ea80fba6438c836e70f6ee45c
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Thu, 27 Aug 2020 12:44:12 +0000 (08:44 -0400)]
Remove Target and TargetType
The dependency should have been removed in the last review to
remove SDC and policy-yaml legacy code.
It was revealed that usage of TargetType and Type were spread out over the
actor code. Those fields are represented differently in the new
TOSCA Operational Policy Type, so fields were created to capture
those values to be used by actor code.
Issue-ID: POLICY-2428
Change-Id: Ib783526a518ca7942ae9e38019bd343639f4dd98
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Jim Hahn [Thu, 27 Aug 2020 11:59:19 +0000 (07:59 -0400)]
Fix random failures in dmaap-sim
Modified the code to use a separate topic for the format tests, as well
as a separate consumer name for each test.
Issue-ID: POLICY-2749
Change-Id: Ia93f17109b761e98a4f676066024b51dd9024dc0
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Wed, 26 Aug 2020 11:13:19 +0000 (11:13 +0000)]
Merge "Address more sonar issues in policy-models"
Jorge Hernandez [Tue, 25 Aug 2020 23:32:27 +0000 (23:32 +0000)]
Merge "update keystore cert"
Taka Cho [Tue, 25 Aug 2020 23:15:10 +0000 (19:15 -0400)]
update keystore cert
new expiration date is
3/17/2021
Issue-ID: POLICY-2795
Change-Id: I6c4b636b48ca2aef8165c1f4fd19067b242aedb4
Signed-off-by: Taka Cho <takamune.cho@att.com>
Jim Hahn [Tue, 25 Aug 2020 16:30:29 +0000 (12:30 -0400)]
Address more sonar issues in policy-models
Addressed sonar issues:
- diamond operator
Also removed a number of the "NOSONAR" comments now that we know how to
address them without disabling sonar.
Issue-ID: POLICY-2714
Change-Id: I440f4fa955968fd911616c2b6ee61b4b4d013821
Signed-off-by: Jim Hahn <jrh3@att.com>
Ram Krishna Verma [Tue, 25 Aug 2020 18:20:26 +0000 (18:20 +0000)]
Merge "Add new match Policy Type"
Pamela Dragosh [Mon, 24 Aug 2020 19:55:29 +0000 (15:55 -0400)]
Add new match Policy Type
Allows Policy Designers to design their own matchable Policy Type
out-of-the-box with ONAP.
Issue-ID: POLICY-2596
Change-Id: I632201f50b565d5a558f8a773bf658407bedbfe6
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Jim Hahn [Mon, 24 Aug 2020 15:05:04 +0000 (15:05 +0000)]
Merge "Remove legacy operational policy from models"
Pamela Dragosh [Mon, 24 Aug 2020 12:05:15 +0000 (08:05 -0400)]
Remove deprecated SDC and Model-yaml
Deprecated as we now use TOSCA and the SDC catalog objects
isn't useful for control loop design and implementation.
Issue-ID: POLICY-2428
Change-Id: Ib4adfbf25ba70c3cad47a8494333a1f20a5c4e23
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
uj426b [Fri, 31 Jul 2020 16:06:01 +0000 (12:06 -0400)]
Sonar Fixes policy/models, removing model-yaml
Change-Id: Icd82ea1aef90e4d638b13958519aac5ed5a53f73
Issue-ID: POLICY-2714
Signed-off-by: uj426b <uj426b@att.com>
Jim Hahn [Wed, 19 Aug 2020 19:13:23 +0000 (19:13 +0000)]
Merge "Upgrade new tcagen2 policy type"
Pamela Dragosh [Wed, 19 Aug 2020 15:18:39 +0000 (11:18 -0400)]
Upgrade new tcagen2 policy type
The old cdap policy type is deprecated by DCAE. Thus,
we are simply replacing with the new tcagen2 policy type.
Issue-ID: POLICY-2772
Change-Id: I1442340729b5f820f2e265b9b86f6f6f84f49bca
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Jim Hahn [Tue, 18 Aug 2020 13:39:19 +0000 (09:39 -0400)]
Make targetEntity a property
The target entity is not always known when an Operation is first
constructed, thus it should be treated as an Operation property instead
of being included within the ControlLoopParams. Started the process of
moving it from the Params to the properties.
Also fixed a bug in custom query - it was setting the outcome response
to the String response instead of setting it to the AaiCqResponse
object.
Also added logging when an Operation's properties are set.
Issue-ID: POLICY-2746
Change-Id: I56c0cd90985f6140363548b0b8d031471b586e88
Signed-off-by: Jim Hahn <jrh3@att.com>
Ram Krishna Verma [Tue, 18 Aug 2020 19:59:14 +0000 (19:59 +0000)]
Merge "Remove event context from Operation post processor"
Jim Hahn [Mon, 17 Aug 2020 22:45:58 +0000 (18:45 -0400)]
Remove event context from Operation post processor
Some operations, notably A&AI, post-process data by putting it into the
event context. However, with the new strategy, the event context may
not be populated. Modified the code to see if the context exists before
putting the data into it.
Issue-ID: POLICY-2746
Change-Id: Ie3b1bd13b4ac5ee59629daaebc05a62e6ef3c804
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Mon, 17 Aug 2020 20:42:55 +0000 (16:42 -0400)]
Add new guard filter policy type
New policy type for testing and preloading.
Issue-ID: POLICY-2590
Change-Id: Ic542c61bd402387870306fce9a1977b169052ef9
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Ram Krishna Verma [Fri, 14 Aug 2020 15:11:36 +0000 (11:11 -0400)]
Remove legacy operational policy from models
Removing all the legacy operational policy related
concepts, providers, examples etc from models repo.
Issue-ID: POLICY-2764
Change-Id: Ie820271381674ccc4eaef0bd6379f673f67701e7
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Ram Krishna Verma [Fri, 14 Aug 2020 21:20:47 +0000 (21:20 +0000)]
Merge "Do not require context in ControlLoopOperationParams"
Jim Hahn [Fri, 14 Aug 2020 19:25:35 +0000 (15:25 -0400)]
Remove annotations from dmaap common test class
Jenkins builds are randomly failing in the junits for the dmaap simulator.
From the console output, it appears that the simulator is being shut down
before all of the test methods have executed. Moved the code for
managing the "Main" object from the common superclass to the only
subclass that needed it.
Issue-ID: POLICY-2749
Change-Id: I2615bbef9b790dbb633ed7f123aeb3f880826862
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Thu, 13 Aug 2020 15:15:29 +0000 (11:15 -0400)]
Do not require context in ControlLoopOperationParams
Modified ControlLoopOperationParams so that the request ID can
be provided instead of the context. However, if the request ID
is not provided, then it still requires a context. (This requirement
should be lifted in a subsequent review).
Issue-ID: POLICY-2746
Change-Id: Ib00f46f2fe56430d700ee2edfba12f2c1a106a3f
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Fri, 7 Aug 2020 22:02:24 +0000 (22:02 +0000)]
Merge "Modify Actors to use properties when provided"
Jim Hahn [Tue, 4 Aug 2020 20:27:18 +0000 (16:27 -0400)]
Modify Actors to use properties when provided
Modified the Actors to use properties when the application provides them
instead of going to the event context for the data. This sometimes entailed
moving code out of the Operation subclass constructor that used or validated
the context data.
Combined some property names and renamed others.
Changed VF Count from AtomicInteger to Integer.
Issue-ID: POLICY-2746
Change-Id: Ib8730538309bb77d2f4f6161e9a20a49362d8972
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Thu, 6 Aug 2020 15:47:40 +0000 (11:47 -0400)]
Exclude javaparser due to license issue
javaparser is included indirectly by aai-schema jar. Modified the
pom to excluded javaparser when including aai-schema jar. Verified
that models aai code still works and that drools-apps use case tests
still work.
Issue-ID: POLICY-2736
Change-Id: Iba137cf7ee4be6f2e35e3053413a4a9068860823
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Tue, 4 Aug 2020 13:09:14 +0000 (09:09 -0400)]
Skip preprocessor step in Actors
Modified Actors to skip the preprocessor step if the "preprocessed" flag
is set to true in the parameters. Did not add any error checking code
to ensure the data was actually available to the operation - will add
that once the properties are being set by the application code.
Extracted common code in GrpcOperationTest into the setup method.
Issue-ID: POLICY-2746
Change-Id: Id70c31a2c96a7aaa9d73cc70cdf4f55f8a4e087f
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Wed, 29 Jul 2020 17:50:40 +0000 (13:50 -0400)]
Add property lists to Actors
Modified the Actor code to provide a list of properties needed by the
actor to perform a given operation.
Added a build() method to the parameter class so invokers can build an
operation and set its properties prior to starting it.
Added a "preprocessed" field to the parameter class so invokers can
indicate that the Actor need not perform any preprocessing steps. Will
modify the actors, in a subsequent review, to observe the flag.
Added "properties" to Operation so invokers can set the properties. Will
modify the actors, in a subsequent review, to use the property values
instead of the event context.
Tweaked a few Actors to get values using the "params" object instead of
reaching inside to the event object that it contains.
Addressed review comment(s):
- add prefix to other property names
Issue-ID: POLICY-2746
Change-Id: I65996aef5cec5afe25e8287c0b2f5f322c532ca5
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 31 Jul 2020 11:51:33 +0000 (07:51 -0400)]
Allocate unique port for dmaap simulator junits
The junits for the dmaap simulator were randomly failing, because the
port was already in use. Modified the junits to allocate their own,
individual ports.
Issue-ID: POLICY-2749
Change-Id: I3f3858091ee8f36ed00346ad9fa002a76d0348ae
Signed-off-by: Jim Hahn <jrh3@att.com>
Taka Cho [Thu, 30 Jul 2020 18:01:07 +0000 (14:01 -0400)]
Update INFO.yaml in policy-models
Verified with Jessica W that the "type" should still be "Addition",
even when updating the PTL.
Updated to Mature, per TSC.
Issue-ID: POLICY-2738
Change-Id: Ibfa990f73e565db4630ff6bc373cea626eb9fc2a
Signed-off-by: Taka Cho <takamune.cho@att.com>
Jim Hahn [Fri, 24 Jul 2020 16:59:20 +0000 (12:59 -0400)]
Add Ajith to policy/models info
Issue-ID: POLICY-2738
Change-Id: Ic3e9f9ee6641410356ff27f4d405fd606e6c44ff
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Tue, 21 Jul 2020 13:55:38 +0000 (09:55 -0400)]
Fix some sonars in policy-models
Fixed the following sonar issues in some of the project directories:
- use assertNull, assertEquals, etc.
- swap assertEquals arguments
- extract a constant
- don't invoke toString() in logger calls
- TODOs
- generic types
Issue-ID: POLICY-2714
Change-Id: Id8803f9bf617ea9fc173a67b8606600709b55bdc
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 17 Jul 2020 20:20:02 +0000 (20:20 +0000)]
Merge "Support vDNS RainyDay test Case."
uj426b [Thu, 16 Jul 2020 18:52:57 +0000 (14:52 -0400)]
Support vDNS RainyDay test Case.
Modifying simulator to handle failure sent from Policy Json.
Change-Id: I52a9f8da4ad06b535262f202418868f79fea4510
Issue-ID: POLICY-2432
Signed-off-by: uj426b <uj426b@att.com>
Taka Cho [Fri, 17 Jul 2020 15:23:08 +0000 (11:23 -0400)]
point to SNAPSHOT version for model
Issue-ID: POLICY-2695
Change-Id: Ife95d9a265646563c2ec2f171a764c6f164edacc
Signed-off-by: Taka Cho <takamune.cho@att.com>
Jim Hahn [Mon, 13 Jul 2020 20:06:57 +0000 (16:06 -0400)]
Remove legacy actor code from models
Deleted legacy actor code. That includes deleting most of the
XxxManager classes.
Issue-ID: POLICY-2559
Change-Id: I1ef1b900ca1d23e88da64b2c95a18986feb1b765
Signed-off-by: Jim Hahn <jrh3@att.com>
Ram Krishna Verma [Thu, 9 Jul 2020 19:43:40 +0000 (15:43 -0400)]
Bump policy/models to 2.3.1-SNAPSHOT
Issue-ID: POLICY-2695
Change-Id: I64473cc81ae48942010472f15faac75c13cb0b7d
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Ram Krishna Verma [Thu, 9 Jul 2020 18:38:38 +0000 (14:38 -0400)]
Release policy/models 2.3.0
Issue-ID: POLICY-2695
Change-Id: Ic801aa2c69c204d4c3bfebbba329c6d254bc3a98
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Ram Krishna Verma [Thu, 9 Jul 2020 17:09:05 +0000 (13:09 -0400)]
Refer to released parent & common in policy/models
Issue-ID: POLICY-2695
Change-Id: I4e30b08822095bddbb720e3785b7493bfddff749
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Jim Hahn [Thu, 2 Jul 2020 13:30:52 +0000 (09:30 -0400)]
Rename XxxActorServiceProvider to XxxActor
Renamed the actors and their test classes.
Addressed review comments:
- some license dates
Issue-ID: POLICY-2684
Change-Id: Ic9d83e146ef36bb305496d541166cb9f80544025
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Tue, 30 Jun 2020 23:08:26 +0000 (19:08 -0400)]
Fix broken models build due to json upgrade
The json dependency was moved to policy-parent and the "version"
property removed which broke the policy-models build. Removed
the "version" from the pom.
Also removed the jetty-security "version" from the pom, as it is
no longer needed either.
Also added asm dependency, because upgrade of openpojo version
caused breakage in one of the TestPojos.
Issue-ID: POLICY-2387
Change-Id: I3c2315b3cbea05de76b6dfcc289f9323af77745b
Signed-off-by: Jim Hahn <jrh3@att.com>
Ram Krishna Verma [Mon, 29 Jun 2020 16:02:12 +0000 (16:02 +0000)]
Merge "Add CDS simulator to policy-models"
Jim Hahn [Fri, 26 Jun 2020 20:59:40 +0000 (16:59 -0400)]
Add CDS simulator to policy-models
Added CDS simulator to policy-models. Added a test case to the CDS
Actor to verify that it works with the simulator.
Issue-ID: POLICY-2676
Change-Id: I9b10de3bde93c69e82df983f77eecc253de8a1a2
Signed-off-by: Jim Hahn <jrh3@att.com>
waynedunican [Fri, 19 Jun 2020 14:30:59 +0000 (15:30 +0100)]
Clean up of Pair classes - models
Removed Pair class from policy-models and replaced with Aoache Common
Pair class
Issue-ID: POLICY-2202
Change-Id: I786467ac02ecb2d433dba94deba45785be3dcf23
Signed-off-by: waynedunican <wayne.dunican@est.tech>
RossC [Wed, 24 Jun 2020 09:49:26 +0000 (10:49 +0100)]
Updating models dependencies to latest versions
Issue-ID: POLICY-2387
Change-Id: Id89dac64139490f6d9b83b295cfe99c43ed657cf
Signed-off-by: RossC <ross.carter@est.tech>
Ram Krishna Verma [Fri, 19 Jun 2020 21:19:30 +0000 (21:19 +0000)]
Merge "Changes for Checkstyle 8.32"
Ram Krishna Verma [Thu, 18 Jun 2020 21:58:58 +0000 (21:58 +0000)]
Merge "make vDNS example use modelVersion string"
liamfallon [Thu, 18 Jun 2020 21:36:23 +0000 (22:36 +0100)]
Changes for Checkstyle 8.32
Issue-ID: POLICY-2188
Change-Id: I6db16763c1d2d80ff934302081a8dfc16afa7d9a
Signed-off-by: liamfallon <liam.fallon@est.tech>
waynedunican [Thu, 18 Jun 2020 09:46:36 +0000 (10:46 +0100)]
Replaced try/catch blocks in policy/models with assertj assertions.
Issue-ID: POLICY-2451
Change-Id: I095beb674196d5ec5c4dd9b93d3a56cca5ee4788
Signed-off-by: waynedunican <wayne.dunican@est.tech>
jhh [Thu, 18 Jun 2020 02:57:13 +0000 (21:57 -0500)]
make vDNS example use modelVersion string
Issue-ID: POLICY-2652
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I2b632b8380f32715d1e0b526445f445cae79e90d
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Pamela Dragosh [Tue, 16 Jun 2020 14:03:02 +0000 (14:03 +0000)]
Merge "Adding 'name' to yamls and json in model"
Ram Krishna Verma [Mon, 15 Jun 2020 13:43:09 +0000 (13:43 +0000)]
Merge "Moving common polling code into HttpOperation"
Jim Hahn [Thu, 11 Jun 2020 23:00:41 +0000 (19:00 -0400)]
Moving common polling code into HttpOperation
SO and VFC have duplicate code for polling. Moved it into the
common superclass.
Issue-ID: POLICY-2632
Change-Id: I27128bfb2d54ef522b6b44ff569819a8463f3454
Signed-off-by: Jim Hahn <jrh3@att.com>
Ram Krishna Verma [Fri, 12 Jun 2020 22:14:19 +0000 (22:14 +0000)]
Merge "Change related to log4j removal needed in models"
aditya.puthuparambil [Fri, 12 Jun 2020 15:39:27 +0000 (16:39 +0100)]
Adding 'name' to yamls and json in model
Issue-ID: POLICY-2052
Signed-off-by: aditya.puthuparambil <aditya.puthuparambil@est.tech>
Change-Id: I3629a2b6f9e93f6d8166e63862d15dd0198865af
a.sreekumar [Fri, 12 Jun 2020 09:40:23 +0000 (10:40 +0100)]
Remove logback.xml files bundled as part of jar
Change-Id: I4d603ea67eca5d8d75b9df004e1ff4a6be2b2a9e
Issue-ID: POLICY-2627
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
uj426b [Thu, 11 Jun 2020 17:37:13 +0000 (13:37 -0400)]
Change related to log4j removal needed in models
Change-Id: I449aef2c1f83edecc88c379525b8da6c80e9d35f
Issue-ID: POLICY-2623
Signed-off-by: uj426b <uj426b@att.com>
Pamela Dragosh [Thu, 11 Jun 2020 18:28:03 +0000 (18:28 +0000)]
Merge "Default ActorImpl should have an "operations" property"
Pamela Dragosh [Thu, 11 Jun 2020 18:26:01 +0000 (18:26 +0000)]
Merge "Fixing issue with Jacoco coverage being stored above project directory"
Jorge Hernandez [Thu, 11 Jun 2020 18:04:32 +0000 (18:04 +0000)]
Merge "Rename GuardOperation to DecisionOperation"
Jim Hahn [Wed, 10 Jun 2020 19:44:29 +0000 (15:44 -0400)]
Default ActorImpl should have an "operations" property
Added "operations" level to actor properties. Also renamed CommonActorParams
to ActorParams, in the process.
Note: This impacts the properties specified in drools-apps.
Issue-ID: POLICY-2629
Change-Id: I155bcb6ced73cb54e656d34e0b184fb2ed6250d1
Signed-off-by: Jim Hahn <jrh3@att.com>
RossC [Thu, 11 Jun 2020 14:11:53 +0000 (15:11 +0100)]
Fixing issue with Jacoco coverage being stored above project directory
Issue-ID: POLICY-2497
Change-Id: Ia0df647c9adc25dea51d4e5baab0191daa1c877e
Signed-off-by: RossC <ross.carter@est.tech>
Ram Krishna Verma [Wed, 10 Jun 2020 19:40:40 +0000 (19:40 +0000)]
Merge "Flesh out junits for SDNR and VFC actors"
Jim Hahn [Wed, 10 Jun 2020 18:14:40 +0000 (14:14 -0400)]
Rename GuardOperation to DecisionOperation
Issue-ID: POLICY-2628
Change-Id: I94eec317ff91f37add417f70f33c2d23fa0f3026
Signed-off-by: Jim Hahn <jrh3@att.com>
RossC [Tue, 9 Jun 2020 13:35:41 +0000 (14:35 +0100)]
Changing toString on ToscaPolicyXXXIdentifiers
Issue-ID: POLICY-2078
Change-Id: I0e8aae118a52aaef7e372293396802b85782a22c
Signed-off-by: RossC <ross.carter@est.tech>
Jim Hahn [Mon, 8 Jun 2020 14:49:39 +0000 (10:49 -0400)]
Flesh out junits for SDNR and VFC actors
Issue-ID: POLICY-2619
Change-Id: Ic0096a25dbcb40dc00f4b97cfafa57d162c7bdfd
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Mon, 8 Jun 2020 14:23:18 +0000 (10:23 -0400)]
Fix VFC Restart operation name
The VFC Restart operation has the name "VF Module Create", which is
incorrect. Changed it to "Restart".
Issue-ID: POLICY-2407
Change-Id: Ic11d1dd25755d0d9e478ab4534cce71bec44c78b
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Wed, 3 Jun 2020 16:09:33 +0000 (16:09 +0000)]
Merge "Use plain HashMap instead of IdentityHashMap"
Jim Hahn [Tue, 2 Jun 2020 21:17:20 +0000 (17:17 -0400)]
Use plain HashMap instead of IdentityHashMap
The javadocs say not to use IdentityHashMap except in special cases.
Modified the Actor code to use HashMap instead.
Issue-ID: POLICY-2604
Change-Id: Idcae4fe2e1e600fbb01cdcd09b1caddf2820740a
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Tue, 2 Jun 2020 20:46:47 +0000 (16:46 -0400)]
Change Actor makeCoder() to getCoder()
Issue-ID: POLICY-2603
Change-Id: I29d5c73f4b8b129bfdd6d0c9fb6d766b260e27c4
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Mon, 1 Jun 2020 11:22:45 +0000 (11:22 +0000)]
Merge "Copy Dbao from drools-apps to models"
Pamela Dragosh [Mon, 1 Jun 2020 11:21:58 +0000 (11:21 +0000)]
Merge "Use "coder" to serialize Actor requests"
Ram Krishna Verma [Sun, 31 May 2020 01:35:16 +0000 (01:35 +0000)]
Merge "Made Actor names public"
Jim Hahn [Fri, 29 May 2020 21:05:20 +0000 (17:05 -0400)]
Made Actor names public
Some of the XxxActor.NAME constants were private. Made them public
so drools-applications can reference them instead of hard-coding the
text.
Issue-ID: POLICY-1242
Change-Id: I849c979a3e209430db5132e6ff574ec73f1e3769
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 29 May 2020 20:32:57 +0000 (16:32 -0400)]
Use "coder" to serialize Actor requests
Modified the Actors to use the "coder" to serialize requests
instead of defaulting to the HttpClient serialization provider.
Decided to just pretty-print the requests since that can be used for
both logging and transmission, which avoids serializing the request twice.
Issue-ID: POLICY-2601
Change-Id: I190ed19dd852a1aa66156b358cbc97c3b121af1f
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 29 May 2020 18:31:29 +0000 (14:31 -0400)]
Use default serialization provider
The default provider has been changed to gson, so the provider property
no longer has to be set.
Issue-ID: POLICY-1527
Change-Id: I3c829e2070617f85d998a56c0f58127d7f22b467
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 29 May 2020 14:17:24 +0000 (10:17 -0400)]
Copy Dbao from drools-apps to models
Drools-apps and xacml-pdp each have their own copy of Dbao. Made
a copy of it in models as a first step toward eliminating the other
copies. Also changed its package name be consistent with the other
interface package names and renamed it to OperationsHistory.
Also reordered the modules in the pom to make it alphabetical.
Issue-ID: POLICY-2581
Change-Id: I45afa680c6344eeac6b2d35c9e4f04a5ba7af431
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 29 May 2020 13:25:04 +0000 (09:25 -0400)]
Do not generate notification in SDNR Actor
Now that the SDNR Actor populates the operation outcome with the
SDNR response, it no longer needs to populate the notification
structure, as the application (e.g., drools-apps) can now generate
the notification, itself, using the response.
Issue-ID: POLICY-2593
Change-Id: Ie9bed0e59ca750211f17782fa7a2833c2087ac23
Signed-off-by: Jim Hahn <jrh3@att.com>
Ram Krishna Verma [Thu, 28 May 2020 20:13:44 +0000 (20:13 +0000)]
Merge "Point to parent SNAPSHOT"
Pamela Dragosh [Thu, 28 May 2020 18:32:34 +0000 (14:32 -0400)]
Point to parent SNAPSHOT
Issue-ID: POLICY-2391
Change-Id: Iad31008a83e781cf1bfc76272d8f1127fa495f02
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Jim Hahn [Wed, 27 May 2020 14:49:39 +0000 (10:49 -0400)]
Include response in OperationOutcome
Added the response field and modified the actors to populate it.
Issue-ID: POLICY-2592
Change-Id: I24487b6fbc23b69bde4a95acd470864d8231c49d
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Wed, 27 May 2020 14:26:49 +0000 (10:26 -0400)]
Use snapshot versions
Issue-ID: POLICY-1526
Change-Id: I00f95b5375ef3d92482630bdf6cb32d8581a45df
Signed-off-by: Jim Hahn <jrh3@att.com>
Ram Krishna Verma [Tue, 19 May 2020 19:16:54 +0000 (15:16 -0400)]
Bump models master to 2.3.0-SNAPSHOT
Issue-ID: POLICY-2514
Change-Id: I6a3d4e588a0ff0d15fccf49de66c51ea7d709b4b
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Ram Krishna Verma [Tue, 19 May 2020 16:39:05 +0000 (12:39 -0400)]
Bump models to 2.2.7-SNAPSHOT
Issue-ID: POLICY-2514
Change-Id: Ie482926a56a5250be5d78a97aa7c1c19311a292c
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Ram Krishna Verma [Tue, 19 May 2020 14:29:46 +0000 (10:29 -0400)]
Release models 2.2.6 artifacts
Issue-ID: POLICY-2514
Change-Id: Ie9892bfcd16d96cc93534c7540921f54f09fdf9e
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Jim Hahn [Fri, 15 May 2020 18:46:15 +0000 (14:46 -0400)]
Cannot parse finishTime in legacy SO responses
Adding the actual sample responses to the SO simulator broke the
drools-apps junit for usecases. Fixed (in theory) by updating the
legacy SO actor to properly decode the finishTime. Refactored the
new SO actor, extracting the type adapter into its own class file
so it could be shared between the new and legacy actors.
Issue-ID: POLICY-2570
Change-Id: I061b603172440b1a91da16d09b4f2a0d289dfc41
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Fri, 15 May 2020 13:52:35 +0000 (09:52 -0400)]
Cannot parse finishTime in SO responses
The timestamp in SO responses appears to follow RFC-1123/RFC-822
format instead of ISO format.
Added a type adapter for SO. In Guilin, we may want to consider
combining the two type adapters for LocalDateTime so that either format
is accepted.
Also modified the SO simulator to return responses that are actual
samples from SO.
As part of that work, discovered that the legacy SO actor is not able
to parse these timestamps either. However, as that code is now
deprecated, left it as is.
Issue-ID: POLICY-2570
Change-Id: I322318d1007e36eef47bb8867fd8ed01cb60223a
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Thu, 14 May 2020 23:08:02 +0000 (19:08 -0400)]
SO poll should not require request ID
When SO is polled for the result of a previous request, it
does not necessarily include the originally returned request
ID in the response. This causes the SO actor to generate a
"missing request ID in response" exception.
Modified the actor to only extract the request ID from the
first response and cache it for subsequeent responses.
Testing this required the SO simulator to be modified so that
it would return an INCOMPLETE on the initial request, forcing
the actor to poll until it returns a COMPLETE. Made this a
settable flag so that it could be enabled just to test the
SO actor without impacting other components (e.g., drools-apps,
CSITs).
Also fixed a couple of checkstyle issues in the simulators.
Issue-ID: POLICY-2568
Change-Id: Ifad8b3c0c2c0b03cb82da693c2cf5ced44ede105
Signed-off-by: Jim Hahn <jrh3@att.com>
Jim Hahn [Tue, 12 May 2020 16:11:14 +0000 (12:11 -0400)]
Fix race condition in AaiCqResponse
The JAXB unmarshaller used by AaiCqResponse is not thread safe. As a
result, if two responses are decoded at the same time, it will generate
exceptions.
Issue-ID: POLICY-2556
Change-Id: I5e81d5f3c39b9ba321c146dc6f4f73e558aaca3e
Signed-off-by: Jim Hahn <jrh3@att.com>
Pamela Dragosh [Mon, 11 May 2020 13:26:40 +0000 (13:26 +0000)]
Merge "Policy DB contents removed on DB deadlock"
liamfallon [Sun, 10 May 2020 14:53:46 +0000 (15:53 +0100)]
Policy DB contents removed on DB deadlock
When a DB deadlock occurs, the DB contents can sometimes be deleted
becasue the DB removes the Service Template object and recreates a new
one in two separate DB transactions.
This change makes sure that the object remove and re-create is in a
sngle DB transaction, so the operation will either happen or not happen
so the DB will not be cleared.
Legacy policy handling must also use the SimpleToscaProvider rather than
accessing the DB directly, as SimpleToscaProvider keeps the DB structure
correct.
Issue-ID: POLICY-2548
Change-Id: I263a41cd1d8bec5d7b421045b3b14aad6e6c66d3
Signed-off-by: liamfallon <liam.fallon@est.tech>