diff options
| author |   Ofir Sonsino <os0695@intl.att.com> | 2020-01-21 15:29:57 +0200 |
|---|---|---|
| committer |   Yuli Shlosberg <ys9693@att.com> | 2020-02-13 08:52:43 +0000 |
| commit | f70e2b5f66493822b512767d504ae26275cb16a2 (patch) | |
| tree | 20e340e2f85c122eda06ad9494600e31afbeb483 | |
| parent | e05eb92e3a8f80dbf8cc15239c83587fca67a79d (diff) | |
Update to Portal SDK v2.6
Change-Id: I602891d783ce4c80fca6e9da3c765218d19da993
Issue-ID: SDC-2684
Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
| -rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/EcompIntImpl.java | 2 | ||||
| -rw-r--r-- | catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java | 13 | ||||
| -rw-r--r-- | pom.xml | 2 |
3 files changed, 3 insertions, 14 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/EcompIntImpl.java b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/EcompIntImpl.java index ec349aeac4..1b22889309 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/EcompIntImpl.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/EcompIntImpl.java @@ -328,7 +328,7 @@ public class EcompIntImpl implements IPortalRestAPIService { } @Override - public boolean isAppAuthenticated(HttpServletRequest request) { + public boolean isAppAuthenticated(HttpServletRequest request, Map<String,String> appCredentials) throws PortalAPIException { final String portal_key = PortalApiProperties.getProperty("portal_pass"); final String portal_user = PortalApiProperties.getProperty("portal_user"); final String USERNAME = request.getHeader("username"); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java index c32768b85b..d94bdeffc0 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java @@ -87,17 +87,6 @@ public class EcompIntImplTest { result = testSubject.getAvailableRoles("Mock"); } - /*@Test - public void testPushUserRole() throws Exception { - EcompIntImpl testSubject; - String loginId = ""; - List<EcompRole> roles = null; - - // test 1 - testSubject = createTestSubject(); - roles = null; - testSubject.pushUserRole(loginId, roles); - }*/ @Test(expected= PortalAPIException.class) public void testGetUserRoles() throws Exception { @@ -117,7 +106,7 @@ public class EcompIntImplTest { HttpServletRequest httpServletRequestImpl = Mockito.mock(HttpServletRequest.class); // default test testSubject = createTestSubject(); - result = testSubject.isAppAuthenticated(httpServletRequestImpl); + result = testSubject.isAppAuthenticated(httpServletRequestImpl, null); } @Test @@ -54,7 +54,7 @@ Modifications copyright (c) 2018-2019 Nokia <netty.version>4.1.36.Final</netty.version> <servlet-api.version>3.1.0</servlet-api.version> <wire-mock.version>2.18.0</wire-mock.version> - <ecomp.version>2.4.0</ecomp.version> + <ecomp.version>2.6.0</ecomp.version> <cassandra.unit.version>3.5.0.1</cassandra.unit.version> <cadi.version>2.1.8</cadi.version> <lombok.version>1.18.2</lombok.version> |