aboutsummaryrefslogtreecommitdiffstats
path: root/models-interactions/model-actors
AgeCommit message (Collapse)AuthorFilesLines
2021-02-11Fix sonars from depeendency upgradeJim Hahn25-120/+96
The dependency upgrades in policy-parent caused some new sonars. In particular, initMocks() has been deprecated - replaced with calls to the Mockito Runner, in most cases. Changed to openMocks() in one case and removed unnecessary stubbings. Issue-ID: POLICY-2905 Change-Id: I9aa098aa7aaebba09f6dcea4cac69ac1e5fbd4d6 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-02-10More sonars in modelsJim Hahn14-35/+37
Addressed the following: - make constructors protected - check exception type - too many assertions - remove annotation lists - use "<>" - reduce cognitive complexity - extract constant - multiple method calls in one assert - don't use eq() in verify() - indentation Issue-ID: POLICY-2905 Change-Id: I25bb3951f781250e9cdfe8f5f3b80cb63e129184 Signed-off-by: Jim Hahn <jrh3@att.com>
2021-02-05Give better messages than NPE for missing dataJim Hahn20-40/+255
When data is not available to actor operations, an NPE is generally thrown. Modified the code to provide more info about what is missing than simply NPE. Issue-ID: POLICY-2913 Change-Id: I37b6eadd966e0693508a6d552b7db4edf5410018 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-12-23Add Service Template TOSCA handlingliamfallon1-12/+6
Today we can only handle a single service template in the database. We should be able to handle multiple service templates and assign arbitrary policy types and policies to maned and versioned service templates. This review brings in the Java API in models provider for handling service templates in this way and uses a simplistic single-teplate implementation in models-tosca, that will work but still only handles a single service template under the hood. Issue-ID: POLICY-2900 Change-Id: Ia02dea8abe44b7f407e685090a4b8e0360889653 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-12-07Fix Modify NSSI operationkrishnaa962-15/+6
Update the operation to receive payload from the onset message Issue-ID: POLICY-2916 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: If49d41b35c1cd6562146fe4d92799a9a77a46db9
2020-12-02Address sonar issues in policy/modelsJim Hahn3-5/+5
Addressed the following issues: - unused parameter in method call - make constructor of abstract class protected instead of public Issue-ID: POLICY-2905 Change-Id: I1e846b88246796f1ad5cee4a3bd296647732fd24 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-11-30Remove targetEntity from makeOutcomeJim Hahn10-55/+35
The Actor Params class had two flavors of makeOutcome, the second of which took a "targetEntity" parameter. As the Params no longer deal directly with the targetEntity, the second flavor was removed. Issue-ID: POLICY-2804 Change-Id: Ic736dd1c809ce54f6bb7cd37d03bc84cf4a1410c Signed-off-by: Jim Hahn <jrh3@att.com>
2020-11-20Delete preprocessed flag from actorsJim Hahn21-79/+64
Removed the "preprocessed" flag from the Actor parameter class, now that the actors no longer have a startPreprocess() method. Also removed targetEntity from Actor parameter class. Created a makeOutcome method within OperationPartial, which is used to create an initial outcome whose target field is pre-populated with the target-entity extracted from the properties. As the meaning of "target" may be specific to an operation, the makeOutcome method may be overridden by an operation subclass. Issue-ID: POLICY-2804 Change-Id: Ifb66de63301d644e69340009593513773ee5672d Signed-off-by: Jim Hahn <jrh3@att.com>
2020-11-18Merge "Make Actors event-agnostic"Ram Krishna Verma54-7372/+212
2020-11-06Fix upcoming checkstyle issuesPamela Dragosh1-1/+1
When we upgrade to oparent, these will fail as oparent upgrades to 8.37 of puppycrawl which fixes a few bugs that should have flagged these previously. Issue-ID: POLICY-2887 Change-Id: Ia0ceab23ff3d5c177f657c5852115ab1b265c698 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-10-27Make Actors event-agnosticJim Hahn54-7372/+212
Removed event and event-context code from the Actor code. Also removed the preprocessing steps from the Actor code, giving the application complete control over any preprocessing. Also fixed a bug wherein the APPC actor was treating the AAI_RESOURCE_VNF property as a String instead of as a GenericVnf. Issue-ID: POLICY-2746-actor Change-Id: Ibc05fe39ffedc0bc461abf10e6a960861ac70119 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-27Bump models master to 2.4.0 SNAPSHOTJim Hahn12-12/+12
Bumping minor version now that guilin branch has been created. Issue-ID: POLICY-2875 Change-Id: Iec7868062610a3acca6f883f999615ccc109f850 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-19Bump models to 2.3.6 snapshotJim Hahn12-12/+12
Issue-ID: POLICY-2869 Change-Id: I98223c20d6d1d6d9bf5bd958d9d3ed4aacdf17e6 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-13Bug fixes and improvements in CDS Simulatora.sreekumar1-0/+27
1) CDS Simulator was not able to run alone. It needed one of the RestServer simulators to start up to continue running. Providing the cds simulators parameters alone in the config file was resulting in termination of the Main process. This is fixed. 2) Response from the CDS Simuator when blueprint and action names are unknown (in real cases, when a corresponding CBA is not uploaded to CDS) is updated to mimic an actual CDS response instead of always returning a dummy success response. Change-Id: I79a6d158addaad31649809006d1e3c1dfdb47a1f Issue-ID: POLICY-2828 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2020-10-09Bump models to 2.3.5Jim Hahn12-12/+12
Issue-ID: POLICY-2863 Change-Id: Iba0dfe78576a2ad1551c165e3b9f53fa3c55259a Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-09Bump models to 2.3.4 snapshotJim Hahn12-12/+12
Issue-ID: POLICY-2863 Change-Id: I9d764a0cd695aa95a5880fd20b594e465d14c658 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-09Specify "Accept" header in A&AI requestsJim Hahn4-7/+4
Modified the A&AI superclass to specify application/json for the Accept header. Removed the header from the subclasses. Issue-ID: POLICY-2863 Change-Id: I90974e305cb36ee2fa01999be4d79225a510e55b Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-07Bump models to 2.3.3Jim Hahn12-12/+12
Issue-ID: POLICY-2839 Change-Id: Ifd7f45854904545b4f2973e1429cb791ac00b600 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-02Fix eclipse/sonar warnings in modelsJim Hahn1-0/+2
Addressed the following eclipse/sonar warnings: - unused imports - unchanged type - unreachable "catch" block - reinterrupt Issue-ID: POLICY-2714 Change-Id: I2fe6011ec74b7fab8889050e5c83647ab034ea25 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-09-08Bump models to 2.3.2Jim Hahn12-12/+12
Issue-ID: POLICY-2789 Change-Id: I19b397ecb165bea30059142d9d4c5357ceba9825 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-09-01Add Modify NSSI operation in SO actorkrishnaa9612-16/+273
Issue-ID: POLICY-2586 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: I6ac184a6e731767f06401a0ac984c6b448c5d82f
2020-08-27Remove Target and TargetTypePamela Dragosh48-330/+589
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>
2020-08-18Make targetEntity a propertyJim Hahn23-125/+194
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>
2020-08-17Remove event context from Operation post processorJim Hahn2-5/+8
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>
2020-08-13Do not require context in ControlLoopOperationParamsJim Hahn2-13/+89
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>
2020-08-06Modify Actors to use properties when providedJim Hahn26-212/+999
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>
2020-08-04Skip preprocessor step in ActorsJim Hahn13-41/+110
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>
2020-07-31Add property lists to ActorsJim Hahn45-64/+489
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>
2020-07-21Fix some sonars in policy-modelsJim Hahn25-45/+39
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>
2020-07-13Remove legacy actor code from modelsJim Hahn18-3056/+2
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>
2020-07-09Bump policy/models to 2.3.1-SNAPSHOTRam Krishna Verma12-12/+12
Issue-ID: POLICY-2695 Change-Id: I64473cc81ae48942010472f15faac75c13cb0b7d Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-07-02Rename XxxActorServiceProvider to XxxActorJim Hahn27-142/+141
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>
2020-06-26Add CDS simulator to policy-modelsJim Hahn2-2/+74
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>
2020-06-24Updating models dependencies to latest versionsRossC1-1/+0
Issue-ID: POLICY-2387 Change-Id: Id89dac64139490f6d9b83b295cfe99c43ed657cf Signed-off-by: RossC <ross.carter@est.tech>
2020-06-18Changes for Checkstyle 8.32liamfallon7-8/+6
Issue-ID: POLICY-2188 Change-Id: I6db16763c1d2d80ff934302081a8dfc16afa7d9a Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-06-12Moving common polling code into HttpOperationJim Hahn40-1081/+861
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>
2020-06-11Merge "Default ActorImpl should have an "operations" property"Pamela Dragosh16-50/+61
2020-06-11Merge "Fixing issue with Jacoco coverage being stored above project directory"Pamela Dragosh1-4/+4
2020-06-11Merge "Rename GuardOperation to DecisionOperation"Jorge Hernandez6-18/+18
2020-06-11Default ActorImpl should have an "operations" propertyJim Hahn16-50/+61
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>
2020-06-11Fixing issue with Jacoco coverage being stored above project directoryRossC1-4/+4
Issue-ID: POLICY-2497 Change-Id: Ia0df647c9adc25dea51d4e5baab0191daa1c877e Signed-off-by: RossC <ross.carter@est.tech>
2020-06-10Rename GuardOperation to DecisionOperationJim Hahn6-18/+18
Issue-ID: POLICY-2628 Change-Id: I94eec317ff91f37add417f70f33c2d23fa0f3026 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-06-09Flesh out junits for SDNR and VFC actorsJim Hahn4-2/+116
Issue-ID: POLICY-2619 Change-Id: Ic0096a25dbcb40dc00f4b97cfafa57d162c7bdfd Signed-off-by: Jim Hahn <jrh3@att.com>
2020-06-08Fix VFC Restart operation nameJim Hahn1-1/+1
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>
2020-06-03Merge "Use plain HashMap instead of IdentityHashMap"Pamela Dragosh2-5/+6
2020-06-02Use plain HashMap instead of IdentityHashMapJim Hahn2-5/+6
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>
2020-06-02Change Actor makeCoder() to getCoder()Jim Hahn12-16/+16
Issue-ID: POLICY-2603 Change-Id: I29d5c73f4b8b129bfdd6d0c9fb6d766b260e27c4 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-06-01Merge "Use "coder" to serialize Actor requests"Pamela Dragosh13-109/+76
2020-05-31Merge "Made Actor names public"Ram Krishna Verma4-4/+7
2020-05-29Made Actor names publicJim Hahn4-4/+7
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>