summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2020-02-26Merge "Fix Java 11/Checkstyle/Sonar warnings"Jim Hahn56-694/+661
2020-02-26Fix Java 11/Checkstyle/Sonar warningsliamfallon56-694/+661
A number of Java 11, checkstyle, and SONAR warnings have crept into the Apex codebase over the last number of reviews. This change fixes those issues. Issue-ID: POLICY-1913 Change-Id: I2afd607e80f48323355380fb2fe5e048e18879f9 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-02-25remove duplication code in plugins-event producerning.xi6-198/+97
Issue-ID: POLICY-1884 Change-Id: I7774dfdc7d7edcc0409a817bfd21ddacec21d085 Signed-off-by: ning.xi <ning.xi@est.tech>
2020-02-24Merge "remove code duplication in plugins"Ram Krishna Verma8-321/+97
2020-02-24Merge "remove code duplication in plugin-event-carrier"Ram Krishna Verma5-367/+298
2020-02-21remove code duplication in pluginsshaoqiu8-321/+97
Remove consumer code duplication in plugins-event-carrier Issue-ID: POLICY-1884 Signed-off-by: shaoqiu <tim.huang@est.tech> Change-Id: I2d222436a97224e54a03c2501f4dc14d3f5f6ac0
2020-02-20Passing taskParameters from ApexConfig to policy logica.sreekumar10-197/+307
TaskParameters can be used to pass parameters from ApexConfig to the policy logic. In the config, these are optional. Usage as below: { "engineParameters": { "taskParameters": [ { "key": "ParameterKey1", "value": "ParameterValue1" }, { "taskId": "TaskIdVal", "key": "ParameterKey2", "value": "ParameterValue2" } ] } } In the taskLogic, taskParameters can be accessed as below: eg: executor.parameters.get("ParameterKey1")) If taskId is provided in ApexConfig for an entry, then that parameter is updated only for that particular task. Otherwise, the task parameter is added to all tasks. Change-Id: I9e1b3d3697428309e7d86db40b63ffe822935b69 Issue-ID: POLICY-2364 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-02-20remove code duplication in plugin-event-carrierning.xi5-367/+298
Issue-ID: POLICY-1884 Change-Id: I610d7ee34d640cc3a7d3381b24993ee9b6f76f2d Signed-off-by: ning.xi <ning.xi@est.tech>
2020-02-06Updating module names to resolve conflictsRam Krishna Verma13-44/+54
Issue-ID: POLICY-2355 Change-Id: I67f0ca2ced9cbe37a3d00d9f312101e756454107 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-02-03Adding Tosca compliant operational policy type to default config file for ↵a.sreekumar1-0/+4
apex-pdp Change-Id: I6de1fd31c2e73814a546b05ee71419fded4a3357 Issue-ID: POLICY-2147 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-01-30Remove content section from ToscaPolicy properties in APEXa.sreekumar6-21/+27
Currently APEX specific information is placed under properties|content in ToscaPolicy. Avoid keeping under "content" and keep the information directly under properties. Change-Id: Ic437271c9a2d71104013b5568af5525df4a4bb56 Issue-ID: POLICY-2332 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-01-27Remove unnecessary sonar configPamela Dragosh1-2/+0
This is no longer needed now that it is pointing to latest policy/parent. BTW - I decided there were too many changes required for combining into one single .exec jacoco file. And it was not improving any of the numbers. This repo is very close to original numbers before the move to sonar cloud. Will investigate another time. Issue-ID: POLICY-2321 Change-Id: If2f3a762de943fb6f73709d9308333b8feda436e Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-01-23Remove apex-pdp TextFileUtils classliamfallon42-703/+596
This class was moved to policy-common some time ago. Removing it in apex-pdp. Issue-ID: POLICY-1913 Change-Id: I982fbd799334b34f1526e19f339236b52205b91e Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-01-23Run apex-pdp in Java 11: base changesliamfallon22-500/+425
This change brings in the minimum changes to get apex-pdp running in Java 11. Other reviews will bring in changes to remove Java 11 warnings and to convert apex-pdp Javascript handling from the now deprecated nashorn engine. Issue-ID: POLICY-1581 Change-Id: I879bbae08d4e67aca3f1bfeedeca639d8dbbc281 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-01-20First sonar updatePamela Dragosh1-81/+2
Just updating this way gets apex to around 79%, which passes. Previously around 80%, when JDK11 is done I will fix it up and hopefully we will get it back to over 80%. Issue-ID: POLICY-2321 Change-Id: If3440e8c8c71f858adcc3f1b349da4e1048f8464 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-01-10Point to policy/models release versionHOCKLA1-2/+2
Issue-ID: POLICY-1592 Change-Id: I4a795fc1496f5608884a7b8bdad0c212c4321392 Signed-off-by: HOCKLA <ah999m@att.com>
2020-01-09Merge "Populate the PdpStatistics data in heartbeat"Jim Hahn16-37/+441
2020-01-09Merge "Enabling logback file to be loaded using oom configmap"Pamela Dragosh1-1/+6
2020-01-08Merge "Update vCPE example to use Avro schemas"Jorge Hernandez51-62/+2731
2020-01-08Enabling logback file to be loaded using oom configmapa.sreekumar1-1/+6
Change-Id: I746ee57003175ae9e3f903ee3e5948ed1875dceb Issue-ID: POLICY-2308 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-01-08Update vCPE example to use Avro schemasliamfallon51-62/+2731
THis change updates the vCPE example to show how the example can work towards the APPC using Avro schemas only. This means that Policies can be adapted to changes in controller APIs using Avro alone. This example works with the old and new format policy-models. Issue-ID: POLICY-2043 Change-Id: I42ac0eac5203eaa37316cf6c460c67f7e8d6deb2 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-01-08Populate the PdpStatistics data in heartbeatshaoqiu16-37/+441
Apex to populate the PdpStatistics data in every heartbeat sent to PAP Issue-ID: POLICY-2302 Change-Id: I2d3a6c1e8605d53bf754a135980527bd50762abd Signed-off-by: shaoqiu <tim.huang@est.tech>
2020-01-06Changing ownership of configuration files in APEXa.sreekumar1-2/+3
Default user when logging into APEX container is apexuser. Updating the ownership of configuration files such as logback.xml and key files so that these can be updated at runtime. Change-Id: Icf21e0b408d3b4ef829e1b1c5505f142a7d08adc Issue-ID: POLICY-2308 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-12-06Merge "Adding native policy type to the config file in APEX"Pamela Dragosh1-1/+10
2019-12-06Merge "Point to release versions of policy/parent and policy/common"Pamela Dragosh1-2/+2
2019-12-06Point to release versions of policy/parent and policy/commonHOCKLA1-2/+2
Issue-ID: POLICY-1583 Change-Id: I5dd6f77991bd5e8419176ea4cba751f58c05d501 Signed-off-by: HOCKLA <ah999m@att.com>
2019-12-06Merge "Minor changes for new Eclipse checkstyle checks"Pamela Dragosh52-418/+533
2019-12-06Adding native policy type to the config file in APEXa.sreekumar1-1/+10
Change-Id: If8167c837d7d28ec9049b00ff6ca314eb4199930 Issue-ID: POLICY-2279 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-12-05APEX-PDP remove supported policy types from heartbeata.sreekumar2-8/+13
Change-Id: Iafd2e2625cfabd89480ca1807eb1607788b30899 Issue-ID: POLICY-2235 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-12-04Minor changes for new Eclipse checkstyle checksliamfallon52-418/+533
The laest Eclipse checkstyle version 8.26.0 does more thorough checking and identified a number of small issues in the apex-pdp codebase. This review fixes those issues. Issue-ID: POLICY-1913 Change-Id: I30ba25e3e425c6d54c77f925e8da3ab841a8357c Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-28Replace getCaononicalName() with getName() in code baseliamfallon45-308/+371
Issue-ID: POLICY-1861 Change-Id: Iccbdcbc5b5978305c56ab74c01a52a562697bee1 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-26Reduce verbosity of logging during unit testliamfallon30-169/+194
Logging dialled back in logback.xml files and on ligging statements in unit test java code. Issue-ID: POLICY-2272 Change-Id: I3b9a46d8993b1571c8dc62687a9c136af46c1f51 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-26Merge "Fixing Junit test cases causing too much logs output during APEX build"Ram Krishna Verma2-2/+2
2019-11-26Merge "Update vCPE example for A&AI custom query"Ram Krishna Verma19-615/+375
2019-11-26Fixing Junit test cases causing too much logs output during APEX builda.sreekumar2-2/+2
Change-Id: If0ad9c6b3a0f19ff3711d6230eb64e0dca1c1ef1 Issue-ID: POLICY-2272 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-11-25Update vCPE example for A&AI custom queryliamfallon19-615/+375
The change in policy-models to use custom queries means that the named queries used in apex examples must be updated to use custom queries. This review is the second of two reviews to implement this change. This patch updates the policy and its associated tests to work with A&AI custom queries. Issue-ID: POLICY-2125 Change-Id: I6a5b90002e43272e3cf296158f09f91a0f6d6907 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-22Build tar.gz without requiring docker image buildjhh1-0/+3
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: I5c4aa52b6cd599b3b4a8f537d927631a14036dfc
2019-11-21Apex PDP change to add PDP groupa.sreekumar9-4/+36
Change-Id: I6cff921bdc65fe505c0b5e7dba94a6cf9aa3ba91 Issue-ID: POLICY-2234 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-11-21Update vCPE example for A&AI custom queryliamfallon3-36/+3914
The change in policy-models to use custom queries means that the named queries used in apex examples must be updated to use custom queries. This review is the first of two reviews to implement this change. I thcnages the A&AI simulator, which will allow the apex-pdp to build again. A further change will bring in the policy changes to get the example implementation fixed. Issue-ID: POLICY-2125 Change-Id: I833c351b43995e648288cdf1c87c0abbe7a671cc Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-15Fix JRuby interpreter shutdown issueliamfallon5-29/+59
The new version of JRuby fixes this issue. Also amended unit test to check for shutdown and immediate recreation of JRuby interpreter. Issue-ID: POLICY-1276 Change-Id: I723e0396985d3163b483e52fdaceb4b4fab7274b Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-14Retaining context in APEX Engine based on policies received in PdpUpdatea.sreekumar25-397/+390
Change-Id: I73fad5bf76ed6b4979f5ab76013f204ea82da30b Issue-ID: POLICY-2215 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-11-11Merge "Do not hardcode io.fabric8 plugin"Pamela Dragosh1-1/+0
2019-11-08Do not hardcode io.fabric8 pluginPamela Dragosh1-1/+0
policy/parent now has this plugin defined Issue-ID: POLICY-2222 Change-Id: I2cc318e0f46f1ae9b9bda23a160c6db55003eca9 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-11-07Fix vCPE example apex-pdp policyliamfallon11-103/+96
The changes in policy-models for appclcm had knock-on impacts on the apex-pdp example policies. This patch fixes the vCPE policy to comply with the new APPCLCM POJOs. Issue-ID: POLICY-2043 Change-Id: Ieebc2cf97a05efde560a2f5a819924ff63dfd695 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-05Merge "Fixing multiple policies with optional event fields fails execution ↵Pamela Dragosh2-4/+2
in APEX"
2019-11-04Use jersey dependencies from policy-endpointsliamfallon14-172/+18
There is no need to have Jersey dependencies in the PDP POMs as they are inherited from the policy-endpoints POM. Issue-ID: POLICY-2209 Change-Id: I5c53e7b29f4df25fd730f7a521e149e4ee70d964 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-04Fixing multiple policies with optional event fields fails execution in APEXa.sreekumar2-4/+2
Policy execution fails when multiple policy models are running and the policies have optional fields. Change-Id: Ifb1a45a25e3a88b8707fb8b76f8279b6ec0b91ce Issue-ID: POLICY-2211 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-11-01Add common Jersey versionliamfallon19-48/+18
Add a common version of Jersey for all Policy Framework components. Issue-ID: POLICY-2209 Change-Id: I6282bc9938cbb63ddf3bf85e488f7b6be0dbdfc3 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-01Resolve mapping between TOSCA policies and APEX policy modelsa.sreekumar29-510/+1665
Change-Id: Ifaedc5074bcc51a5d495e342feae89b6a2aac1cf Issue-ID: POLICY-1626 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-10-31Use updated APPC model code in apex vcpe exampleliamfallon4-32/+46
The APPC implementation was changed in a recent review, this review fixes the apex vcpe example to use this new model. Also fixes an an issue in the CLI editor where escape characters are not now required in example JSON. Issue-ID: POLICY-2043 Change-Id: Id251948c9de27f73ba48cec498e68a43f71c4062 Signed-off-by: liamfallon <liam.fallon@est.tech>