summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-09-10Updated git submodulesVictor Morales1-0/+0
Project: multicloud/k8s master e7a7b50f6fc0f036eeb116f95e8e5fb8d56aa4ef Add no_proxy config value to docker-compose.yml The no_proxy configuration value was missing in the docker-compose.yml this was causing a different behaviour when the functional tests were running and consuming the services on the container. Change-Id: Ie88e88d50e0ec9c4aa0d03367f2a9d25edccb753 Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: MULTICLOUD-301
2018-09-10Updated git submodulesMandeep Khinda1-0/+0
Project: oom master 5d4009b3530ef2332122ab6bed115c43edb146f3 Merge "SDC Workflow Designer" SDC Workflow Designer 1. Added additional arguments 2. Changed the debug ports on BE and FE Change-Id: I8b83ee4e7656b3cdb64436c48b1c44bf720ba873 Issue-ID: OOM-1312 Signed-off-by: priyanshua <pagarwal@amdocs.com>
2018-09-10Updated git submodulesMandeep Khinda1-0/+0
Project: oom master ab86fe01cee542fa7d08a584aa129b1a4c904a40 Merge "Fix APICDOC HC creds" Fix APICDOC HC creds Change-Id: I08ea5930b7c119081fcfdc0dc80ba1d07645ab23 Issue-ID: INT-641 Signed-off-by: Aaron Hay <ah415j@att.com>
2018-09-10Updated git submodulesMohammadreza Pasandideh1-0/+0
Project: oom master a38dba9df4d366f3eb089b27b2c8e2cfa116394c Add NDCXT builder to Context Aggregator Issue-ID: LOG-460 Change-Id: I5f827b23707b336df3771638fbe8dfc87367ea05 Signed-off-by: Mohammadreza Pasandideh <mohammadreza.pasandideh@amdocs.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-10Updated git submodulesSandeep J1-0/+0
Project: appc master 52b8066a392b0c3bee7fa9339930126ff684eafa added test case to ConfigResourceNodeTest to increase code coverage Issue-ID: APPC-1086 Change-Id: I1e8948ed3009704bf4f118b2ac6a6b94aa96178c Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-09-10Updated git submodulesPatrick Brady1-0/+0
Project: appc master 237e4d0ffa907fefd203f1e34cba840f4d8eba08 Fix for artifact handler rpc error Change over to using blueprint for rpc registration Change-Id: Ie647472eb3e42eb7e878c526b13acbfffd1bc18f Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-1185
2018-09-10Updated git submodulesThomas Nelson1-0/+0
Project: music master 393b00e29666cea35849ada88cdc6983b792120a Merge "RestMusicQAPI.java: Fixed sonar issues" RestMusicQAPI.java: Fixed sonar issues Fixed sonar code-smells/issues across this file Issue-ID: MUSIC-132 Change-Id: I8085caf301a46165675ff20a80b0fac1fbf885ff Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-09-10Updated git submodulesSooriyaa1-0/+0
Project: music master 8a4224bffad3139e151722dcc9ddd52731d3d5e6 Adding a constant to remove duplicate string Adding a constant to remove duplicate string Issue-ID: MUSIC-133 Change-Id: I1c9e82cf210c2dd0f00bec53c95fa5281f368568 Signed-off-by: Sooriyaa <soponraj@in.ibm.com>
2018-09-10Updated git submodulesMichael O'Brien1-0/+0
Project: logging-analytics master 8dff758d560d3acdbd21a2ea11f4ba5a5ede1ff0 Merge "Support Marker in python logging" Support Marker in python logging 1 Add 'Marker' feature which carry extra contextual information for loggers, can be used to mark a single log statement 2 Make MDC Formatter have "marker" label. Change-Id: I21ac547b97c49190393d57ff290dcbc3ae20da2a Issue-ID: MULTICLOUD-328 Signed-off-by: liangke <lokyse@163.com>
2018-09-10Updated git submodulesMichael O'Brien1-0/+0
Project: logging-analytics master 915f857e3330ae376ee23fd8499b3ffa7c5c4ff9 Merge "Python3 compatible" Python3 compatible Upgrade code compatibly with python-3.x Change-Id: I04f2e7a92d21f161a2e4cc904743043394616145 Issue-ID: MULTICLOUD-327 Signed-off-by: liangke <lokyse@163.com>
2018-09-10Updated git submodulesTaka Cho1-0/+0
Project: appc master b51a315636321718cde5ea759cebcb1b28a06d94 remove logback 1.1.2 security issue under provider, we need to specify logback artifact to remove the issue Change-Id: Idb85bac263983447cc4b0d3d8e828371d1c7b2b4 Issue-ID: APPC-1018 Signed-off-by: Taka Cho <tc012c@att.com>
2018-09-10Updated git submodulesRob Daugherty1-0/+0
Project: so master c5caaf624bb44713c4daa8d68befa67ee28573f4 Merge "sparate beans and repositories" sparate beans and repositories Seperate out Beans and repositories for RequestDB Change-Id: I67d6597d580e9828b6bb8faafaea7e09cc6467c0 Issue-ID: SO-999 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-10Updated git submodulesPatrick Brady1-0/+0
Project: appc master 58d1bddf8148b33e613931f4ec94dd5e591bc7cf Fix for provider rpc error Change over to using blueprint for rpc registration Tests cases will need to be modified and uncommented Change-Id: I6535c2d9d141406ac29dc8bb2b769fea3bdbf53f Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-1185
2018-09-10Updated git submodulesJonathan Gathman1-0/+0
Project: aaf/authz master c864fd0dd9ac5a3704c883abbb16005aa5b16742 Merge "CertResp.java: Fixed sonar issue" CertResp.java: Fixed sonar issue Sonar Link : https://sonar.onap.org/code?id=org.onap.aaf.authz%3Aparent&selected=org.onap.aaf.authz%3Aaaf-auth-certman%3Asrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcm%2Fdata%2FCertResp.java Issue-ID: AAF-476 Change-Id: I5aafc143b7af1fdb11c2ef029fef624cf34fad3a Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-09-10Updated git submodulesArundathi Patil1-0/+0
Project: aaf/authz master 143dcbee432c4083f207b6b5cac95e545c6b051f URFFutureApprove.java: Fixed sonar issue Sonar Link : https://sonar.onap.org/code?id=org.onap.aaf.authz%3Aparent&selected=org.onap.aaf.authz%3Aaaf-auth-batch%3Asrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Factions%2FURFutureApprove.java Issue-ID: AAF-475 Change-Id: I960e62206de8848bb8e85d15ebe7ef56d9c81b56 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-09-10Updated git submodulesSandeep J1-0/+0
Project: appc master 872f19c71c545950efb9fb65391f2ab7ee8af1a4 added test case to SshJcraftWrapperTest to increase code coverage Issue-ID: APPC-1086 Change-Id: Ic40b87f63f4b14b70870fa717bcf01f206dc982f Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-09-10Updated git submodulesArul.Nambi1-0/+0
Project: aai/sparky-be master f90ea27dbd53b3c378d374997894a86457c69443 Fixing issues found by nexus scan Issue-ID: AAI-1583 Change-Id: I3633fb1e86a07c94a777746b93c6080c049b50e8 Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
2018-09-10Updated git submodulesByung-Woo Jun1-0/+0
Project: so master 54bff33ffe1318f0ed72f19041546b4dc3a679cb Merge "RequestTunables.java: Fixed sonar issues" RequestTunables.java: Fixed sonar issues Sonar-Link : https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so%3Amso-sdnc-adapter%3Asrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Fadapters%2Fsdnc%2Fimpl%2FRequestTunables.java Issue-ID: SO-1008 Change-Id: I7660ac5f7be56e1a1d409305e6ffaf5a841ae446 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-09-10Updated git submodulesByung-Woo Jun1-0/+0
Project: so master 63b09e55e00fed781eaaa92fe9e79673ee601d8f Merge "SDNCAdapterTypeImpl.java: Fixed sonar issue" SDNCAdapterTypeImpl.java: Fixed sonar issue Sonar Link : https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so%3Amso-sdnc-adapter%3Asrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Fadapters%2Fsdnc%2Fimpl%2FSDNCAdapterPortTypeImpl.java Issue-ID: SO-1007 Change-Id: Id11dcccaeb7a728f9fa238570759783fb9053ed9 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-09-10Updated git submodulesByung-Woo Jun1-0/+0
Project: so master 0bcace2b12c25746e1335cd58aa4226de82ef97f Merge "fixed sonar issue in MsoNetworkAdapterImpl" fixed sonar issue in MsoNetworkAdapterImpl fixed sonar issue as detailed in SO-989 Issue-ID: SO-989 Change-Id: Ic4ec79847bbc5980cb6889d0ab2d766b3875faca Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-09-10Updated git submodulesedepaul1-0/+0
Project: dmaap/datarouter master 82105b59b2502fe1f119bc909c08c9bac173bdfc Update POM version for DOM4j Change-Id: Idabced2faf24295b862fd38f1ec93ab3cd9ffca9 Signed-off-by: Paul Dennehy <paul.p.dennehy@ericsson.com> Issue-ID: DMAAP-758
2018-09-10Updated git submodulesBozawglanian, Hagop (hb755d)1-0/+0
Project: vnfrqts/requirements master 5052284bcd1480ed3486acf1ef3750347a573a3d VNFRQTS - Reword and Move Security Req Batch 1 Including changes for VNFRQTS - 333, 334, 374, 378, 407, 409 Issue-ID: VNFRQTS-333 Change-Id: I336ae80a7c92887b06050a6bbe5d1a8d42f68008 Signed-off-by: Bozawglanian, Hagop (hb755d) <hb755d@att.com>
2018-09-10Updated git submodulesByung-Woo Jun1-0/+0
Project: so master 18256c29ead252e163fa195cb6c0059673f3aa79 Merge "ValetStatus.jsvs: Fixed sonar issue" ValetStatus.jsvs: Fixed sonar issue Sonar-link: https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so%3Amso-openstack-adapters%3Asrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Fadapters%2Fvalet%2Fbeans%2FValetStatus.java Issue-ID: SO-1006 Change-Id: Ie7595dbc17f6e86590d153d25afe00fbae670a13 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-09-10Updated git submodulesRob Daugherty1-0/+0
Project: so master aae59c1642f773fac85e749d2d7cf68cdda31aaa Merge "added object constructor" added object constructor added Object constructor to AAIResultWrapper Change-Id: Ic1bae387a13b7b7864c2687a63532347d8f102e7 Issue-ID: SO-998 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-10Updated git submodulesRob Daugherty1-0/+0
Project: so master e8b5ccd0a6865aea17385056b75b2df8b6566570 Merge "stability fixes" stability fixes fixed bean error fixed execution variable name do not explicitly set hibernate objects Removed remaing references to tunnel-xconnect fixed virtual link case Change-Id: Ia5a59794e84beadcbf259efb899878cc4465ca57 Issue-ID: SO-997 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-10Updated git submodulesRob Daugherty1-0/+0
Project: so master fcbb46d2e3d11a271014b2b2a08d36be076ea732 Merge "cleaned up missed repo interactions" cleaned up missed repo interactions -Missed oen file from the previous commit - Removing any left out repository imports and dependencies from the api handle Change-Id: I5447d1a9f20b2e50243432e4570dec7aa27c7061 Issue-ID: SO-996 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-10Updated git submodulesRob Daugherty1-0/+0
Project: so master 66c9f177a6ff7c19a769e7a0eb5a387f90fe9deb Merge "fixed null pointer on northbound" fixed null pointer on northbound Removed ID from sample request JSON Added null check to fix null query value parameter error Change-Id: I1bf427b7864560bbbd577972763be439edad6ec0 Issue-ID: SO-943 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-10Updated git submodulesRob Daugherty1-0/+0
Project: so master c8e5d9f69a133fb0c9919257fc340811152526ef Merge "added generic fabric support to SO" added generic fabric support to SO Fix Autoincrement of ID field in table Fix accidental removal of method Update usage of requestdb client removed unused imports in common tasks and test Fix broken branch, have unit tests pass references the Epic branch Fix broken branch from compiling committing classpath for vfc adapter cause its not going away added in the fail case for when there are no profiles removed second set of adapters in application test yml removed double adapters in request db application test added jpa repo dependency to the so bpmn folder pom add creation timestamp column to the table added in null checks for Config returned from policy switched to string in requestprocess with jenerate switched to string in requestprocess with jenerate updated aai version in common pom to 605 from 591 renamed the db scripts for flyway sync to register added endpoint to application test yml for failing test ... Change-Id: I800f837ea75d7cdff740dc3a387e4d7654cfd085 Issue-ID: SO-972 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-10Updated git submodulesByung-Woo Jun1-0/+0
Project: so master 0ca2380f86cf7ea460017590f8a33967c8fc380b Merge "fixed sonar issue in MsoNetworkAdapterAsyncImpl" fixed sonar issue in MsoNetworkAdapterAsyncImpl fixed sonar issue as detailed in SO-988 Issue-ID: SO-988 Change-Id: I66fcee5129fb749a887db2f6eab0f9fd2cdb1e36 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-09-10Updated git submodulesByung-Woo Jun1-0/+0
Project: so master b3e50d4d5efe6b8e845548e355573d8b210c5513 Merge "GenericValeResponse.java: Fixed sonar issues" GenericValeResponse.java: Fixed sonar issues Sonar Link: https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so%3Amso-openstack-adapters%3Asrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Fadapters%2Fvalet%2FGenericValetResponse.java Issue-ID: SO-1004 Change-Id: I0e17108693913302bc0485ac9e30d2c0bcaa68e6 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-09-10Updated git submodulesArundathi Patil1-0/+0
Project: so master da8b20001c03c45c0ea1eac471009e60db1dc8e0 CFXConfiguration.java: Fixed sonar issues Sonar Link : https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so%3Amso-sdnc-adapter%3Asrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Fadapters%2Fsdnc%2FCXFConfiguration.java Issue-ID: SO-1002 Change-Id: Ieea4c3a2fe9798dc44d2f3bd8bc6c1d02726f32f Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-09-10Updated git submodulesJakub Zieba1-0/+0
Project: vid master b4aa71e35ea1fc3898fc1577fd4c8f7a228f34ca Use correct trust store Use correct trust store file in SSL configuration Fix for schema and data creation Change-Id: Ie5b329191779a75ea902f547f09b59b65f09f64c Issue-ID: VID-271 Signed-off-by: Jakub Zieba <jakub.zieba@nokia.com>
2018-09-10Updated git submodulesGuangrongFu1-0/+0
Project: holmes/rule-management master addd081a91a85d038c042f91bcf0f56a838a9c68 Added health check url to MSB registration Change-Id: I2ccd68ca20b88be3179058cd0f29055cdf442946 Issue-ID: HOLMES-130 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2018-09-10Updated git submodulesGuangrongFu1-0/+0
Project: holmes/engine-management master 9daa8134d541724dbd7bceaa9aa62a45b3ac975c Added health check url to MSB registration Change-Id: I19722571c6fa4a14e62d95dfae4c5d2ba5a197a9 Issue-ID: HOLMES-130 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2018-09-10Updated git submodulesGuangrongFu1-0/+0
Project: holmes/rule-management master fe82105b379a26dae3d552b483965833f10fe4b9 Update the Jetty & PG Dependencies Version Change-Id: I65b47c521e5031b463083fe4df617cc35baa9768 Issue-ID: HOLMES-165 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2018-09-10Updated git submodulesGuangrongFu1-0/+0
Project: holmes/engine-management master d277804f976d3fea07ce6d167c8e75a6b1c1e747 Update the Jetty & PG Dependencies Version Change-Id: I485b34e023366a80d813cdb211838c5cbc07f9e3 Issue-ID: HOLMES-165 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2018-09-10Updated git submodulesGuangrongFu1-0/+0
Project: holmes/rule-management master cc95aa4f9966f014f45e32f177bf622b3ef7a8b7 Correted UT Coverage Issues Change-Id: Id89d4c600683646958e7e0b4b2982506e1bf7db4 Issue-ID: HOLMES-159 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2018-09-10Updated git submodulesRuoyu Ying1-0/+0
Project: vfc/nfvo/lcm master f2c8a6137235d8f9664b36cce49aa3cbe061a5e5 Refine logic for OOF response resolvation Refine some logic inside resolvation Change-Id: I0a69758b39f6f3deed075d82cedbf674ff16a3a2 Issue-ID: VFC-941 Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com>
2018-09-10Updated git submodulesByung-Woo Jun1-0/+0
Project: so master 59002804ca23f60b7a2c4ab837cb08a263a8afb5 Merge "fixed sonar issue in in VfcAdapterRest.java" fixed sonar issue in in VfcAdapterRest.java fixed sonar issue as detailed in SO-991 Issue-ID: SO-991 Change-Id: I016f1db14c5dd03f9b9bb872c16a221168c2d628 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-09-10Updated git submodulesByung-Woo Jun1-0/+0
Project: so master 46863ad3111d69190ab255565c3ef1a76f0fd934 Merge "fixed sonar issue in MSOVfcApplication.java" fixed sonar issue in MSOVfcApplication.java fixed sonar issue as detailed in SO-990 Issue-ID: SO-990 Change-Id: Ie27a1040d64b53b699a14cae95e5641a70c18ec0 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-09-10Updated git submodulesByung-Woo Jun1-0/+0
Project: so master 0bfdfc30e17e3051ae2b4e33e9dc6872901708e3 Merge "fixed sonar issue in VolumeAdapterRest.java" fixed sonar issue in VolumeAdapterRest.java fixed sonar issue as detailed in SO-992 Issue-ID: SO-992 Change-Id: I4e222fd6b80a2dde199ad2d1e049357f64651e40 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-09-10Updated git submodulesSandeep J1-0/+0
Project: so master 5a4e63330f77e6366b1ee66ee6f466d4b0f7252d fixed sonar issue in CamundaClient.java fixed sonar issue as detailed in SO-993 Issue-ID: SO-993 Change-Id: I614cf8add2e056b18f1e4926b658b4ea716afd86 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-09-10Updated git submodulesByung-Woo Jun1-0/+0
Project: so master 7ecb73575d91b6d42d0dbdc6b26af73e8c0f26a9 Merge "fixed sonar issue in HeatRequest.java" fixed sonar issue in HeatRequest.java fixed sonar issue as detailed in SO-987 Issue-ID: SO-987 Change-Id: Ia397b3a3061c1654d59ccd154334193ccaf6d6e5 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-09-10Updated git submodulesHuabing Zhao1-0/+0
Project: msb/apigateway master 07c51ccd6ded30e8d5ceba4abaed0c202a183283 Merge "Use managed guava version" Use managed guava version Use centrally managed guava version specified in oparent. Includes upgrade to oparent 1.2.0. This change was submitted by script and may include additional whitespace or formatting changes. Change-Id: Ic904edfd7421d78f05417492fc1766e83f3d7f2d Issue-ID: INT-619 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2018-09-10Updated git submodulesSandeep J1-0/+0
Project: so master 39b5d1616dbc54a63954c0730695ca32ab87eada fixed sonar issue in WebSecurityConfigImpl.java fixed sonar issue as detailed in SO-986 Issue-ID: SO-986 Change-Id: Ia110b07c336c9bcf002f9dbf930042387ebc7abf Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-09-10Updated git submodulesRuoyu Ying1-0/+0
Project: vfc/nfvo/lcm master b1fb8844820a212f3f86810fed63e8d5f2576c3e Resolve OOF response and store it into DB Resolve the OOF response and update it to DB Change-Id: I8f0c7944ecdd63535bafc8007d30b973f7b41b91 Issue-ID: VFC-941 Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com>
2018-09-09Updated git submodulesAmichai Hemli1-0/+0
Project: vid master f971858079154a57f83cd77299315ca0262e9628 Merge "Update vid-schema.sql" Update vid-schema.sql Change-Id: Ia56312b70cc98e499a2d3920a0ab17fd7d976e16 Issue-ID: VID-307 Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
2018-09-09Updated git submodulesshiria1-0/+0
Project: sdc master f450879a13742c710173e6e2ccad74aa21e342fc Add support for service substitution filter Change-Id: Id320380b83f072e0b8f5a81831111cbe96957d78 Issue-ID: SDC-1740 Signed-off-by: shiria <shiri.amichai@amdocs.com>
2018-09-08Updated git submodulesShankaranarayanan Puzhavakath Narayanan1-0/+0
Project: optf/osdf master 02390e7240f796075ea4ed4d0486f28806e4afd3 Merge "Add credentials for VFC placement request" Add credentials for VFC placement request Change-Id: I74ae1c1821ca4fabdf82a55c74f91f56d88d3703 Signed-off-by: Varma, Vikas <vv8305@att.com> Issue-ID: OPTFRA-338