summaryrefslogtreecommitdiffstats
path: root/docs/submodules/policy
AgeCommit message (Collapse)AuthorFilesLines
2018-10-03Updated git submodulesliamfallon1-0/+0
Project: policy/apex-pdp master b4a5e9eaeed3b76db48e01875013d694014814bb Add Unit Test for Admin Protocol messages Issue-ID: POLICY-1034 Change-Id: Ie07d5036ab328ab51843694a3b2a6bac87920f2e Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-10-02Merge "Added submodule for policy apex-pdp"Rich Bennett1-0/+0
2018-10-02Updated git submodulesJorge Hernandez1-0/+0
Project: policy/engine master 3e8154370058fa38dec06b6d224fc8f3825dd5a4 Recreate latest keystore. Some changes have been made since the first set of stores were generated from the cert manager tooling in the windriver test instance used for this purpose. Change-Id: I976333df7e020bda76c5cbdc9c0be752e5a88778 Issue-ID: POLICY-1156 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-10-02Added submodule for policy apex-pdpmmis1-0/+0
Issue-ID: POLICY-1161 Change-Id: Ibd09d03898ed2a3f9bdaae3d401111d0a8fe14e3 Signed-off-by: mmis <michael.morris@ericsson.com>
2018-09-27Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 2eda9c4ca7c47714055be1b1d8adcb989573dba4 Add Sdnr Actor code These need to be defined for BRMS Gateway to re-created the artifacts. Issue-ID: POLICY-1155 Change-Id: I424be9976fa129a42e0020870af01ba30e0c0d47 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-09-25Updated git submodulesMichael Mokry1-0/+0
Project: policy/engine master e9312923e96a2678f794fcf08ff5918d1b005bbd CADI AAF changes for policy/engine Added cadi properties and modified policy aaf client code. Fixed issue with namespace and modified code to reverse it for structuring the username sent in AAF API call Added properties for keystore and keystore password after getting error response from AAF when setting up the connection to AAF Missed a fix for one of Jorge's comments in last patch, here it is. Change-Id: Ic164ade8aa34da95a560c1592656e0caf990a595 Issue-ID: POLICY-913 Signed-off-by: Michael Mokry <mm117s@att.com>
2018-09-20Updated git submodulesMichael Mokry1-0/+0
Project: policy/engine master 26eed4a43bd97265ea08ded2eaf626a23bf66ce4 BRMSGW HTTPS support for DMaaP/UEB interfaces Modified BrmsPush UEB interface implementation to use HTTPS Change-Id: Id8ae68f23ee371142da3f9d8aa0a2b2e7988ff36 Issue-ID: POLICY-942 Signed-off-by: Michael Mokry <mm117s@att.com>
2018-09-20Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 767899b588f39f9f80d72699c3057af36b9318d2 Upgrade javax.mail to 1.6.2 The former version was frozen in github. It looks like they moved to another website and the changes were transparent codewise. So let's see what the CLM results are for this. I believe this does remove the security vulnerability. Issue-ID: POLICY-1127 Change-Id: Ib659eddc2808131c8dded3782fcf1d382060fc29 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-09-19Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 06d41227e6e745cf9dfbe8df2b29fd67992060da Fixes for oparent upgrade Clean up mariadb so that it is consistent, allow jetty to be defined by oparent, and fixes to fully support google guava upgrade. Issue-ID: POLICY-1126 Change-Id: Ic0c2fba5f6f5f1a41e53770b95861606a5b4bbe6 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-09-18Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 43dd8e5baa16c1fb1e68343b0b4b9ca0cd486500 Merge "Fixing issue with validation errors" Fixing issue with validation errors I found this change internally that was committed to fix an issue with validating required fields when creating some Config MS policies. This should fix the CSIT tests and the pre-loaded policies for SDNC Naming policies Change-Id: I04406b8efbef173a6ab967a32cfbd86e17b7c59e Issue-ID: POLICY-983 Signed-off-by: Michael Mokry <mm117s@att.com>
2018-09-18Updated git submodulesLiam Fallon1-0/+0
Project: policy/engine master 82f6d6809ddbceef8f8fdf2cfac2d80737f2e19b Merge "Remove override of parent aaf version" Remove override of parent aaf version policy/parent now declares the aaf dependency so consistency is maintained in all the repositories. Removing the version declaration in order to pull in the declared version. The constructor changes to add a namespace. A null value is still possible to be used. If we are given a namespace then we will have to add that in. Preferrably via a properties file. I also noticed there is a hard-coded URL in here in the setupAAF() method on line 212. That should be moved to a property file. Issue-ID: POLICY-1119 Change-Id: I97dcd7d669d3d05db7c6597be6f3038183fa4e17 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-09-18Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 47066cb4750955f9eed0db0e772f6224151a11a2 Merge "Fix Policy GUI Template Issue" Fix Policy GUI Template Issue Fix the a bug in this html file by adding msPolicyloader Issue-ID: POLICY-1118 Change-Id: I7a45b232ed0680f1c8233b8ed71fdde685fbb9c9 Signed-off-by: Wang, Frank(gw1218) <gw1218@att.com>
2018-09-18Updated git submodulesJorge Hernandez1-0/+0
Project: policy/engine master 75d9db3e29232580871c106560016be6492255d6 Merge "Added validation on matching required fields" Added validation on matching required fields Import policy should report to end users if there are missing required matching fields in policy template. Issue-ID: POLICY-1117 Change-Id: Iac4485259b73784e641f42a22d5a12c524f4b8e2 Signed-off-by: Wang,Frank(gw1218) <gw1218@att.com> Signed-off-by: Wang, Frank(gw1218) <gw1218@att.com>
2018-09-18Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 79cd00fc32b9894672590418a5af9a64929db49d Merge "AAF integration in Policy SDK" AAF integration in Policy SDK Upgraded SDK version. Added SQL script with encrypt key. Added a function to save role on reading from session in PolicyController.java Addressed Check Style warnings in PolicyController.java Issue-ID: POLICY-1088 Change-Id: I446b6c1a0db2a989ad3f4e982e5cdba845f81045 Signed-off-by: rb7147 <rb7147@att.com>
2018-09-17Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 8287e34104ce634d2a20c5906ddb53a2a4fe6959 Upgrade elasticsearch v6.3.0 Resolves a security issue around information disclosure. The recommendation is to upgrade to this version for the fix. Issue-ID: POLICY-1063 Change-Id: Idebb19d2c530b716a25aa91832c053e6b2d0ffce Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-09-17Updated git submodulesLiam Fallon1-0/+0
Project: policy/engine master a1a279f01734ba32f12b44186d6278dfebbf6385 Merge "Upgrade commons-compress v1.18" Upgrade commons-compress v1.18 Fixes 2 security issues and brings the common property value to the root pom.xml for easier management. Issue-ID: POLICY-1063 Change-Id: I56e3318bdfae2d205c61a5ad7af70a79bd70dada Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-09-17Updated git submodulesMichael Mokry1-0/+0
Project: policy/engine master 27e394f8c77fab9b0be1c22e7130b10a032153c1 Fixed incorrect model name Changed the model name of the script to be the correct SDNC-GenerateName version CSIT to fix the failed CSIT test cases Change-Id: I8974202cfc8cea3a19e102813fbf2a4f449cd11b Issue-ID: POLICY-983 Signed-off-by: Michael Mokry <mm117s@att.com>
2018-09-14Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master aec7ea166403a3319cf558460881164834694c1f Upgrade springframework 4.3.18.RELEASE To resolve security issue for 4.3.15.RELEASE and also have a single place where the dependency is defined for the sub-modules. NOTE: 4.2.0.RELEASE is left alone in Policy SDK App due to Portal SDK dependency. Issue-ID: POLICY-1063 Change-Id: Ibdc464b16b4771faccb2c8c472efa7fbcbf3352c Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-09-12Updated git submodulesJorge Hernandez1-0/+0
Project: policy/engine master 55e795c171cabb7800effcbbb75bed0224b92691 Merge "Upgrade dmaap client" Upgrade dmaap client Upgrading to dmaap 1.1.8 for Casablanca. Hoping they have removed some license issues. Also, policy/parent has the version property definition now because this dependency is shared across multiple repos. Issue-ID: POLICY-1116 Change-Id: I6ffe7b7cf4b46b12b3ec8d534a58f0be40bb97b9 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-09-12Updated git submodulesMichael Mokry1-0/+0
Project: policy/engine master 786e6c02b0a95a8553cdea67861a3669ccb0c42e Added SQL to import SDNC naming model Modified the script to inlcude an insert statement to add the SDNCGenerate Naming model to the microservicemodels table during installation This will need to be merged before I add the CSIT test to Integration Change-Id: I1620ce3f1097d45111bddb08c12b5b8c12bb1b2e Issue-ID: POLICY-983 Signed-off-by: Michael Mokry <mm117s@att.com>
2018-09-12Updated git submodulesMichael Mokry1-0/+0
Project: policy/engine master a290a5fedd395f075135949a7f5313ee1abffc89 Modified Min Max Guard xacml template Changed the condition to remove not from permit and have only one not for deny Change-Id: Ie4563aba000fa5366095fe23d23c37019b5224d4 Issue-ID: POLICY-1038 Signed-off-by: Michael Mokry <mm117s@att.com>
2018-09-11Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 7614ce4634486cea3898ff9328626f69196687cc Merge "New min/max Guard Policy" New min/max Guard Policy Made changes to support Guard policy create/update and other policy manager functions including deletePolicy and pushPolicy. Includes changes for new Guard policy support using GUI and API (Rest and Java Client) Made changes to address Jim's comments Made changes to address Liam's comments Change-Id: I133fe1fd9287ea77ea41a2788de90c7642c36b6a Issue-ID: POLICY-1038 Signed-off-by: Mike Mokry <mm117s@att.com>
2018-09-11Updated git submodulesliamfallon1-0/+0
Project: policy/engine master 08f30ef9c85266a769530a8f5179cb01a68a7612 Change websockets to managed version Change-Id: Iff8f9053640752f86e6f5aa94c1f16f6d3e01d6a Issue-ID: POLICY-884 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-10Updated git submodulesrb71471-0/+0
Project: policy/engine master 1134bd40da28d3833a0dd4f821e75ec938f6061f Resolved XACML Platform Sonar issues Issue-ID: POLICY-902 Change-Id: If22627dfe7df993b5c725ddf3a66c10ebbaa73ca Signed-off-by: rb7147 <rb7147@att.com>
2018-09-06Updated git submodulesJorge Hernandez1-0/+0
Project: policy/engine master 5aeeaae2e6ea881dd11601bedc2ffc94443bc9d3 Merge "XACML Platform Enhancements" XACML Platform Enhancements To Support Raw Policy Creation from GUI and API. GetDecision on combining algorithim with Policy Set. Issue-ID: POLICY-902 Change-Id: Ie3189f8ded2e03366bc7d65d15b95b88c89b0acd Signed-off-by: rb7147 <rb7147@att.com>
2018-09-06Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 5dfb55068e2bb88af55d6ce48c235cff7ea9b326 Merge "TOSCA model enhancements" TOSCA model enhancements Add those features below to existing TOSCA Policy model: 1. Set default value to HTML element 2. Set description of a property as a tooltip 3. Support Boolean type 4. User defined object can be re-used by different properties in the same yaml file Issue-ID: POLICY-900 Change-Id: I337107828ce8130b9a68a2ba000ee719bbcb923e Signed-off-by: Wang,Frank(gw1218) <gw1218@att.com>
2018-08-30Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 2cb76b3efe8ca385da3bc5f5afc5b26a52c6fd43 Upgrade to policy/parent Change from oparent to policy/parent which inherit from the latest oparent. The latest oparent has dependencyManagement recommendations from the ONAP Security sub committee that the policy team is adhering as part of the effort to consolidate security work across projects. Change-Id: I1a43fc5a04dbc8c4cb2b7bedbca67ad3e9dd120b Issue-ID: INT-619 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-08-28Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master d4832f75d3410139d62f29e1b2c91dd8d3636c99 Merge "Enhancement on Dashboard" Enhancement on Dashboard Enhancement on dashboard by including more info related to CRUD actions on policies and also providing an advanced search feature. Issue-ID: POLICY-1042 Change-Id: I987e0ca13824413f90299a366fb4464fca7de06a Signed-off-by: Wang,Frank(gw1218) <gw1218@att.com>
2018-08-28Updated git submodulesSaryu Shah1-0/+0
Project: policy/engine master c004512b82598088cf333fd354e90aee4e601a64 Modified Blacklist documentation Modified Blacklist documentation ------------------------------------------------------------- Issue-ID: POLICY-947 Change-Id: Ie31d45c302c51abc09705df8e714fb42d9ced1a6 Signed-off-by: Saryu Shah <ss3917@att.com>
2018-08-24Updated git submodulesMichael Mokry1-0/+0
Project: policy/engine master e1f88b91981a22cc63019d1d6b73089566425383 policy/engine changes to support PE https Enabled https connector in server.xml and modified the docker-install.sh to fix the default variable name for policy truststore Change-Id: I6db6a6d2353130c91c1f344ea7927d187150adca Issue-ID: POLICY-781 Signed-off-by: Michael Mokry <mm117s@att.com>
2018-08-22Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master c25e4d412eb573de020ba4e5da48f48451217f52 Merge "Use builder for std pap policy" Use builder for std pap policy Modify constructor in stdpappolicy to use builder this will fix the sonar issue related with more than 7 parameters method parameters Issue-ID: POLICY-1016 Change-Id: Id736a66e5ea48f0f233cffb640cdce8aaa8f2c0d Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-08-20Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master b0557d5e3e2218d794fac3b28c2254593a6c3a80 Merge "Updated guard blacklist documentation" Updated guard blacklist documentation Updated guard blacklist documentation ------------------------------------------------------------- Change-Id: Ib99fd83119994a59e9708e3585d0eafdababc8d5 Issue-ID: POLICY-947 Signed-off-by: Saryu Shah <ss3917@att.com>
2018-08-20Updated git submodulesJorge Hernandez1-0/+0
Project: policy/engine master a7ad88d23b2a59a16c098b156c430a2fe3558023 https certs with aaf+pe containers compatibility Change-Id: I21ed7a0fea5ea7d62857a077fa2568da4af99d26 Issue-ID: POLICY-1057 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-08-15Updated git submodulesJorge Hernandez1-0/+0
Project: policy/engine master 84df4a428ded309f750f52ac1c104ac84e426fc0 Merge "Junit Coverage for Import Black List Entries" Junit Coverage for Import Black List Entries Issue-ID: POLICY-901 Change-Id: I3776d3c4ed01bb27ed930c074c370361e33b100a Signed-off-by: rb7147 <rb7147@att.com>
2018-08-14Updated git submodulesJorge Hernandez1-0/+0
Project: policy/engine master 8f4e03b0867eada5220f78a3988865851443b7da Merge "Resolved the Sonar issues" Resolved the Sonar issues Issue-ID: POLICY-901 Change-Id: I30e1d075dd8eb4739bcb5aa1f2503a016900ff75 Signed-off-by: rb7147 <rb7147@att.com>
2018-08-14Updated git submodulesKrishnajinka1-0/+0
Project: policy/engine master 343df73f2b2dd2a39d090244c091371edbd2127f Optimize PAP policy constructor with builder Fix sonar issue about constructor using more than 7 params. Use builder parameters object for setting the attributes of std pap policy.Recommit1 Issue-ID: POLICY-1016 Change-Id: Id9631a42813960baa78df4ab0c0f6706244c3180 Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-08-13Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 5368a1d66dce2a1029e947a43e8ccdcfad98fbc8 Merge "Modify std pap policy to use builder in constr" Modify std pap policy to use builder in constr Fix sonar issue about constructor using more than 7 params. Use builder parameters object for setting the attributes of std pap policy.Rework2 Issue-ID: POLICY-1016 Change-Id: If26f7daa8d5b5d387238aad74daeddd49a8b95bb Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-08-13Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master a54ec0fce0cb5032d373e811d830cdd027b0dd9c Merge "Fix comparison issues in onap pap rest" Fix comparison issues in onap pap rest Fix issues about incorrect comparison in pap rest modules indicated by analysis tools.Rework to fix review comments1 Issue-ID: POLICY-1016 Change-Id: I7a0ee45a721307fc3ba89ab65e807613a3df2542 Signed-off-by: krisjinka <kris.jinka@samsung.com>
2018-08-10Updated git submoduleskrishnajinka1-0/+0
Project: policy/engine master 6ed1731fa2ce340d745dc2d39ffc6a066f50fbc2 Add PAP Policy parameter builder xacml policy Fix Sonar flagged major issue about 14 params instead of 9 in the constructor of std pap policy class. Commit5 for modify constrctor.fix test Issue-ID: POLICY-1016 Change-Id: I79c8482b7fc4e203cb18402ba2b5a68a120c57b1 Signed-off-by: krisjinka <kris.jinka@samsung.com>
2018-08-08Updated git submoduleskrishnajinka1-0/+0
Project: policy/engine master 5e8b7f573f0f7f08be242ee017ecf1243317f1b5 Fix sonar issue with constrctr in xacml comp Fix sonar issue of Method has 9 parameters, which is greater than 7 authorized in StdPDPPolicy. Make the actual sonar fix Issue-ID: POLICY-1016 Change-Id: Ibc79ddce81a6209ec190c7f393557e9c569df453 Signed-off-by: krisjinka <kris.jinka@samsung.com>
2018-08-07Updated git submodulesKrishnajinka1-0/+0
Project: policy/engine master 47c46108782dccd44101b772ba979e3fdf3ead04 Resolve sonar issue in Policy parameters Fix sonar issue of Method has 9 parameters, which is greater than 7 authorized in PolicyParameters class and related test class.Rework2 Issue-ID: POLICY-1016 Change-Id: I3096566d958e093439bcc95d92f1fe92e0ac57be Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-08-06Updated git submodulesKrishnajinka1-0/+0
Project: policy/engine master 7414584e40572c7854db959052c56f3cc8849488 Modify Policy manager servlet for sonar issues Fix basic sonar issues in policy manager servlet major and minor issues reported by sonar Basic refactoring Issue-ID: POLICY-1016 Change-Id: If3c19943c04d9af43807090b6340547d69ca6a19 Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-08-03Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 2fc1a1510259202e8854beb8c04ef045bd28c79b Merge "Modify ONAP PAP REST classes basic checkstyle" Modify ONAP PAP REST classes basic checkstyle Modify tabs to space for checkstyle issue fix in ONAP PAP REST module. It helps future reviews and refactoring. Remaining classes Issue-ID: POLICY-1014 Change-Id: I677eadac9e8364b388be922024528c27fd1e2545 Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-08-03Updated git submodulesJorge Hernandez1-0/+0
Project: policy/engine master dea7a9791960ac2f913e2ab4c70491706ab9e2a0 Merge "Fix major sonar issues in SDK APP admin mod" Fix major sonar issues in SDK APP admin mod Fix Sonar reported major issues regarding extracting constants, method complexity, duplicated code blocks, more than 3 nested control blocks. Rework3 after self review. Issue-ID: POLICY-1016 Change-Id: Icbf940c966c51a8ef4319a94a3832cb1e8c360ba Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-08-02Updated git submodulesKrishnajinka1-0/+0
Project: policy/engine master f0fec2a861ea0a92b27b40882ea38f9422cde0c6 Convert tabs to space in ONAP PAP REST1 Modify tabs to space for checkstyle issue fix in ONAP PAP REST module. It helps future reviews and refactoring Issue-ID: POLICY-1014 Change-Id: Idcf45689565f039c76a3ef0f40ad9a46b41bd8d6 Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-07-31Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 7a6c4f9214a71101db3354ed06ccd3cfd3cea65b Merge "Copy policy-endpoints from drools-pdp to common" Copy policy-endpoints from drools-pdp to common Issue-ID: POLICY-967 Change-Id: I84eba5c06d129cb2a7ef27ed78b63a8ada37805c Signed-off-by: mmis <michael.morris@ericsson.com>
2018-07-31Updated git submodulesJorge Hernandez1-0/+0
Project: policy/engine master e31e46738ca14c18a00773e598df6639154aa1f2 Merge "Convert tabs to spaces basic refactoring" Convert tabs to spaces basic refactoring Change tabs into spaces for checkstyle fixes in ONAP REST module of policy engine. These changes come in way for review. Hence doing them before refactoring is better. Issue-ID: POLICY-1014 Change-Id: I31a372ae527946927157bc23b576f3066679b0ae Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-07-31Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 64d3d5f9d4fb225fde55598e5b7462978642c417 Merge "Fix major sonar issues in SDK APP" Fix major sonar issues in SDK APP Fix major issues reported by sonar in POLICY SDK APP files such as CreateBRMSParamController, PolicyManagerServlet. Also modify tabs to space. Rework2 based on review comments Issue-ID: POLICY-1016 Change-Id: I5407ade1ce9f597fa91d9ca18506f5ac2d8b1411 Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-07-30Updated git submodulesKrishnajinka1-0/+0
Project: policy/engine master 1ecf9de8c889adb2dbc9ddd9a79d28e1da89d87b Fix Sonar issues in utils PDP ParseLog rework Fix Major Sonar issues in ParseLog BackupMonitor and ONAP-PDP component. Issues related to nested control statements. Rework2 based on review comments Issue-ID: POLICY-1013 Change-Id: I10edb242b45a649df902a4e7c1aba0a285b8b7fb Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-07-27Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master 1df87df1af0d215b9ff908dd15089393b9be270b Merge "Copy policy-endpoints from drools-pdp to common" Copy policy-endpoints from drools-pdp to common Replaced references to classes deleted from drools-pdp with references to the corresponding classes in polcy-common Issue-ID: POLICY-967 Change-Id: I7bb580af3b3b2eb0ddcab9421c595237fa37282b Signed-off-by: mmis <michael.morris@ericsson.com>